July 2011 - tor-commits - lists.torproject.org

[arm/master] Changelog update for the 1.4.3 release
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit dc4ce6205b49593d2f6602cf776022485d10c19a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 16 23:00:22 2011 -0700 Changelog update for the 1.4.3 release --- ChangeLog | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c9ecde..8b1b776 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,58 @@ CHANGE LOG +7/16/11 - version 1.4.3 +This completes the codebase refactoring project that's been a year in the works and provides numerous performance and usability improvements. Most notably this includes a setup wizard for new relays, menuing interface, gui prototype, substantial performance improvements, and support for Mac OSX. + + * added: relay setup wizard for autogenerating a torrc configuration + * added: menu interface with all of arm's functionality (thanks to help from krkhan) + * added: option for reconnecting to tor if it's been shut down and restarted + * added: fetching the download and upload bandwidth totals from Tor if it's available + * added: option for requesting a new identity + * added: file descriptor usage in the header panel when running low + * added: logging a notice when file descriptor usage is high + * added: making interface components optionally excludeable + * added: reintroduced the descriptor popup for the new connection panel + * added: moved arm's codebase to git, with helper scripts to replace svn:externals and export + * added: option for overriding all displayed color + * change: renaming our process from "python src/starter.py <args>" to "arm <args>" (thanks to help from ioerror) + * change: hiding connection init latency, dropping arm's startup time from 0.84 seconds to 0.14 (83% improvement) + * change: using blank space to display the nickname for circuit connections + * change: dropping the file descriptor popup (it was both unused and inaccurate) + * change: dropping deprecated connection panel from the codebase + * change: using SAVECONF rather than writing directly when able + * change: closing all message prompts when a key is pressed + * change: using a more intuitive mode toggling for resizing the graph + * change: added summaries for new tor config options + * fix: avoiding mass memory allocation in torctl, lowering arm's perceived base memory footprint by 2.5 MB (12%) (https://trac.torproject.org/projects/tor/ticket/3406) + * fix: fixing shutdown concurrency in torctl, lowering arm's shutdown time from a second to being almost instantaneous (https://trac.torproject.org/projects/tor/ticket/2412) + * fix: sighups that caused tor to crash would also crash torctl and arm (https://trac.torproject.org/projects/tor/ticket/1329) + * fix: crash when connecting to tor's socks port rather than control port (https://trac.torproject.org/projects/tor/ticket/2580) + * fix: shutting down torctl zombie connections to the control port (https://trac.torproject.org/projects/tor/ticket/2812) + * fix: moving connection component negotiation into torctl (https://trac.torproject.org/projects/tor/ticket/3409) + * fix: all pid resolution was failing on macs, causing much of arm's functionality to fail + * fix: dropping straight to lsof on macs to avoid fallback process, which was both lengthy and raised warnings + * fix: misparsing circuit paths for Tor < 0.2.2.1 (caught by asn) + * fix: pressing enter on an empty connection page caused crash (caught by asn, https://trac.torproject.org/projects/tor/ticket/3128) + * fix: edited config entries weren't displaying their new value + * fix: ns/desc lookup failures could crash descriptor popup (caught by asn) + * fix: autogenerated Nickname field caused a torrc validation false positive + * fix: crashing issue when querying locales with an unavailable geoip file + * fix: misparsing config option types for some older tor versions + * fix: stacktrace from unjoined thread at shutdown + * fix: intermediate graphing bounds were either inaccurate or missing + * fix: man page typo (caught by tagnaq) + * fix: --debug flag broke if config-text unavailable (caught by trogdor) + * fix: man page had author's hard coded home rather than ~ (caught by kuhkatz) + * fix: dropping remaining addfstr usage from the codebase + * fix: indicating when tor's shut down in client mode + * fix: miscropping strings that broke on their first word, causing alignment issues in the config panel + * fix: cropping whitespace-only strings could crash + * fix: display was cropped by an extra cell + * fix: utilizing extra horizontal space for the configuration value field if wide + * fix: providing a more descriptive controller password prompt (suggestion by weasel) + * fix: fallback configuration descriptions weren't being installed (caught by ioerror) + * fix: daemons weren't being shut down on keyboard interrupt, causing occasional stacktrace + 4/4/11 - version 1.4.2 (r24555) This release chiefly consists of a fully reimplemented connection panel. Besides being a sane, maintainable implementation this includes numerous new features and improvements like full circuit paths, applications involved for local connections, and better type identification.

1 0

[arm/master] fix: couple issues spotted by pylint
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 7bd1d2af1d27ce91f179b63a6fcf0f95090b19b8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 16 21:55:15 2011 -0700 fix: couple issues spotted by pylint --- src/util/__init__.py | 2 +- src/util/panel.py | 1 - src/util/torConfig.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/util/__init__.py b/src/util/__init__.py index 365e82a..cd5d721 100644 --- a/src/util/__init__.py +++ b/src/util/__init__.py @@ -4,5 +4,5 @@ application's status, making cross platform system calls, parsing tor data, and safely working with curses (hiding some of the gory details). """ -__all__ = ["conf", "connections", "enum", "hostnames", "log", "panel", "procTools", "procName", "sysTools", "torConfig", "torTools", "uiTools"] +__all__ = ["conf", "connections", "enum", "gtkTools", "hostnames", "log", "panel", "procTools", "procName", "sysTools", "torConfig", "torTools", "uiTools"] diff --git a/src/util/panel.py b/src/util/panel.py index 5a96623..bb47726 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -4,7 +4,6 @@ Wrapper for safely working with curses subwindows. import copy import time -import traceback import curses import curses.ascii import curses.textpad diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 2eca571..e4570ca 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -146,7 +146,7 @@ def loadOptionDescriptions(loadPath = None, checkVersion = True): category = inputFileContents.pop(0).rstrip() if not category in Category.values(): baseMsg = "invalid category in input file: '%s'" - raise IOError(baseMsg % categoryStr) + raise IOError(baseMsg % category) # gets the position in the man page indexArg, indexStr = -1, inputFileContents.pop(0).rstrip()

1 0

[arm/master] fix: including gui resources with arm install
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit de8695a17bb96fd7a461c2b49fa5f064c004f9e2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 16 22:29:46 2011 -0700 fix: including gui resources with arm install --- install | 2 +- setup.py | 3 ++- src/gui/__init__.py | 2 +- src/gui/controller.py | 13 ++++++++++--- src/prereq.py | 6 ++++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/install b/install index fead85c..605f724 100755 --- a/install +++ b/install @@ -1,5 +1,5 @@ #!/bin/sh -python src/prereq.py +python src/prereq.py --both if [ $? = 0 ]; then python setup.py -q install diff --git a/setup.py b/setup.py index 6e31f44..4513dee 100644 --- a/setup.py +++ b/setup.py @@ -93,7 +93,7 @@ if "install" in sys.argv: # When installing we include a bundled copy of TorCtl. However, when creating # a deb we have a dependency on the python-torctl package instead: # http://packages.debian.org/unstable/main/python-torctl -installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.util'] +installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.gui', 'arm.gui.connections', 'arm.gui.graphing', 'arm.util', 'arm.cagraph', 'arm.cagraph.axis', 'arm.cagraph.series'] if not isDebInstall: installPackages.append('arm.TorCtl') setup(name='arm', @@ -108,6 +108,7 @@ setup(name='arm', data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]), (docPath, ["armrc.sample"]), + ("/usr/share/arm/gui", ["src/gui/arm.xml"]), ("/usr/share/arm", ["src/settings.cfg", "src/uninstall"])] + getResources("/usr/share/arm", "resources"), ) diff --git a/src/gui/__init__.py b/src/gui/__init__.py index b700273..f274d81 100644 --- a/src/gui/__init__.py +++ b/src/gui/__init__.py @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["controller", "logPanel"] +__all__ = ["controller", "generalPanel", "logPanel"] diff --git a/src/gui/controller.py b/src/gui/controller.py index 5736def..4979ea1 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -13,10 +13,17 @@ gobject.threads_init() class GuiController: def __init__(self): - filename = 'src/gui/arm.xml' - self.builder = gtk.Builder() - self.builder.add_from_file(filename) + + try: + self.builder.add_from_file('src/gui/arm.xml') + except: + # when installed the above path doesn't work (the 'src' prefix doesn't + # exist and whichever path it's working off of doens't seem to exist), + # so using absolute path instead + + self.builder.add_from_file('/usr/share/arm/gui/arm.xml') + self.builder.connect_signals(self) self.logPanel = logPanel.LogPanel(self.builder) diff --git a/src/prereq.py b/src/prereq.py index eee9fdb..8641057 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -232,6 +232,8 @@ def guiPrereq(): if __name__ == '__main__': isGui = "-g" in sys.argv or "--gui" in sys.argv - if isGui: guiPrereq() - else: cliPrereq() + isBoth = "--both" in sys.argv + + if isGui or isBoth: guiPrereq() + if not isGui or isBoth: cliPrereq()

1 0

r24910: {website} Update Debian versions and Ubuntu warning Based on feedback (website/trunk/docs/en)
by Sebastian Hahn 16 Jul '11

16 Jul '11

Author: sebastian Date: 2011-07-16 22:34:16 +0000 (Sat, 16 Jul 2011) New Revision: 24910 Modified: website/trunk/docs/en/debian.wml Log: Update Debian versions and Ubuntu warning Based on feedback by rww from #tor. Thanks! Modified: website/trunk/docs/en/debian.wml =================================================================== --- website/trunk/docs/en/debian.wml 2011-07-15 17:24:09 UTC (rev 24909) +++ website/trunk/docs/en/debian.wml 2011-07-16 22:34:16 UTC (rev 24910) @@ -11,12 +11,12 @@ </div> <div id="maincol"> <a id="debian"></a> -<h2><a class="anchor" href="#debian">Option one: Tor on Debian lenny, +<h2><a class="anchor" href="#debian">Option one: Tor on Debian squeeze, lenny, Debian sid, or Debian testing</a></h2> <br /> <p> -If you're using Debian just run<br /> +If you're using Debian, just run<br /> <tt>apt-get install tor tor-geoipdb</tt> as root. </p> @@ -42,9 +42,9 @@ <br /> <p> -<b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained -and out of date. That means you'll be missing stability and security -fixes. +<b>Do not use the packages in Ubuntu's universe.</b> In the past they have +not reliably been updated. That means you could be missing stability +and security fixes. </p> <p>

1 0

[tor/master] Better messages when we're stalled because of microdescriptors
by nickm＠torproject.org 15 Jul '11

15 Jul '11

commit 975150a13ec3500b233e2d60d547bca7b89d895d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 15 19:38:27 2011 -0400 Better messages when we're stalled because of microdescriptors It's a little confusing for me to say "only X/Y descriptors" when I have microdescriptors enabled. So, let's fix that. --- src/or/routerlist.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2fff4c9..8b09813 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4967,6 +4967,7 @@ update_router_have_minimum_dir_info(void) const or_options_t *options = get_options(); const networkstatus_t *consensus = networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); + int using_md; if (!consensus) { if (!networkstatus_get_latest_consensus()) @@ -4987,19 +4988,22 @@ update_router_have_minimum_dir_info(void) goto done; } + using_md = consensus->flavor == FLAV_MICRODESC; + count_usable_descriptors(&num_present, &num_usable, consensus, options, now, NULL); if (num_present < num_usable/4) { tor_snprintf(dir_info_status, sizeof(dir_info_status), - "We have only %d/%d usable descriptors.", num_present, num_usable); + "We have only %d/%d usable %sdescriptors.", + num_present, num_usable, using_md ? "micro" : ""); res = 0; control_event_bootstrap(BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS, 0); goto done; } else if (num_present < 2) { tor_snprintf(dir_info_status, sizeof(dir_info_status), - "Only %d descriptor%s here and believed reachable!", - num_present, num_present ? "" : "s"); + "Only %d %sdescriptor%s here and believed reachable!", + num_present, using_md ? "micro" : "", num_present ? "" : "s"); res = 0; goto done; } @@ -5011,8 +5015,8 @@ update_router_have_minimum_dir_info(void) if (!num_usable || !num_present) { tor_snprintf(dir_info_status, sizeof(dir_info_status), - "We have only %d/%d usable entry node descriptors.", - num_present, num_usable); + "We have only %d/%d usable entry node %sdescriptors.", + num_present, num_usable, using_md?"micro":""); res = 0; goto done; }

1 0

[tor/master] Fix bug in upload/download of hsdesc with microdescs
by nickm＠torproject.org 15 Jul '11

15 Jul '11

commit b8943461c0d26074522f905eba862bd9caab591b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 15 18:53:29 2011 -0400 Fix bug in upload/download of hsdesc with microdescs Previously we were using router_get_by_id(foo) to test "do we have a descriptor that will let us make an anonymous circuit to foo". But that isn't right for microdescs: we should have been using node_t. Fixes bug 3601; bugfix on 0.2.3.1-alpha. --- changes/bug3601 | 4 ++++ src/or/rendclient.c | 9 +++++---- src/or/rendservice.c | 4 +++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/changes/bug3601 b/changes/bug3601 new file mode 100644 index 0000000..36686a4 --- /dev/null +++ b/changes/bug3601 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Using microdescriptors no longer prevents Tor from uploading and + downloading hidden service descriptors. Fixes bug 3601; bugfix + on 0.2.3.1-alpha. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 5164559..413d9b7 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -510,10 +510,11 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query) directory_clean_last_hid_serv_requests(now); SMARTLIST_FOREACH(responsible_dirs, routerstatus_t *, dir, { - if (lookup_last_hid_serv_request(dir, desc_id_base32, 0, 0) + - REND_HID_SERV_DIR_REQUERY_PERIOD >= now || - !router_get_by_id_digest(dir->identity_digest)) - SMARTLIST_DEL_CURRENT(responsible_dirs, dir); + time_t last = lookup_last_hid_serv_request(dir, desc_id_base32, 0, 0); + const node_t *node = node_get_by_id(dir->identity_digest); + if (last + REND_HID_SERV_DIR_REQUERY_PERIOD >= now || + !node || !node_has_descriptor(node)) + SMARTLIST_DEL_CURRENT(responsible_dirs, dir); }); hs_dir = smartlist_choose(responsible_dirs); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 47a9fc7..5888e39 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1632,12 +1632,14 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc, for (j = 0; j < smartlist_len(responsible_dirs); j++) { char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1]; char *hs_dir_ip; + const node_t *node; hs_dir = smartlist_get(responsible_dirs, j); if (smartlist_digest_isin(renddesc->successful_uploads, hs_dir->identity_digest)) /* Don't upload descriptor if we succeeded in doing so last time. */ continue; - if (!router_get_by_id_digest(hs_dir->identity_digest)) { + node = node_get_by_id(hs_dir->identity_digest); + if (!node || !node_has_descriptor(node)) { log_info(LD_REND, "Not sending publish request for v2 descriptor to " "hidden service directory %s; we don't have its " "router descriptor. Queuing for later upload.",

1 0

[tor/master] Remove compare_addr_to_addr_policy
by nickm＠torproject.org 15 Jul '11

15 Jul '11

commit 3380dc9cc0a8cdaae0dbd3e8b7c11e4ccdab504d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 15 12:31:09 2011 -0400 Remove compare_addr_to_addr_policy Nothing used it but the unit tests; everything else knows to use compare_tor_addr_to_addr_policy instead. --- src/or/policies.c | 12 ------------ src/or/policies.h | 2 -- src/test/test.c | 9 ++++++--- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index f80808d..5bd13b5 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -570,18 +570,6 @@ addr_policy_get_canonical_entry(addr_policy_t *e) return found->policy; } -/** As compare_tor_addr_to_addr_policy, but instead of a tor_addr_t, takes - * in host order. */ -addr_policy_result_t -compare_addr_to_addr_policy(uint32_t addr, uint16_t port, - const smartlist_t *policy) -{ - /*XXXX deprecate this function when possible. */ - tor_addr_t a; - tor_addr_from_ipv4h(&a, addr); - return compare_tor_addr_to_addr_policy(&a, port, policy); -} - /** Helper for compare_tor_addr_to_addr_policy. Implements the case where * addr and port are both known. */ static addr_policy_result_t diff --git a/src/or/policies.h b/src/or/policies.h index 6f3624a..9859b00 100644 --- a/src/or/policies.h +++ b/src/or/policies.h @@ -37,8 +37,6 @@ addr_policy_t *addr_policy_get_canonical_entry(addr_policy_t *ent); int cmp_addr_policies(smartlist_t *a, smartlist_t *b); addr_policy_result_t compare_tor_addr_to_addr_policy(const tor_addr_t *addr, uint16_t port, const smartlist_t *policy); -addr_policy_result_t compare_addr_to_addr_policy(uint32_t addr, - uint16_t port, const smartlist_t *policy); addr_policy_result_t compare_addr_to_node_policy(uint32_t addr, uint16_t port, const node_t *node); diff --git a/src/test/test.c b/src/test/test.c index 74ada0e..05f5922 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -998,12 +998,15 @@ test_policies(void) smartlist_add(policy, p); + tor_addr_from_ipv4h(&tar, 0x01020304u); test_assert(ADDR_POLICY_ACCEPTED == - compare_addr_to_addr_policy(0x01020304u, 2, policy)); + compare_tor_addr_to_addr_policy(&tar, 2, policy)); + tor_addr_make_unspec(&tar); test_assert(ADDR_POLICY_PROBABLY_ACCEPTED == - compare_addr_to_addr_policy(0, 2, policy)); + compare_tor_addr_to_addr_policy(&tar, 2, policy)); + tor_addr_from_ipv4h(&tar, 0xc0a80102); test_assert(ADDR_POLICY_REJECTED == - compare_addr_to_addr_policy(0xc0a80102, 2, policy)); + compare_tor_addr_to_addr_policy(&tar, 2, policy)); test_assert(0 == policies_parse_exit_policy(NULL, &policy2, 1, NULL, 1)); test_assert(policy2);

1 0

[tor/master] Treat null address as "unknown", not "rejected" in md policy
by nickm＠torproject.org 15 Jul '11

15 Jul '11

commit f40df02f3e26df792b7e364d1b6ea5dab167405c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 15 12:44:51 2011 -0400 Treat null address as "unknown", not "rejected" in md policy Previously, we had an issue where we'd treat an unknown address as 0, which turned into "0.0.0.0", which looked like a rejected address. This meant in practice that as soon as we started doing comparisons of unknown uint32 addresses to short policies, we'd get 'rejected' right away. Because of the circumstances under which this would be called, it would only happen when we had local DNS cached entries and we were looking to launch new circuits. --- changes/shortpolicy_compare | 4 ++++ src/or/policies.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/shortpolicy_compare b/changes/shortpolicy_compare new file mode 100644 index 0000000..3de0948 --- /dev/null +++ b/changes/shortpolicy_compare @@ -0,0 +1,4 @@ + o Major bugfixes: + - Fix a bug where comparing an unknown address to a microdescriptor's + shortened exit policy would always seem to give a "rejected" result. + Bugfix on 0.2.3.1-alpha. Fixes bug 3599. diff --git a/src/or/policies.c b/src/or/policies.c index 5bd13b5..93cae76 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1415,8 +1415,10 @@ compare_tor_addr_to_short_policy(const tor_addr_t *addr, uint16_t port, tor_assert(port != 0); + if (addr && tor_addr_is_null(addr)) + addr = NULL; /* Unspec means 'no address at all,' in this context. */ + if (addr && (tor_addr_is_internal(addr, 0) || - tor_addr_is_null(addr) || tor_addr_is_loopback(addr))) return ADDR_POLICY_REJECTED;

1 0

[tor/master] Fix a compile warning on OS X 10.6
by nickm＠torproject.org 15 Jul '11

15 Jul '11

commit 2d0b56a5050380f541a9ddd3143dd95300c3f065 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Jul 15 23:12:43 2011 +0200 Fix a compile warning on OS X 10.6 --- src/or/connection_or.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 2871f1f..e66d36a 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -262,7 +262,8 @@ connection_or_report_broken_states(int severity, int domain) items = smartlist_create(); STRMAP_FOREACH(broken_connection_counts, state, void *, countptr) { broken_state_count_t *c = tor_malloc(sizeof(broken_state_count_t)); - total += c->count = (intptr_t)countptr; + c->count = (intptr_t)countptr; + total += (int)c->count; c->state = state; smartlist_add(items, c); } STRMAP_FOREACH_END;

1 0

[tor/master] Remove compare_addr_to_node_policy
by nickm＠torproject.org 15 Jul '11

15 Jul '11

commit 6aef89bda4800384eddf79e42d965c2b011acdb4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 15 12:58:13 2011 -0400 Remove compare_addr_to_node_policy Instead, use compare_tor_addr_to_node_policy everywhere. One advantage of this is that compare_tor_addr_to_node_policy can better distinguish 0.0.0.0 from "unknown", which caused a nasty bug with microdesc users. --- src/or/circuitbuild.c | 2 +- src/or/circuituse.c | 12 +++++++----- src/or/connection_edge.c | 10 ++++++---- src/or/policies.c | 13 +------------ src/or/policies.h | 2 -- src/or/routerlist.c | 4 ++-- src/or/routerlist.h | 2 +- 7 files changed, 18 insertions(+), 27 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 4397aa5..f7d5524 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2634,7 +2634,7 @@ node_handles_some_port(const node_t *node, smartlist_t *needed_ports) port = *(uint16_t *)smartlist_get(needed_ports, i); tor_assert(port); if (node) - r = compare_addr_to_node_policy(0, port, node); + r = compare_tor_addr_to_node_policy(NULL, port, node); else continue; if (r != ADDR_POLICY_REJECTED && r != ADDR_POLICY_PROBABLY_REJECTED) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 67677ef..460c41f 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -509,7 +509,7 @@ circuit_stream_is_being_handled(edge_connection_t *conn, ok = connection_ap_can_use_exit(conn, exitnode); } else { addr_policy_result_t r; - r = compare_addr_to_node_policy(0, port, exitnode); + r = compare_tor_addr_to_node_policy(NULL, port, exitnode); ok = r != ADDR_POLICY_REJECTED && r != ADDR_POLICY_PROBABLY_REJECTED; } if (ok) { @@ -1262,10 +1262,12 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn, if (check_exit_policy) { if (!conn->chosen_exit_name) { struct in_addr in; - uint32_t addr = 0; - if (tor_inet_aton(conn->socks_request->address, &in)) - addr = ntohl(in.s_addr); - if (router_exit_policy_all_nodes_reject(addr, + tor_addr_t addr, *addrp=NULL; + if (tor_inet_aton(conn->socks_request->address, &in)) { + tor_addr_from_in(&addr, &in); + addrp = &addr; + } + if (router_exit_policy_all_nodes_reject(addrp, conn->socks_request->port, need_uptime)) { log_notice(LD_APP, diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index a4a77af..867bd7a 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3193,11 +3193,13 @@ connection_ap_can_use_exit(edge_connection_t *conn, const node_t *exit) if (conn->socks_request->command == SOCKS_COMMAND_CONNECT && !conn->use_begindir) { struct in_addr in; - uint32_t addr = 0; + tor_addr_t addr, *addrp = NULL; addr_policy_result_t r; - if (tor_inet_aton(conn->socks_request->address, &in)) - addr = ntohl(in.s_addr); - r = compare_addr_to_node_policy(addr, conn->socks_request->port, exit); + if (tor_inet_aton(conn->socks_request->address, &in)) { + tor_addr_from_in(&addr, &in); + addrp = &addr; + } + r = compare_tor_addr_to_node_policy(addrp, conn->socks_request->port, exit); if (r == ADDR_POLICY_REJECTED) return 0; /* We know the address, and the exit policy rejects it. */ if (r == ADDR_POLICY_PROBABLY_REJECTED && !conn->chosen_exit_name) diff --git a/src/or/policies.c b/src/or/policies.c index 93cae76..40e5277 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -689,7 +689,7 @@ compare_tor_addr_to_addr_policy(const tor_addr_t *addr, uint16_t port, if (!policy) { /* no policy? accept all. */ return ADDR_POLICY_ACCEPTED; - } else if (tor_addr_is_null(addr)) { + } else if (addr == NULL || tor_addr_is_null(addr)) { tor_assert(port != 0); return compare_unknown_tor_addr_to_addr_policy(port, policy); } else if (port == 0) { @@ -1461,17 +1461,6 @@ short_policy_is_reject_star(const short_policy_t *policy) * <b>node</b>. See compare_tor_addr_to_addr_policy for details on addr/port * interpretation. */ addr_policy_result_t -compare_addr_to_node_policy(uint32_t addr, uint16_t port, const node_t *node) -{ - tor_addr_t a; - tor_addr_from_ipv4h(&a, addr); - return compare_tor_addr_to_node_policy(&a, port, node); -} - -/** Decides whether addr:port is probably or definitely accepted or rejcted by - * <b>node</b>. See compare_tor_addr_to_addr_policy for details on addr/port - * interpretation. */ -addr_policy_result_t compare_tor_addr_to_node_policy(const tor_addr_t *addr, uint16_t port, const node_t *node) { diff --git a/src/or/policies.h b/src/or/policies.h index 9859b00..51716ab 100644 --- a/src/or/policies.h +++ b/src/or/policies.h @@ -38,8 +38,6 @@ int cmp_addr_policies(smartlist_t *a, smartlist_t *b); addr_policy_result_t compare_tor_addr_to_addr_policy(const tor_addr_t *addr, uint16_t port, const smartlist_t *policy); -addr_policy_result_t compare_addr_to_node_policy(uint32_t addr, - uint16_t port, const node_t *node); addr_policy_result_t compare_tor_addr_to_node_policy(const tor_addr_t *addr, uint16_t port, const node_t *node); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index c0a233c..2fff4c9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4028,7 +4028,7 @@ routerlist_retry_directory_downloads(time_t now) /** Return 1 if all running sufficiently-stable routers we can use will reject * addr:port, return 0 if any might accept it. */ int -router_exit_policy_all_nodes_reject(uint32_t addr, uint16_t port, +router_exit_policy_all_nodes_reject(const tor_addr_t *addr, uint16_t port, int need_uptime) { /* XXXX MOVE */ addr_policy_result_t r; @@ -4037,7 +4037,7 @@ router_exit_policy_all_nodes_reject(uint32_t addr, uint16_t port, if (node->is_running && !node_is_unreliable(node, need_uptime, 0, 0)) { - r = compare_addr_to_node_policy(addr, port, node); + r = compare_tor_addr_to_node_policy(addr, port, node); if (r != ADDR_POLICY_REJECTED && r != ADDR_POLICY_PROBABLY_REJECTED) return 0; /* this one could be ok. good enough. */ diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 1129046..cae8814 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -129,7 +129,7 @@ void router_load_extrainfo_from_string(const char *s, const char *eos, int descriptor_digests); void routerlist_retry_directory_downloads(time_t now); -int router_exit_policy_all_nodes_reject(uint32_t addr, uint16_t port, +int router_exit_policy_all_nodes_reject(const tor_addr_t *addr, uint16_t port, int need_uptime); int router_exit_policy_rejects_all(const routerinfo_t *router);

1 0