diff options
| author | George Kadianakis <desnacked@riseup.net> | 2012-06-14 18:01:22 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2012-06-14 18:01:22 +0300 |
| commit | aa212b173c340536eb94b4978174b068ead89cb1 (patch) | |
| tree | 7f0dfc25a11888893136c94886248776c4c61283 /src/or/main.c | |
| parent | 068046eebc73fbe1f0d8419f0dfea65d3de9c14a (diff) | |
| download | tor-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/main.c')
| -rw-r--r-- | src/or/main.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/or/main.c b/src/or/main.c index 163dd5d0fb..5ede4b8601 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1118,7 +1118,6 @@ run_scheduled_events(time_t now) static int should_init_bridge_stats = 1; static time_t time_to_retry_dns_init = 0; static time_t time_to_next_heartbeat = 0; - static int has_validated_pt = 0; const or_options_t *options = get_options(); int is_server = server_mode(options); @@ -1526,14 +1525,6 @@ run_scheduled_events(time_t now) if (!net_is_disabled() && pt_proxies_configuration_pending()) pt_configure_remaining_proxies(); - /** 11c. validate pluggable transports configuration if we need to */ - if (!has_validated_pt && - (options->Bridges || options->ClientTransportPlugin)) { - if (validate_pluggable_transports_config() == 0) { - has_validated_pt = 1; - } - } - /** 12. write the heartbeat message */ if (options->HeartbeatPeriod && time_to_next_heartbeat <= now) { |