[or-cvs] r8812: Remove reference to NS_FULL event; add two GETINFO targets. (in tor/trunk: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-10-23 22:58:03 -0400 (Mon, 23 Oct 2006)
New Revision: 8812

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/doc/control-spec.txt
   tor/trunk/src/or/control.c
Log:
 r9364 at Kushana:  nickm | 2006-10-23 22:57:48 -0400
 Remove reference to NS_FULL event; add two GETINFO targets.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r9364] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2006-10-24 01:31:31 UTC (rev 8811)
+++ tor/trunk/ChangeLog	2006-10-24 02:58:03 UTC (rev 8812)
@@ -28,6 +28,8 @@
       like those for circuit events.
     - NS events to inform a controller when our opinion of a router's status
       has changed.
+    - Add a GETINFO events/names and GETINFO features/names so controllers
+      can tell which events and features are supported.
 
   o Security bugfixes:
     - When the user sends a NEWNYM signal, clear the client-side DNS

Modified: tor/trunk/doc/control-spec.txt
===================================================================
--- tor/trunk/doc/control-spec.txt	2006-10-24 01:31:31 UTC (rev 8811)
+++ tor/trunk/doc/control-spec.txt	2006-10-24 02:58:03 UTC (rev 8812)
@@ -194,8 +194,7 @@
      EventCode = "CIRC" / "STREAM" / "ORCONN" / "BW" / "DEBUG" /
          "INFO" / "NOTICE" / "WARN" / "ERR" / "NEWDESC" / "ADDRMAP" /
          "AUTHDIR_NEWDESCS" / "DESCCHANGED" / "STATUS_GENERAL" /
-         "STATUS_CLIENT" / "STATUS_SERVER" / "GUARDS" / "NS" /
-         "NS_FULL"
+         "STATUS_CLIENT" / "STATUS_SERVER" / "GUARDS" / "NS"
 
   Any events *not* listed in the SETEVENTS line are turned off; thus, sending
   SETEVENTS with an empty body turns off all event reporting.
@@ -447,6 +446,14 @@
          OptionPrefix SP Documentation CRLF
          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/fp/<F>"
     "dir/status/fp/<F1>+<F2>+<F3>"

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2006-10-24 01:31:31 UTC (rev 8811)
+++ tor/trunk/src/or/control.c	2006-10-24 02:58:03 UTC (rev 8812)
@@ -1482,6 +1482,12 @@
     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 @@
         /* 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",