[or-cvs] r11604: Patch from Robert Hogan: fix a couple of status-event relate (in tor/trunk: . doc/spec src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-09-24 11:41:20 -0400 (Mon, 24 Sep 2007)
New Revision: 11604

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/doc/spec/control-spec.txt
   tor/trunk/src/or/router.c
Log:
 r15310 at catbus:  nickm | 2007-09-24 11:36:08 -0400
 Patch from Robert Hogan: fix a couple of status-event related typos. Backport candidate.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15310] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-09-24 15:05:20 UTC (rev 11603)
+++ tor/trunk/ChangeLog	2007-09-24 15:41:20 UTC (rev 11604)
@@ -3,6 +3,11 @@
     - When an authority is missing votes or signatures, it now tries to fetch
       them.
 
+  o Minor bugfixes (controller):
+    - When sending a status event to the controller telling it that an
+      OR address is readable, set the port correctly.  (Previously we
+      were reporting the dir port.)  Bugfix on 0.1.2.x.
+
 Changes in version 0.2.0.7-alpha - 2007-09-21
   o New directory authorities:
     - Set up moria1 and tor26 as the first v3 directory authorities. See

Modified: tor/trunk/doc/spec/control-spec.txt
===================================================================
--- tor/trunk/doc/spec/control-spec.txt	2007-09-24 15:05:20 UTC (rev 11603)
+++ tor/trunk/doc/spec/control-spec.txt	2007-09-24 15:41:20 UTC (rev 11604)
@@ -1188,7 +1188,7 @@
        {Controllers should log bugs, but shouldn't annoy the user in case a
        bug appears frequently.}
 
-     CLOCK_SKEWED
+     CLOCK_SKEW
        SKEW="+" / "-" SECONDS
        SOURCE="DIRSERV:IP:Port" / "NETWORKSTATUS:IP:PORT"
          If "SKEW" is present, it's an estimate of how far we are from the

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2007-09-24 15:05:20 UTC (rev 11603)
+++ tor/trunk/src/or/router.c	2007-09-24 15:41:20 UTC (rev 11604)
@@ -708,7 +708,7 @@
       return;
     control_event_server_status(LOG_NOTICE,
                                 "REACHABILITY_SUCCEEDED ORADDRESS=%s:%d",
-                                me->address, me->dir_port);
+                                me->address, me->or_port);
   }
 }