diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuitbuild.c | 29 | ||||
| -rw-r--r-- | src/or/config.c | 3 | ||||
| -rw-r--r-- | src/or/or.h | 3 |
3 files changed, 2 insertions, 33 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 896c0903e7..86925772f4 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1816,7 +1816,7 @@ build_state_get_exit_nickname(cpath_build_state_t *state) } /** Check whether the entry guard <b>e</b> is usable, given the directory - * authorities' opinion about the rouer (stored in <b>ri</b>) and the user's + * authorities' opinion about the router (stored in <b>ri</b>) and the user's * configuration (in <b>options</b>). Set <b>e</b>->bad_since * accordingly. Return true iff the entry guard's status changes. */ static int @@ -2622,30 +2622,3 @@ getinfo_helper_entry_guards(control_connection_t *conn, return 0; } -typedef struct { - uint32_t addr; - uint16_t port; - char identity[DIGEST_LEN]; -} bridge_info_t; - -#if 0 -/** A list of known bridges. */ -static smartlist_t *bridge_list = NULL; -/** A value of 1 means that the bridge_list list has changed - * and those changes need to be flushed to disk. */ -static int bridge_list_dirty = 0; -#endif - -void -clear_bridge_list(void) -{ -} - -void -bridge_add_from_config(uint32_t addr, uint16_t port, char *digest) -{ - (void)addr; - (void)port; - (void)digest; -} - diff --git a/src/or/config.c b/src/or/config.c index 1a04c311e7..a147f20979 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -952,7 +952,6 @@ options_act(or_options_t *old_options) add_default_trusted_dirservers(); } - clear_bridge_list(); if (options->Bridges) { for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 0)<0) { @@ -3607,7 +3606,7 @@ parse_bridge_line(const char *line, int validate_only) log_debug(LD_DIR, "Bridge at %s:%d (%s)", address, (int)port, fingerprint ? fingerprint : "no key listed"); - bridge_add_from_config(addr, port, fingerprint ? digest : NULL); +// bridge_add_from_config(addr, port, fingerprint ? digest : NULL); } r = 0; diff --git a/src/or/or.h b/src/or/or.h index 7220800db8..4c6aa1a6d5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2210,9 +2210,6 @@ int getinfo_helper_entry_guards(control_connection_t *conn, const char *question, char **answer); void entry_guards_free_all(void); -void clear_bridge_list(void); -void bridge_add_from_config(uint32_t addr, uint16_t port, char *digest); - /********************************* circuitlist.c ***********************/ circuit_t * _circuit_get_global_list(void); |