diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-02-05 19:40:26 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-02-05 19:40:26 +0000 |
| commit | a51deb9a9c7bf33ba353e008724c150bddde144b (patch) | |
| tree | 5797a9e4129ba027269bb48f4e3d4571f98fe473 /src/common/util.c | |
| parent | 2866c53eec8cd592955f15cec1a317e04aaafc7f (diff) | |
| download | tor-a51deb9a9c7bf33ba353e008724c150bddde144b.tar.gz tor-a51deb9a9c7bf33ba353e008724c150bddde144b.zip | |
r17903@catbus: nickm | 2008-02-05 14:40:03 -0500
Remove some dead code; fix some XXX020s; turn some XXX020s into XXXX_IP6s (i.e., "needs to be fixed when we add ipv6 support").
svn:r13382
Diffstat (limited to 'src/common/util.c')
| -rw-r--r-- | src/common/util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/util.c b/src/common/util.c index 0623093e64..21ac808786 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2409,7 +2409,7 @@ addr_mask_get_bits(uint32_t mask) /** Compare two addresses <b>a1</b> and <b>a2</b> for equality under a * etmask of <b>mbits</b> bits. Return -1, 0, or 1. * - * XXXX020Temporary function to allow masks as bitcounts everywhere. This + * XXXX_IP6 Temporary function to allow masks as bitcounts everywhere. This * will be replaced with an IPv6-aware version as soon as 32-bit addresses are * no longer passed around. */ @@ -2646,7 +2646,7 @@ tor_addr_parse_mask_ports(const char *s, tor_addr_t *addr_out, memset(addr_out, 0, sizeof(tor_addr_t)); if (!strcmp(address, "*")) { - addr_out->family = AF_INET; /* AF_UNSPEC ???? XXXXX020 */ + addr_out->family = AF_INET; /* AF_UNSPEC ???? XXXX_IP6 */ any_flag = 1; } else if (tor_inet_pton(AF_INET6, address, &addr_out->addr.in6_addr) > 0) { addr_out->family = AF_INET6; @@ -2714,7 +2714,7 @@ tor_addr_parse_mask_ports(const char *s, tor_addr_t *addr_out, bits); goto err; } - /* XXXX020 is this really what we want? */ + /* XXXX_IP6 is this really what we want? */ bits = 96 + bits%32; /* map v4-mapped masks onto 96-128 bits */ } } else { /* pick an appropriate mask, as none was given */ @@ -2827,7 +2827,7 @@ tor_inet_ntoa(const struct in_addr *in, char *buf, size_t buf_len) /** Take a 32-bit host-order ipv4 address <b>v4addr</b> and store it in the * tor_addr *<b>dest</b>. * - * XXXX020 Temporary, for use while 32-bit int addresses are still being + * XXXX_IP6 Temporary, for use while 32-bit int addresses are still being * passed around. */ void @@ -2876,7 +2876,7 @@ tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, tor_assert(addr1 && addr2); - /* XXXX020 this code doesn't handle mask bits right it's using v4-mapped v6 + /* XXXX_IP6 this code doesn't handle mask bits right it's using v4-mapped v6 * addresses. If I ask whether ::ffff:1.2.3.4 and ::ffff:1.2.7.8 are the * same in the first 16 bits, it will say "yes." That's not so intuitive. */ |