[tor-commits] [tor/master] Don't warn of stray Bridges if managed proxies are still unconfigured.

[nickm at torproject.org]

commit d0416ce3ec67ca87448153c8b2416dd7901013c6
Author: George Kadianakis <desnacked at gmail.com>
Date:   Sun Sep 11 23:51:29 2011 +0200

    Don't warn of stray Bridges if managed proxies are still unconfigured.
    
    With managed proxies you would always get the error message:
    
    "You have a Bridge line using the X pluggable transport, but there
    doesn't seem to be a corresponding ClientTransportPlugin line."
    
    because the check happened directly after parse_client_transport_line()
    when managed proxies were not fully configured and their transports
    were not registered.
    
    The fix is to move the validation to run_scheduled_events() and make
    sure that all managed proxies are configured first.
---
 src/or/circuitbuild.c |   13 ++++++++++---
 src/or/circuitbuild.h |    2 +-
 src/or/config.c       |    5 -----
 src/or/main.c         |    9 +++++++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index b4c2343..ed81304 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -4769,11 +4769,14 @@ transport_add_from_config(const tor_addr_t *addr, uint16_t port,
   }
 }
 
-/** Warns the user of possible pluggable transport misconfiguration. */
-void
+/** 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)
 {
-  if (bridge_list) {
+  /* Don't validate if managed proxies are not yet fully configured. */
+  if (bridge_list && !pt_proxies_configuration_pending()) {
     SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, b) {
       /* Skip bridges without transports. */
       if (!b->transport_name)
@@ -4787,6 +4790,10 @@ validate_pluggable_transports_config(void)
                  "corresponding ClientTransportPlugin line.",
                  b->transport_name);
     } SMARTLIST_FOREACH_END(b);
+
+    return 0;
+  } else {
+    return -1;
   }
 }
 
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h
index 10e7287..dca541d 100644
--- a/src/or/circuitbuild.h
+++ b/src/or/circuitbuild.h
@@ -157,7 +157,7 @@ int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port,
                                       const transport_t **transport);
 transport_t *transport_get_by_name(const char *name);
 
-void validate_pluggable_transports_config(void);
+int validate_pluggable_transports_config(void);
 
 #endif
 
diff --git a/src/or/config.c b/src/or/config.c
index f2cb6cd..8bd47b5 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1271,11 +1271,6 @@ options_act(or_options_t *old_options)
   sweep_transport_list();
   sweep_proxy_list();
 
-  /* If we have pluggable transport related options enabled, see if we
-     should warn the user about potential configuration problems. */
-  if (options->Bridges || options->ClientTransportPlugin)
-    validate_pluggable_transports_config();
-
   /* Bail out at this point if we're not going to be a client or server:
    * we want to not fork, and to log stuff to stderr. */
   if (!running_tor)
diff --git a/src/or/main.c b/src/or/main.c
index 5294e4a..6297f0f 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1068,6 +1068,7 @@ 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;
   or_options_t *options = get_options();
   int is_server = server_mode(options);
   int i;
@@ -1472,6 +1473,14 @@ run_scheduled_events(time_t now)
   if (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) {