mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-01 04:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug: assert fired when MEMP_ARP_QUEUE was empty (which can happen any time). Now the packet simply isn't enqueued when out of memory.

Browse Source
This commit is contained in:
goldsimon 2007-11-10 17:41:46 +00:00
parent bfe24b138d
commit 21bbc9a81a
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -460,6 +460,10 @@ HISTORY
++ Bug fixes: ++ Bug fixes:
2007-11-10 Simon Goldschmidt
* etharp.c: Fixed bug: assert fired when MEMP_ARP_QUEUE was empty (which can
happen any time). Now the packet simply isn't enqueued when out of memory.
2007-11-01 Simon Goldschmidt 2007-11-01 Simon Goldschmidt
* tcp.c, tcp_in.c: Fixed bug #21494: The send mss (pcb->mss) is set to 536 (or * tcp.c, tcp_in.c: Fixed bug #21494: The send mss (pcb->mss) is set to 536 (or
TCP_MSS if that is smaller) as long as no MSS option is received from the TCP_MSS if that is smaller) as long as no MSS option is received from the

34
src/netif/etharp.c
View File

@ -945,23 +945,29 @@ etharp_query(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q)
struct etharp_q_entry *new_entry; struct etharp_q_entry *new_entry;
/* allocate a new arp queue entry */ /* allocate a new arp queue entry */
new_entry = memp_malloc(MEMP_ARP_QUEUE); new_entry = memp_malloc(MEMP_ARP_QUEUE);
LWIP_ASSERT("newEntry != NULL", new_entry != NULL); if (new_entry != NULL) {
new_entry->next = 0; new_entry->next = 0;
new_entry->p = p; new_entry->p = p;
if(arp_table[i].q != NULL) { if(arp_table[i].q != NULL) {
/* queue was already existent, append the new entry to the end */ /* queue was already existent, append the new entry to the end */
struct etharp_q_entry *r; struct etharp_q_entry *r;
r = arp_table[i].q; r = arp_table[i].q;
while (r->next != NULL) { while (r->next != NULL) {
r = r->next; r = r->next;
}
r->next = new_entry;
} else {
/* queue did not exist, first item in queue */
arp_table[i].q = new_entry;
} }
r->next = new_entry; LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: queued packet %p on ARP entry %"S16_F"\n", (void *)q, (s16_t)i));
result = ERR_OK;
} else { } else {
/* queue did not exist, first item in queue */ /* the pool MEMP_ARP_QUEUE is empty */
arp_table[i].q = new_entry; pbuf_free(p);
LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: could not queue a copy of PBUF_REF packet %p (out of memory)\n", (void *)q));
/* { result == ERR_MEM } through initialization */
} }
LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: queued packet %p on ARP entry %"S16_F"\n", (void *)q, (s16_t)i));
result = ERR_OK;
} else { } else {
LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: could not queue a copy of PBUF_REF packet %p (out of memory)\n", (void *)q)); LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: could not queue a copy of PBUF_REF packet %p (out of memory)\n", (void *)q));
/* { result == ERR_MEM } through initialization */ /* { result == ERR_MEM } through initialization */