[tor-commits] [bridgedb/master] Clarify which bridges are used and which ones are skipped

[isis@xxxxxxxxxxxxxx]

commit 907ab23075b358c2106cbded24ab7cbdfda17ca0
Author: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
Date:   Thu Aug 15 05:29:25 2013 +0000

    Clarify which bridges are used and which ones are skipped
    
    If we receive a descriptor for a bridge which was not listed in the
    network status, then we should not use it. We do not use it, but
    this is not obvious without some investigation. Make this obvious.
---
 lib/bridgedb/Main.py |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py
index 8e8179b..87b95fc 100644
--- a/lib/bridgedb/Main.py
+++ b/lib/bridgedb/Main.py
@@ -134,6 +134,10 @@ def load(state, splitter, clear=False):
                 # single ip:port So for now, we will only consider the bridges
                 # primary IP:port
                 bridge.or_addresses = addresses.get(bridge.getID())
+                # We attempt to insert all bridges. If the bridge is not
+                # running, then it is skipped during the insertion process. Also,
+                # if we have a descriptor for the bridge but it was not in the
+                # ns, then we skip it there, too.
                 splitter.insert(bridge)
 
                 if bridge.getID() in timestamps.keys():



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits