Don't try to fetch bridge descriptors when DisableNetwork is set

Patch from Roger; changes file by me.

Fixes 10405; bugfix on 0.2.3.9-alpha, where DisableNetwork was
introduced.

diff --git a/changes/bug10405 b/changes/bug10405
new file mode 100644 (file)
index 0000000..46a0746
--- /dev/null
+++ b/changes/bug10405
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Avoid "Tried to open a socket with DisableNetwork set" warnings
+      when starting a bridge client without bridge descriptors. Fixes
+      bug 10405; bugfix on 0.2.3.9-alpha.

diff --git a/src/or/main.c b/src/or/main.c
index a3be9a20df69cf37ab5dcc686bfeb60dff0365f2..3c661cd12149322d57c87537eb60081e51004025 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1247,7 +1247,7 @@ run_scheduled_events(time_t now)
       now + DESCRIPTOR_FAILURE_RESET_INTERVAL;
   }
 
-  if (options->UseBridges)
+  if (options->UseBridges && !options->DisableNetwork)
     fetch_bridge_descriptors(options, now);
 
   /* 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our