Begin writing unit tests for rewrite code

2 files changed, 3 insertions, 1 deletions

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 56e496f670..ca99a86ae0 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -924,6 +924,7 @@ connection_ap_handshake_rewrite(entry_connection_t *conn,
   out->map_expires = TIME_MAX;
   out->end_reason = 0;
   out->should_close = 0;
+  out->orig_address[0] = 0;
 
   tor_strlower(socks->address); /* normalize it */
   strlcpy(out->orig_address, socks->address, sizeof(out->orig_address));
diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h
index af564cec0c..d4a20e7f96 100644
--- a/src/or/connection_edge.h
+++ b/src/or/connection_edge.h
@@ -151,7 +151,8 @@ typedef struct {
    */
   char orig_address[MAX_SOCKS_ADDR_LEN];
   /** True iff the address has been automatically remapped to a local
-   * address in VirtualAddrNetwork */
+   * address in VirtualAddrNetwork.  (Only set true the first time we
+   * do the mapping.) */
   int automap;
   /** If this connection has a .exit address, who put it there? */
   addressmap_entry_source_t exit_source;