abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-05-20 23:26:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

PPP, PPPoS, moved out_accm from PPP core to PPPoS

Browse Source 
Last PPPoS variable in PPP core moved to PPPoS.
This commit is contained in:
Sylvain Rochet
2015-02-17 00:48:33 +01:00
parent baaa2592a6
commit 69469496e2
5 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,14 +300,6 @@ struct ppp_addrs {
#endif /* PPP_IPV6_SUPPORT */
};
/* FIXME: find a way to move ppp_dev_states and ppp_pcb_rx_s to ppp_impl.h */
#if PPPOS_SUPPORT
/*
* Extended asyncmap - allows any character to be escaped.
*/
typedef u_char ext_accm[32];
#endif /* PPPOS_SUPPORT */
/*
* PPP interface control block.
*/
@@ -367,10 +359,6 @@ struct ppp_pcb_s {
#endif /* VJ_SUPPORT */
unsigned int :5; /* 5 bits of padding to round out to 16 bits */
#if PPPOS_SUPPORT
ext_accm out_accm; /* Async-Ctl-Char-Map for output. */
#endif /* PPPOS_SUPPORT */
u32_t last_xmit; /* Time of last transmission. */
struct ppp_addrs addrs; /* PPP addresses */

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

@@ -401,9 +401,6 @@ struct pbuf * ppp_singlebuf(struct pbuf *p);
*/
void new_phase(ppp_pcb *pcb, int p);
#if PPPOS_SUPPORT
void ppp_set_xaccm(ppp_pcb *pcb, ext_accm *accm);
#endif /* PPPOS_SUPPORT */
int ppp_send_config(ppp_pcb *pcb, int mtu, u32_t accm, int pcomp, int accomp);
int ppp_recv_config(ppp_pcb *pcb, int mru, u32_t accm, int pcomp, int accomp);

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

@@ -55,6 +55,11 @@ typedef enum {
PDDATA /* Process data byte. */
} pppos_rx_state;
/*
* Extended asyncmap - allows any character to be escaped.
*/
typedef u_char ext_accm[32];
/*
* PPPoS interface control block.
*/
@@ -67,9 +72,10 @@ struct pppos_pcb_s {
/* -- below are data that will be cleared between two sessions
*
* in_accm must be the first member of cleared members, because it is
* out_accm must be the first member of cleared members, because it is
* used to know which part must not be cleared.
*/
ext_accm out_accm; /* Async-Ctl-Char-Map for output. */
/* PPPoS rx */
ext_accm in_accm; /* Async-Ctl-Char-Map for input. */
@@ -91,6 +97,7 @@ ppp_pcb *ppp_over_serial_create(struct netif *pppif, sio_fd_t fd,
void pppos_input(ppp_pcb *ppp, u_char* data, int len);
void pppos_accm_out_config(pppos_pcb *pppos, u32_t accm);
void pppos_accm_in_config(pppos_pcb *pppos, u32_t accm);
sio_fd_t pppos_get_fd(pppos_pcb *pppos);
void pppos_vjc_config(pppos_pcb *pppos, int vjcomp, int cidcomp, int maxcid);