PPP, moved EAP configuration to ppp_settings struct

This commit is contained in:
Sylvain Rochet
2012-12-09 21:45:14 +01:00
parent c719ba7bf3
commit 6764957d06
5 changed files with 42 additions and 31 deletions

View File

@@ -1913,11 +1913,11 @@
#endif /* PPP_SERVER */
#ifndef EAP_DEFREQTIME
#define EAP_DEFREQTIME 20 /* Time to wait for peer request */
#define EAP_DEFREQTIME 6 /* Time to wait for peer request */
#endif
#ifndef EAP_DEFALLOWREQ
#define EAP_DEFALLOWREQ 20 /* max # times to accept requests */
#define EAP_DEFALLOWREQ 10 /* max # times to accept requests */
#endif
#if PPP_SERVER

View File

@@ -117,8 +117,6 @@ struct eap_auth {
char *ea_peer; /* Peer's name */
void *ea_session; /* Authentication library linkage */
u_char *ea_skey; /* Shared encryption key */
int ea_timeout; /* Time to wait (for retransmit/fail) */
int ea_maxrequests; /* Max Requests allowed */
u_short ea_namelen; /* Length of our name */
u_short ea_peerlen; /* Length of peer's name */
enum eap_state_code ea_state;

View File

@@ -240,6 +240,15 @@ typedef struct ppp_settings_s {
#endif /* PPP_SERVER */
#endif /* CHAP_SUPPPORT */
#if EAP_SUPPORT
u8_t eap_req_time; /* Time to wait (for retransmit/fail) */
u8_t eap_allow_req; /* Max Requests allowed */
#if PPP_SERVER
u8_t eap_timeout_time; /* Time to wait (for retransmit/fail) */
u8_t eap_max_transmits; /* Max Requests allowed */
#endif /* PPP_SERVER */
#endif /* EAP_SUPPORT */
u8_t lcp_loopbackfail; /* Number of times we receive our magic number from the peer
before deciding the link is looped-back. */
u8_t lcp_echo_interval; /* Interval between LCP echo-requests */