[or-cvs] r11605: Backport patch from Robert Hogan: fix a status-event related (in tor/branches/tor-0_1_2-patches: . src/or)

[nickm at seul.org]

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

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/router.c
Log:
 r15315 at catbus:  nickm | 2007-09-24 11:37:25 -0400
 Backport patch from Robert Hogan: fix a status-event related typo.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r15315] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-09-24 15:41:20 UTC (rev 11604)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-09-24 15:41:28 UTC (rev 11605)
@@ -8,7 +8,12 @@
       --list-fingerprint or --verify-config or --hash-password. (Resolves
       bug 499.)
 
+  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.)
 
+
 Changes in version 0.1.2.17 - 2007-08-30
   o Major bugfixes (security):
     - We removed support for the old (v0) control protocol. It has been

Modified: tor/branches/tor-0_1_2-patches/src/or/router.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/router.c	2007-09-24 15:41:20 UTC (rev 11604)
+++ tor/branches/tor-0_1_2-patches/src/or/router.c	2007-09-24 15:41:28 UTC (rev 11605)
@@ -529,7 +529,7 @@
       return;
     control_event_server_status(LOG_NOTICE,
                                 "REACHABILITY_SUCCEEDED ORADDRESS=%s:%d",
-                                me->address, me->dir_port);
+                                me->address, me->or_port);
   }
 }