mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-03 21:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcpip_input()/tcpip_ethinput(): don't free the pbuf if returning ERR_MEM, that is the netif driver's responsibility

Browse Source
This commit is contained in:
goldsimon 2007-05-17 09:04:36 +00:00
parent 75f7f21eb0
commit 5e9d80fbdb
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/tcpip.c
View File

@ -150,10 +150,10 @@ ethernet_input(struct pbuf *p, struct netif *netif)
switch (htons(ethhdr->type)) { switch (htons(ethhdr->type)) {
/* IP packet? */ /* IP packet? */
case ETHTYPE_IP: case ETHTYPE_IP:
#if ETHARP_TRUST_IP_MAC #if ETHARP_TRUST_IP_MAC
/* update ARP table */ /* update ARP table */
etharp_ip_input( netif, p); etharp_ip_input( netif, p);
#endif #endif
/* skip Ethernet header */ /* skip Ethernet header */
if(pbuf_header(p, -(s16_t)sizeof(struct eth_hdr))) { if(pbuf_header(p, -(s16_t)sizeof(struct eth_hdr))) {
LWIP_ASSERT("Can't move over header in packet", 0); LWIP_ASSERT("Can't move over header in packet", 0);
@ -255,7 +255,6 @@ tcpip_input(struct pbuf *p, struct netif *inp)
if (mbox != SYS_MBOX_NULL) { if (mbox != SYS_MBOX_NULL) {
msg = memp_malloc(MEMP_TCPIP_MSG); msg = memp_malloc(MEMP_TCPIP_MSG);
if (msg == NULL) { if (msg == NULL) {
pbuf_free(p);
return ERR_MEM; return ERR_MEM;
} }
@ -278,8 +277,7 @@ tcpip_ethinput(struct pbuf *p, struct netif *inp)
if (mbox != SYS_MBOX_NULL) { if (mbox != SYS_MBOX_NULL) {
msg = memp_malloc(MEMP_TCPIP_MSG); msg = memp_malloc(MEMP_TCPIP_MSG);
if (msg == NULL) { if (msg == NULL) {
pbuf_free(p); return ERR_MEM;
return ERR_MEM;
} }
msg->type = TCPIP_MSG_ETHINPUT; msg->type = TCPIP_MSG_ETHINPUT;