diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-07 12:18:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-07 12:24:36 -0500 |
| commit | 0a35ac6a22de04748c2f078c8f1f5a166423049d (patch) | |
| tree | 25634f123d208c89fac2d7d59284f6cd6725cdb0 /src | |
| parent | d6b49c55c58777ec7457cd8ae6a372fe0939f920 (diff) | |
| download | tor-0a35ac6a22de04748c2f078c8f1f5a166423049d.tar.gz tor-0a35ac6a22de04748c2f078c8f1f5a166423049d.zip | |
Correctly detect and exclude addresses outside of our virtual address range
Found by cypherpunks; fixes more of 2328. Bug was introduced in 3623a122;
first appeared in 0.2.0.5-alpha.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/connection_edge.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 4caa01cb50..05338e83ba 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1139,6 +1139,18 @@ address_is_in_virtual_range(const char *address) return 0; } +/** Increment the value of next_virtual_addr; reset it to the start of the + * virtual address range if it wraps around. + */ +static INLINE void +increment_virtual_addr(void) +{ + ++next_virtual_addr; + if (addr_mask_cmp_bits(next_virtual_addr, virtual_addr_network, + virtual_addr_netmask_bits)) + next_virtual_addr = virtual_addr_network; +} + /** Return a newly allocated string holding an address of <b>type</b> * (one of RESOLVED_TYPE_{IPV4|HOSTNAME}) that has not yet been mapped, * and that is very unlikely to be the address of any real host. @@ -1168,7 +1180,7 @@ addressmap_get_virtual_address(int type) /* Don't hand out any .0 or .255 address. */ while ((next_virtual_addr & 0xff) == 0 || (next_virtual_addr & 0xff) == 0xff) { - ++next_virtual_addr; + increment_virtual_addr(); if (! --available) { log_warn(LD_CONFIG, "Ran out of virtual addresses!"); return NULL; @@ -1177,20 +1189,17 @@ addressmap_get_virtual_address(int type) in.s_addr = htonl(next_virtual_addr); tor_inet_ntoa(&in, buf, sizeof(buf)); if (!strmap_get(addressmap, buf)) { - ++next_virtual_addr; + increment_virtual_addr(); break; } - ++next_virtual_addr; + increment_virtual_addr(); --available; log_info(LD_CONFIG, "%d addrs available", (int)available); if (! available) { log_warn(LD_CONFIG, "Ran out of virtual addresses!"); return NULL; } - if (addr_mask_cmp_bits(next_virtual_addr, virtual_addr_network, - virtual_addr_netmask_bits)) - next_virtual_addr = virtual_addr_network; } return tor_strdup(buf); } else { |