Merge remote-tracking branch 'public/bug10431'

4 files changed, 12 insertions, 3 deletions

diff --git a/src/or/control.c b/src/or/control.c
index 7f421a71d5..c91705257d 100755
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -4887,7 +4887,7 @@ control_event_bootstrap(bootstrap_status_t status, int progress)
  */
 MOCK_IMPL(void,
           control_event_bootstrap_problem, (const char *warn, int reason,
-                                            const or_connection_t *or_conn))
+                                            or_connection_t *or_conn))
 {
   int status = bootstrap_percent;
   const char *tag, *summary;
@@ -4898,6 +4898,11 @@ MOCK_IMPL(void,
   /* bootstrap_percent must not be in "undefined" state here. */
   tor_assert(status >= 0);
 
+  if (or_conn->have_noted_bootstrap_problem)
+    return;
+
+  or_conn->have_noted_bootstrap_problem = 1;
+
   if (bootstrap_percent == 100)
     return; /* already bootstrapped; nothing to be done here. */
 
diff --git a/src/or/control.h b/src/or/control.h
index ce605a1208..988c171d7f 100644
--- a/src/or/control.h
+++ b/src/or/control.h
@@ -94,7 +94,7 @@ void monitor_owning_controller_process(const char *process_spec);
 void control_event_bootstrap(bootstrap_status_t status, int progress);
 MOCK_DECL(void, control_event_bootstrap_problem,(const char *warn,
                                                  int reason,
-                                              const or_connection_t *or_conn));
+                                                 or_connection_t *or_conn));
 
 void control_event_clients_seen(const char *controller_str);
 void control_event_transport_launched(const char *mode,
diff --git a/src/or/or.h b/src/or/or.h
index e17b5816a2..19a1c99a9b 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1482,6 +1482,10 @@ typedef struct or_connection_t {
   unsigned int is_outgoing:1;
   unsigned int proxy_type:2; /**< One of PROXY_NONE...PROXY_SOCKS5 */
   unsigned int wide_circ_ids:1;
+  /** True iff this connection has had its bootstrap failure logged with
+   * control_event_bootstrap_problem. */
+  unsigned int have_noted_bootstrap_problem:1;
+
   uint16_t link_proto; /**< What protocol version are we using? 0 for
                         * "none negotiated yet." */
 
diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c
index b34f5e38de..f91ac7415e 100644
--- a/src/test/test_extorport.c
+++ b/src/test/test_extorport.c
@@ -364,7 +364,7 @@ test_ext_or_cookie_auth_testvec(void *arg)
 
 static void
 ignore_bootstrap_problem(const char *warn, int reason,
-                       const or_connection_t *conn)
+                         or_connection_t *conn)
 {
   (void)warn;
   (void)reason;