Commit c58b3726 authored by teor (Tim Wilson-Brown)'s avatar teor (Tim Wilson-Brown)
Browse files

Allow IPv6 literal addresses in routersets 

routerset_parse now accepts IPv6 literal addresses.

Fix for ticket 17060. Patch by "teor".
Patch on 3ce6e2fb (24 Jul 2008), and related commits,
released in 0.2.1.3-alpha.
parent a444b113

changes/routerset-parse-IPv6-literals

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bug fixes (routersets, IPv6):

    - routerset_parse now accepts IPv6 literal addresses.

      Fix for ticket 17060. Patch by "teor".

      Patch on 3ce6e2fba290 (24 Jul 2008), and related commits,

      released in 0.2.1.3-alpha.

src/or/routerset.c

+5 −3
Original line number Diff line number Diff line
@@ -104,9 +104,11 @@ routerset_parse(routerset_t *target, const char *s, const char *description) 
                  description);

        smartlist_add(target->country_names, countryname);

        added_countries = 1;

      } else if ((strchr(nick,'.') || strchr(nick, '*')) &&

                 (p = router_parse_addr_policy_item_from_string(

      } else if ((strchr(nick,'.') || strchr(nick, ':') ||  strchr(nick, '*'))

                 && (p = router_parse_addr_policy_item_from_string(

                                        nick, ADDR_POLICY_REJECT))) {

        /* IPv4 addresses contain '.', IPv6 addresses contain ':',

         * and wildcard addresses contain '*'. */

        log_debug(LD_CONFIG, "Adding address %s to %s", nick, description);

        smartlist_add(target->policies, p);

      } else {