summaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2012-06-14 18:01:22 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2012-06-14 18:01:22 +0300
commitaa212b173c340536eb94b4978174b068ead89cb1 (patch)
tree7f0dfc25a11888893136c94886248776c4c61283 /src/or/circuitbuild.c
parent068046eebc73fbe1f0d8419f0dfea65d3de9c14a (diff)
downloadtor-aa212b173c340536eb94b4978174b068ead89cb1.tar.gz
tor-aa212b173c340536eb94b4978174b068ead89cb1.zip
Remove validate_pluggable_transports_config(): redundant since 9d9b5ed0.
The warning message of validate_pluggable_transports_config() is superseded by the changes in the warning message of connection_or_connect() when the proxy credentials can't be found.
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 3ab72e4b82..807738b785 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -4795,34 +4795,6 @@ transport_add_from_config(const tor_addr_t *addr, uint16_t port,
}
}
-/** Warn the user of possible pluggable transport misconfiguration.
- * Return 0 if the validation happened, -1 if we should postpone the
- * validation. */
-int
-validate_pluggable_transports_config(void)
-{
- /* Don't validate if managed proxies are not yet fully configured. */
- if (!bridge_list || pt_proxies_configuration_pending())
- return -1;
-
- SMARTLIST_FOREACH_BEGIN(bridge_list, const bridge_info_t *, b) {
- /* Skip bridges without transports. */
- if (!b->transport_name)
- continue;
- /* See if the user has Bridges that specify nonexistent
- pluggable transports. We should warn the user in such case,
- since it's probably misconfiguration. */
- if (!transport_get_by_name(b->transport_name))
- log_warn(LD_CONFIG, "We can't find a pluggable transport proxy "
- "that supports '%s' for bridge '%s:%u'. This can happen "
- "if you haven't provided a ClientTransportPlugin line, or "
- "if your pluggable transport proxy stopped working.",
- b->transport_name, fmt_addr(&b->addr), b->port);
- } SMARTLIST_FOREACH_END(b);
-
- return 0;
-}
-
/** Return a bridge pointer if <b>ri</b> is one of our known bridges
* (either by comparing keys if possible, else by comparing addr/port).
* Else return NULL. */