Commit 4fa70e11 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'real_ipv6_fix' into maint-0.2.1

parents 0f637492 2ce132e3

changes/ipv6_crash

+3 −2
Original line number Diff line number Diff line 
  o Major bugfixes (directory authority)

  o Major bugfixes:

    - Fix a crash in parsing router descriptors containing IPv6

      addresses.  Bugfix on 0.2.1.3-alpha.
 
      addresses.  This one crashed the directory authorities when somebody

      fired up some experimental code. Bugfix on 0.2.1.3-alpha.

src/or/routerparse.c

+8 −0
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ typedef struct token_rule_t { 
static token_rule_t routerdesc_token_table[] = {

  T0N("reject",              K_REJECT,              ARGS,    NO_OBJ ),

  T0N("accept",              K_ACCEPT,              ARGS,    NO_OBJ ),

  T0N("reject6",             K_REJECT6,             ARGS,    NO_OBJ ),

  T0N("accept6",             K_ACCEPT6,             ARGS,    NO_OBJ ),

  T1_START( "router",        K_ROUTER,              GE(5),   NO_OBJ ),

  T1( "signing-key",         K_SIGNING_KEY,         NO_ARGS, NEED_KEY_1024 ),

  T1( "onion-key",           K_ONION_KEY,           NO_ARGS, NEED_KEY_1024 ),
@@ -1367,6 +1369,12 @@ router_parse_entry_from_string(const char *s, const char *end, 
      router->has_old_dnsworkers = 1;

  }



  if (find_opt_by_keyword(tokens, K_REJECT6) ||

      find_opt_by_keyword(tokens, K_ACCEPT6)) {

    log_warn(LD_DIR, "Rejecting router with reject6/accept6 line: they crash "

             "older Tors.");

    goto err;

  }

  exit_policy_tokens = find_all_exitpolicy(tokens);

  if (!smartlist_len(exit_policy_tokens)) {

    log_warn(LD_DIR, "No exit policy tokens in descriptor.");