r15310@catbus: nickm | 2007-09-24 11:36:08 -0400

 Patch from Robert Hogan: fix a couple of status-event related typos. Backport candidate.


svn:r11604

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f86f0a2a63..da5de5307f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@ Changes in version 0.2.0.8-alpha - 2007-??-??
     - 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
diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt
index 9b250758f0..3f2ba44e3a 100644
--- a/doc/spec/control-spec.txt
+++ b/doc/spec/control-spec.txt
@@ -1188,7 +1188,7 @@ $Id$
        {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
diff --git a/src/or/router.c b/src/or/router.c
index 34be215ed0..57625fadb6 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -708,7 +708,7 @@ router_orport_found_reachable(void)
       return;
     control_event_server_status(LOG_NOTICE,
                                 "REACHABILITY_SUCCEEDED ORADDRESS=%s:%d",
-                                me->address, me->dir_port);
+                                me->address, me->or_port);
   }
 }