diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-02-09 22:07:22 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-02-09 22:07:22 -0500 |
| commit | 74e6a47a808803c985f55b626dff294dbe425043 (patch) | |
| tree | 9ba39d530438b96f69a04a698ece46b22939862e /src/test | |
| parent | 002c860caee374688f9478dfd6a6e2ebddad791f (diff) | |
| download | tor-74e6a47a808803c985f55b626dff294dbe425043.tar tor-74e6a47a808803c985f55b626dff294dbe425043.tar.gz | |
stop setting, or using, router->address
resolves ticket 5528.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_dir.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c index f1c745ef7..150a2acf5 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -94,7 +94,6 @@ test_dir_formats(void) get_platform_str(platform, sizeof(platform)); r1 = tor_malloc_zero(sizeof(routerinfo_t)); - r1->address = tor_strdup("18.244.0.1"); r1->addr = 0xc0a80001u; /* 192.168.0.1 */ r1->cache_info.published_on = 0; r1->or_port = 9000; @@ -121,7 +120,6 @@ test_dir_formats(void) ex2->maskbits = 8; ex2->prt_min = ex2->prt_max = 24; r2 = tor_malloc_zero(sizeof(routerinfo_t)); - r2->address = tor_strdup("1.1.1.1"); r2->addr = 0x0a030201u; /* 10.3.2.1 */ r2->platform = tor_strdup(platform); r2->cache_info.published_on = 5; @@ -145,7 +143,7 @@ test_dir_formats(void) memset(buf, 0, 2048); test_assert(router_dump_router_to_string(buf, 2048, r1, pk2)>0); - strlcpy(buf2, "router Magri 18.244.0.1 9000 0 9003\n" + strlcpy(buf2, "router Magri 192.168.0.1 9000 0 9003\n" "or-address [1:2:3:4::]:9999\n" "platform Tor "VERSION" on ", sizeof(buf2)); strlcat(buf2, get_uname(), sizeof(buf2)); @@ -175,7 +173,7 @@ test_dir_formats(void) cp = buf; rp1 = router_parse_entry_from_string((const char*)cp,NULL,1,0,NULL); test_assert(rp1); - test_streq(rp1->address, r1->address); + test_eq(rp1->addr, r1->addr); test_eq(rp1->or_port, r1->or_port); //test_eq(rp1->dir_port, r1->dir_port); test_eq(rp1->bandwidthrate, r1->bandwidthrate); @@ -198,7 +196,7 @@ test_dir_formats(void) cp = buf; rp2 = router_parse_entry_from_string(&cp,1); test_assert(rp2); - test_streq(rp2->address, r2.address); + test_eq(rp2->addr, r2.addr); test_eq(rp2->or_port, r2.or_port); test_eq(rp2->dir_port, r2.dir_port); test_eq(rp2->bandwidth, r2.bandwidth); |