nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we're removing conn from old_conns *once*

Browse Source
This commit is contained in:
rl1987 2018-10-03 15:45:48 +03:00
parent 2b146bdb9a
commit 9d886185c1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/mainloop/connection.c
View File

@ -2762,6 +2762,11 @@ retry_listener_ports(smartlist_t *old_conns,
const port_cfg_t *found_port = NULL; const port_cfg_t *found_port = NULL;
/* Okay, so this is a listener. Is it configured? */ /* Okay, so this is a listener. Is it configured? */
/* That is, is it either: 1) exact match - address and port
* pair match exactly between old listener and new port; or 2)
* wildcard match - port matches exactly, but *one* of the
* addresses is wildcard (0.0.0.0 or ::)?
*/
SMARTLIST_FOREACH_BEGIN(launch, const port_cfg_t *, wanted) { SMARTLIST_FOREACH_BEGIN(launch, const port_cfg_t *, wanted) {
if (conn->type != wanted->type) if (conn->type != wanted->type)
continue; continue;
@ -2805,6 +2810,7 @@ retry_listener_ports(smartlist_t *old_conns,
SMARTLIST_DEL_CURRENT(launch, wanted); SMARTLIST_DEL_CURRENT(launch, wanted);
SMARTLIST_DEL_CURRENT(old_conns, conn); SMARTLIST_DEL_CURRENT(old_conns, conn);
break;
} }
#endif #endif
} }