mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-09-13 02:05:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes: coding style (tabs, ident, etc...).

Browse Source
This commit is contained in:
fbernon 2007-12-02 22:35:55 +00:00
parent 865f6eb5f3
commit 37a5a87057
6 changed files with 1225 additions and 1148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

924
src/netif/ppp/auth.c
View File

File diff suppressed because it is too large Load Diff

38
src/netif/ppp/auth.h
View File

@ -28,7 +28,7 @@
* 03-01-01 Marc Boucher <marc@mbsi.ca> * 03-01-01 Marc Boucher <marc@mbsi.ca>
* Ported to lwIP. * Ported to lwIP.
* 97-12-04 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc. * 97-12-04 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
* Original derived from BSD pppd.h. * Original derived from BSD pppd.h.
*****************************************************************************/ *****************************************************************************/
/* /*
* pppd.h - PPP daemon global declarations. * pppd.h - PPP daemon global declarations.
@ -56,14 +56,30 @@
/*********************** /***********************
*** PUBLIC FUNCTIONS *** *** PUBLIC FUNCTIONS ***
***********************/ ***********************/
void link_required (int); /* we are starting to use the link */
void link_terminated (int); /* we are finished with the link */ /* we are starting to use the link */
void link_down (int); /* the LCP layer has left the Opened state */ void link_required (int);
void link_established (int); /* the link is up; authenticate now */
void np_up (int, u16_t); /* a network protocol has come up */ /* we are finished with the link */
void np_down (int, u16_t); /* a network protocol has gone down */ void link_terminated (int);
void np_finished (int, u16_t); /* a network protocol no longer needs link */
void auth_peer_fail (int, u16_t);/* peer failed to authenticate itself */ /* the LCP layer has left the Opened state */
void link_down (int);
/* the link is up; authenticate now */
void link_established (int);
/* a network protocol has come up */
void np_up (int, u16_t);
/* a network protocol has gone down */
void np_down (int, u16_t);
/* a network protocol no longer needs link */
void np_finished (int, u16_t);
/* peer failed to authenticate itself */
void auth_peer_fail (int, u16_t);
/* peer successfully authenticated itself */ /* peer successfully authenticated itself */
void auth_peer_success (int, u16_t, char *, int); void auth_peer_success (int, u16_t, char *, int);
@ -76,7 +92,9 @@ void auth_withpeer_success (int, u16_t);
/* check authentication options supplied */ /* check authentication options supplied */
void auth_check_options (void); void auth_check_options (void);
void auth_reset (int); /* check what secrets we have */
/* check what secrets we have */
void auth_reset (int);
/* Check peer-supplied username/password */ /* Check peer-supplied username/password */
int check_passwd (int, char *, int, char *, int, char **, int *); int check_passwd (int, char *, int, char *, int, char **, int *);

1021
src/netif/ppp/chap.c
View File

File diff suppressed because it is too large Load Diff

7
src/netif/ppp/magic.c
View File

@ -53,7 +53,6 @@
#include "randm.h" #include "randm.h"
#include "magic.h" #include "magic.h"
/***********************************/ /***********************************/
/*** PUBLIC FUNCTION DEFINITIONS ***/ /*** PUBLIC FUNCTION DEFINITIONS ***/
/***********************************/ /***********************************/
@ -65,7 +64,7 @@
*/ */
void magicInit() void magicInit()
{ {
return; return;
} }
/* /*
@ -73,7 +72,5 @@ void magicInit()
*/ */
u32_t magic() u32_t magic()
{ {
return avRandom(); return avRandom();
} }

9
src/netif/ppp/magic.h
View File

@ -48,7 +48,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
* *
* $Id: magic.h,v 1.1 2003/05/27 14:37:56 jani Exp $ * $Id: magic.h,v 1.2 2007/12/02 22:35:55 fbernon Exp $
*/ */
#ifndef MAGIC_H #ifndef MAGIC_H
@ -58,7 +58,10 @@
************************** PUBLIC FUNCTIONS ********************************** ************************** PUBLIC FUNCTIONS **********************************
*****************************************************************************/ *****************************************************************************/
void magicInit(void); /* Initialize the magic number generator */ /* Initialize the magic number generator */
u32_t magic(void); /* Returns the next magic number */ void magicInit(void);
/* Returns the next magic number */
u32_t magic(void);
#endif /* MAGIC_H */ #endif /* MAGIC_H */

96
src/netif/ppp/ppp.h
View File

@ -28,7 +28,7 @@
* 03-01-01 Marc Boucher <marc@mbsi.ca> * 03-01-01 Marc Boucher <marc@mbsi.ca>
* Ported to lwIP. * Ported to lwIP.
* 97-11-05 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc. * 97-11-05 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc.
* Original derived from BSD codes. * Original derived from BSD codes.
*****************************************************************************/ *****************************************************************************/
#ifndef PPP_H #ifndef PPP_H
@ -97,13 +97,13 @@
#define UNTIMEOUT(f, a) sys_untimeout((f), (a)) #define UNTIMEOUT(f, a) sys_untimeout((f), (a))
# ifndef __u_char_defined #ifndef __u_char_defined
/* Type definitions for BSD code. */ /* Type definitions for BSD code. */
typedef unsigned long u_long; typedef unsigned long u_long;
typedef unsigned int u_int; typedef unsigned int u_int;
typedef unsigned short u_short; typedef unsigned short u_short;
typedef unsigned char u_char; typedef unsigned char u_char;
#endif #endif
@ -115,8 +115,8 @@ typedef unsigned char u_char;
/* /*
* The basic PPP frame. * The basic PPP frame.
*/ */
#define PPP_HDRLEN 4 /* octets for standard ppp header */ #define PPP_HDRLEN 4 /* octets for standard ppp header */
#define PPP_FCSLEN 2 /* octets for FCS */ #define PPP_FCSLEN 2 /* octets for FCS */
/* /*
@ -148,8 +148,8 @@ typedef unsigned char u_char;
/* /*
* Values for FCS calculations. * Values for FCS calculations.
*/ */
#define PPP_INITFCS 0xffff /* Initial FCS value */ #define PPP_INITFCS 0xffff /* Initial FCS value */
#define PPP_GOODFCS 0xf0b8 /* Good final FCS value */ #define PPP_GOODFCS 0xf0b8 /* Good final FCS value */
#define PPP_FCS(fcs, c) (((fcs) >> 8) ^ fcstab[((fcs) ^ (c)) & 0xff]) #define PPP_FCS(fcs, c) (((fcs) >> 8) ^ fcstab[((fcs) ^ (c)) & 0xff])
/* /*
@ -161,10 +161,10 @@ typedef u_char ext_accm[32];
* What to do with network protocol (NP) packets. * What to do with network protocol (NP) packets.
*/ */
enum NPmode { enum NPmode {
NPMODE_PASS, /* pass the packet through */ NPMODE_PASS, /* pass the packet through */
NPMODE_DROP, /* silently drop the packet */ NPMODE_DROP, /* silently drop the packet */
NPMODE_ERROR, /* return an error */ NPMODE_ERROR, /* return an error */
NPMODE_QUEUE /* save it up for later. */ NPMODE_QUEUE /* save it up for later. */
}; };
/* /*
@ -210,6 +210,7 @@ enum NPmode {
#define BCMP(s0, s1, l) memcmp((u_char *)(s0), (u_char *)(s1), (l)) #define BCMP(s0, s1, l) memcmp((u_char *)(s0), (u_char *)(s1), (l))
#define BCOPY(s, d, l) MEMCPY((d), (s), (l)) #define BCOPY(s, d, l) MEMCPY((d), (s), (l))
#define BZERO(s, n) memset(s, 0, n) #define BZERO(s, n) memset(s, 0, n)
#if PPP_DEBUG #if PPP_DEBUG
#define PRINTMSG(m, l) { m[l] = '\0'; ppp_trace(LOG_INFO, "Remote message: %s\n", m); } #define PRINTMSG(m, l) { m[l] = '\0'; ppp_trace(LOG_INFO, "Remote message: %s\n", m); }
#else /* PPP_DEBUG */ #else /* PPP_DEBUG */
@ -229,15 +230,15 @@ enum NPmode {
*************************/ *************************/
/* Error codes. */ /* Error codes. */
#define PPPERR_NONE 0 /* No error. */ #define PPPERR_NONE 0 /* No error. */
#define PPPERR_PARAM -1 /* Invalid parameter. */ #define PPPERR_PARAM -1 /* Invalid parameter. */
#define PPPERR_OPEN -2 /* Unable to open PPP session. */ #define PPPERR_OPEN -2 /* Unable to open PPP session. */
#define PPPERR_DEVICE -3 /* Invalid I/O device for PPP. */ #define PPPERR_DEVICE -3 /* Invalid I/O device for PPP. */
#define PPPERR_ALLOC -4 /* Unable to allocate resources. */ #define PPPERR_ALLOC -4 /* Unable to allocate resources. */
#define PPPERR_USER -5 /* User interrupt. */ #define PPPERR_USER -5 /* User interrupt. */
#define PPPERR_CONNECT -6 /* Connection lost. */ #define PPPERR_CONNECT -6 /* Connection lost. */
#define PPPERR_AUTHFAIL -7 /* Failed authentication challenge. */ #define PPPERR_AUTHFAIL -7 /* Failed authentication challenge. */
#define PPPERR_PROTOCOL -8 /* Failed to meet protocol. */ #define PPPERR_PROTOCOL -8 /* Failed to meet protocol. */
/* /*
* PPP IOCTL commands. * PPP IOCTL commands.
@ -246,10 +247,10 @@ enum NPmode {
* Get the up status - 0 for down, non-zero for up. The argument must * Get the up status - 0 for down, non-zero for up. The argument must
* point to an int. * point to an int.
*/ */
#define PPPCTLG_UPSTATUS 100 /* Get the up status - 0 down else up */ #define PPPCTLG_UPSTATUS 100 /* Get the up status - 0 down else up */
#define PPPCTLS_ERRCODE 101 /* Set the error code */ #define PPPCTLS_ERRCODE 101 /* Set the error code */
#define PPPCTLG_ERRCODE 102 /* Get the error code */ #define PPPCTLG_ERRCODE 102 /* Get the error code */
#define PPPCTLG_FD 103 /* Get the fd associated with the ppp */ #define PPPCTLG_FD 103 /* Get the fd associated with the ppp */
/************************ /************************
*** PUBLIC DATA TYPES *** *** PUBLIC DATA TYPES ***
@ -300,42 +301,43 @@ struct protent {
* the last NP packet was sent or received. * the last NP packet was sent or received.
*/ */
struct ppp_idle { struct ppp_idle {
u_short xmit_idle; /* seconds since last NP packet sent */ u_short xmit_idle; /* seconds since last NP packet sent */
u_short recv_idle; /* seconds since last NP packet received */ u_short recv_idle; /* seconds since last NP packet received */
}; };
struct ppp_settings { struct ppp_settings {
u_int disable_defaultip : 1; /* Don't use hostname for default IP addrs */ u_int disable_defaultip : 1; /* Don't use hostname for default IP addrs */
u_int auth_required : 1; /* Peer is required to authenticate */ u_int auth_required : 1; /* Peer is required to authenticate */
u_int explicit_remote : 1; /* remote_name specified with remotename opt */ u_int explicit_remote : 1; /* remote_name specified with remotename opt */
u_int refuse_pap : 1; /* Don't wanna auth. ourselves with PAP */ u_int refuse_pap : 1; /* Don't wanna auth. ourselves with PAP */
u_int refuse_chap : 1; /* Don't wanna auth. ourselves with CHAP */ u_int refuse_chap : 1; /* Don't wanna auth. ourselves with CHAP */
u_int usehostname : 1; /* Use hostname for our_name */ u_int usehostname : 1; /* Use hostname for our_name */
u_int usepeerdns : 1; /* Ask peer for DNS adds */ u_int usepeerdns : 1; /* Ask peer for DNS adds */
u_short idle_time_limit; /* Shut down link if idle for this long */ u_short idle_time_limit; /* Shut down link if idle for this long */
int maxconnect; /* Maximum connect time (seconds) */ int maxconnect; /* Maximum connect time (seconds) */
char user[MAXNAMELEN + 1];/* Username for PAP */ char user [MAXNAMELEN + 1]; /* Username for PAP */
char passwd[MAXSECRETLEN + 1]; /* Password for PAP, secret for CHAP */ char passwd [MAXSECRETLEN + 1]; /* Password for PAP, secret for CHAP */
char our_name[MAXNAMELEN + 1]; /* Our name for authentication purposes */ char our_name [MAXNAMELEN + 1]; /* Our name for authentication purposes */
char remote_name[MAXNAMELEN + 1]; /* Peer's name for authentication */ char remote_name[MAXNAMELEN + 1]; /* Peer's name for authentication */
}; };
struct ppp_addrs { struct ppp_addrs {
struct ip_addr our_ipaddr, his_ipaddr, netmask, dns1, dns2; struct ip_addr our_ipaddr, his_ipaddr, netmask, dns1, dns2;
}; };
/***************************** /*****************************
*** PUBLIC DATA STRUCTURES *** *** PUBLIC DATA STRUCTURES ***
*****************************/ *****************************/
/* Buffers for outgoing packets. */ /* Buffers for outgoing packets. */
extern u_char *outpacket_buf[NUM_PPP]; extern u_char *outpacket_buf[NUM_PPP];
extern struct ppp_settings ppp_settings; extern struct ppp_settings ppp_settings;
extern struct protent *ppp_protocols[];/* Table of pointers to supported protocols */ extern struct protent *ppp_protocols[]; /* Table of pointers to supported protocols */
/*********************** /***********************
@ -382,13 +384,14 @@ void pppSetAuth(enum pppAuthType authType, const char *user, const char *passwd)
*/ */
int pppOverSerialOpen(sio_fd_t fd, void (*linkStatusCB)(void *ctx, int errCode, void *arg), void *linkStatusCtx); int pppOverSerialOpen(sio_fd_t fd, void (*linkStatusCB)(void *ctx, int errCode, void *arg), void *linkStatusCtx);
/* for source code compatibility */
#define pppOpen(fd,cb,ls) pppOverSerialOpen(fd,cb,ls)
/* /*
* Open a new PPP Over Ethernet (PPPOE) connection. * Open a new PPP Over Ethernet (PPPOE) connection.
*/ */
int pppOverEthernetOpen(struct netif *ethif, const char *service_name, const char *concentrator_name, void (*linkStatusCB)(void *ctx, int errCode, void *arg), void *linkStatusCtx); int pppOverEthernetOpen(struct netif *ethif, const char *service_name, const char *concentrator_name, void (*linkStatusCB)(void *ctx, int errCode, void *arg), void *linkStatusCtx);
/* for source code compatibility */
#define pppOpen(fd,cb,ls) pppOverSerialOpen(fd,cb,ls)
/* /*
* Close a PPP connection and release the descriptor. * Close a PPP connection and release the descriptor.
* Any outstanding packets in the queues are dropped. * Any outstanding packets in the queues are dropped.
@ -414,8 +417,7 @@ u_int pppMTU(int pd);
/* /*
* Write n characters to a ppp link. * Write n characters to a ppp link.
* RETURN: >= 0 Number of characters written * RETURN: >= 0 Number of characters written, -1 Failed to write to device.
* -1 Failed to write to device
*/ */
int pppWrite(int pd, const u_char *s, int n); int pppWrite(int pd, const u_char *s, int n);