aboutsummaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-06-16 16:18:16 -0400
committerNick Mathewson <nickm@torproject.org>2009-06-16 16:18:16 -0400
commit0d2976d64b43083e1f036ecca6a8c9634830f0e9 (patch)
tree2b8722d2e2df6f5c27dac5824f4481fc8ed0a458 /src/or/relay.c
parentb871cdf64bc6ee3956fbec8b611588f417eae52f (diff)
parent7f8a6c5e92531658e54b243ab00d1f279693a28d (diff)
downloadtor-0d2976d64b43083e1f036ecca6a8c9634830f0e9.tar
tor-0d2976d64b43083e1f036ecca6a8c9634830f0e9.tar.gz
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src/or/relay.c')
-rw-r--r--src/or/relay.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index e9baac6a4..3ce05c885 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -925,7 +925,7 @@ connection_edge_process_relay_cell_not_open(
2+answer_len));
else
ttl = -1;
- if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) {
+ if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) {
uint32_t addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+2));
if (get_options()->ClientDNSRejectInternalAddresses &&
is_internal_IP(addr, 0)) {
@@ -947,7 +947,7 @@ connection_edge_process_relay_cell_not_open(
cell->payload+RELAY_HEADER_SIZE+2, /*answer*/
ttl,
-1);
- if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) {
+ if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) {
uint32_t addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+2));
remap_event_helper(conn, addr);
}