r14000@catbus: nickm | 2007-07-29 21:16:45 -0400

 Fix bug 472: do not use spaces in pseudo-address for local link cons.

svn:r10979

diff --git a/ChangeLog b/ChangeLog
index f989efb0333db54ed1829ca3b1e6752301a73f64..4834641c5db19e403956cdcd1e372b1f0a835b77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,6 +108,8 @@ Changes in version 0.2.0.3-alpha - 2007-07-29
     - Use CRLF line endings properly in NS events.
     - Terminate multi-line control events properly. (Original patch from tup.)
       [Bugfix on 0.1.2.x-alpha]
+    - Do not include spaces in SOURCE_ADDR fields in STREAM events. Resolves
+      bug 472.  [Bugfix on 0.2.0.x-alpha]
 
   o Minor bugfixes (misc):
     - Choose perfectly fairly among routers when choosing by bandwidth and

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index f310d9289b736f2d35fbd57763f5c969b88df7be..efea1464bf14efe7ba8c6311cf0ec53cb4807f3f 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1962,7 +1962,7 @@ connection_ap_make_link(char *address, uint16_t port,
                   digest, DIGEST_LEN);
   }
 
-  conn->_base.address = tor_strdup("(local link)");
+  conn->_base.address = tor_strdup("(Tor_internal)");
   conn->_base.addr = 0;
   conn->_base.port = 0;