nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

r9364@Kushana: nickm | 2006-10-23 22:57:48 -0400

Browse Source 
Remove reference to NS_FULL event; add two GETINFO targets.


svn:r8812
This commit is contained in:
Nick Mathewson 2006-10-24 02:58:03 +00:00
parent 48a926df67
commit 6c7bf2f830
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -28,6 +28,8 @@ Changes in version 0.1.2.3-alpha - 2006-10-??
like those for circuit events. like those for circuit events.
- NS events to inform a controller when our opinion of a router's status - NS events to inform a controller when our opinion of a router's status
has changed. has changed.
- Add a GETINFO events/names and GETINFO features/names so controllers
can tell which events and features are supported.
o Security bugfixes: o Security bugfixes:
- When the user sends a NEWNYM signal, clear the client-side DNS - When the user sends a NEWNYM signal, clear the client-side DNS

11
doc/control-spec.txt
View File

@ -194,8 +194,7 @@ $Id$
EventCode = "CIRC" / "STREAM" / "ORCONN" / "BW" / "DEBUG" / EventCode = "CIRC" / "STREAM" / "ORCONN" / "BW" / "DEBUG" /
"INFO" / "NOTICE" / "WARN" / "ERR" / "NEWDESC" / "ADDRMAP" / "INFO" / "NOTICE" / "WARN" / "ERR" / "NEWDESC" / "ADDRMAP" /
"AUTHDIR_NEWDESCS" / "DESCCHANGED" / "STATUS_GENERAL" / "AUTHDIR_NEWDESCS" / "DESCCHANGED" / "STATUS_GENERAL" /
"STATUS_CLIENT" / "STATUS_SERVER" / "GUARDS" / "NS" / "STATUS_CLIENT" / "STATUS_SERVER" / "GUARDS" / "NS"
"NS_FULL"
Any events *not* listed in the SETEVENTS line are turned off; thus, sending Any events *not* listed in the SETEVENTS line are turned off; thus, sending
SETEVENTS with an empty body turns off all event reporting. SETEVENTS with an empty body turns off all event reporting.
@ -447,6 +446,14 @@ $Id$
OptionPrefix SP Documentation CRLF OptionPrefix SP Documentation CRLF
OptionPrefix = OptionName "/*" OptionPrefix = OptionName "/*"
"events/names"
A space-separated list of all the events supported by this version of
Tor's SETEVENTS.
"features/names"
A space-separated list of all the events supported by this version of
Tor's USEFEATURE.
"dir/status/authority" "dir/status/authority"
"dir/status/fp/<F>" "dir/status/fp/<F>"
"dir/status/fp/<F1>+<F2>+<F3>" "dir/status/fp/<F1>+<F2>+<F3>"

9
src/or/control.c
View File

@ -1482,6 +1482,12 @@ handle_getinfo_helper(control_connection_t *control_conn,
return config_getinfo_helper(question, answer); return config_getinfo_helper(question, answer);
} else if (!strcmp(question, "info/names")) { } else if (!strcmp(question, "info/names")) {
*answer = list_getinfo_options(); *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/")) { } else if (!strcmpstart(question, "desc/id/")) {
routerinfo_t *ri = router_get_by_hexdigest(question+strlen("desc/id/")); routerinfo_t *ri = router_get_by_hexdigest(question+strlen("desc/id/"));
if (ri) { 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 /* remove this in 0.1.2.4; EXTENDED_FORMAT only ever worked for a
* little while during 0.1.2.2-alpha-dev. */ * little while during 0.1.2.2-alpha-dev. */
log_warn(LD_GENERAL, log_warn(LD_GENERAL,
"EXTENDED_FORMAT is deprecated; use EXTENDED_EVENTS instead."); "EXTENDED_FORMAT is deprecated; use EXTENDED_EVENTS "
"instead.");
extended_events = 1; extended_events = 1;
} else { } else {
connection_printf_to_buf(conn, "552 Unrecognized feature \"%s\"\r\n", connection_printf_to_buf(conn, "552 Unrecognized feature \"%s\"\r\n",