[or-cvs] r15578: backport r15571 and give it a changelog entry (in tor/branches/tor-0_2_0-patches: . src/or)

[arma at seul.org]

Author: arma
Date: 2008-06-30 19:27:50 -0400 (Mon, 30 Jun 2008)
New Revision: 15578

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/connection_edge.c
Log:
backport r15571 and give it a changelog entry


Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-06-30 23:27:11 UTC (rev 15577)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-06-30 23:27:50 UTC (rev 15578)
@@ -19,6 +19,10 @@
       so it asked for another one soon after, until there were no
       more preemptive circuits, at which point it launched one from
       scratch. Bugfix on 0.0.9.x.
+    - Make directory servers include the X-Your-Address-Is: http header in
+      their responses even for begin_dir conns. Now clients who only
+      ever use begin_dir connections still have a way to learn their IP
+      address. Fixes bug 737; bugfix on 0.2.0.22-rc. Reported by goldy.
 
   o Minor bugfixes:
     - Fix a macro/CPP interactions that was confusing some compilers:

Modified: tor/branches/tor-0_2_0-patches/src/or/connection_edge.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/connection_edge.c	2008-06-30 23:27:11 UTC (rev 15577)
+++ tor/branches/tor-0_2_0-patches/src/or/connection_edge.c	2008-06-30 23:27:50 UTC (rev 15578)
@@ -2712,9 +2712,9 @@
 
   dirconn = TO_DIR_CONN(connection_new(CONN_TYPE_DIR, AF_INET));
 
-  dirconn->_base.addr = 0x7f000001;
+  dirconn->_base.addr = exitconn->_base.addr;
   dirconn->_base.port = 0;
-  dirconn->_base.address = tor_strdup("Tor network");
+  dirconn->_base.address = tor_strdup(circ->p_conn->_base.address);
   dirconn->_base.type = CONN_TYPE_DIR;
   dirconn->_base.purpose = DIR_PURPOSE_SERVER;
   dirconn->_base.state = DIR_CONN_STATE_SERVER_COMMAND_WAIT;