discard the "bridge list" stubs that i hope i never need.

svn:r10547
This commit is contained in:
Roger Dingledine
2007-06-10 00:30:14 +00:00
parent a97c3b8c2d
commit 1ae7708ff8
3 changed files with 2 additions and 33 deletions
+1 -28
View File
@@ -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>-&gt;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;
}
+1 -2
View File
@@ -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;
-3
View File
@@ -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);