nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

r18900@catbus: nickm | 2008-03-17 18:32:25 -0400

Browse Source 
Fix tests and routerdesc behavior on trunk.


svn:r14084
This commit is contained in:
Nick Mathewson 2008-03-17 22:32:28 +00:00
parent e17e6371d1
commit fe1b2a4ed4
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/router.c
View File

@ -1686,7 +1686,8 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
} }
/* Write the exit policy to the end of 's'. */ /* 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. */ /* DNS is screwed up; don't claim to be an exit. */
strlcat(s+written, "reject *:*\n", maxlen-written); strlcat(s+written, "reject *:*\n", maxlen-written);
written += strlen("reject *:*\n"); written += strlen("reject *:*\n");

6
src/or/test.c
View File

@ -2336,7 +2336,7 @@ test_dir_format(void)
strlcat(buf2, pk1_str, sizeof(buf2)); strlcat(buf2, pk1_str, sizeof(buf2));
strlcat(buf2, "signing-key\n", sizeof(buf2)); strlcat(buf2, "signing-key\n", sizeof(buf2));
strlcat(buf2, pk2_str, 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 buf[strlen(buf2)] = '\0'; /* Don't compare the sig; it's never the same
* twice */ * twice */
@ -2354,7 +2354,7 @@ test_dir_format(void)
test_eq(rp1->bandwidthcapacity, r1->bandwidthcapacity); test_eq(rp1->bandwidthcapacity, r1->bandwidthcapacity);
test_assert(crypto_pk_cmp_keys(rp1->onion_pkey, pk1) == 0); test_assert(crypto_pk_cmp_keys(rp1->onion_pkey, pk1) == 0);
test_assert(crypto_pk_cmp_keys(rp1->identity_pkey, pk2) == 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 #if 0
/* XXX Once we have exit policies, test this again. XXX */ /* XXX Once we have exit policies, test this again. XXX */
@ -3034,8 +3034,6 @@ test_policies(void)
compare_addr_to_addr_policy(0, 2, policy)); compare_addr_to_addr_policy(0, 2, policy));
test_assert(ADDR_POLICY_REJECTED == test_assert(ADDR_POLICY_REJECTED ==
compare_addr_to_addr_policy(0xc0a80102, 2, policy)); compare_addr_to_addr_policy(0xc0a80102, 2, policy));
test_assert(ADDR_POLICY_REJECTED ==
compare_addr_to_addr_policy(0x01020304u, 2, NULL));
policy2 = NULL; policy2 = NULL;
test_assert(0 == policies_parse_exit_policy(NULL, &policy2, 1, NULL)); test_assert(0 == policies_parse_exit_policy(NULL, &policy2, 1, NULL));