abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-05-30 22:43:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

PPP, PPPoS, moved pcomp and accomp only used by PPPoS to PPPoS

Browse Source
This commit is contained in:
Sylvain Rochet
2015-03-10 23:51:32 +01:00
parent 31aea3c996
commit 02598d1e91
5 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -328,8 +328,6 @@ struct ppp_pcb_s {
u8_t err_code; /* Code indicating why interface is down. */
/* flags */
unsigned int pcomp :1; /* Does peer accept protocol compression? */
unsigned int accomp :1; /* Does peer accept addr/ctl compression? */
#if PPP_IPV4_SUPPORT
unsigned int ipcp_is_open :1; /* haven't called np_finished() */
unsigned int ipcp_is_up :1; /* have called ipcp_up() */
@@ -347,6 +345,7 @@ 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 */
u32_t last_xmit; /* Time of last transmission. */

4
src/include/netif/ppp/ppp_impl.h
View File

@@ -156,9 +156,9 @@ struct link_callbacks {
/* Send a packet from lwIP core (IPv4 or IPv6) */
err_t (*netif_output)(ppp_pcb *pcb, void *ctx, struct pbuf *p, u_short protocol);
/* configure the transmit-side characteristics of the PPP interface */
void (*send_config)(ppp_pcb *pcb, void *ctx, u32_t accm);
void (*send_config)(ppp_pcb *pcb, void *ctx, u32_t accm, int pcomp, int accomp);
/* confire the receive-side characteristics of the PPP interface */
void (*recv_config)(ppp_pcb *pcb, void *ctx, u32_t accm);
void (*recv_config)(ppp_pcb *pcb, void *ctx, u32_t accm, int pcomp, int accomp);
#if VJ_SUPPORT
/* configure TCP header compression */
void (*vj_config)(ppp_pcb *pcb, void *ctx, int vjcomp, int cidcomp, int maxcid);

4
src/include/netif/ppp/pppos.h
View File

@@ -78,12 +78,14 @@ struct pppos_pcb_s {
/* flags */
unsigned int open :1; /* Set if PPPoS is open */
unsigned int pcomp :1; /* Does peer accept protocol compression? */
unsigned int accomp :1; /* Does peer accept addr/ctl compression? */
#if VJ_SUPPORT
unsigned int vj_enabled :1; /* Flag indicating VJ compression enabled. */
#else
unsigned int :1; /* 1 bit of padding */
#endif /* VJ_SUPPORT */
unsigned int :6; /* 6 bits of padding to round out to 8 bits */
unsigned int :4; /* 4 bits of padding to round out to 8 bits */
/* PPPoS rx */
ext_accm in_accm; /* Async-Ctl-Char-Map for input. */