[or-cvs] r9822: Make the response to 'getinfo addr-mappings/*' follow the sp (in tor/trunk: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-03-15 02:10:58 -0400 (Thu, 15 Mar 2007)
New Revision: 9822

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/connection_edge.c
   tor/trunk/src/or/control.c
Log:
Make the response to 'getinfo addr-mappings/*' follow the spec.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-03-15 04:03:45 UTC (rev 9821)
+++ tor/trunk/ChangeLog	2007-03-15 06:10:58 UTC (rev 9822)
@@ -34,9 +34,13 @@
 
   o Minor bugfixes:
     - Stop allowing hibernating servers to be "stable" or "fast".
+
+  o Minor bugfixes (controller), reported by daejees:
     - Make 'getinfo fingerprint' return a 551 error if we're not a
-      server, so we match what the control spec claims we do. Reported
-      by daejees.
+      server, so we match what the control spec claims we do.
+    - Fix a typo in an error message when extendcircuit fails that
+      caused us to not follow the \r\n-based delimiter protocol.
+    - Make the response to 'getinfo addr-mappings/*' follow the spec.
 
 
 Changes in version 0.1.2.10-rc - 2007-03-07

Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2007-03-15 04:03:45 UTC (rev 9821)
+++ tor/trunk/src/or/connection_edge.c	2007-03-15 06:10:58 UTC (rev 9822)
@@ -1142,7 +1142,7 @@
 
 /** Iterate over all address mappings which have expiry times between
  * min_expires and max_expires, inclusive.  If sl is provided, add an
- * "old-addr new-addr" string to sl for each mapping.  If sl is NULL,
+ * "old-addr=new-addr" string to sl for each mapping.  If sl is NULL,
  * remove the mappings.
  */
 void
@@ -1168,7 +1168,7 @@
        } else if (val->new_address) {
          size_t len = strlen(key)+strlen(val->new_address)+2;
          char *line = tor_malloc(len);
-         tor_snprintf(line, len, "%s %s", key, val->new_address);
+         tor_snprintf(line, len, "%s=%s", key, val->new_address);
          smartlist_add(sl, line);
        }
      }

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2007-03-15 04:03:45 UTC (rev 9821)
+++ tor/trunk/src/or/control.c	2007-03-15 06:10:58 UTC (rev 9822)
@@ -1465,7 +1465,7 @@
     }
     mappings = smartlist_create();
     addressmap_get_mappings(mappings, min_e, max_e);
-    *answer = smartlist_join_strings(mappings, "\r\n", 0, NULL);
+    *answer = smartlist_join_strings(mappings, " ", 0, NULL);
     SMARTLIST_FOREACH(mappings, char *, cp, tor_free(cp));
     smartlist_free(mappings);
   }