[or-cvs] r10071: Backport candidate: correctly set the purpose of routers tha (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-04-30 15:48:45 -0400 (Mon, 30 Apr 2007)
New Revision: 10071

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/control.c
Log:
 r12587 at catbus:  nickm | 2007-04-30 15:47:39 -0400
 Backport candidate: correctly set the purpose of routers that are inserted by the controller with purpose=controller.



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

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-04-30 19:48:39 UTC (rev 10070)
+++ tor/trunk/ChangeLog	2007-04-30 19:48:45 UTC (rev 10071)
@@ -113,6 +113,10 @@
     - Correct the control spec to match how the code actually responds
       to 'getinfo addr-mappings/*'.
 
+  o Minor bugfixes (controller):
+    - Actually set the purpose correctly for descriptors inserted with
+      purpose=controller.
+
   o Code simplifications and refactoring
     - Stop passing around circuit_t and crypt_path_t pointers that are
       implicit in other procedure arguments.

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2007-04-30 19:48:39 UTC (rev 10070)
+++ tor/trunk/src/or/control.c	2007-04-30 19:48:45 UTC (rev 10071)
@@ -1696,7 +1696,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;
   }