Commit a38026bb authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

fix wide lines 

svn:r17198
parent 3ebd1ebe

src/or/circuituse.c

+3 −2
Original line number Diff line number Diff line
@@ -1074,10 +1074,11 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn, 
      uint32_t addr = 0;

      if (tor_inet_aton(conn->socks_request->address, &in))

        addr = ntohl(in.s_addr);

      if (router_exit_policy_all_routers_reject(addr, conn->socks_request->port,

      if (router_exit_policy_all_routers_reject(addr,

                                                conn->socks_request->port,

                                                need_uptime)) {

        log_notice(LD_APP,

                   "No Tor server exists that allows exit to %s:%d. Rejecting.",

                   "No Tor server allows exit to %s:%d. Rejecting.",

                   safe_str(conn->socks_request->address),

                   conn->socks_request->port);

        return -1;

src/or/dirserv.c

+2 −2
Original line number Diff line number Diff line
@@ -1814,7 +1814,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl) 
      "Cutoffs: For Stable, %lu sec uptime, %lu sec MTBF. "

      "For Fast: %lu bytes/sec. "

      "For Guard: WFU %.03lf%%, time-known %lu sec, "

      "and bandwidth %lu or %lu bytes/sec. We do%s have enough stability data.",

      "and bandwidth %lu or %lu bytes/sec. We%s have enough stability data.",

      (unsigned long)stable_uptime,

      (unsigned long)stable_mtbf,

      (unsigned long)fast_bandwidth,
@@ -1822,7 +1822,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl) 
      (unsigned long)guard_tk,

      (unsigned long)guard_bandwidth_including_exits,

      (unsigned long)guard_bandwidth_excluding_exits,

      enough_mtbf_info ? "" : "not ");

      enough_mtbf_info ? "" : "don't ");



  tor_free(uptimes);

  tor_free(mtbfs);

src/or/dnsserv.c

+2 −1
Original line number Diff line number Diff line
@@ -255,7 +255,8 @@ dnsserv_resolved(edge_connection_t *conn, 
  int err = DNS_ERR_NONE;

  if (!req)

    return;

  name = evdns_get_orig_address(req, answer_type, conn->socks_request->address);

  name = evdns_get_orig_address(req, answer_type,

                                conn->socks_request->address);



  /* XXXX021 Re-do; this is dumb. */

  if (ttl < 60)

src/or/or.h

+2 −0
Original line number Diff line number Diff line
@@ -4223,10 +4223,12 @@ typedef enum { 
  CRN_NEED_CAPACITY = 1<<1,

  CRN_NEED_GUARD = 1<<2,

  CRN_ALLOW_INVALID = 1<<3,

#if 0

  /* XXXX021 not used, apparently. */

  CRN_STRICT_PREFERRED = 1<<4,

  /* XXXX021 not used, apparently. */

  CRN_WEIGHT_AS_EXIT = 1<<5

#endif

} router_crn_flags_t;



routerinfo_t *router_choose_random_node(const char *preferred,