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

display IPV6CP packets

Browse Source
This commit is contained in:
Sylvain Rochet 2012-06-23 01:44:52 +02:00
parent 295eeef9b6
commit 5033e0e752
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,9 +187,9 @@ struct protent *protocols[] = {
static void ppp_start(ppp_pcb *pcb); /** Initiate LCP open request */ static void ppp_start(ppp_pcb *pcb); /** Initiate LCP open request */
#if PPPOS_SUPPORT #if PPPOS_SUPPORT && PPP_INPROC_OWNTHREAD
static void ppp_receive_wakeup(ppp_pcb *pcb); static void ppp_receive_wakeup(ppp_pcb *pcb);
#endif /* #if PPPOS_SUPPORT */ #endif /* #if PPPOS_SUPPORT && PPP_INPROC_OWNTHREAD */
static void ppp_stop(ppp_pcb *pcb); static void ppp_stop(ppp_pcb *pcb);
static void ppp_hup(ppp_pcb *pcb); static void ppp_hup(ppp_pcb *pcb);
@ -200,7 +200,9 @@ static void ppp_input_thread(void *arg);
#endif /* PPP_INPROC_OWNTHREAD */ #endif /* PPP_INPROC_OWNTHREAD */
static void ppp_drop(ppp_pcb_rx *pcrx); static void ppp_drop(ppp_pcb_rx *pcrx);
static void pppos_input_proc(ppp_pcb_rx *pcrx, u_char *s, int l); static void pppos_input_proc(ppp_pcb_rx *pcrx, u_char *s, int l);
#if PPP_INPROC_MULTITHREADED
static void pppos_input_callback(void *arg); static void pppos_input_callback(void *arg);
#endif /* PPP_INPROC_MULTITHREADED */
static void ppp_free_current_input_packet(ppp_pcb_rx *pcrx); static void ppp_free_current_input_packet(ppp_pcb_rx *pcrx);
#endif /* PPPOS_SUPPORT */ #endif /* PPPOS_SUPPORT */
@ -1356,7 +1358,7 @@ ppp_drop(ppp_pcb_rx *pcrx)
void void
pppos_input(ppp_pcb *pcb, u_char* data, int len) pppos_input(ppp_pcb *pcb, u_char* data, int len)
{ {
pppos_input_proc(pcb->rx, data, len); pppos_input_proc(&pcb->rx, data, len);
} }
#endif #endif
@ -1573,6 +1575,7 @@ pppos_input_proc(ppp_pcb_rx *pcrx, u_char *s, int l)
magic_randomize(); magic_randomize();
} }
#if PPP_INPROC_MULTITHREADED
/* PPPoS input callback using one input pointer /* PPPoS input callback using one input pointer
* *arg is a pbuf chain of two chained pbuf, the first contains * *arg is a pbuf chain of two chained pbuf, the first contains
* a pointer to the PPP PCB structure, the second contains the * a pointer to the PPP PCB structure, the second contains the
@ -1600,6 +1603,7 @@ drop:
pbuf_free(pl); pbuf_free(pl);
return; return;
} }
#endif /* PPP_INPROC_MULTITHREADED */
#endif /* PPPOS_SUPPORT */ #endif /* PPPOS_SUPPORT */
/* merge a pbuf chain into one pbuf */ /* merge a pbuf chain into one pbuf */

2
src/netif/ppp/utils.c
View File

@ -721,7 +721,7 @@ void dump_packet(const char *tag, unsigned char *p, int len) {
if (proto == PPP_IP) if (proto == PPP_IP)
return; return;
#if PPP_IPV6_SUPPORT #if PPP_IPV6_SUPPORT
if (proto == PPP_IPV6 || proto == PPP_IPV6CP) if (proto == PPP_IPV6)
return; return;
#endif #endif