mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-11-19 05:10:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, PPPoS: only reserve header space for IPv4 and IPv6 packets if IP forwarding is enabled

Browse Source 
We only have to reserve header space for forwarding for IPv4 and IPv6
packets, all other packets are PPP control packets. Doing so reduce
the need of having to coalesce the PBUF chain before PPP processes
control packets.
This commit is contained in:
Sylvain Rochet 2020-10-20 03:17:53 +02:00
parent e801307738
commit 6584002826
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,7 +561,16 @@ pppos_input(ppp_pcb *ppp, u8_t *s, int l)
pppos->in_tail = NULL; pppos->in_tail = NULL;
#if IP_FORWARD || LWIP_IPV6_FORWARD #if IP_FORWARD || LWIP_IPV6_FORWARD
/* hide the room for Ethernet forwarding header */ /* hide the room for Ethernet forwarding header */
pbuf_remove_header(inp, PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN); if (0
#if PPP_IPV4_SUPPORT
|| pppos->in_protocol == PPP_IP
#endif /* PPP_IPV4_SUPPORT */
#if PPP_IPV6_SUPPORT
|| pppos->in_protocol == PPP_IPV6
#endif /* PPP_IPV6_SUPPORT */
) {
pbuf_remove_header(inp, PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN);
}
#endif /* IP_FORWARD || LWIP_IPV6_FORWARD */ #endif /* IP_FORWARD || LWIP_IPV6_FORWARD */
#if PPP_INPROC_IRQ_SAFE #if PPP_INPROC_IRQ_SAFE
if(tcpip_try_callback(pppos_input_callback, inp) != ERR_OK) { if(tcpip_try_callback(pppos_input_callback, inp) != ERR_OK) {
@ -670,7 +679,14 @@ pppos_input(ppp_pcb *ppp, u8_t *s, int l)
* + PBUF_LINK_HLEN bytes so the packet is being allocated with enough header * + PBUF_LINK_HLEN bytes so the packet is being allocated with enough header
* space to be forwarded (to Ethernet for example). * space to be forwarded (to Ethernet for example).
*/ */
if (pppos->in_head == NULL) { if (pppos->in_head == NULL && (0
#if PPP_IPV4_SUPPORT
|| pppos->in_protocol == PPP_IP
#endif /* PPP_IPV4_SUPPORT */
#if PPP_IPV6_SUPPORT
|| pppos->in_protocol == PPP_IPV6
#endif /* PPP_IPV6_SUPPORT */
)) {
pbuf_alloc_len = PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN; pbuf_alloc_len = PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN;
} }
#endif /* IP_FORWARD || LWIP_IPV6_FORWARD */ #endif /* IP_FORWARD || LWIP_IPV6_FORWARD */