From ae726e659e3f52964c7edbd0a7bbe93ee3df32e4 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 3 Sep 2005 02:14:31 +0000
Subject: and another byte counting error.

svn:r4902
---
 src/or/relay.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/or/relay.c')

diff --git a/src/or/relay.c b/src/or/relay.c
index 7c90089ae2..f2a5904d77 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -779,14 +779,14 @@ connection_edge_process_relay_cell_not_open(
       return 0;
     }
     if (rh->length >= answer_len+6)
-      ttl = (int)ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+6));
+      ttl = (int)ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+2+answer_len));
     else
       ttl = -1;
     connection_ap_handshake_socks_resolved(conn,
                    cell->payload[RELAY_HEADER_SIZE], /*answer_type*/
                    cell->payload[RELAY_HEADER_SIZE+1], /*answer_len*/
-                   cell->payload+RELAY_HEADER_SIZE+2,
-                   ttl); /* answer */
+                   cell->payload+RELAY_HEADER_SIZE+2, /*answer*/
+                   ttl);
     connection_mark_unattached_ap(conn, END_STREAM_REASON_ALREADY_SOCKS_REPLIED);
     return 0;
   }
-- 
cgit v1.2.3-54-g00ecf