diff options
Diffstat (limited to 'networks/hs_intro_selection.py')
| -rw-r--r-- | networks/hs_intro_selection.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/networks/hs_intro_selection.py b/networks/hs_intro_selection.py index 99b73d8..1ed351a 100644 --- a/networks/hs_intro_selection.py +++ b/networks/hs_intro_selection.py @@ -4,6 +4,8 @@ from chutney.TorNet import * from stem.control import EventType def hs_select_test(network, failures=1): + result = True + hs_nodes = network.get("h") initial_nodes = network.get("a") + network.get("r") + network.get("c") + hs_nodes[:1] @@ -57,7 +59,7 @@ def hs_select_test(network, failures=1): # Now begin testing - connection_test(network.get("c"), len(hs_nodes)) + result &= connection_test(network.get("c"), len(hs_nodes)) time.sleep(5) @@ -65,8 +67,8 @@ def hs_select_test(network, failures=1): next_intro_points = get_next_intro_points() - print("Predicted new introduction points") - print(next_intro_points) + logging.info("Predicted new introduction points") + logging.info(next_intro_points) fingerprint = next_intro_points[0][0] node = nodes_by_fingerprint[fingerprint] @@ -77,7 +79,7 @@ def hs_select_test(network, failures=1): time.sleep(10) - check_same_intro_points() + result &= check_same_intro_points() logging.info("About to stop %d introduction points" % failures) @@ -120,6 +122,8 @@ def hs_select_test(network, failures=1): else: logging.info("All did not change") - check_same_intro_points() + result &= check_same_intro_points() + + result &= connection_test(network.get("c"), len(hs_nodes)) - connection_test(network.get("c"), len(hs_nodes)) + return result |