Commit f0b2dc83 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'arma/ticket5528' 

Conflicts:
	src/or/router.c
	src/test/test_dir.c
parents 12954908 74e6a47a

changes/ticket5528

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Code simplifications and refactoring:

    - Get rid of router->address, since in all cases it was just the

      string representation of router->addr. Resolves ticket 5528.

src/or/circuitbuild.c

+7 −4
Original line number Diff line number Diff line
@@ -606,27 +606,30 @@ int 
inform_testing_reachability(void)

{

  char dirbuf[128];

  char *address;

  const routerinfo_t *me = router_get_my_routerinfo();

  if (!me)

    return 0;

  address = tor_dup_ip(me->addr);

  control_event_server_status(LOG_NOTICE,

                              "CHECKING_REACHABILITY ORADDRESS=%s:%d",

                              me->address, me->or_port);

                              address, me->or_port);

  if (me->dir_port) {

    tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d",

                 me->address, me->dir_port);

                 address, me->dir_port);

    control_event_server_status(LOG_NOTICE,

                                "CHECKING_REACHABILITY DIRADDRESS=%s:%d",

                                me->address, me->dir_port);

                                address, me->dir_port);

  }

  log_notice(LD_OR, "Now checking whether ORPort %s:%d%s %s reachable... "

                         "(this may take up to %d minutes -- look for log "

                         "messages indicating success)",

      me->address, me->or_port,

      address, me->or_port,

      me->dir_port ? dirbuf : "",

      me->dir_port ? "are" : "is",

      TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60);



  tor_free(address);

  return 1;

}

src/or/directory.c

+7 −19
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ static void dir_microdesc_download_failed(smartlist_t *failed, 
static void note_client_request(int purpose, int compressed, size_t bytes);

static int client_likes_consensus(networkstatus_t *v, const char *want_url);



static void directory_initiate_command_rend(const char *address,

                                            const tor_addr_t *addr,

static void directory_initiate_command_rend(const tor_addr_t *addr,

                                            uint16_t or_port,

                                            uint16_t dir_port,

                                            const char *digest,
@@ -464,7 +463,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, 
        tor_addr_t addr;

        routerinfo_t *ri = node->ri;

        node_get_addr(node, &addr);

        directory_initiate_command(ri->address, &addr,

        directory_initiate_command(&addr,

                                   ri->or_port, 0/*no dirport*/,

                                   ri->cache_info.identity_digest,

                                   dir_purpose,
@@ -593,9 +592,6 @@ directory_initiate_command_routerstatus_rend(const routerstatus_t *status, 
{

  const or_options_t *options = get_options();

  const node_t *node;

  char address_buf[INET_NTOA_BUF_LEN+1];

  struct in_addr in;

  const char *address;

  tor_addr_t addr;

  const int anonymized_connection = dirind_is_anon(indirection);

  node = node_get_by_id(status->identity_digest);
@@ -605,13 +601,6 @@ directory_initiate_command_routerstatus_rend(const routerstatus_t *status, 
             "don't have its router descriptor.",

             routerstatus_describe(status));

    return;

  } else if (node) {

    node_get_address_string(node, address_buf, sizeof(address_buf));

    address = address_buf;

  } else {

    in.s_addr = htonl(status->addr);

    tor_inet_ntoa(&in, address_buf, sizeof(address_buf));

    address = address_buf;

  }

  tor_addr_from_ipv4h(&addr, status->addr);
@@ -625,7 +614,7 @@ directory_initiate_command_routerstatus_rend(const routerstatus_t *status, 
    return;

  }



  directory_initiate_command_rend(address, &addr,

  directory_initiate_command_rend(&addr,

                             status->or_port, status->dir_port,

                             status->identity_digest,

                             dir_purpose, router_purpose,
@@ -867,7 +856,7 @@ directory_command_should_use_begindir(const or_options_t *options, 
 * <b>supports_begindir</b>, and whose identity key digest is

 * <b>digest</b>. */

void

directory_initiate_command(const char *address, const tor_addr_t *_addr,

directory_initiate_command(const tor_addr_t *_addr,

                           uint16_t or_port, uint16_t dir_port,

                           const char *digest,

                           uint8_t dir_purpose, uint8_t router_purpose,
@@ -875,7 +864,7 @@ directory_initiate_command(const char *address, const tor_addr_t *_addr, 
                           const char *payload, size_t payload_len,

                           time_t if_modified_since)

{

  directory_initiate_command_rend(address, _addr, or_port, dir_port,

  directory_initiate_command_rend(_addr, or_port, dir_port,

                             digest, dir_purpose,

                             router_purpose, indirection,

                             resource, payload, payload_len,
@@ -897,7 +886,7 @@ is_sensitive_dir_purpose(uint8_t dir_purpose) 
/** Same as directory_initiate_command(), but accepts rendezvous data to

 * fetch a hidden service descriptor. */

static void

directory_initiate_command_rend(const char *address, const tor_addr_t *_addr,

directory_initiate_command_rend(const tor_addr_t *_addr,

                                uint16_t or_port, uint16_t dir_port,

                                const char *digest,

                                uint8_t dir_purpose, uint8_t router_purpose,
@@ -915,7 +904,6 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, 
  const int anonymized_connection = dirind_is_anon(indirection);

  tor_addr_t addr;



  tor_assert(address);

  tor_assert(_addr);

  tor_assert(or_port || dir_port);

  tor_assert(digest);
@@ -948,7 +936,7 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, 
  /* set up conn so it's got all the data we need to remember */

  tor_addr_copy(&conn->base_.addr, &addr);

  conn->base_.port = use_begindir ? or_port : dir_port;

  conn->base_.address = tor_strdup(address);

  conn->base_.address = tor_dup_addr(&addr);

  memcpy(conn->identity_digest, digest, DIGEST_LEN);



  conn->base_.purpose = dir_purpose;

src/or/directory.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ int connection_dir_process_inbuf(dir_connection_t *conn); 
int connection_dir_finished_flushing(dir_connection_t *conn);

int connection_dir_finished_connecting(dir_connection_t *conn);

void connection_dir_about_to_close(dir_connection_t *dir_conn);

void directory_initiate_command(const char *address, const tor_addr_t *addr,

void directory_initiate_command(const tor_addr_t *addr,

                                uint16_t or_port, uint16_t dir_port,

                                const char *digest,

                                uint8_t dir_purpose, uint8_t router_purpose,

src/or/dirserv.c

+10 −23
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ static int add_fingerprint_to_dir(const char *nickname, const char *fp, 
                                  struct authdir_config_t *list);

static uint32_t

dirserv_get_status_impl(const char *fp, const char *nickname,

                        const char *address,

                        uint32_t addr, uint16_t or_port,

                        const char *platform, const char *contact,

                        const char **msg, int should_log);
@@ -327,7 +326,6 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg) 
  }



  return dirserv_get_status_impl(d, router->nickname,

                                 router->address,

                                 router->addr, router->or_port,

                                 router->platform, router->contact_info,

                                 msg, 1);
@@ -341,7 +339,6 @@ dirserv_would_reject_router(const routerstatus_t *rs) 
  uint32_t res;



  res = dirserv_get_status_impl(rs->identity_digest, rs->nickname,

                                "", /* address is only used in logs */

                                rs->addr, rs->or_port,

                                NULL, NULL,

                                NULL, 0);
@@ -380,7 +377,6 @@ dirserv_get_name_status(const char *id_digest, const char *nickname) 
 */

static uint32_t

dirserv_get_status_impl(const char *id_digest, const char *nickname,

                        const char *address,

                        uint32_t addr, uint16_t or_port,

                        const char *platform, const char *contact,

                        const char **msg, int should_log)
@@ -452,14 +448,14 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, 
    if (should_log)

      log_info(LD_DIRSERV,

               "Marking '%s' as bad directory because of address '%s'",

               nickname, address);

               nickname, fmt_addr32(addr));

    result |= FP_BADDIR;

  }



  if (authdir_policy_badexit_address(addr, or_port)) {

    if (should_log)

      log_info(LD_DIRSERV, "Marking '%s' as bad exit because of address '%s'",

               nickname, address);

               nickname, fmt_addr32(addr));

    result |= FP_BADEXIT;

  }
@@ -467,7 +463,7 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, 
    if (!authdir_policy_permits_address(addr, or_port)) {

      if (should_log)

        log_info(LD_DIRSERV, "Rejecting '%s' because of address '%s'",

                 nickname, address);

                 nickname, fmt_addr32(addr));

      if (msg)

        *msg = "Authdir is rejecting routers in this range.";

      return FP_REJECT;
@@ -475,7 +471,7 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, 
    if (!authdir_policy_valid_address(addr, or_port)) {

      if (should_log)

        log_info(LD_DIRSERV, "Not marking '%s' valid because of address '%s'",

                 nickname, address);

                 nickname, fmt_addr32(addr));

      result |= FP_INVALID;

    }

    if (reject_unlisted) {
@@ -524,19 +520,12 @@ dirserv_free_fingerprint_list(void) 
static int

dirserv_router_has_valid_address(routerinfo_t *ri)

{

  struct in_addr iaddr;

  if (get_options()->DirAllowPrivateAddresses)

    return 0; /* whatever it is, we're fine with it */

  if (!tor_inet_aton(ri->address, &iaddr)) {

    log_info(LD_DIRSERV,"Router %s published non-IP address '%s'. Refusing.",

             router_describe(ri),

             ri->address);

    return -1;

  }

  if (is_internal_IP(ntohl(iaddr.s_addr), 0)) {

  if (is_internal_IP(ri->addr, 0)) {

    log_info(LD_DIRSERV,

             "Router %s published internal IP address '%s'. Refusing.",

             router_describe(ri), ri->address);

             "Router %s published internal IP address. Refusing.",

             router_describe(ri));

    return -1; /* it's a private IP, we should reject it */

  }

  return 0;
@@ -588,12 +577,10 @@ authdir_wants_to_reject_router(routerinfo_t *ri, const char **msg, 
  }

  if (dirserv_router_has_valid_address(ri) < 0) {

    log_fn(severity, LD_DIRSERV,

           "Router %s has invalid address '%s'. "

           "Not adding (%s).",

           "Router %s has invalid address. Not adding (%s).",

           router_describe(ri),

           ri->address,

           esc_router_info(ri));

    *msg = "Rejected: Address is not an IP, or IP is a private address.";

    *msg = "Rejected: Address is a private address.";

    return -1;

  }
@@ -3279,7 +3266,7 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) 


  /* IPv4. */

  log_debug(LD_OR,"Testing reachability of %s at %s:%u.",

            router->nickname, router->address, router->or_port);

            router->nickname, fmt_addr32(router->addr), router->or_port);

  tor_addr_from_ipv4h(&router_addr, router->addr);

  chan = channel_tls_connect(&router_addr, router->or_port,

                             router->cache_info.identity_digest);