espressif/esp-lwip
1
0
Fork 0
mirror of https://github.com/espressif/esp-lwip.git synced 2025-08-06 18:23:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix IPv6 ND6 queue too much pkts issue.

Browse Source
This commit is contained in:
ChenJianxing
2020-07-20 21:03:09 +08:00
parent 602d25c525
commit 80d6d19a92
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/ipv6/nd6.c
View File

@ -2095,6 +2095,12 @@ nd6_queue_packet(s8_t neighbor_index, struct pbuf *q)
if (copy_needed) { if (copy_needed) {
/* copy the whole packet into new pbufs */ /* copy the whole packet into new pbufs */
p = pbuf_clone(PBUF_LINK, PBUF_RAM, q); p = pbuf_clone(PBUF_LINK, PBUF_RAM, q);
#if ESP_ND6_QUEUEING
if(p == NULL) {
pbuf_free(q);
return ERR_MEM;
}
#else
while ((p == NULL) && (neighbor_cache[neighbor_index].q != NULL)) { while ((p == NULL) && (neighbor_cache[neighbor_index].q != NULL)) {
/* Free oldest packet (as per RFC recommendation) */ /* Free oldest packet (as per RFC recommendation) */
#if LWIP_ND6_QUEUEING #if LWIP_ND6_QUEUEING
@ -2108,6 +2114,7 @@ nd6_queue_packet(s8_t neighbor_index, struct pbuf *q)
#endif /* LWIP_ND6_QUEUEING */ #endif /* LWIP_ND6_QUEUEING */
p = pbuf_clone(PBUF_LINK, PBUF_RAM, q); p = pbuf_clone(PBUF_LINK, PBUF_RAM, q);
} }
#endif
} else { } else {
/* referencing the old pbuf is enough */ /* referencing the old pbuf is enough */
p = q; p = q;
@ -2128,19 +2135,31 @@ nd6_queue_packet(s8_t neighbor_index, struct pbuf *q)
new_entry = (struct nd6_q_entry *)memp_malloc(MEMP_ND6_QUEUE); new_entry = (struct nd6_q_entry *)memp_malloc(MEMP_ND6_QUEUE);
} }
if (new_entry != NULL) { if (new_entry != NULL) {
unsigned int qlen = 0;
new_entry->next = NULL; new_entry->next = NULL;
new_entry->p = p; new_entry->p = p;
if (neighbor_cache[neighbor_index].q != NULL) { if (neighbor_cache[neighbor_index].q != NULL) {
/* queue was already existent, append the new entry to the end */ /* queue was already existent, append the new entry to the end */
r = neighbor_cache[neighbor_index].q; r = neighbor_cache[neighbor_index].q;
qlen++;
while (r->next != NULL) { while (r->next != NULL) {
r = r->next; r = r->next;
qlen++;
} }
r->next = new_entry; r->next = new_entry;
} else { } else {
/* queue did not exist, first item in queue */ /* queue did not exist, first item in queue */
neighbor_cache[neighbor_index].q = new_entry; neighbor_cache[neighbor_index].q = new_entry;
} }
#if ESP_ND6_QUEUEING
if (qlen >= MEMP_NUM_ND6_QUEUE) {
r->next = NULL;
pbuf_free(new_entry->p);
memp_free(MEMP_ND6_QUEUE, new_entry);
LWIP_DEBUGF(LWIP_DBG_TRACE, ("ipv6: could not queue the packet %p (queue is full)\n", (void *)q));
return ERR_MEM;
}
#endif
LWIP_DEBUGF(LWIP_DBG_TRACE, ("ipv6: queued packet %p on neighbor entry %"S16_F"\n", (void *)p, (s16_t)neighbor_index)); LWIP_DEBUGF(LWIP_DBG_TRACE, ("ipv6: queued packet %p on neighbor entry %"S16_F"\n", (void *)p, (s16_t)neighbor_index));
result = ERR_OK; result = ERR_OK;
} else { } else {

8
src/include/lwip/opt.h
View File

@ -2590,6 +2590,14 @@
#define LWIP_ND6_QUEUEING LWIP_IPV6 #define LWIP_ND6_QUEUEING LWIP_IPV6
#endif #endif
/**
* ESP_ND6_QUEUEING==1: queue outgoing IPv6 packets while MAC address
* is being resolved.
*/
#if !defined ESP_ND6_QUEUEING || defined __DOXYGEN__
#define ESP_ND6_QUEUEING LWIP_IPV6
#endif
/** /**
* MEMP_NUM_ND6_QUEUE: Max number of IPv6 packets to queue during MAC resolution. * MEMP_NUM_ND6_QUEUE: Max number of IPv6 packets to queue during MAC resolution.
*/ */