nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug10449'

Browse Source
This commit is contained in:
Nick Mathewson 2014-02-25 16:09:15 -05:00
commit bf1678603f
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changes/bug10449 Normal file
View File

@ -0,0 +1,8 @@
o Minor bugfixes:
- Exit immediately when exiting because of dropped connection from
a process-owning controller. Previously, if we were running in
server mode, we would wait for a little while as in the when we
got an INT signal--but this was problematic, since there was no
feedback for the user. Controllers that want to do a clean
shutdown should send an INT signal, and let the user know what's
going on. Fix for bug 10449; bugfix on 0.2.2.28-beta.

17
src/or/control.c
View File

@ -3181,22 +3181,13 @@ connection_control_reached_eof(control_connection_t *conn)
static void static void
lost_owning_controller(const char *owner_type, const char *loss_manner) lost_owning_controller(const char *owner_type, const char *loss_manner)
{ {
int shutdown_slowly = server_mode(get_options()); log_notice(LD_CONTROL, "Owning controller %s has %s -- exiting now.",
owner_type, loss_manner);
log_notice(LD_CONTROL, "Owning controller %s has %s -- %s.",
owner_type, loss_manner,
shutdown_slowly ? "shutting down" : "exiting now");
/* XXXX Perhaps this chunk of code should be a separate function, /* XXXX Perhaps this chunk of code should be a separate function,
* called here and by process_signal(SIGINT). */ * called here and by process_signal(SIGINT). */
tor_cleanup();
if (!shutdown_slowly) { exit(0);
tor_cleanup();
exit(0);
}
/* XXXX This will close all listening sockets except control-port
* listeners. Perhaps we should close those too. */
hibernate_begin_shutdown();
} }
/** Called when <b>conn</b> is being freed. */ /** Called when <b>conn</b> is being freed. */