r12587@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.

svn:r10071

diff --git a/ChangeLog b/ChangeLog
index 019e733da6849da10013e496445d22e2d203b66a..f17268bd482ff9bd2b232752a24b0cbe9fa1d1d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -113,6 +113,10 @@ Changes in version 0.2.0.1-alpha - 2007-??-??
     - 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.

diff --git a/src/or/control.c b/src/or/control.c
index f965b7035a2076f91bd231bd72ca3384c2887791..9222220636bcfb9686a0acf693e8030c995aff98 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1696,7 +1696,7 @@ get_purpose(char **string, int for_circuits, uint8_t *purpose)
                               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;
   }