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

improved ppp_write_over_ethernet(), don't MEMCPY the entire packet into a new pbuf

Browse Source
This commit is contained in:
Sylvain Rochet 2012-06-22 17:03:59 +02:00
parent 9b7860d6ec
commit 77aa06df64
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1174,7 +1174,13 @@ ppp_ioctl(ppp_pcb *pcb, int cmd, void *arg)
} }
/* /*
* Write a pbuf to a ppp link. * Write a pbuf to a ppp link, only used from PPP functions
* to send PPP packets.
*
* IPv4 and IPv6 packets from lwIP are sent, respectively,
* with ppp_netif_output_ip4() and ppp_netif_output_ip6()
* functions (which are callbacks of the netif PPP interface).
*
* RETURN: >= 0 Number of characters written * RETURN: >= 0 Number of characters written
* -1 Failed to write to device * -1 Failed to write to device
*/ */
@ -1256,17 +1262,13 @@ int ppp_write(ppp_pcb *pcb, struct pbuf *p) {
#if PPPOE_SUPPORT #if PPPOE_SUPPORT
static int ppp_write_over_ethernet(ppp_pcb *pcb, struct pbuf *p) { static int ppp_write_over_ethernet(ppp_pcb *pcb, struct pbuf *p) {
u_char *s = p->payload; struct pbuf *ph; /* Ethernet + PPPoE header */
int n = p->len;
struct pbuf *pb;
/* skip address & flags */ /* skip address & flags */
s += 2; pbuf_header(p, -(s16_t)2);
n -= 2;
LWIP_ASSERT("PPPOE_HDRLEN + n <= 0xffff", PPPOE_HDRLEN + n <= 0xffff); ph = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HDRLEN), PBUF_RAM);
pb = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HDRLEN + n), PBUF_RAM); if(!ph) {
if(!pb) {
LINK_STATS_INC(link.memerr); LINK_STATS_INC(link.memerr);
LINK_STATS_INC(link.proterr); LINK_STATS_INC(link.proterr);
snmp_inc_ifoutdiscards(&pcb->netif); snmp_inc_ifoutdiscards(&pcb->netif);
@ -1274,27 +1276,27 @@ static int ppp_write_over_ethernet(ppp_pcb *pcb, struct pbuf *p) {
return PPPERR_ALLOC; return PPPERR_ALLOC;
} }
pbuf_header(pb, -(s16_t)PPPOE_HDRLEN); pbuf_header(ph, -(s16_t)PPPOE_HDRLEN); /* hide PPPoE header */
pbuf_cat(ph, p);
pbuf_ref(ph); /* we need the pbuf after pppoe_xmit() returned, which free the pbuf */
pcb->last_xmit = sys_jiffies(); pcb->last_xmit = sys_jiffies();
MEMCPY(pb->payload, s, n); if(pppoe_xmit(pcb->pppoe_sc, ph) != ERR_OK) {
if(pppoe_xmit(pcb->pppoe_sc, pb) != ERR_OK) {
LINK_STATS_INC(link.err); LINK_STATS_INC(link.err);
snmp_inc_ifoutdiscards(&pcb->netif); snmp_inc_ifoutdiscards(&pcb->netif);
pbuf_free(p); pbuf_free(ph);
return PPPERR_DEVICE; return PPPERR_DEVICE;
} }
#if PRINTPKT_SUPPORT #if PRINTPKT_SUPPORT
dump_packet("sent", (unsigned char *)s, n); dump_packet("sent", (unsigned char *)ph->payload, ph->len);
#endif /* PRINTPKT_SUPPORT */ #endif /* PRINTPKT_SUPPORT */
snmp_add_ifoutoctets(&pcb->netif, (u16_t)n); snmp_add_ifoutoctets(&pcb->netif, (u16_t)ph->len);
snmp_inc_ifoutucastpkts(&pcb->netif); snmp_inc_ifoutucastpkts(&pcb->netif);
LINK_STATS_INC(link.xmit); LINK_STATS_INC(link.xmit);
pbuf_free(p); pbuf_free(ph);
return PPPERR_NONE; return PPPERR_NONE;
} }
#endif /* PPPOE_SUPPORT */ #endif /* PPPOE_SUPPORT */

4
src/netif/ppp/ppp_oe.c
View File

@ -1067,14 +1067,14 @@ pppoe_xmit(struct pppoe_softc *sc, struct pbuf *pb)
len = pb->tot_len; len = pb->tot_len;
/* make room for Ethernet header - should not fail */ /* make room for Ethernet + PPPoE header - should not fail */
if (pbuf_header(pb, sizeof(struct eth_hdr) + PPPOE_HEADERLEN) != 0) { if (pbuf_header(pb, sizeof(struct eth_hdr) + PPPOE_HEADERLEN) != 0) {
/* bail out */ /* bail out */
PPPDEBUG(LOG_ERR, ("pppoe: %c%c%"U16_F": pppoe_xmit: could not allocate room for header\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num)); PPPDEBUG(LOG_ERR, ("pppoe: %c%c%"U16_F": pppoe_xmit: could not allocate room for header\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
LINK_STATS_INC(link.lenerr); LINK_STATS_INC(link.lenerr);
pbuf_free(pb); pbuf_free(pb);
return ERR_BUF; return ERR_BUF;
} }
p = (u8_t*)pb->payload + sizeof(struct eth_hdr); p = (u8_t*)pb->payload + sizeof(struct eth_hdr);
PPPOE_ADD_HEADER(p, 0, sc->sc_session, len); PPPOE_ADD_HEADER(p, 0, sc->sc_session, len);