[or-cvs] r13098: Fix bug in r13094: be sure to set the purpose and send_unenc (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-01-10 13:20:04 -0500 (Thu, 10 Jan 2008)
New Revision: 13098

Modified:
   tor/trunk/
   tor/trunk/src/or/router.c
Log:
 r17564@catbus:  nickm | 2008-01-10 13:19:59 -0500
 Fix bug in r13094: be sure to set the purpose and send_unencrypted fields correctly in our own routerinfo and extrainfo.



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

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2008-01-10 18:11:34 UTC (rev 13097)
+++ tor/trunk/src/or/router.c	2008-01-10 18:20:04 UTC (rev 13098)
@@ -1322,6 +1322,13 @@
   ri->cache_info.signed_descriptor_len =
     strlen(ri->cache_info.signed_descriptor_body);
 
+  ri->purpose =
+    options->BridgeRelay ? ROUTER_PURPOSE_BRIDGE : ROUTER_PURPOSE_GENERAL;
+  if (!options->BridgeRelay) {
+    ri->cache_info.send_unencrypted = 1;
+    ei->cache_info.send_unencrypted = 1;
+  }
+
   router_get_router_hash(ri->cache_info.signed_descriptor_body,
                          ri->cache_info.signed_descriptor_digest);