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

Close orconns correctly through channels when setting DisableNetwork to 1

Browse Source
This commit is contained in:
Andrea Shepard 2014-04-15 20:19:39 -07:00
parent 125c8e5468
commit a5544e589d
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug11306 Normal file
View File

@ -0,0 +1,4 @@
o Bugfixes:
- When closing all connections on setting DisableNetwork to 1, use
connection_or_close_normally() rather than closing orconns out from
under the channel layer. Fixes bug #11306.

14
src/or/connection.c
View File

@ -2359,6 +2359,20 @@ connection_mark_all_noncontrol_connections(void)
connection_mark_unattached_ap(TO_ENTRY_CONN(conn),
END_STREAM_REASON_HIBERNATING);
break;
case CONN_TYPE_OR:
{
or_connection_t *orconn = TO_OR_CONN(conn);
if (orconn->chan) {
connection_or_close_normally(orconn, 0);
} else {
/*
* There should have been one, but mark for close and hope
* for the best..
*/
connection_mark_for_close(conn);
}
}
break;
default:
connection_mark_for_close(conn);
break;