scratch/lwip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PPP, MPPE, moved MPPE global variables from MSCHAP to ppp_pcb

Browse Source
This commit is contained in:
Sylvain Rochet
2015-04-18 17:41:44 +02:00
parent ab46ac9bd8
commit 2a005c2f11
4 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/netif/ppp/chap_ms.h
View File

@@ -71,11 +71,6 @@
#define MS_CHAP2_FLAGS 48
#if MPPE_SUPPORT
#include "mppe.h" /* MPPE_MAX_KEY_LEN */
extern u_char mppe_send_key[MPPE_MAX_KEY_LEN];
extern u_char mppe_recv_key[MPPE_MAX_KEY_LEN];
extern int mppe_keys_set;
#if 0 /* UNUSED */
/* These values are the RADIUS attribute values--see RFC 2548. */
#define MPPE_ENC_POL_ENC_ALLOWED 1

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

@@ -366,7 +366,12 @@ struct ppp_pcb_s {
unsigned int :2; /* 2 bit of padding */
#endif /* PPP_IPV6_SUPPORT */
unsigned int lcp_echo_timer_running :1; /* set if a timer is running */
unsigned int :2; /* 2 bits of padding to round out to 8 bits */
#if MPPE_SUPPORT
unsigned int mppe_keys_set :1; /* Have the MPPE keys been set? */
#else /* MPPE_SUPPORT */
unsigned int :1; /* 1 bit of padding */
#endif /* MPPE_SUPPORT */
unsigned int :1; /* 1 bit of padding to round out to 8 bits */
#if PPP_AUTH_SUPPORT
/* auth data */
@@ -416,6 +421,8 @@ struct ppp_pcb_s {
#if MPPE_SUPPORT
ppp_mppe_state mppe_comp; /* MPPE "compressor" structure */
ppp_mppe_state mppe_decomp; /* MPPE "decompressor" structure */
u8_t mppe_send_key[MPPE_MAX_KEY_LEN];
u8_t mppe_recv_key[MPPE_MAX_KEY_LEN];
#endif /* MPPE_SUPPORT */
#endif /* CCP_SUPPORT */