Commit bf2b71be authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Fix an error in tor_addr_parse that kept us from having a hidden service or a...

Fix an error in tor_addr_parse that kept us from having a hidden service or a bridge live at an IPv6 address.

svn:r18206
parent 3f8ab367
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ Changes in version 0.2.1.12-alpha - 2009-01-??
      on 0.2.1.10-alpha; reported by Matt Edman.
    - Fix a compile warning on OSX Panther.  Fixes bug 913; bugfix against
      0.2.1.11-alpha.
    - Fix a bug in address parsing that was preventing bridges or hidden
      service targets from being at IPv6 addresses.


Changes in version 0.2.1.11-alpha - 2009-01-20
+4 −4
Original line number Diff line number Diff line
@@ -962,9 +962,9 @@ tor_addr_from_str(tor_addr_t *addr, const char *src)
  return result;
}

/** Parse an address or address-port combination from <b>s</b>, and put the
    result in <b>addr_out</b> and (optionally) <b>port_out</b>.  Return 0 on
    success, negative on failure. */
/** Parse an address or address-port combination from <b>s</b>, resolve the
 * address as needed, and put the result in <b>addr_out</b> and (optionally)
 * <b>port_out</b>.  Return 0 on success, negative on failure. */
int
tor_addr_port_parse(const char *s, tor_addr_t *addr_out, uint16_t *port_out)
{
@@ -982,7 +982,7 @@ tor_addr_port_parse(const char *s, tor_addr_t *addr_out, uint16_t *port_out)
    port = strstr(s, "]");
    if (!port)
      goto err;
    tmp = tor_strndup(s+1, port-s);
    tmp = tor_strndup(s+1, port-(s+1));
    port = port+1;
    if (*port == ':')
      port++;