abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-08-09 17:13:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

PPP, PPPoS, improved tcpip input path, fixed bug #44565

Browse Source 
New input type TCPIP_MSG_INPKT_PPPOS. Removed the netif input pointer usage
which was actually broken by design.

Fixed bug #44565.
This commit is contained in:
Sylvain Rochet
2015-03-19 21:04:21 +01:00
parent 4ed34d2c6f
commit 0e919d25e9
4 changed files with 68 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/netif/ppp/pppos.c
View File

@@ -70,9 +70,6 @@ static err_t pppos_netif_input(ppp_pcb *ppp, void *ctx, struct pbuf *p, u16_t pr
#endif /* VJ_SUPPORT */
/* Prototypes for procedures local to this file. */
#if !NO_SYS && !PPP_INPROC_MULTITHREADED
static err_t pppos_input_sys(struct pbuf *p, struct netif *inp);
#endif /* !NO_SYS && !PPP_INPROC_MULTITHREADED */
#if PPP_INPROC_MULTITHREADED
static void pppos_input_callback(void *arg);
#endif /* PPP_INPROC_MULTITHREADED */
@@ -205,9 +202,6 @@ ppp_pcb *pppos_create(struct netif *pppif, sio_fd_t fd,
pppos->ppp = ppp;
pppos->fd = fd;
#if !NO_SYS && !PPP_INPROC_MULTITHREADED
ppp->netif->input = pppos_input_sys;
#endif /* !NO_SYS && !PPP_INPROC_MULTITHREADED */
ppp_link_set_callbacks(ppp, &pppos_callbacks, pppos);
return ppp;
}
@@ -494,7 +488,7 @@ pppos_input_tcpip(ppp_pcb *ppp, u8_t *s, int l)
}
pbuf_take(p, s, l);
err = tcpip_input(p, ppp_netif(ppp));
err = tcpip_pppos_input(p, ppp_netif(ppp));
if (err != ERR_OK) {
pbuf_free(p);
}
@@ -502,7 +496,7 @@ pppos_input_tcpip(ppp_pcb *ppp, u8_t *s, int l)
}
/* called from TCPIP thread */
static err_t pppos_input_sys(struct pbuf *p, struct netif *inp) {
err_t pppos_input_sys(struct pbuf *p, struct netif *inp) {
ppp_pcb *ppp = (ppp_pcb*)inp->state;
struct pbuf *n;