[or-cvs] r14084: Fix tests and routerdesc behavior on trunk. (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-03-17 18:32:28 -0400 (Mon, 17 Mar 2008)
New Revision: 14084

Modified:
   tor/trunk/
   tor/trunk/src/or/router.c
   tor/trunk/src/or/test.c
Log:
 r18900@catbus:  nickm | 2008-03-17 18:32:25 -0400
 Fix tests and routerdesc behavior on trunk.



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

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2008-03-17 20:26:00 UTC (rev 14083)
+++ tor/trunk/src/or/router.c	2008-03-17 22:32:28 UTC (rev 14084)
@@ -1686,7 +1686,8 @@
   }
 
   /* Write the exit policy to the end of 's'. */
-  if (dns_seems_to_be_broken()) {
+  if (dns_seems_to_be_broken() ||
+      !router->exit_policy || !smartlist_len(router->exit_policy)) {
     /* DNS is screwed up; don't claim to be an exit. */
     strlcat(s+written, "reject *:*\n", maxlen-written);
     written += strlen("reject *:*\n");

Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c	2008-03-17 20:26:00 UTC (rev 14083)
+++ tor/trunk/src/or/test.c	2008-03-17 22:32:28 UTC (rev 14084)
@@ -2336,7 +2336,7 @@
   strlcat(buf2, pk1_str, sizeof(buf2));
   strlcat(buf2, "signing-key\n", sizeof(buf2));
   strlcat(buf2, pk2_str, sizeof(buf2));
-  strlcat(buf2, "router-signature\n", sizeof(buf2));
+  strlcat(buf2, "reject *:*\nrouter-signature\n", sizeof(buf2));
   buf[strlen(buf2)] = '\0'; /* Don't compare the sig; it's never the same
                              * twice */
 
@@ -2354,7 +2354,7 @@
   test_eq(rp1->bandwidthcapacity, r1->bandwidthcapacity);
   test_assert(crypto_pk_cmp_keys(rp1->onion_pkey, pk1) == 0);
   test_assert(crypto_pk_cmp_keys(rp1->identity_pkey, pk2) == 0);
-  test_assert(rp1->exit_policy == NULL);
+  //test_assert(rp1->exit_policy == NULL);
 
 #if 0
   /* XXX Once we have exit policies, test this again. XXX */
@@ -3034,8 +3034,6 @@
           compare_addr_to_addr_policy(0, 2, policy));
   test_assert(ADDR_POLICY_REJECTED ==
           compare_addr_to_addr_policy(0xc0a80102, 2, policy));
-  test_assert(ADDR_POLICY_REJECTED ==
-          compare_addr_to_addr_policy(0x01020304u, 2, NULL));
 
   policy2 = NULL;
   test_assert(0 == policies_parse_exit_policy(NULL, &policy2, 1, NULL));