diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-07-18 17:05:58 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-07-18 17:05:58 +0200 |
| commit | 0b4b51314f5cb0242e7a8fd3b87bc800cd04eacc (patch) | |
| tree | a21f97794107eafb0f8e4192d88f8812b037ea62 /src/or/hibernate.c | |
| parent | 9d5d0f040f9b0ddf6c10166200d115bfa30a31da (diff) | |
| download | tor-0b4b51314f5cb0242e7a8fd3b87bc800cd04eacc.tar.gz tor-0b4b51314f5cb0242e7a8fd3b87bc800cd04eacc.zip | |
Make the controller act more usefully when GETINFO fails
Right now it says "552 internal error" because there's no way for
getinfo_helper_*() countries to specify an error message. This
patch changes the getinfo_helper_*() interface, and makes most of the
getinfo helpers give useful error messages in response to failures.
This should prevent recurrences of bug 1699, where a missing GeoIPFile
line in the torrc made GETINFO ip-to-county/* fail in a "not obvious
how to fix" way.
Diffstat (limited to 'src/or/hibernate.c')
| -rw-r--r-- | src/or/hibernate.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 3c52a31729..6b512eacf2 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -863,9 +863,11 @@ consider_hibernation(time_t now) * NULL. */ int getinfo_helper_accounting(control_connection_t *conn, - const char *question, char **answer) + const char *question, char **answer, + const char **errmsg) { (void) conn; + (void) errmsg; if (!strcmp(question, "accounting/enabled")) { *answer = tor_strdup(accounting_is_enabled(get_options()) ? "1" : "0"); } else if (!strcmp(question, "accounting/hibernating")) { |