tor-commits December 2014

tor-commits@lists.torproject.org

20 participants
797 discussions

[stem/master] Added persisting_a_consensus test
by atagar＠torproject.org 21 Dec '14

21 Dec '14

commit 27c749f7b0572e05606535e3a360b98b3f46ad3b Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Thu Dec 18 00:23:27 2014 +0400 Added persisting_a_consensus test --- test/unit/tutorial_examples.py | 41 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 97234ea..aeeb761 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -2,6 +2,7 @@ Tests for the examples given in stem's tutorial. """ +import itertools import StringIO import unittest @@ -86,6 +87,10 @@ Getting maatuska's vote from http://171.25.193.9:443/tor/status-vote/current/aut 6313 measured entries and 1112 unmeasured """ +PERSISTING_A_CONSENSUS_OUTPUT = """\ +A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB: caerSidi +""" + def _get_event(content): controller_event = mocking.get_message(content) @@ -363,7 +368,6 @@ class TestTutorialExamples(unittest.TestCase): except Exception as exc: print " failed to get the vote (%s)" % exc -# get_authorities_mock().values.return_value = [DIRECTORY_AUTHORITIES['gabelmoo'], DIRECTORY_AUTHORITIES['tor26'], DIRECTORY_AUTHORITIES['moria1'], DIRECTORY_AUTHORITIES['maatuska']] directory_values = [] directory_values.append(DIRECTORY_AUTHORITIES['gabelmoo']) directory_values[0].address = '212.112.245.170' @@ -403,3 +407,38 @@ class TestTutorialExamples(unittest.TestCase): query_run_mock.side_effect = router_status tutorial_example() self.assertEqual(VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT, stdout_mock.getvalue()) + + @patch('sys.stdout', new_callable = StringIO.StringIO) + @patch('stem.descriptor.parse_file') + @patch('%s.open' % __name__, create = True) + @patch('stem.descriptor.remote.Query') + def test_persisting_a_consensus(self, query_mock, open_mock, parse_file_mock, stdout_mock): + def tutorial_example_1(): + from stem.descriptor import DocumentHandler + from stem.descriptor.remote import DescriptorDownloader + + downloader = DescriptorDownloader() + consensus = downloader.get_consensus(document_handler = DocumentHandler.DOCUMENT).run()[0] + + with open('/tmp/descriptor_dump', 'w') as descriptor_file: + descriptor_file.write(str(consensus)) + + def tutorial_example_2(): + from stem.descriptor import DocumentHandler, parse_file + + consensus = next(parse_file( + '/tmp/descriptor_dump', + descriptor_type = 'network-status-consensus-3 1.0', + document_handler = DocumentHandler.DOCUMENT, + )) + + for fingerprint, relay in consensus.routers.items(): + print "%s: %s" % (fingerprint, relay.nickname) + + entry = get_router_status_entry_v3() + network_status = get_network_status_document_v3(routers = (entry,)) + query_mock().run.return_value = [network_status] + parse_file_mock.return_value = itertools.cycle([network_status]) + tutorial_example_1() + tutorial_example_2() + self.assertEqual(PERSISTING_A_CONSENSUS_OUTPUT, stdout_mock.getvalue())

1 0

[stem/master] Added test for list circuits example script
by atagar＠torproject.org 21 Dec '14

21 Dec '14

commit f28142dce4ee8f1035e0df5ec009725c641a8545 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sun Dec 14 15:33:13 2014 +0400 Added test for list circuits example script Made better use of functions --- test/settings.cfg | 1 + test/unit/tutorial_examples.py | 111 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) diff --git a/test/settings.cfg b/test/settings.cfg index 6ce27b8..96fa40d 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -172,6 +172,7 @@ test.unit_tests |test.unit.exit_policy.policy.TestExitPolicy |test.unit.version.TestVersion |test.unit.tutorial.TestTutorial +|test.unit.tutorial_examples.TestTutorialExamples |test.unit.response.control_message.TestControlMessage |test.unit.response.control_line.TestControlLine |test.unit.response.events.TestEvents diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py new file mode 100644 index 0000000..59be150 --- /dev/null +++ b/test/unit/tutorial_examples.py @@ -0,0 +1,111 @@ +""" +Tests for the examples given in stem's tutorial. +""" + +import StringIO +import unittest + +import stem.response + +from stem.control import Controller +from test import mocking +from test.mocking import get_router_status_entry_v3 +from test.mocking import ROUTER_STATUS_ENTRY_V3_HEADER + +try: + # added in python 3.3 + from unittest.mock import patch +except ImportError: + from mock import patch + +CIRC_CONTENT = '650 CIRC %d %s \ +%s \ +PURPOSE=%s' + +PATH_CONTENT = '$%s=%s,$%s=%s,$%s=%s' + +LIST_CIRCUITS_OUTPUT = """\ + +Circuit 4 (GENERAL) + |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) + |- 0DD9935C5E939CFA1E07B8DDA6D91C1A2A9D9338 (afo02, 87.238.194.176) + +- DB3B1CFBD3E4D97B84B548ADD5B9A31451EEC4CC (edwardsnowden3, 109.163.234.10) + +Circuit 6 (GENERAL) + |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) + |- EC01CB4766BADC1611678555CE793F2A7EB2D723 (sprockets, 46.165.197.96) + +- 9EA317EECA56BDF30CAEB208A253FB456EDAB1A0 (bolobolo1, 96.47.226.20) + +Circuit 10 (GENERAL) + |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) + |- 00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F (ph3x, 86.59.119.83) + +- 65242C91BFF30F165DA4D132C81A9EBA94B71D62 (torexit16, 176.67.169.171) +""" + + +def _get_event(id, status, hop1, hop2, hop3, purpose): + path = PATH_CONTENT % (hop1[0], hop1[1], hop2[0], hop2[1], hop3[0], hop3[1]) + content = CIRC_CONTENT % (id, status, path, purpose) + controller_event = mocking.get_message(content) + stem.response.convert('EVENT', controller_event) + return controller_event + + +def _get_router_status(address): + r_line = ROUTER_STATUS_ENTRY_V3_HEADER[0][1].replace('71.35.150.29', address) + content = get_router_status_entry_v3({'r': r_line}) + return content + + +class TestTutorialExamples(unittest.TestCase): + @patch('sys.stdout', new_callable = StringIO.StringIO) + @patch('stem.control.Controller.from_port', spec = Controller) + def test_list_circuits(self, from_port_mock, stdout_mock): + def tutorial_example(): + from stem import CircStatus + from stem.control import Controller + + with Controller.from_port(port = 9051) as controller: + controller.authenticate() + + for circ in sorted(controller.get_circuits()): + if circ.status != CircStatus.BUILT: + continue + + print + print "Circuit %s (%s)" % (circ.id, circ.purpose) + + for i, entry in enumerate(circ.path): + div = '+' if (i == len(circ.path) - 1) else '|' + fingerprint, nickname = entry + + desc = controller.get_network_status(fingerprint, None) + address = desc.address if desc else 'unknown' + + print " %s- %s (%s, %s)" % (div, fingerprint, nickname, address) + + path_1 = ('B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C', 'ByTORAndTheSnowDog') + path_2 = ('0DD9935C5E939CFA1E07B8DDA6D91C1A2A9D9338', 'afo02') + path_3 = ('DB3B1CFBD3E4D97B84B548ADD5B9A31451EEC4CC', 'edwardsnowden3') + path_4 = ('EC01CB4766BADC1611678555CE793F2A7EB2D723', 'sprockets') + path_5 = ('9EA317EECA56BDF30CAEB208A253FB456EDAB1A0', 'bolobolo1') + path_6 = ('00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F', 'ph3x') + path_7 = ('65242C91BFF30F165DA4D132C81A9EBA94B71D62', 'torexit16') + + circuit_4 = _get_event(4, 'BUILT', path_1, path_2, path_3, 'GENERAL') + circuit_6 = _get_event(6, 'BUILT', path_1, path_4, path_5, 'GENERAL') + circuit_10 = _get_event(10, 'BUILT', path_1, path_6, path_7, 'GENERAL') + + controller = from_port_mock().__enter__() + controller.get_circuits.return_value = [circuit_4, circuit_6, circuit_10] + controller.get_network_status.side_effect = lambda fingerprint, *args: { + path_1[0]: _get_router_status("173.209.180.61"), + path_2[0]: _get_router_status("87.238.194.176"), + path_3[0]: _get_router_status("109.163.234.10"), + path_4[0]: _get_router_status("46.165.197.96"), + path_5[0]: _get_router_status("96.47.226.20"), + path_6[0]: _get_router_status("86.59.119.83"), + path_7[0]: _get_router_status("176.67.169.171") + }[fingerprint] + tutorial_example() + self.assertEqual(LIST_CIRCUITS_OUTPUT, stdout_mock.getvalue())

1 0

[stem/master] Added test for exit_used
by atagar＠torproject.org 21 Dec '14

21 Dec '14

commit 7deeb8520e4302d7c3df4137704baed59716025b Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Tue Dec 16 17:17:21 2014 +0400 Added test for exit_used --- test/unit/tutorial_examples.py | 92 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 84 insertions(+), 8 deletions(-) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 59be150..9184957 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -42,17 +42,40 @@ Circuit 10 (GENERAL) +- 65242C91BFF30F165DA4D132C81A9EBA94B71D62 (torexit16, 176.67.169.171) """ +EXIT_USED_OUTPUT = """\ +Tracking requests for tor exits. Press 'enter' to end. -def _get_event(id, status, hop1, hop2, hop3, purpose): - path = PATH_CONTENT % (hop1[0], hop1[1], hop2[0], hop2[1], hop3[0], hop3[1]) - content = CIRC_CONTENT % (id, status, path, purpose) +Exit relay for our connection to 64.15.112.44:80 + address: 31.172.30.2:443 + fingerprint: A59E1E7C7EAEE083D756EE1FF6EC31CA3D8651D7 + nickname: chaoscomputerclub19 + locale: unknown + +""" + + +def _get_event(content): controller_event = mocking.get_message(content) stem.response.convert('EVENT', controller_event) return controller_event -def _get_router_status(address): - r_line = ROUTER_STATUS_ENTRY_V3_HEADER[0][1].replace('71.35.150.29', address) +def _get_circ_event(id, status, hop1, hop2, hop3, purpose): + path = PATH_CONTENT % (hop1[0], hop1[1], hop2[0], hop2[1], hop3[0], hop3[1]) + content = CIRC_CONTENT % (id, status, path, purpose) + return _get_event(content) + + +def _get_router_status(address = None, port = None, nickname = None, fingerprint_base64 = None): + r_line = ROUTER_STATUS_ENTRY_V3_HEADER[0][1] + if address: + r_line = r_line.replace('71.35.150.29', address) + if port: + r_line = r_line.replace('9001', port) + if nickname: + r_line = r_line.replace('caerSidi', nickname) + if fingerprint_base64: + r_line = r_line.replace('p1aag7VwarGxqctS7/fS0y5FU+s', fingerprint_base64) content = get_router_status_entry_v3({'r': r_line}) return content @@ -92,9 +115,9 @@ class TestTutorialExamples(unittest.TestCase): path_6 = ('00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F', 'ph3x') path_7 = ('65242C91BFF30F165DA4D132C81A9EBA94B71D62', 'torexit16') - circuit_4 = _get_event(4, 'BUILT', path_1, path_2, path_3, 'GENERAL') - circuit_6 = _get_event(6, 'BUILT', path_1, path_4, path_5, 'GENERAL') - circuit_10 = _get_event(10, 'BUILT', path_1, path_6, path_7, 'GENERAL') + circuit_4 = _get_circ_event(4, 'BUILT', path_1, path_2, path_3, 'GENERAL') + circuit_6 = _get_circ_event(6, 'BUILT', path_1, path_4, path_5, 'GENERAL') + circuit_10 = _get_circ_event(10, 'BUILT', path_1, path_6, path_7, 'GENERAL') controller = from_port_mock().__enter__() controller.get_circuits.return_value = [circuit_4, circuit_6, circuit_10] @@ -109,3 +132,56 @@ class TestTutorialExamples(unittest.TestCase): }[fingerprint] tutorial_example() self.assertEqual(LIST_CIRCUITS_OUTPUT, stdout_mock.getvalue()) + + @patch('sys.stdout', new_callable = StringIO.StringIO) + @patch('stem.control.Controller.from_port', spec = Controller) + def test_exit_used(self, from_port_mock, stdout_mock): + import functools + + from stem import StreamStatus + from stem.control import EventType, Controller + + def main(): + print "Tracking requests for tor exits. Press 'enter' to end." + print + + with Controller.from_port() as controller: + controller.authenticate() + + stream_listener = functools.partial(stream_event, controller) + controller.add_event_listener(stream_listener, EventType.STREAM) + + raw_input() + + def stream_event(controller, event): + if event.status == StreamStatus.SUCCEEDED and event.circ_id: + circ = controller.get_circuit(event.circ_id) + + exit_fingerprint = circ.path[-1][0] + exit_relay = controller.get_network_status(exit_fingerprint) + + print "Exit relay for our connection to %s" % (event.target) + print " address: %s:%i" % (exit_relay.address, exit_relay.or_port) + print " fingerprint: %s" % exit_relay.fingerprint + print " nickname: %s" % exit_relay.nickname + print " locale: %s" % controller.get_info("ip-to-country/%s" % exit_relay.address, 'unknown') + print + + path_1 = ('9EA317EECA56BDF30CAEB208A253FB456EDAB1A0', 'bolobolo1') + path_2 = ('00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F', 'ph3x') + path_3 = ('A59E1E7C7EAEE083D756EE1FF6EC31CA3D8651D7', 'chaoscomputerclub19') + circuit = _get_circ_event(1, 'BUILT', path_1, path_2, path_3, 'GENERAL') + + event_content = '650 STREAM 15 SUCCEEDED 3 64.15.112.44:80' + event = _get_event(event_content) + + controller = from_port_mock().__enter() + controller.get_circuit.return_value = circuit + controller.get_network_status.return_value = _get_router_status("31.172.30.2", "443", path_3[1], "pZ4efH6u4IPXVu4f9uwxyj2GUdc=") + controller.get_info.return_value = 'unknown' + origin_raw_input = __builtins__['raw_input'] + __builtins__['raw_input'] = lambda: "" + main() + __builtins__['raw_input'] = origin_raw_input + stream_event(controller, event) + self.assertEqual(EXIT_USED_OUTPUT, stdout_mock.getvalue())

1 0

[stem/master] Use absolute paths for test hidden services
by atagar＠torproject.org 21 Dec '14

21 Dec '14

commit af6b5b86f4308a51df96a3ae6baed604a6947da5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 21 12:22:53 2014 -0800 Use absolute paths for test hidden services Originally I did this as part of my investigation of... https://trac.torproject.org/projects/tor/ticket/14010 ... but though it's doesn't impact that, I'd prefer absolute paths here. This way they're in the test data directory rather than whatever the user's cwd happens to be. --- test/integ/control/controller.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index e482281..b6d7036 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -466,6 +466,12 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() + test_dir = runner.get_test_dir() + service1_path = os.path.join(test_dir, 'test_hidden_service1') + service2_path = os.path.join(test_dir, 'test_hidden_service2') + service3_path = os.path.join(test_dir, 'test_hidden_service3') + empty_service_path = os.path.join(test_dir, 'test_hidden_service_empty') + with runner.get_tor_controller() as controller: try: # initially we shouldn't be running any hidden services @@ -480,14 +486,14 @@ class TestController(unittest.TestCase): # create a hidden service initialconf = { - 'test_hidden_service1/': { + service1_path: { 'HiddenServicePort': [ (8020, '127.0.0.1', 8020), (8021, '127.0.0.1', 8021), ], 'HiddenServiceVersion': '2', }, - 'test_hidden_service2/': { + service2_path: { 'HiddenServiceAuthorizeClient': 'stealth a, b', 'HiddenServicePort': [ (8030, '127.0.0.1', 8030), @@ -495,7 +501,7 @@ class TestController(unittest.TestCase): (8032, '127.0.0.1', 8032), ] }, - 'test_hidden_service_empty/': { + empty_service_path: { 'HiddenServicePort': [] } } @@ -505,13 +511,13 @@ class TestController(unittest.TestCase): # add already existing services, with/without explicit target - self.assertEqual(None, controller.create_hidden_service('test_hidden_service1/', 8020)) - self.assertEqual(None, controller.create_hidden_service('test_hidden_service1/', 8021, target_port = 8021)) + self.assertEqual(None, controller.create_hidden_service(service1_path, 8020)) + self.assertEqual(None, controller.create_hidden_service(service1_path, 8021, target_port = 8021)) self.assertDictEqual(initialconf, controller.get_hidden_service_conf()) # add a new service, with/without explicit target - hs_path = os.path.join(os.getcwd(), 'test_hidden_serviceX') + hs_path = os.path.join(os.getcwd(), service3_path) hs_address1 = controller.create_hidden_service(hs_path, 8888).hostname hs_address2 = controller.create_hidden_service(hs_path, 8989, target_port = 8021).hostname @@ -536,7 +542,7 @@ class TestController(unittest.TestCase): # clean up the hidden service directories created as part of this test - for path in ('test_hidden_service1', 'test_hidden_service2', 'test_hidden_serviceX'): + for path in (service1_path, service2_path, service3_path): try: shutil.rmtree(path) except:

1 0

[stem/master] Added outdated_relays test
by atagar＠torproject.org 21 Dec '14

21 Dec '14

commit 8e85d49eccf6ea2b6fa63cbadf9e049c021f6650 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Tue Dec 16 18:02:37 2014 +0400 Added outdated_relays test --- test/unit/tutorial_examples.py | 47 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 9184957..9ce78a0 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -9,8 +9,11 @@ import stem.response from stem.control import Controller from test import mocking -from test.mocking import get_router_status_entry_v3 -from test.mocking import ROUTER_STATUS_ENTRY_V3_HEADER +from test.mocking import ( + get_relay_server_descriptor, + get_router_status_entry_v3, + ROUTER_STATUS_ENTRY_V3_HEADER, +) try: # added in python 3.3 @@ -53,6 +56,14 @@ Exit relay for our connection to 64.15.112.44:80 """ +OUTDATED_RELAYS_OUTPUT = """\ +Checking for outdated relays... + + 0.1.0 Sambuddha Basu + +2 outdated relays found, 1 had contact information +""" + def _get_event(content): controller_event = mocking.get_message(content) @@ -185,3 +196,35 @@ class TestTutorialExamples(unittest.TestCase): __builtins__['raw_input'] = origin_raw_input stream_event(controller, event) self.assertEqual(EXIT_USED_OUTPUT, stdout_mock.getvalue()) + + @patch('sys.stdout', new_callable = StringIO.StringIO) + @patch('stem.descriptor.remote.DescriptorDownloader') + def test_outdated_relays(self, downloader_mock, stdout_mock): + def tutorial_example(): + from stem.descriptor.remote import DescriptorDownloader + from stem.version import Version + + downloader = DescriptorDownloader() + count, with_contact = 0, 0 + + print "Checking for outdated relays..." + print + + for desc in downloader.get_server_descriptors(): + if desc.tor_version < Version('0.2.3.0'): + count += 1 + + if desc.contact: + print ' %-15s %s' % (desc.tor_version, desc.contact.decode("utf-8", "replace")) + with_contact += 1 + + print + print "%i outdated relays found, %i had contact information" % (count, with_contact) + + desc_1 = get_relay_server_descriptor({'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}) + desc_2 = get_relay_server_descriptor({'platform': 'node-Tor 0.1.0 on Linux x86_64'}) + desc_3 = get_relay_server_descriptor({'opt': 'contact Random Person admin(a)gtr-10.de', 'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}) + desc_4 = get_relay_server_descriptor({'opt': 'contact Sambuddha Basu', 'platform': 'node-Tor 0.1.0 on Linux x86_64'}) + downloader_mock().get_server_descriptors.return_value = [desc_1, desc_2, desc_3, desc_4] + tutorial_example() + self.assertEqual(OUTDATED_RELAYS_OUTPUT, stdout_mock.getvalue())

1 0

[stem/master] Added compare_flags test
by atagar＠torproject.org 21 Dec '14

21 Dec '14

commit 4fddd2335fb8e3e88798e77523b2c9c62df72022 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Wed Dec 17 17:56:08 2014 +0400 Added compare_flags test --- test/unit/tutorial_examples.py | 92 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 2 deletions(-) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 9ce78a0..efcaab7 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -6,13 +6,16 @@ import StringIO import unittest import stem.response +import stem.descriptor.remote from stem.control import Controller +from stem.descriptor.remote import DIRECTORY_AUTHORITIES from test import mocking from test.mocking import ( get_relay_server_descriptor, get_router_status_entry_v3, ROUTER_STATUS_ENTRY_V3_HEADER, + get_network_status_document_v3, ) try: @@ -64,6 +67,14 @@ Checking for outdated relays... 2 outdated relays found, 1 had contact information """ +COMPARE_FLAGS_OUTPUT = """\ +maatuska has the Running flag but moria1 doesn't: E2BB13AA2F6960CD93ABE5257A825687F3973C62 +moria1 has the Running flag but maatuska doesn't: 546C54E2A89D88E0794D04AECBF1AC8AC9DA81DE +maatuska has the Running flag but moria1 doesn't: 92FCB6748A40E6088E22FBAB943AB2DD743EA818 +maatuska has the Running flag but moria1 doesn't: 6871F682350BA931838C0EC1E4A23044DAE06A73 +moria1 has the Running flag but maatuska doesn't: DCAEC3D069DC39AAE43D13C8AF31B5645E05ED61 +""" + def _get_event(content): controller_event = mocking.get_message(content) @@ -77,7 +88,7 @@ def _get_circ_event(id, status, hop1, hop2, hop3, purpose): return _get_event(content) -def _get_router_status(address = None, port = None, nickname = None, fingerprint_base64 = None): +def _get_router_status(address = None, port = None, nickname = None, fingerprint_base64 = None, s_line = None): r_line = ROUTER_STATUS_ENTRY_V3_HEADER[0][1] if address: r_line = r_line.replace('71.35.150.29', address) @@ -87,7 +98,10 @@ def _get_router_status(address = None, port = None, nickname = None, fingerprint r_line = r_line.replace('caerSidi', nickname) if fingerprint_base64: r_line = r_line.replace('p1aag7VwarGxqctS7/fS0y5FU+s', fingerprint_base64) - content = get_router_status_entry_v3({'r': r_line}) + if s_line: + content = get_router_status_entry_v3({'r': r_line, 's': s_line}) + else: + content = get_router_status_entry_v3({'r': r_line}) return content @@ -228,3 +242,77 @@ class TestTutorialExamples(unittest.TestCase): downloader_mock().get_server_descriptors.return_value = [desc_1, desc_2, desc_3, desc_4] tutorial_example() self.assertEqual(OUTDATED_RELAYS_OUTPUT, stdout_mock.getvalue()) + + @patch('sys.stdout', new_callable = StringIO.StringIO) + @patch('stem.descriptor.remote.Query') + @patch('stem.descriptor.remote.get_authorities') + def test_compare_flags(self, get_authorities_mock, query_mock, stdout_mock): + def tutorial_example(): + from stem.descriptor import DocumentHandler, remote + + # Query all authority votes asynchronously. + + downloader = remote.DescriptorDownloader(document_handler = DocumentHandler.DOCUMENT) + queries = {} + + for name, authority in remote.get_authorities().items(): + if authority.v3ident is None: + continue # authority doens't vote if it lacks a v3ident + + queries[name] = downloader.get_vote(authority) + + # Wait for the votes to finish being downloaded, this produces a dictionary of + # authority nicknames to their vote. + + votes = dict((name, query.run()[0]) for (name, query) in queries.items()) + + # Get a superset of all the fingerprints in all the votes. + + all_fingerprints = set() + + for vote in votes.values(): + all_fingerprints.update(vote.routers.keys()) + + # Finally, compare moria1's votes to maatuska. + + for fingerprint in all_fingerprints: + moria1_vote = votes['moria1'].routers.get(fingerprint) + maatuska_vote = votes['maatuska'].routers.get(fingerprint) + + if not moria1_vote and not maatuska_vote: + print "both moria1 and maatuska haven't voted about %s" % fingerprint + elif not moria1_vote: + print "moria1 hasn't voted about %s" % fingerprint + elif not maatuska_vote: + print "maatuska hasn't voted about %s" % fingerprint + elif 'Running' in moria1_vote.flags and 'Running' not in maatuska_vote.flags: + print "moria1 has the Running flag but maatuska doesn't: %s" % fingerprint + elif 'Running' in maatuska_vote.flags and 'Running' not in moria1_vote.flags: + print "maatuska has the Running flag but moria1 doesn't: %s" % fingerprint + + get_authorities_mock().items.return_value = [('moria1', DIRECTORY_AUTHORITIES['moria1']), ('maatuska', DIRECTORY_AUTHORITIES['maatuska'])] + fingerprint = [] + fingerprint.append(('92FCB6748A40E6088E22FBAB943AB2DD743EA818', 'kvy2dIpA5giOIvurlDqy3XQ+qBg=')) + fingerprint.append(('6871F682350BA931838C0EC1E4A23044DAE06A73', 'aHH2gjULqTGDjA7B5KIwRNrganM=')) + fingerprint.append(('E2BB13AA2F6960CD93ABE5257A825687F3973C62', '4rsTqi9pYM2Tq+UleoJWh/OXPGI=')) + fingerprint.append(('546C54E2A89D88E0794D04AECBF1AC8AC9DA81DE', 'VGxU4qidiOB5TQSuy/Gsisnagd4=')) + fingerprint.append(('DCAEC3D069DC39AAE43D13C8AF31B5645E05ED61', '3K7D0GncOarkPRPIrzG1ZF4F7WE=')) + entry = [] + # Entries for moria1. + entry.append(_get_router_status(fingerprint_base64 = fingerprint[0][1], s_line = ' ')) + entry.append(_get_router_status(fingerprint_base64 = fingerprint[1][1], s_line = ' ')) + entry.append(_get_router_status(fingerprint_base64 = fingerprint[2][1], s_line = ' ')) + entry.append(_get_router_status(fingerprint_base64 = fingerprint[3][1])) + entry.append(_get_router_status(fingerprint_base64 = fingerprint[4][1])) + # Entries for maatuska. + entry.append(_get_router_status(fingerprint_base64 = fingerprint[0][1])) + entry.append(_get_router_status(fingerprint_base64 = fingerprint[1][1])) + entry.append(_get_router_status(fingerprint_base64 = fingerprint[2][1])) + entry.append(_get_router_status(fingerprint_base64 = fingerprint[3][1], s_line = ' ')) + entry.append(_get_router_status(fingerprint_base64 = fingerprint[4][1], s_line = ' ')) + network_status = [] + network_status.append(get_network_status_document_v3(routers = (entry[0], entry[1], entry[2], entry[3], entry[4],))) + network_status.append(get_network_status_document_v3(routers = (entry[5], entry[6], entry[7], entry[8], entry[9],))) + query_mock().run.side_effect = [[network_status[0]], [network_status[1]]] + tutorial_example() + self.assertEqual(COMPARE_FLAGS_OUTPUT, stdout_mock.getvalue())

1 0

[stem/master] Added votes_by_bandwidth_authorities test
by atagar＠torproject.org 21 Dec '14

21 Dec '14

commit 4aea13c37eb514eab5da1163f9508b3d4caa16e7 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Wed Dec 17 19:53:50 2014 +0400 Added votes_by_bandwidth_authorities test --- test/unit/tutorial_examples.py | 87 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index efcaab7..97234ea 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -75,6 +75,17 @@ maatuska has the Running flag but moria1 doesn't: 6871F682350BA931838C0EC1E4A230 moria1 has the Running flag but maatuska doesn't: DCAEC3D069DC39AAE43D13C8AF31B5645E05ED61 """ +VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT = """\ +Getting gabelmoo's vote from http://212.112.245.170:80/tor/status-vote/current/authority: + 5935 measured entries and 1332 unmeasured +Getting tor26's vote from http://86.59.21.38:80/tor/status-vote/current/authority: + 5735 measured entries and 1690 unmeasured +Getting moria1's vote from http://128.31.0.39:9131/tor/status-vote/current/authority: + 6647 measured entries and 625 unmeasured +Getting maatuska's vote from http://171.25.193.9:443/tor/status-vote/current/authority: + 6313 measured entries and 1112 unmeasured +""" + def _get_event(content): controller_event = mocking.get_message(content) @@ -316,3 +327,79 @@ class TestTutorialExamples(unittest.TestCase): query_mock().run.side_effect = [[network_status[0]], [network_status[1]]] tutorial_example() self.assertEqual(COMPARE_FLAGS_OUTPUT, stdout_mock.getvalue()) + + @patch('sys.stdout', new_callable = StringIO.StringIO) + @patch('stem.descriptor.remote.get_authorities') + @patch('stem.descriptor.remote.Query.run') + def test_votes_by_bandwidth_authorities(self, query_run_mock, get_authorities_mock, stdout_mock): + def tutorial_example(): + from stem.descriptor import remote + + # request votes from all the bandwidth authorities + + queries = {} + downloader = remote.DescriptorDownloader() + + for authority in remote.get_authorities().values(): + if authority.is_bandwidth_authority: + queries[authority.nickname] = downloader.query( + '/tor/status-vote/current/authority', + endpoints = [(authority.address, authority.dir_port)], + ) + + for authority_name, query in queries.items(): + try: + print "Getting %s's vote from %s:" % (authority_name, query.download_url) + + measured, unmeasured = 0, 0 + + for desc in query.run(): + if desc.measured: + measured += 1 + else: + unmeasured += 1 + + print ' %i measured entries and %i unmeasured' % (measured, unmeasured) + except Exception as exc: + print " failed to get the vote (%s)" % exc + +# get_authorities_mock().values.return_value = [DIRECTORY_AUTHORITIES['gabelmoo'], DIRECTORY_AUTHORITIES['tor26'], DIRECTORY_AUTHORITIES['moria1'], DIRECTORY_AUTHORITIES['maatuska']] + directory_values = [] + directory_values.append(DIRECTORY_AUTHORITIES['gabelmoo']) + directory_values[0].address = '212.112.245.170' + directory_values.append(DIRECTORY_AUTHORITIES['tor26']) + directory_values.append(DIRECTORY_AUTHORITIES['moria1']) + directory_values.append(DIRECTORY_AUTHORITIES['maatuska']) + get_authorities_mock().values.return_value = directory_values + router_status = [] + # Count for gabelmoo. + entry = [] + for count in range(5935): + entry.append(get_router_status_entry_v3({'w': 'Bandwidth=1 Measured=1'})) + for count in range(1332): + entry.append(get_router_status_entry_v3()) + router_status.append(entry) + # Count for tor26. + entry = [] + for count in range(5735): + entry.append(get_router_status_entry_v3({'w': 'Bandwidth=1 Measured=1'})) + for count in range(1690): + entry.append(get_router_status_entry_v3()) + router_status.append(entry) + # Count for moria1. + entry = [] + for count in range(6647): + entry.append(get_router_status_entry_v3({'w': 'Bandwidth=1 Measured=1'})) + for count in range(625): + entry.append(get_router_status_entry_v3()) + router_status.append(entry) + # Count for maatuska. + entry = [] + for count in range(6313): + entry.append(get_router_status_entry_v3({'w': 'Bandwidth=1 Measured=1'})) + for count in range(1112): + entry.append(get_router_status_entry_v3()) + router_status.append(entry) + query_run_mock.side_effect = router_status + tutorial_example() + self.assertEqual(VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT, stdout_mock.getvalue())

1 0

[tor/master] Using macros and inline function for quick lookup of channel state.
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit b884ae6d98d0fd684bc93aa48a0da656ea1849b7 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 23 20:52:24 2014 +0200 Using macros and inline function for quick lookup of channel state. --- src/or/channel.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/or/channel.h b/src/or/channel.h index 4cd8f43..5a2431b 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -431,6 +431,39 @@ channel_t * channel_find_by_remote_digest(const char *identity_digest); channel_t * channel_next_with_digest(channel_t *chan); /* + * Helper macros to lookup state of given channel. + */ + +#define CHANNEL_IS_CLOSED(chan) (channel_is_in_state((chan), \ + CHANNEL_STATE_CLOSED)) +#define CHANNEL_IS_OPENING(chan) (channel_is_in_state((chan), \ + CHANNEL_STATE_OPENING)) +#define CHANNEL_IS_OPEN(chan) (channel_is_in_state((chan), \ + CHANNEL_STATE_OPEN)) +#define CHANNEL_IS_MAINT(chan) (channel_is_in_state((chan), \ + CHANNEL_STATE_MAINT)) +#define CHANNEL_IS_CLOSING(chan) (channel_is_in_state((chan), \ + CHANNEL_STATE_CLOSING)) +#define CHANNEL_IS_ERROR(chan) (channel_is_in_state((chan), \ + CHANNEL_STATE_ERROR)) + +#define CHANNEL_FINISHED(chan) (CHANNEL_IS_CLOSED(chan) || \ + CHANNEL_IS_ERROR(chan)) + +#define CHANNEL_CONDEMNED(chan) (CHANNEL_IS_CLOSING(chan) || \ + CHANNEL_FINISHED(chan)) + +#define CHANNEL_CAN_HANDLE_CELLS(chan) (CHANNEL_IS_OPENING(chan) || \ + CHANNEL_IS_OPEN(chan) || \ + CHANNEL_IS_MAINT(chan)) + +static INLINE int +channel_is_in_state(channel_t *chan, channel_state_t state) +{ + return chan->state == state; +} + +/* * Metadata queries/updates */

1 0

[tor/master] Use channel state lookup macros in channel.c
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit 032d44226ec618c106c0431c39a79303fb78fc6b Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 23 20:53:13 2014 +0200 Use channel state lookup macros in channel.c --- src/or/channel.c | 119 +++++++++++++++++++----------------------------------- 1 file changed, 41 insertions(+), 78 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 13a1226..5651bb4 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -378,8 +378,7 @@ channel_register(channel_t *chan) smartlist_add(all_channels, chan); /* Is it finished? */ - if (chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR) { + if (CHANNEL_FINISHED(chan)) { /* Put it in the finished list, creating it if necessary */ if (!finished_channels) finished_channels = smartlist_new(); smartlist_add(finished_channels, chan); @@ -388,7 +387,7 @@ channel_register(channel_t *chan) if (!active_channels) active_channels = smartlist_new(); smartlist_add(active_channels, chan); - if (chan->state != CHANNEL_STATE_CLOSING) { + if (!CHANNEL_IS_CLOSING(chan)) { /* It should have a digest set */ if (!tor_digest_is_zero(chan->identity_digest)) { /* Yeah, we're good, add it to the map */ @@ -423,8 +422,7 @@ channel_unregister(channel_t *chan) if (!(chan->registered)) return; /* Is it finished? */ - if (chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR) { + if (CHANNEL_FINISHED(chan)) { /* Get it out of the finished list */ if (finished_channels) smartlist_remove(finished_channels, chan); } else { @@ -440,9 +438,7 @@ channel_unregister(channel_t *chan) /* Should it be in the digest map? */ if (!tor_digest_is_zero(chan->identity_digest) && - !(chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR)) { + !(CHANNEL_CONDEMNED(chan))) { /* Remove it */ channel_remove_from_digest_map(chan); } @@ -542,9 +538,7 @@ channel_add_to_digest_map(channel_t *chan) tor_assert(chan); /* Assert that the state makes sense */ - tor_assert(!(chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR)); + tor_assert(!CHANNEL_CONDEMNED(chan)); /* Assert that there is a digest */ tor_assert(!tor_digest_is_zero(chan->identity_digest)); @@ -779,8 +773,8 @@ channel_free(channel_t *chan) if (!chan) return; /* It must be closed or errored */ - tor_assert(chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR); + tor_assert(CHANNEL_FINISHED(chan)); + /* It must be deregistered */ tor_assert(!(chan->registered)); @@ -988,9 +982,7 @@ channel_get_cell_handler(channel_t *chan) { tor_assert(chan); - if (chan->state == CHANNEL_STATE_OPENING || - chan->state == CHANNEL_STATE_OPEN || - chan->state == CHANNEL_STATE_MAINT) + if (CHANNEL_CAN_HANDLE_CELLS(chan)) return chan->cell_handler; return NULL; @@ -1008,9 +1000,7 @@ channel_get_var_cell_handler(channel_t *chan) { tor_assert(chan); - if (chan->state == CHANNEL_STATE_OPENING || - chan->state == CHANNEL_STATE_OPEN || - chan->state == CHANNEL_STATE_MAINT) + if (CHANNEL_CAN_HANDLE_CELLS(chan)) return chan->var_cell_handler; return NULL; @@ -1033,9 +1023,7 @@ channel_set_cell_handlers(channel_t *chan, int try_again = 0; tor_assert(chan); - tor_assert(chan->state == CHANNEL_STATE_OPENING || - chan->state == CHANNEL_STATE_OPEN || - chan->state == CHANNEL_STATE_MAINT); + tor_assert(CHANNEL_CAN_HANDLE_CELLS(chan)); log_debug(LD_CHANNEL, "Setting cell_handler callback for channel %p to %p", @@ -1089,9 +1077,8 @@ channel_mark_for_close(channel_t *chan) tor_assert(chan->close != NULL); /* If it's already in CLOSING, CLOSED or ERROR, this is a no-op */ - if (chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR) return; + if (CHANNEL_CONDEMNED(chan)) + return; log_debug(LD_CHANNEL, "Closing channel %p (global ID " U64_FORMAT ") " @@ -1170,9 +1157,8 @@ channel_close_from_lower_layer(channel_t *chan) tor_assert(chan != NULL); /* If it's already in CLOSING, CLOSED or ERROR, this is a no-op */ - if (chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR) return; + if (CHANNEL_CONDEMNED(chan)) + return; log_debug(LD_CHANNEL, "Closing channel %p (global ID " U64_FORMAT ") " @@ -1230,9 +1216,8 @@ channel_close_for_error(channel_t *chan) tor_assert(chan != NULL); /* If it's already in CLOSING, CLOSED or ERROR, this is a no-op */ - if (chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR) return; + if (CHANNEL_CONDEMNED(chan)) + return; log_debug(LD_CHANNEL, "Closing channel %p due to lower-layer error", @@ -1288,13 +1273,11 @@ void channel_closed(channel_t *chan) { tor_assert(chan); - tor_assert(chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR); + tor_assert(CHANNEL_CONDEMNED(chan)); /* No-op if already inactive */ - if (chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR) return; + if (CHANNEL_FINISHED(chan)) + return; /* Inform any pending (not attached) circs that they should * give up. */ @@ -1357,10 +1340,7 @@ channel_clear_identity_digest(channel_t *chan) "global ID " U64_FORMAT, chan, U64_PRINTF_ARG(chan->global_identifier)); - state_not_in_map = - (chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR); + state_not_in_map = CHANNEL_CONDEMNED(chan); if (!state_not_in_map && chan->registered && !tor_digest_is_zero(chan->identity_digest)) @@ -1393,10 +1373,8 @@ channel_set_identity_digest(channel_t *chan, identity_digest ? hex_str(identity_digest, DIGEST_LEN) : "(null)"); - state_not_in_map = - (chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR); + state_not_in_map = CHANNEL_CONDEMNED(chan); + was_in_digest_map = !state_not_in_map && chan->registered && @@ -1446,10 +1424,7 @@ channel_clear_remote_end(channel_t *chan) "global ID " U64_FORMAT, chan, U64_PRINTF_ARG(chan->global_identifier)); - state_not_in_map = - (chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR); + state_not_in_map = CHANNEL_CONDEMNED(chan); if (!state_not_in_map && chan->registered && !tor_digest_is_zero(chan->identity_digest)) @@ -1485,10 +1460,8 @@ channel_set_remote_end(channel_t *chan, identity_digest ? hex_str(identity_digest, DIGEST_LEN) : "(null)"); - state_not_in_map = - (chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR); + state_not_in_map = CHANNEL_CONDEMNED(chan); + was_in_digest_map = !state_not_in_map && chan->registered && @@ -1682,9 +1655,7 @@ channel_write_cell_queue_entry(channel_t *chan, cell_queue_entry_t *q) tor_assert(q); /* Assert that the state makes sense for a cell write */ - tor_assert(chan->state == CHANNEL_STATE_OPENING || - chan->state == CHANNEL_STATE_OPEN || - chan->state == CHANNEL_STATE_MAINT); + tor_assert(CHANNEL_CAN_HANDLE_CELLS(chan)); { circid_t circ_id; @@ -1695,7 +1666,7 @@ channel_write_cell_queue_entry(channel_t *chan, cell_queue_entry_t *q) /* Can we send it right out? If so, try */ if (TOR_SIMPLEQ_EMPTY(&chan->outgoing_queue) && - chan->state == CHANNEL_STATE_OPEN) { + CHANNEL_IS_OPEN(chan)) { /* Pick the right write function for this cell type and save the result */ switch (q->type) { case CELL_QUEUE_FIXED: @@ -1738,7 +1709,7 @@ channel_write_cell_queue_entry(channel_t *chan, cell_queue_entry_t *q) tmp = cell_queue_entry_dup(q); TOR_SIMPLEQ_INSERT_TAIL(&chan->outgoing_queue, tmp, next); /* Try to process the queue? */ - if (chan->state == CHANNEL_STATE_OPEN) channel_flush_cells(chan); + if (CHANNEL_IS_OPEN(chan)) channel_flush_cells(chan); } } @@ -1759,7 +1730,7 @@ channel_write_cell(channel_t *chan, cell_t *cell) tor_assert(chan); tor_assert(cell); - if (chan->state == CHANNEL_STATE_CLOSING) { + if (CHANNEL_IS_CLOSING(chan)) { log_debug(LD_CHANNEL, "Discarding cell_t %p on closing channel %p with " "global ID "U64_FORMAT, cell, chan, U64_PRINTF_ARG(chan->global_identifier)); @@ -1793,7 +1764,7 @@ channel_write_packed_cell(channel_t *chan, packed_cell_t *packed_cell) tor_assert(chan); tor_assert(packed_cell); - if (chan->state == CHANNEL_STATE_CLOSING) { + if (CHANNEL_IS_CLOSING(chan)) { log_debug(LD_CHANNEL, "Discarding packed_cell_t %p on closing channel %p " "with global ID "U64_FORMAT, packed_cell, chan, U64_PRINTF_ARG(chan->global_identifier)); @@ -1829,7 +1800,7 @@ channel_write_var_cell(channel_t *chan, var_cell_t *var_cell) tor_assert(chan); tor_assert(var_cell); - if (chan->state == CHANNEL_STATE_CLOSING) { + if (CHANNEL_IS_CLOSING(chan)) { log_debug(LD_CHANNEL, "Discarding var_cell_t %p on closing channel %p " "with global ID "U64_FORMAT, var_cell, chan, U64_PRINTF_ARG(chan->global_identifier)); @@ -2069,7 +2040,7 @@ channel_flush_some_cells(channel_t *chan, ssize_t num_cells) if (!unlimited && num_cells <= flushed) goto done; /* If we aren't in CHANNEL_STATE_OPEN, nothing goes through */ - if (chan->state == CHANNEL_STATE_OPEN) { + if (CHANNEL_IS_OPEN(chan)) { /* Try to flush as much as we can that's already queued */ flushed += channel_flush_some_cells_from_outgoing_queue(chan, (unlimited ? -1 : num_cells - flushed)); @@ -2127,7 +2098,7 @@ channel_flush_some_cells_from_outgoing_queue(channel_t *chan, if (!unlimited && num_cells <= flushed) return 0; /* If we aren't in CHANNEL_STATE_OPEN, nothing goes through */ - if (chan->state == CHANNEL_STATE_OPEN) { + if (CHANNEL_IS_OPEN(chan)) { while ((unlimited || num_cells > flushed) && NULL != (q = TOR_SIMPLEQ_FIRST(&chan->outgoing_queue))) { @@ -2462,9 +2433,8 @@ channel_process_cells(channel_t *chan) { cell_queue_entry_t *q; tor_assert(chan); - tor_assert(chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_MAINT || - chan->state == CHANNEL_STATE_OPEN); + tor_assert(CHANNEL_IS_CLOSING(chan) || CHANNEL_IS_MAINT(chan) || + CHANNEL_IS_OPEN(chan)); log_debug(LD_CHANNEL, "Processing as many incoming cells as we can for channel %p", @@ -2531,7 +2501,7 @@ channel_queue_cell(channel_t *chan, cell_t *cell) tor_assert(chan); tor_assert(cell); - tor_assert(chan->state == CHANNEL_STATE_OPEN); + tor_assert(CHANNEL_IS_OPEN(chan)); /* Do we need to queue it, or can we just call the handler right away? */ if (!(chan->cell_handler)) need_to_queue = 1; @@ -2584,7 +2554,7 @@ channel_queue_var_cell(channel_t *chan, var_cell_t *var_cell) tor_assert(chan); tor_assert(var_cell); - tor_assert(chan->state == CHANNEL_STATE_OPEN); + tor_assert(CHANNEL_IS_OPEN(chan)); /* Do we need to queue it, or can we just call the handler right away? */ if (!(chan->var_cell_handler)) need_to_queue = 1; @@ -2692,10 +2662,7 @@ channel_send_destroy(circid_t circ_id, channel_t *chan, int reason) } /* Check to make sure we can send on this channel first */ - if (!(chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR) && - chan->cmux) { + if (!CHANNEL_CONDEMNED(chan) && chan->cmux) { channel_note_destroy_pending(chan, circ_id); circuitmux_append_destroy_cell(chan, chan->cmux, circ_id, reason); log_debug(LD_OR, @@ -2872,9 +2839,7 @@ channel_free_list(smartlist_t *channels, int mark_for_close) } channel_unregister(curr); if (mark_for_close) { - if (!(curr->state == CHANNEL_STATE_CLOSING || - curr->state == CHANNEL_STATE_CLOSED || - curr->state == CHANNEL_STATE_ERROR)) { + if (!CHANNEL_CONDEMNED(curr)) { channel_mark_for_close(curr); } channel_force_free(curr); @@ -3088,9 +3053,7 @@ channel_get_for_extend(const char *digest, tor_assert(tor_memeq(chan->identity_digest, digest, DIGEST_LEN)); - if (chan->state == CHANNEL_STATE_CLOSING || - chan->state == CHANNEL_STATE_CLOSED || - chan->state == CHANNEL_STATE_ERROR) + if (CHANNEL_CONDEMNED(chan)) continue; /* Never return a channel on which the other end appears to be @@ -3100,7 +3063,7 @@ channel_get_for_extend(const char *digest, } /* Never return a non-open connection. */ - if (chan->state != CHANNEL_STATE_OPEN) { + if (!CHANNEL_IS_OPEN(chan)) { /* If the address matches, don't launch a new connection for this * circuit. */ if (channel_matches_target_addr_for_extend(chan, target_addr))

1 0

[tor/master] Using channel state lookup macros in channeltls.c
by nickm＠torproject.org 21 Dec '14

21 Dec '14

commit 668edc51323e507be88b50fb8a49f20bef779bc8 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 23 21:02:00 2014 +0200 Using channel state lookup macros in channeltls.c --- src/or/channeltls.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index db044ae..987dd9b 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -855,10 +855,10 @@ channel_tls_handle_state_change_on_orconn(channel_tls_t *chan, /* Make sure the base connection state makes sense - shouldn't be error, * closed or listening. */ - tor_assert(base_chan->state == CHANNEL_STATE_OPENING || - base_chan->state == CHANNEL_STATE_OPEN || - base_chan->state == CHANNEL_STATE_MAINT || - base_chan->state == CHANNEL_STATE_CLOSING); + tor_assert(CHANNEL_IS_OPENING(base_chan) || + CHANNEL_IS_OPEN(base_chan) || + CHANNEL_IS_MAINT(base_chan) || + CHANNEL_IS_CLOSING(base_chan)); /* Did we just go to state open? */ if (state == OR_CONN_STATE_OPEN) { @@ -872,7 +872,7 @@ channel_tls_handle_state_change_on_orconn(channel_tls_t *chan, * Not open, so from CHANNEL_STATE_OPEN we go to CHANNEL_STATE_MAINT, * otherwise no change. */ - if (base_chan->state == CHANNEL_STATE_OPEN) { + if (CHANNEL_IS_OPEN(base_chan)) { channel_change_state(base_chan, CHANNEL_STATE_MAINT); } }

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2014