espressif/esp-lwip
1
0
Fork 0
mirror of https://github.com/espressif/esp-lwip.git synced 2026-06-05 21:04:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

arp: Return ERR_MEM if ARP queue is full

Browse Source 
2.1.3-esp: 00585644 arp: Return ERR_MEM on ARP queue full
This commit is contained in:
xiehang
2020-08-04 19:57:12 +08:00
committed by David Cermak
parent 318512828c
commit 37b10cbdec
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/examples/example_app/lwipopts.h
+1
View File
@@ -328,5 +328,6 @@ void lwip_example_app_platform_assert(const char *msg, int line, const char *fil
#define ESP_LWIP_IGMP_TIMERS_ONDEMAND ESP_LWIP
#define ESP_LWIP_MLD6_TIMERS_ONDEMAND ESP_LWIP
#define ESP_DNS ESP_LWIP
#define ESP_LWIP_ARP ESP_LWIP
#endif /* LWIP_LWIPOPTS_H */
src/core/ipv4/etharp.c
+9 -1
View File
@@ -1038,12 +1038,12 @@ etharp_query(struct netif *netif, const ip4_addr_t *ipaddr, struct pbuf *q)
/* allocate a new arp queue entry */
new_entry = (struct etharp_q_entry *)memp_malloc(MEMP_ARP_QUEUE);
if (new_entry != NULL) {
struct etharp_q_entry *r;
unsigned int qlen = 0;
new_entry->next = NULL;
new_entry->p = p;
if (arp_table[i].q != NULL) {
/* queue was already existent, append the new entry to the end */
struct etharp_q_entry *r;
r = arp_table[i].q;
qlen++;
while (r->next != NULL) {
@@ -1057,11 +1057,19 @@ etharp_query(struct netif *netif, const ip4_addr_t *ipaddr, struct pbuf *q)
}
#if ARP_QUEUE_LEN
if (qlen >= ARP_QUEUE_LEN) {
#if ESP_LWIP_ARP
r->next = NULL;
pbuf_free(new_entry->p);
memp_free(MEMP_ARP_QUEUE, new_entry);
LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: could not queue the packet %p (queue is full)\n", (void *)q));
return ERR_MEM;
#else
struct etharp_q_entry *old;
old = arp_table[i].q;
arp_table[i].q = arp_table[i].q->next;
pbuf_free(old->p);
memp_free(MEMP_ARP_QUEUE, old);
#endif
}
#endif
LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: queued packet %p on ARP entry %"U16_F"\n", (void *)q, i));