[or-cvs] r10160: Backport r10071: correctly set the purpose of routers that a (in tor/branches/tor-0_1_2-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-05-10 15:29:39 -0400 (Thu, 10 May 2007)
New Revision: 10160

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/control.c
Log:
 r12719 at catbus:  nickm | 2007-05-10 15:26:54 -0400
 Backport r10071: correctly set the purpose of routers that are inserted by the controller with purpose=controller.



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

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-05-10 19:29:32 UTC (rev 10159)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-05-10 19:29:39 UTC (rev 10160)
@@ -9,7 +9,11 @@
     - Fix a bug in dirserv_remove_invalid() that would cause authorities to
       corrupt memory under some really unlikely scenarios.
 
+  o Minor bugfixes:
+    - Actually set the purpose correctly for descriptors inserted with
+      purpose=controller.
 
+
 Changes in version 0.1.2.13 - 2007-04-24
   o Minor fixes:
     - Fix a memory leak when we ask for "all" networkstatuses and we

Modified: tor/branches/tor-0_1_2-patches/src/or/control.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/control.c	2007-05-10 19:29:32 UTC (rev 10159)
+++ tor/branches/tor-0_1_2-patches/src/or/control.c	2007-05-10 19:29:39 UTC (rev 10160)
@@ -2045,7 +2045,7 @@
                               ROUTER_PURPOSE_GENERAL;
   else if (!strcmp(*string, "controller"))
     *purpose = for_circuits ? CIRCUIT_PURPOSE_CONTROLLER :
-                              ROUTER_PURPOSE_GENERAL;
+                              ROUTER_PURPOSE_CONTROLLER;
   else { /* not a recognized purpose */
     return -1;
   }