mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-01-30 03:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, CCP, added data packet configuration in ppp_pcb

Browse Source
This commit is contained in:
Sylvain Rochet 2015-04-19 14:17:34 +02:00
parent ffb10e7aac
commit 71d085bd13
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,14 +372,17 @@ struct ppp_pcb_s {
unsigned int lcp_echo_timer_running :1; /* set if a timer is running */ unsigned int lcp_echo_timer_running :1; /* set if a timer is running */
#if CCP_SUPPORT #if CCP_SUPPORT
unsigned int ccp_all_rejected :1; /* we rejected all peer's options */ unsigned int ccp_all_rejected :1; /* we rejected all peer's options */
unsigned int ccp_is_open :1; /* true when CCP is open (currently negotiating) */
unsigned int ccp_is_up :1; /* true when CCP is up (ready to handle data packets) */
#else /* CCP_SUPPORT */ #else /* CCP_SUPPORT */
unsigned int :1; /* 1 bit of padding */ unsigned int :3; /* 3 bits of padding */
#endif /* CCP_SUPPORT */ #endif /* CCP_SUPPORT */
#if MPPE_SUPPORT #if MPPE_SUPPORT
unsigned int mppe_keys_set :1; /* Have the MPPE keys been set? */ unsigned int mppe_keys_set :1; /* Have the MPPE keys been set? */
#else /* MPPE_SUPPORT */ #else /* MPPE_SUPPORT */
unsigned int :1; /* 1 bit of padding */ unsigned int :1; /* 1 bit of padding */
#endif /* MPPE_SUPPORT */ #endif /* MPPE_SUPPORT */
unsigned int :6; /* 6 bits of padding to round out to 16 bits */
#if PPP_AUTH_SUPPORT #if PPP_AUTH_SUPPORT
/* auth data */ /* auth data */
@ -424,6 +427,8 @@ struct ppp_pcb_s {
ccp_options ccp_allowoptions; /* what we'll agree to do */ ccp_options ccp_allowoptions; /* what we'll agree to do */
ccp_options ccp_hisoptions; /* what we agreed to do */ ccp_options ccp_hisoptions; /* what we agreed to do */
u8_t ccp_localstate; /* Local state (mainly for handling reset-reqs and reset-acks). */ u8_t ccp_localstate; /* Local state (mainly for handling reset-reqs and reset-acks). */
u8_t ccp_receive_method; /* Method chosen on receive path */
u8_t ccp_transmit_method; /* Method chosen on transmit path */
#if MPPE_SUPPORT #if MPPE_SUPPORT
ppp_mppe_state mppe_comp; /* MPPE "compressor" structure */ ppp_mppe_state mppe_comp; /* MPPE "compressor" structure */
ppp_mppe_state mppe_decomp; /* MPPE "decompressor" structure */ ppp_mppe_state mppe_decomp; /* MPPE "decompressor" structure */

11
src/netif/ppp/ppp.c
View File

@ -1158,11 +1158,12 @@ ccp_test(ppp_pcb *pcb, u_char *opt_ptr, int opt_len, int for_transmit)
void void
ccp_set(ppp_pcb *pcb, u8_t isopen, u8_t isup, u8_t receive_method, u8_t transmit_method) ccp_set(ppp_pcb *pcb, u8_t isopen, u8_t isup, u8_t receive_method, u8_t transmit_method)
{ {
LWIP_UNUSED_ARG(pcb); pcb->ccp_is_open = isopen;
LWIP_UNUSED_ARG(isopen); pcb->ccp_is_up = isup;
LWIP_UNUSED_ARG(isup); pcb->ccp_receive_method = receive_method;
LWIP_UNUSED_ARG(receive_method); pcb->ccp_transmit_method = transmit_method;
LWIP_UNUSED_ARG(transmit_method); PPPDEBUG(LOG_DEBUG, ("ccp_set[%d]: is_open=%d, is_up=%d, receive_method=%u, transmit_method=%u\n",
pcb->netif->num, isopen, isup, receive_method, transmit_method));
} }
/* /*