Let controllers actually ask for the "clients_seen" event. Bugfix

on 0.2.1.10-alpha; reported by Matt Edman.

svn:r18201

diff --git a/ChangeLog b/ChangeLog
index d38f105a2a7357875d47121b0567f192e7099525..00e308de82bb6e551851ba8b6242bf06b910dfb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 Changes in version 0.2.1.12-alpha - 2009-01-??
+  o Minor bugfixes:
+    - Let controllers actually ask for the "clients_seen" event. Bugfix
+      on 0.2.1.10-alpha; reported by Matt Edman.
 
 
 Changes in version 0.2.1.11-alpha - 2009-01-20

diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt
index 7c9bcea0833c6d105b456f91e823cc36d12421bb..7ea0d865f2442bec41ebc30a36ff3c2939134c3f 100644 (file)
--- a/doc/spec/control-spec.txt
+++ b/doc/spec/control-spec.txt
@@ -218,7 +218,8 @@ $Id$
      EventCode = "CIRC" / "STREAM" / "ORCONN" / "BW" / "DEBUG" /
          "INFO" / "NOTICE" / "WARN" / "ERR" / "NEWDESC" / "ADDRMAP" /
          "AUTHDIR_NEWDESCS" / "DESCCHANGED" / "STATUS_GENERAL" /
-         "STATUS_CLIENT" / "STATUS_SERVER" / "GUARD" / "NS" / "STREAM_BW"
+         "STATUS_CLIENT" / "STATUS_SERVER" / "GUARD" / "NS" / "STREAM_BW" /
+         "CLIENTS_SEEN"
 
   Any events *not* listed in the SETEVENTS line are turned off; thus, sending
   SETEVENTS with an empty body turns off all event reporting.

diff --git a/src/or/control.c b/src/or/control.c
index 0236d1ea88c2bf8f552e41c73e0f1559feb9c9d3..571224188fabcb70035391fe8244f8822bea14cc 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -997,6 +997,8 @@ handle_control_setevents(control_connection_t *conn, uint32_t len,
         event_code = EVENT_GUARD;
       else if (!strcasecmp(ev, "STREAM_BW"))
         event_code = EVENT_STREAM_BANDWIDTH_USED;
+      else if (!strcasecmp(ev, "CLIENTS_SEEN"))
+        event_code = EVENT_CLIENTS_SEEN;
       else {
         connection_printf_to_buf(conn, "552 Unrecognized event \"%s\"\r\n",
                                  ev);