diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-03-15 06:10:58 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-03-15 06:10:58 +0000 |
| commit | 8ca31c81954794e01cc6c644bf9e1b6f43d1cbc7 (patch) | |
| tree | 9a4117e4aacacfc14dca00d2b8ea3aed1b52554e | |
| parent | c995a369728adbe769f9251e2877bc650c532dd5 (diff) | |
| download | tor-8ca31c81954794e01cc6c644bf9e1b6f43d1cbc7.tar.gz tor-8ca31c81954794e01cc6c644bf9e1b6f43d1cbc7.zip | |
Make the response to 'getinfo addr-mappings/*' follow the spec.
svn:r9822
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 4 | ||||
| -rw-r--r-- | src/or/control.c | 2 |
3 files changed, 9 insertions, 5 deletions
@@ -34,9 +34,13 @@ Changes in version 0.2.0.1-alpha - 2007-??-?? 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 diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index beb1caeea6..c5c150c5f7 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1142,7 +1142,7 @@ address_is_invalid_destination(const char *address, int client) /** 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 @@ addressmap_get_mappings(smartlist_t *sl, time_t min_expires, } 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); } } diff --git a/src/or/control.c b/src/or/control.c index 8e3a2db601..83c94cb6d3 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1465,7 +1465,7 @@ getinfo_helper_events(control_connection_t *control_conn, } 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); } |