December 2013 - tor-commits - lists.torproject.org

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 23 Dec '13

23 Dec '13

commit 4fe31c8fb339d440ed32359f861f4c54169661fc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 23 03:15:44 2013 +0000 Update translations for vidalia_installer --- pt_BR/vidalia_pt_BR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR/vidalia_pt_BR.po b/pt_BR/vidalia_pt_BR.po index 1ad0dcf..c2fd350 100755 --- a/pt_BR/vidalia_pt_BR.po +++ b/pt_BR/vidalia_pt_BR.po @@ -1,14 +1,14 @@ # # Translators: -# m4lqu1570 <>, 2012 +# Snake Plissken <>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" +"PO-Revision-Date: 2013-12-23 03:10+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: translations(a)vidalia-project.net\n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[tor/master] and forward-port those lines too
by arma＠torproject.org 23 Dec '13

23 Dec '13

commit 107b347eb3b8e53fdf04cfe84a243bc5c9e5f8b0 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Dec 22 18:37:49 2013 -0500 and forward-port those lines too --- ChangeLog | 2 ++ ReleaseNotes | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index a758835..0863b61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,8 @@ Changes in version 0.2.4.20 - 2013-12-22 sources. Fixes bug 10402; works around behavior introduced in OpenSSL 1.0.0. Diagnosis and investigation thanks to "coderman" and "rl1987". + - Fix assertion failure when AutomapHostsOnResolve yields an IPv6 + address. Fixes bug 10465; bugfix on 0.2.4.7-alpha. - Avoid launching spurious extra circuits when a stream is pending. This fixes a bug where any circuit that _wasn't_ unusable for new streams would be treated as if it were, causing extra circuits to diff --git a/ReleaseNotes b/ReleaseNotes index ad9121b..54195f8 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -24,6 +24,8 @@ Changes in version 0.2.4.20 - 2013-12-22 sources. Fixes bug 10402; works around behavior introduced in OpenSSL 1.0.0. Diagnosis and investigation thanks to "coderman" and "rl1987". + - Fix assertion failure when AutomapHostsOnResolve yields an IPv6 + address. Fixes bug 10465; bugfix on 0.2.4.7-alpha. - Avoid launching spurious extra circuits when a stream is pending. This fixes a bug where any circuit that _wasn't_ unusable for new streams would be treated as if it were, causing extra circuits to

1 0

[tor/release-0.2.4] fold in next changes entry
by arma＠torproject.org 23 Dec '13

23 Dec '13

commit 3cb5c70beec5bf46b9e70b1fc6287a1c1c7847ee Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Dec 22 18:34:37 2013 -0500 fold in next changes entry --- ChangeLog | 2 ++ ReleaseNotes | 2 ++ changes/bug10465 | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 066bb9d..595e259 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,8 @@ Changes in version 0.2.4.20 - 2013-12-22 sources. Fixes bug 10402; works around behavior introduced in OpenSSL 1.0.0. Diagnosis and investigation thanks to "coderman" and "rl1987". + - Fix assertion failure when AutomapHostsOnResolve yields an IPv6 + address. Fixes bug 10465; bugfix on 0.2.4.7-alpha. - Avoid launching spurious extra circuits when a stream is pending. This fixes a bug where any circuit that _wasn't_ unusable for new streams would be treated as if it were, causing extra circuits to diff --git a/ReleaseNotes b/ReleaseNotes index ad9121b..54195f8 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -24,6 +24,8 @@ Changes in version 0.2.4.20 - 2013-12-22 sources. Fixes bug 10402; works around behavior introduced in OpenSSL 1.0.0. Diagnosis and investigation thanks to "coderman" and "rl1987". + - Fix assertion failure when AutomapHostsOnResolve yields an IPv6 + address. Fixes bug 10465; bugfix on 0.2.4.7-alpha. - Avoid launching spurious extra circuits when a stream is pending. This fixes a bug where any circuit that _wasn't_ unusable for new streams would be treated as if it were, causing extra circuits to diff --git a/changes/bug10465 b/changes/bug10465 deleted file mode 100644 index 330f969..0000000 --- a/changes/bug10465 +++ /dev/null @@ -1,3 +0,0 @@ - o Major bugfixes: - - Fix assertion failure when AutomapHostsOnResolve yields an IPv6 - address. Fixes bug 10465; bugfix on 0.2.4.7-alpha.

1 0

[tor/release-0.2.4] Merge branch 'bug10465' into maint-0.2.4
by arma＠torproject.org 23 Dec '13

23 Dec '13

commit 59a162f7d2048bc5e6bbc953c2bdc76a0367221b Merge: 2c956f0 b9f6e40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 22 17:20:22 2013 -0500 Merge branch 'bug10465' into maint-0.2.4 changes/bug10465 | 3 +++ src/or/connection_edge.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 8 deletions(-)

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 23 Dec '13

23 Dec '13

commit ce43072831250eb5e0a089bd2cf092c34701eebf Merge: 9f7be02 59a162f Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Dec 22 18:31:50 2013 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug10465 | 3 +++ src/or/connection_edge.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 8 deletions(-)

1 0

[tor/release-0.2.4] Fix automapping to ipv6
by arma＠torproject.org 23 Dec '13

23 Dec '13

commit b9f6e40ecbc9469abeefa7e73d724917d0bbcc24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 22 08:38:36 2013 -0500 Fix automapping to ipv6 Bugfix on 0.2.4.7-alpha; fixes bug 10465. --- changes/bug10465 | 3 +++ src/or/connection_edge.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/changes/bug10465 b/changes/bug10465 new file mode 100644 index 0000000..330f969 --- /dev/null +++ b/changes/bug10465 @@ -0,0 +1,3 @@ + o Major bugfixes: + - Fix assertion failure when AutomapHostsOnResolve yields an IPv6 + address. Fixes bug 10465; bugfix on 0.2.4.7-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index bb7ffb9..3a72110 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -61,6 +61,11 @@ static int connection_ap_process_natd(entry_connection_t *conn); static int connection_exit_connect_dir(edge_connection_t *exitconn); static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port); static int connection_ap_supports_optimistic_data(const entry_connection_t *); +static void connection_ap_handshake_socks_resolved_addr( + entry_connection_t *conn, + const tor_addr_t *answer, + int ttl, + time_t expires); /** An AP stream has failed/finished. If it hasn't already sent back * a socks reply, send one now (based on endreason). Also set @@ -1156,17 +1161,13 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, } if (socks->command == SOCKS_COMMAND_RESOLVE) { - uint32_t answer; - struct in_addr in; + tor_addr_t answer; /* Reply to resolves immediately if we can. */ - if (tor_inet_aton(socks->address, &in)) { /* see if it's an IP already */ - /* leave it in network order */ - answer = in.s_addr; + if (tor_addr_parse(&answer, socks->address) >= 0) {/* is it an IP? */ /* remember _what_ is supposed to have been resolved. */ strlcpy(socks->address, orig_address, sizeof(socks->address)); - connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4, - (uint8_t*)&answer, - -1,map_expires); + connection_ap_handshake_socks_resolved_addr(conn, &answer, -1, + map_expires); connection_mark_unattached_ap(conn, END_STREAM_REASON_DONE | END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); @@ -2059,6 +2060,35 @@ tell_controller_about_resolved_result(entry_connection_t *conn, } } +/** + * As connection_ap_handshake_socks_resolved, but take a tor_addr_t to send + * as the answer. + */ +static void +connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn, + const tor_addr_t *answer, + int ttl, + time_t expires) +{ + if (tor_addr_family(answer) == AF_INET) { + uint32_t a = tor_addr_to_ipv4n(answer); /* network order */ + connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4, + (uint8_t*)&a, + ttl, expires); + } else if (tor_addr_family(answer) == AF_INET6) { + const uint8_t *a = tor_addr_to_in6_addr8(answer); + connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV6,16, + a, + ttl, expires); + } else { + log_warn(LD_BUG, "Got called with address of unexpected family %d", + tor_addr_family(answer)); + connection_ap_handshake_socks_resolved(conn, + RESOLVED_TYPE_ERROR,0,NULL,-1,-1); + } +} + + /** Send an answer to an AP connection that has requested a DNS lookup via * SOCKS. The type should be one of RESOLVED_TYPE_(IPV4|IPV6|HOSTNAME) or -1 * for unreachable; the answer should be in the format specified in the socks

1 0

[arm/master] Removing the get_chroot helper
by atagar＠torproject.org 23 Dec '13

23 Dec '13

commit 19ad43d8c75768d6838642323d4078e5dc32017c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 22 15:12:35 2013 -0800 Removing the get_chroot helper The get_chroot() function normalizes user supplied chroot paths and fetches one if on FreeBSD. We might as well do this in the starter during initialization rather than lazy evaluation. --- arm/graphing/bandwidthStats.py | 4 +++- arm/logPanel.py | 3 ++- arm/starter.py | 31 +++++++++++++++++++----- arm/util/torConfig.py | 3 ++- arm/util/torTools.py | 52 +--------------------------------------- test/starter/authenticate.py | 13 +++++----- 6 files changed, 40 insertions(+), 66 deletions(-) diff --git a/arm/graphing/bandwidthStats.py b/arm/graphing/bandwidthStats.py index e074716..2bf417e 100644 --- a/arm/graphing/bandwidthStats.py +++ b/arm/graphing/bandwidthStats.py @@ -23,6 +23,7 @@ CONFIG = conf.config_dict("arm", { "features.graph.bw.accounting.show": True, "features.graph.bw.accounting.rate": 10, "features.graph.bw.accounting.isTimeLong": False, + "tor.chroot": "", }, conf_handler) DL_COLOR, UL_COLOR = "green", "cyan" @@ -151,7 +152,8 @@ class BandwidthStats(graphPanel.GraphStats): return False # attempt to open the state file - try: stateFile = open("%s%s/state" % (torTools.get_chroot(), dataDir), "r") + try: + stateFile = open("%s%s/state" % (CONFIG['tor.chroot'], dataDir), "r") except IOError: msg = PREPOPULATE_FAILURE_MSG % "unable to read the state file" log.notice(msg) diff --git a/arm/logPanel.py b/arm/logPanel.py index 01b34f4..3b58125 100644 --- a/arm/logPanel.py +++ b/arm/logPanel.py @@ -57,6 +57,7 @@ CONFIG = conf.config_dict("arm", { "features.log.regex": [], "cache.logPanel.size": 1000, "msg.event_types": '', + "tor.chroot": '', }, conf_handler) DUPLICATE_MSG = " [%i duplicate%s hidden]" @@ -209,7 +210,7 @@ def getLogFileEntries(runlevels, readLimit = None, addLimit = None): if not loggingLocation: return [] # includes the prefix for tor paths - loggingLocation = torTools.get_chroot() + loggingLocation + loggingLocation = CONFIG['tor.chroot'] + loggingLocation # if the runlevels argument is a superset of the log file then we can # limit the read contents to the addLimit diff --git a/arm/starter.py b/arm/starter.py index ca2179f..707317c 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -36,6 +36,7 @@ import stem.util.system SETTINGS_PATH = os.path.join(os.path.dirname(__file__), 'settings.cfg') CONFIG = stem.util.conf.config_dict("arm", { + 'tor.chroot': '', 'tor.password': None, 'startup.events': 'N3', 'msg.debug_header': '', @@ -90,15 +91,14 @@ def _authenticate(controller, password): Authenticates to the given Controller. :param stem.control.Controller controller: controller to be authenticated to - :param str args: password to authenticate with, **None** if nothing was provided + :param str password: password to authenticate with, **None** if nothing was + provided :raises: **ValueError** if unable to authenticate """ - chroot = arm.util.torTools.get_chroot() - try: - controller.authenticate(password = password, chroot_path = chroot) + controller.authenticate(password = password, chroot_path = CONFIG['tor.chroot']) except stem.connection.IncorrectSocketType: control_socket = controller.get_socket() @@ -127,7 +127,7 @@ def _setup_debug_logging(args): Configures us to log at stem's trace level to debug log path, and notes some general diagnostic information. - :param namedtuple args: startup arguments + :param namedtuple args: arguments that arm was started with :raises: **IOError** if we can't log to this location """ @@ -229,7 +229,17 @@ def main(): else: stem.util.log.notice(CONFIG['msg.config_not_found'].format(path = args.config)) - config.set("startup.events", args.logged_events) + config.set('startup.events', args.logged_events) + + # check that the chroot exists and strip trailing slashes + + chroot = CONFIG['tor.chroot'].strip().rstrip(os.path.sep) + + if chroot and not os.path.exists(chroot): + stem.util.log.notice("The chroot path set in your config (%s) doesn't exist." % chroot) + config.set('tor.chroot', '') + else: + config.set('tor.chroot', chroot) # use the normalized path # validates and expands log event flags @@ -289,6 +299,15 @@ def main(): except ValueError: stem.util.log.warn(CONFIG['msg.unable_to_determine_pid']) + # If we're running under FreeBSD then check the system for a chroot path. + + if not CONFIG['tor.chroot'] and platform.system() == 'FreeBSD': + jail_chroot = stem.util.system.get_bsd_jail_path(controller.get_pid(0)) + + if jail_chroot and os.path.exists(jail_chroot): + stem.util.log.info("Adjusting paths to account for Tor running in a FreeBSD jail at: %s" % jail_chroot) + config.set('tor.chroot', jail_chroot) + # If using our LANG variable for rendering multi-byte characters lets us # get unicode support then then use it. This needs to be done before # initializing curses. diff --git a/arm/util/torConfig.py b/arm/util/torConfig.py index f6e693c..e08fc40 100644 --- a/arm/util/torConfig.py +++ b/arm/util/torConfig.py @@ -48,6 +48,7 @@ CONFIG = conf.config_dict("arm", { "startup.dataDirectory": "~/.arm", "features.config.descriptions.enabled": True, "features.config.descriptions.persist": True, + "tor.chroot": '', }, conf_handler) def general_conf_handler(config, key): @@ -359,7 +360,7 @@ def getConfigLocation(): conn = torTools.getConn() configLocation = conn.getInfo("config-file", None) - torPid, torPrefix = conn.controller.get_pid(None), torTools.get_chroot() + torPid, torPrefix = conn.controller.get_pid(None), CONFIG['tor.chroot'] if not configLocation: raise IOError("unable to query the torrc location") try: diff --git a/arm/util/torTools.py b/arm/util/torTools.py index 7c0a108..69cd574 100644 --- a/arm/util/torTools.py +++ b/arm/util/torTools.py @@ -5,33 +5,18 @@ accessing stem and notifications of state changes to subscribers. import math import os -import platform import threading import time import stem import stem.control -import stem.descriptor -import stem.util.system -from arm.util import connections - -from stem.util import conf, enum, log, proc, str_tools, system +from stem.util import log, proc, system CONTROLLER = None # singleton Controller instance UNDEFINED = "<Undefined_ >" -CONFIG = conf.config_dict("arm", { - "tor.chroot": "", -}) - -# Logs issues and notices when fetching the path prefix if true. This is -# only done once for the duration of the application to avoid pointless -# messages. - -LOG_ABOUT_CHROOTS = True - def getConn(): """ Singleton constructor for a Controller. Be aware that this starts as being @@ -43,41 +28,6 @@ def getConn(): return CONTROLLER -def get_chroot(): - """ - Provides the path prefix that should be used for fetching tor resources. - If undefined and Tor is inside a jail under FreeBSD then this provides the - jail's path. - - :returns: **str** with the path of the jail tor is running within, this is an - empty string if none can be determined - """ - - global LOG_ABOUT_CHROOTS - - chroot = CONFIG["tor.chroot"].strip() - - if chroot and not os.path.exists(chroot): - if LOG_ABOUT_CHROOTS: - log.notice("The prefix path set in your config (%s) doesn't exist." % chroot) - - chroot = '' - - if not chroot and platform.system() == "FreeBSD": - jail_chroot = system.get_bsd_jail_path(getConn().controller.get_pid(0)) - - if jail_chroot and os.path.exists(jail_chroot): - chroot = jail_chroot - - if LOG_ABOUT_CHROOTS: - log.info("Adjusting paths to account for Tor running in a FreeBSD jail at: %s" % chroot) - - chroot = chroot.rstrip(os.path.sep) # strip off trailing slashes - LOG_ABOUT_CHROOTS = False # don't log about further calls - - return chroot - - class Controller: """ Stem wrapper providing convenience functions (mostly from the days of using diff --git a/test/starter/authenticate.py b/test/starter/authenticate.py index b2f7592..1b228b5 100644 --- a/test/starter/authenticate.py +++ b/test/starter/authenticate.py @@ -10,23 +10,25 @@ from arm.starter import ( import stem import stem.connection import stem.socket +import stem.util.conf class TestAuthenticate(unittest.TestCase): - @patch('arm.util.torTools.get_chroot') - def test_success(self, get_chroot_mock): + def setUp(self): + arm_conf = stem.util.conf.get_config('arm') + arm_conf.set('tor.chroot', '') # no chroot + + def test_success(self): controller = Mock() - get_chroot_mock.return_value = '' # no chroot _authenticate(controller, None) controller.authenticate.assert_called_with(password = None, chroot_path = '') controller.authenticate.reset_mock() - get_chroot_mock.return_value = '/my/chroot' + stem.util.conf.get_config('arm').set('tor.chroot', '/my/chroot') _authenticate(controller, 's3krit!!!') controller.authenticate.assert_called_with(password = 's3krit!!!', chroot_path = '/my/chroot') - @patch('arm.util.torTools.get_chroot', Mock(return_value = '')) @patch('getpass.getpass') def test_success_with_password_prompt(self, getpass_mock): controller = Mock() @@ -46,7 +48,6 @@ class TestAuthenticate(unittest.TestCase): controller.authenticate.assert_any_call(password = None, chroot_path = '') controller.authenticate.assert_any_call(password = 'my_password', chroot_path = '') - @patch('arm.util.torTools.get_chroot', Mock(return_value = '')) def test_failure(self): controller = Mock()

1 0

[tor/master] Merge branch 'bug10465' into maint-0.2.4
by nickm＠torproject.org 23 Dec '13

23 Dec '13

commit 59a162f7d2048bc5e6bbc953c2bdc76a0367221b Merge: 2c956f0 b9f6e40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 22 17:20:22 2013 -0500 Merge branch 'bug10465' into maint-0.2.4 changes/bug10465 | 3 +++ src/or/connection_edge.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 8 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 23 Dec '13

23 Dec '13

commit 6276cca8ce15c442f9eb7a45649b6bb377daefc2 Merge: 1cc3bb3 59a162f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 22 17:26:25 2013 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug10465 | 3 +++ src/or/connection_edge.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 8 deletions(-)

1 0

[tor/master] Fix automapping to ipv6
by nickm＠torproject.org 23 Dec '13

23 Dec '13

commit b9f6e40ecbc9469abeefa7e73d724917d0bbcc24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 22 08:38:36 2013 -0500 Fix automapping to ipv6 Bugfix on 0.2.4.7-alpha; fixes bug 10465. --- changes/bug10465 | 3 +++ src/or/connection_edge.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/changes/bug10465 b/changes/bug10465 new file mode 100644 index 0000000..330f969 --- /dev/null +++ b/changes/bug10465 @@ -0,0 +1,3 @@ + o Major bugfixes: + - Fix assertion failure when AutomapHostsOnResolve yields an IPv6 + address. Fixes bug 10465; bugfix on 0.2.4.7-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index bb7ffb9..3a72110 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -61,6 +61,11 @@ static int connection_ap_process_natd(entry_connection_t *conn); static int connection_exit_connect_dir(edge_connection_t *exitconn); static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port); static int connection_ap_supports_optimistic_data(const entry_connection_t *); +static void connection_ap_handshake_socks_resolved_addr( + entry_connection_t *conn, + const tor_addr_t *answer, + int ttl, + time_t expires); /** An AP stream has failed/finished. If it hasn't already sent back * a socks reply, send one now (based on endreason). Also set @@ -1156,17 +1161,13 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, } if (socks->command == SOCKS_COMMAND_RESOLVE) { - uint32_t answer; - struct in_addr in; + tor_addr_t answer; /* Reply to resolves immediately if we can. */ - if (tor_inet_aton(socks->address, &in)) { /* see if it's an IP already */ - /* leave it in network order */ - answer = in.s_addr; + if (tor_addr_parse(&answer, socks->address) >= 0) {/* is it an IP? */ /* remember _what_ is supposed to have been resolved. */ strlcpy(socks->address, orig_address, sizeof(socks->address)); - connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4, - (uint8_t*)&answer, - -1,map_expires); + connection_ap_handshake_socks_resolved_addr(conn, &answer, -1, + map_expires); connection_mark_unattached_ap(conn, END_STREAM_REASON_DONE | END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); @@ -2059,6 +2060,35 @@ tell_controller_about_resolved_result(entry_connection_t *conn, } } +/** + * As connection_ap_handshake_socks_resolved, but take a tor_addr_t to send + * as the answer. + */ +static void +connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn, + const tor_addr_t *answer, + int ttl, + time_t expires) +{ + if (tor_addr_family(answer) == AF_INET) { + uint32_t a = tor_addr_to_ipv4n(answer); /* network order */ + connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4, + (uint8_t*)&a, + ttl, expires); + } else if (tor_addr_family(answer) == AF_INET6) { + const uint8_t *a = tor_addr_to_in6_addr8(answer); + connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV6,16, + a, + ttl, expires); + } else { + log_warn(LD_BUG, "Got called with address of unexpected family %d", + tor_addr_family(answer)); + connection_ap_handshake_socks_resolved(conn, + RESOLVED_TYPE_ERROR,0,NULL,-1,-1); + } +} + + /** Send an answer to an AP connection that has requested a DNS lookup via * SOCKS. The type should be one of RESOLVED_TYPE_(IPV4|IPV6|HOSTNAME) or -1 * for unreachable; the answer should be in the format specified in the socks

1 0