mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-07-17 02:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, PPPoS, TCPIP: add packet input path for point to point interfaces (only PPPoS for now) through the TCPIP API

Browse Source 
!NO_SYS users may now use as well the TCPIP API for PPPoS input data,
this way they can disable PPP_INPROC_MULTITHREADED and run pppos_input()
inside the lwIP thread, which fixes, at least for them, all the
threading issues related to PPP_INPROC_MULTITHREADED.
This commit is contained in:
Sylvain Rochet 2015-03-11 00:58:09 +01:00
parent 636ff411f1
commit 9778b1411c
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/tcpip.c
View File

@ -114,6 +114,13 @@ tcpip_thread(void *arg)
ethernet_input(msg->msg.inp.p, msg->msg.inp.netif);
} else
#endif /* LWIP_ETHERNET */
#if PPPOS_SUPPORT
/* FIXME: can be generalized to all point to point interfaces */
if ((msg->msg.inp.netif->flags & NETIF_FLAG_BROADCAST) == 0
&& msg->msg.inp.netif->input) {
msg->msg.inp.netif->input(msg->msg.inp.p, msg->msg.inp.netif);
} else
#endif /* PPPOS_SUPPORT */
#if LWIP_IPV6
if (((*(u8_t*)(msg->msg.inp.p->payload)) & 0xf0) == 0x60) {
ip6_input(msg->msg.inp.p, msg->msg.inp.netif);

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

@ -68,6 +68,9 @@ 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
static err_t pppos_input_sys(struct pbuf *p, struct netif *inp);
#endif /* !NO_SYS */
#if PPP_INPROC_MULTITHREADED
static void pppos_input_callback(void *arg);
#endif /* PPP_INPROC_MULTITHREADED */
@ -200,6 +203,9 @@ ppp_pcb *pppos_create(struct netif *pppif, sio_fd_t fd,
pppos->ppp = ppp;
pppos->fd = fd;
#if !NO_SYS
ppp->netif->input = pppos_input_sys;
#endif /* !NO_SYS */
ppp_link_set_callbacks(ppp, &pppos_callbacks, pppos);
return ppp;
}
@ -521,6 +527,19 @@ pppos_destroy(ppp_pcb *ppp, void *ctx)
return ERR_OK;
}
#if !NO_SYS
static err_t pppos_input_sys(struct pbuf *p, struct netif *inp) {
ppp_pcb *ppp = (ppp_pcb*)inp->state;
struct pbuf *n;
for (n = p; n; n = n->next) {
pppos_input(ppp, (u8_t*)n->payload, n->len);
}
pbuf_free(p);
return ERR_OK;
}
#endif /* !NO_SYS */
/** PPPoS input helper struct, must be packed since it is stored
* to pbuf->payload, which might be unaligned. */
#if PPP_INPROC_MULTITHREADED