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

r14102@tombo: nickm | 2008-02-10 13:30:04 -0500 

 Remove some deadcode.


svn:r13459
parent a4db22f6

src/or/circuitbuild.c

+0 −27
Original line number Diff line number Diff line
@@ -1761,33 +1761,6 @@ extend_info_from_router(routerinfo_t *r) 
                           r->onion_pkey, r->addr, r->or_port);

}



#if 0

/** What router purpose is <b>digest</b>?

 * It's a general purpose router unless it's on our bridges list.

 */

static uint8_t

get_router_purpose_from_digest(char *digest)

{

  if (digest_is_a_bridge(digest))

    return ROUTER_PURPOSE_BRIDGE;

  return ROUTER_PURPOSE_GENERAL;

}

#endif



#if 0

/** Allocate and return a new extend_info_t that can be used to build a

 * circuit to or through the router <b>r</b>. */

extend_info_t *

extend_info_from_routerstatus(routerstatus_t *s)

{

  tor_assert(s);

  /* routerstatus doesn't know onion_key; leave it NULL */

  return extend_info_alloc(s->nickname, s->identity_digest,

                           NULL, s->addr, s->or_port);

//                      get_router_purpose_from_digest(s->identity_digest));

}

#endif



/** Release storage held by an extend_info_t struct. */

void

extend_info_free(extend_info_t *info)

src/or/or.h

+0 −3
Original line number Diff line number Diff line
@@ -2836,9 +2836,6 @@ int connection_or_process_inbuf(or_connection_t *conn); 
int connection_or_flushed_some(or_connection_t *conn);

int connection_or_finished_flushing(or_connection_t *conn);

int connection_or_finished_connecting(or_connection_t *conn);

#if 0

int connection_or_finish_or_handshake(or_connection_t *conn);

#endif



or_connection_t *connection_or_connect(uint32_t addr, uint16_t port,

                                    const char *id_digest);

src/or/routerlist.c

+1 −1
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ router_pick_directory_server(authority_type_t type, int flags) 
  if (choice)

    return choice;



  /* XXXX020 what's the point of *reloading* and trying again?? -NM */

  /* XXXX020 arma: what's the point of *reloading* and trying again?? -NM */

  log_info(LD_DIR,"Still no %s router entries. Reloading and trying again.",

           (flags & PDS_IGNORE_FASCISTFIREWALL) ? "known" : "reachable");

  if (router_reload_router_list()) {