[or-cvs] r11679: When we are a bridge directory, add bridges with purpose BRI (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-09-27 16:46:28 -0400 (Thu, 27 Sep 2007)
New Revision: 11679

Modified:
   tor/trunk/
   tor/trunk/src/or/directory.c
Log:
 r15421 at catbus:  nickm | 2007-09-27 15:44:17 -0400
 When we are a bridge directory, add bridges with purpose BRIDGE, not with purpose CONTROLLER.  Roger, is this right?



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

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2007-09-27 20:46:24 UTC (rev 11678)
+++ tor/trunk/src/or/directory.c	2007-09-27 20:46:28 UTC (rev 11679)
@@ -2413,7 +2413,7 @@
       !strcmp(url,"/tor/")) { /* server descriptor post */
     const char *msg = NULL;
     uint8_t purpose = authdir_mode_bridge(options) ?
-                      ROUTER_PURPOSE_CONTROLLER : ROUTER_PURPOSE_GENERAL;
+                      ROUTER_PURPOSE_BRIDGE : ROUTER_PURPOSE_GENERAL;
     int r = dirserv_add_multiple_descriptors(body, purpose, &msg);
     tor_assert(msg);
     if (r > 0)