summaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2006-10-24 02:58:03 +0000
committerNick Mathewson <nickm@torproject.org>2006-10-24 02:58:03 +0000
commit6c7bf2f83098af6cf3f7f84725cc91154642ca65 (patch)
treed146b5a3fe3fafa1201b5e96ea5837727a33cf9a /src/or/control.c
parent48a926df67b05a36ddda7d27e0cc487019f5eab2 (diff)
downloadtor-6c7bf2f83098af6cf3f7f84725cc91154642ca65.tar.gz
tor-6c7bf2f83098af6cf3f7f84725cc91154642ca65.zip
r9364@Kushana: nickm | 2006-10-23 22:57:48 -0400
Remove reference to NS_FULL event; add two GETINFO targets. svn:r8812
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 8d099ffc87..2317dff3c0 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1482,6 +1482,12 @@ handle_getinfo_helper(control_connection_t *control_conn,
return config_getinfo_helper(question, answer);
} else if (!strcmp(question, "info/names")) {
*answer = list_getinfo_options();
+ } else if (!strcmp(question, "events/names")) {
+ *answer = tor_strdup("CIRC STREAM ORCONN BW DEBUG INFO NOTICE WARN ERR "
+ "NEWDESC ADDRMAP AUTHDIR_NEWDESCS DESCCHANGED "
+ "NS STATUS_GENERAL STATUS_CLIENT STATUS_SERVER");
+ } else if (!strcmp(question, "features/names")) {
+ *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS");
} else if (!strcmpstart(question, "desc/id/")) {
routerinfo_t *ri = router_get_by_hexdigest(question+strlen("desc/id/"));
if (ri) {
@@ -2420,7 +2426,8 @@ handle_control_usefeature(control_connection_t *conn,
/* remove this in 0.1.2.4; EXTENDED_FORMAT only ever worked for a
* little while during 0.1.2.2-alpha-dev. */
log_warn(LD_GENERAL,
- "EXTENDED_FORMAT is deprecated; use EXTENDED_EVENTS instead.");
+ "EXTENDED_FORMAT is deprecated; use EXTENDED_EVENTS "
+ "instead.");
extended_events = 1;
} else {
connection_printf_to_buf(conn, "552 Unrecognized feature \"%s\"\r\n",