Commit 8ca31c81 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Make the response to 'getinfo addr-mappings/*' follow the spec. 


svn:r9822
parent c995a369

ChangeLog

+6 −2
Original line number Diff line number Diff line
@@ -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

src/or/connection_edge.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

       }

     }

src/or/control.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

  }