Bug #919: Don't rebind ports if we receive SIGHUP while hibernating.

This commit is contained in:
Chris Ball 2010-07-31 22:35:20 -04:00 committed by Nick Mathewson
parent 9ffa977981
commit 73a4c0690e
2 changed files with 10 additions and 4 deletions

4
changes/bug919 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- Fix a regression that caused Tor to rebind its ports if it receives
SIGHUP while hibernating. Bugfix in 0.1.1.6-alpha, closes bug 919.

View File

@ -950,10 +950,12 @@ options_act_reversible(or_options_t *old_options, char **msg)
}
/* Launch the listeners. (We do this before we setuid, so we can bind to
* ports under 1024.) */
if (retry_all_listeners(replaced_listeners, new_listeners) < 0) {
*msg = tor_strdup("Failed to bind one of the listener ports.");
goto rollback;
* ports under 1024.) We don't want to rebind if we're hibernating. */
if (!we_are_hibernating()) {
if (retry_all_listeners(replaced_listeners, new_listeners) < 0) {
*msg = tor_strdup("Failed to bind one of the listener ports.");
goto rollback;
}
}
}