mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-05 22:29:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow-up to patch #9472: tcp_kill_prio: Don't kill active connection that has the same priority

Browse Source 
Correctly search for connection with lowest prio AND longest inactivity time
This commit is contained in:
Dirk Ziegelmeier 2017-11-13 22:13:11 +01:00
parent 1665fcba83
commit a82054d24f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/tcp.c
View File

@ -1635,25 +1635,29 @@ tcp_kill_prio(u8_t prio)
mprio = LWIP_MIN(TCP_PRIO_MAX, prio); mprio = LWIP_MIN(TCP_PRIO_MAX, prio);
/* We want to kill connections with a lower prio, so bail out if /* We want to kill connections with a lower prio, so bail out if
* supplied prio is 0 - there cannot be a no lower prio * supplied prio is 0 - there can never be a lower prio
*/ */
if (mprio == 0) { if (mprio == 0) {
return; return;
} }
/* We want kill connections with a lower prio, so decrement prio by one /* We only want kill connections with a lower prio, so decrement prio by one
* and start searching for oldest connection with same or lower prio than mprio. * and start searching for oldest connection with same or lower priority than mprio.
* We want to find the connections with the lowest possible prio, and among
* these the one with the longest inactivity time.
*/ */
mprio--; mprio--;
inactivity = 0; inactivity = 0;
inactive = NULL; inactive = NULL;
for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) { for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) {
if (pcb->prio <= mprio && /* lower prio is always a kill candidate */
(u32_t)(tcp_ticks - pcb->tmr) >= inactivity) { if ((pcb->prio < mprio) ||
/* longer inactivity is also a kill candidate */
((pcb->prio == mprio) && ((u32_t)(tcp_ticks - pcb->tmr) >= inactivity))) {
inactivity = tcp_ticks - pcb->tmr; inactivity = tcp_ticks - pcb->tmr;
inactive = pcb; inactive = pcb;
mprio = pcb->prio; mprio = pcb->prio;
} }
} }
if (inactive != NULL) { if (inactive != NULL) {