- tor-commits - lists.torproject.org

[tor/master] Mark descriptor as dirty if all managed proxies are configured.
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit ca4e986c1d7fc806c8b9b6cb580ae8e6a51f8857 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Feb 23 17:51:54 2012 -0800 Mark descriptor as dirty if all managed proxies are configured. --- src/or/transports.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index e5a5446..26bb260 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -572,6 +572,9 @@ pt_configure_remaining_proxies(void) smartlist_free(tmp); check_if_restarts_needed = 0; assert_unconfigured_count_ok(); + + if (!pt_proxies_configuration_pending()) + mark_my_descriptor_dirty("configured managed proxies"); } #ifdef _WIN32

1 0

[tor/master] Add pluggable transport info to extra-info descriptors.
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit 9dea3a03b925f8cd83f2a975c4d5899f7691252d Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Feb 23 17:51:48 2012 -0800 Add pluggable transport info to extra-info descriptors. --- src/or/router.c | 7 +++++++ src/or/transports.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ src/or/transports.h | 2 ++ 3 files changed, 54 insertions(+), 0 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 352c456..795afe2 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2344,6 +2344,13 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo, } } + /* Add information about the pluggable transports we support. */ + if (options->ServerTransportPlugin) { + char *pluggable_transports = pt_get_extra_info_descriptor_string(); + if (pluggable_transports) + smartlist_add(chunks, pluggable_transports); + } + if (should_record_bridge_info(options) && write_stats_to_extrainfo) { const char *bridge_stats = geoip_get_bridge_stats_extrainfo(now); if (bridge_stats) { diff --git a/src/or/transports.c b/src/or/transports.c index e0492b8..e5a5446 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1373,6 +1373,51 @@ pt_prepare_proxy_list_for_config_read(void) tor_assert(unconfigured_proxies_n == 0); } +/** Return the pluggable transport string that we should display in + * our extra-info descriptor. If we shouldn't display such a string, + * or we have nothing to display, return NULL. The string is + * allocated on the heap and it's the responsibility of the caller to + * free it. */ +char * +pt_get_extra_info_descriptor_string(void) +{ + char *the_string = NULL; + smartlist_t *string_chunks = NULL; + + if (!managed_proxy_list) + return NULL; + + string_chunks = smartlist_new(); + + /* For each managed proxy, add its transports to the chunks list. */ + SMARTLIST_FOREACH_BEGIN(managed_proxy_list, const managed_proxy_t *, mp) { + if ((!mp->is_server) || (mp->conf_state != PT_PROTO_COMPLETED)) + continue; + + tor_assert(mp->transports); + + SMARTLIST_FOREACH_BEGIN(mp->transports, const transport_t *, t) { + smartlist_add_asprintf(string_chunks, + "method %s %s:%u", + t->name, fmt_addr(&t->addr), t->port); + } SMARTLIST_FOREACH_END(t); + + } SMARTLIST_FOREACH_END(mp); + + if (smartlist_len(string_chunks) == 0) { + smartlist_free(string_chunks); + return NULL; + } + + /* Join all the chunks into the final string. */ + the_string = smartlist_join_strings(string_chunks, "\n", 1, NULL); + + SMARTLIST_FOREACH(string_chunks, char *, s, tor_free(s)); + smartlist_free(string_chunks); + + return the_string; +} + /** The tor config was read. * Destroy all managed proxies that were marked by a previous call to * prepare_proxy_list_for_config_read() and are not used by the new diff --git a/src/or/transports.h b/src/or/transports.h index 39f7bf4..17d99dd 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -46,6 +46,8 @@ void pt_configure_remaining_proxies(void); int pt_proxies_configuration_pending(void); +char *pt_get_extra_info_descriptor_string(void); + void pt_free_all(void); void pt_prepare_proxy_list_for_config_read(void);

1 0

[tor/master] Change extra-info "method" to "transport".
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit f8e49c57893f35b9b3c45865d00040bd05e53f0c Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Mar 15 14:36:00 2012 -0700 Change extra-info "method" to "transport". --- src/or/transports.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 26bb260..2518846 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1401,7 +1401,7 @@ pt_get_extra_info_descriptor_string(void) SMARTLIST_FOREACH_BEGIN(mp->transports, const transport_t *, t) { smartlist_add_asprintf(string_chunks, - "method %s %s:%u", + "transport %s %s:%u", t->name, fmt_addr(&t->addr), t->port); } SMARTLIST_FOREACH_END(t);

1 0

[tor/master] Address Nick's comments.
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit 8b9f4d75f27728ca5f07c1eb00d4144cb3b33eac Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jul 12 15:28:43 2012 +0200 Address Nick's comments. - Add a changes/ file. - Make it compile under --enable-gcc-warnings. - Update the file-level documentation of src/or/transports.c. - Only update descriptor if at least a managed proxy was configured. - Add our external IP address to the extra-info descriptor instead of 0.0.0.0. --- changes/bug3589 | 3 +++ src/or/circuitbuild.h | 6 ++++-- src/or/connection.c | 1 + src/or/router.c | 1 + src/or/transports.c | 39 ++++++++++++++++++++++++++++++--------- src/or/transports.h | 5 +++-- 6 files changed, 42 insertions(+), 13 deletions(-) diff --git a/changes/bug3589 b/changes/bug3589 new file mode 100644 index 0000000..eff2650 --- /dev/null +++ b/changes/bug3589 @@ -0,0 +1,3 @@ + o Major features: + - Bridges now report the pluggable transports they support to the + bridge authority. Implements ticket 3589. diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index e6783d8..a7becce 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -12,8 +12,6 @@ #ifndef _TOR_CIRCUITBUILD_H #define _TOR_CIRCUITBUILD_H -#include "transports.h" - char *circuit_list_path(origin_circuit_t *circ, int verbose); char *circuit_list_path_for_controller(origin_circuit_t *circ); void circuit_log_path(int severity, unsigned int domain, @@ -136,6 +134,10 @@ void circuit_build_times_network_circ_success(circuit_build_times_t *cbt); /* DOCDOC circuit_build_times_get_bw_scale */ int circuit_build_times_get_bw_scale(networkstatus_t *ns); +/* DOCDOC find_transport_name_by_bridge_addrport */ +const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr, + uint16_t port); +typedef struct transport_t transport_t; int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, const transport_t **transport); diff --git a/src/or/connection.c b/src/or/connection.c index af5c011..c9b16d7 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -34,6 +34,7 @@ #include "rendcommon.h" #include "rephist.h" #include "router.h" +#include "transports.h" #include "routerparse.h" #ifdef USE_BUFFEREVENTS diff --git a/src/or/router.c b/src/or/router.c index 795afe2..df44a76 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -27,6 +27,7 @@ #include "router.h" #include "routerlist.h" #include "routerparse.h" +#include "transports.h" /** * \file router.c diff --git a/src/or/transports.c b/src/or/transports.c index 2518846..dd07a91 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -39,13 +39,17 @@ * transport_t structs. * * When the managed proxy stops spitting METHOD lines (signified by a - * '{S,C}METHODS DONE' message) we register all the transports - * collected to the circuitbuild.c subsystem. At this point, the - * pointers to transport_t can be transformed into dangling pointers - * at any point by the circuitbuild.c subsystem, and so we replace all - * transport_t pointers with strings describing the transport names. - * We can still go from a transport name to a transport_t using the - * fact that each transport name uniquely identifies a transport_t. + * '{S,C}METHODS DONE' message) we pass copies of its transports to + * the bridge subsystem. We keep copies of the 'transport_t's on the + * managed proxy to be able to associate the proxy with its + * transports, and we pass copies to the bridge subsystem so that + * transports can be associated with bridges. + * [ XXX We should try see whether the two copies are really needed + * and maybe cut it into a single copy of the 'transport_t' shared + * between the managed proxy and the bridge subsystem. Preliminary + * analysis shows that both copies are needed with the current code + * logic, because of race conditions that can cause dangling + * pointers. ] * * In even more detail, this is what happens when a SIGHUP * occurs: @@ -530,6 +534,7 @@ launch_managed_proxy(managed_proxy_t *mp) void pt_configure_remaining_proxies(void) { + int at_least_a_proxy_config_finished = 0; smartlist_t *tmp = smartlist_new(); log_debug(LD_CONFIG, "Configuring remaining managed proxies (%d)!", @@ -567,13 +572,16 @@ pt_configure_remaining_proxies(void) if (!proxy_configuration_finished(mp)) configure_proxy(mp); + if (proxy_configuration_finished(mp)) + at_least_a_proxy_config_finished = 1; + } SMARTLIST_FOREACH_END(mp); smartlist_free(tmp); check_if_restarts_needed = 0; assert_unconfigured_count_ok(); - if (!pt_proxies_configuration_pending()) + if (at_least_a_proxy_config_finished) mark_my_descriptor_dirty("configured managed proxies"); } @@ -1400,9 +1408,22 @@ pt_get_extra_info_descriptor_string(void) tor_assert(mp->transports); SMARTLIST_FOREACH_BEGIN(mp->transports, const transport_t *, t) { + /* If the transport proxy returned "0.0.0.0" as its address, and + * we know our external IP address, use it. Otherwise, use the + * returned address. */ + const char *addr_str = fmt_addr(&t->addr); + uint32_t external_ip_address = 0; + if (tor_addr_is_null(&t->addr) && + router_pick_published_address(get_options(), + &external_ip_address) >= 0) { + /* returned addr was 0.0.0.0 and we found our external IP + address: use it. */ + addr_str = fmt_addr32(external_ip_address); + } + smartlist_add_asprintf(string_chunks, "transport %s %s:%u", - t->name, fmt_addr(&t->addr), t->port); + t->name, addr_str, t->port); } SMARTLIST_FOREACH_END(t); } SMARTLIST_FOREACH_END(mp); diff --git a/src/or/transports.h b/src/or/transports.h index 17d99dd..3fd97f8 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -12,12 +12,13 @@ #define TOR_TRANSPORTS_H /** Represents a pluggable transport used by a bridge. */ -typedef struct { +typedef struct transport_t { /** SOCKS version: One of PROXY_SOCKS4, PROXY_SOCKS5. */ int socks_version; /** Name of pluggable transport protocol */ char *name; - /** Address of proxy */ + /** The IP address where the transport bound and is waiting for + * connections. */ tor_addr_t addr; /** Port of proxy */ uint16_t port;

1 0

[tor/master] Merge remote-tracking branch 'asn/bug3589'
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit ec8bdc5da81a27fd0d382db689addd8114347e1e Merge: f9478b7 8b9f4d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 12:05:08 2012 -0400 Merge remote-tracking branch 'asn/bug3589' changes/bug3589 | 3 + src/or/circuitbuild.c | 196 -------------------------- src/or/circuitbuild.h | 28 +---- src/or/connection.c | 1 + src/or/router.c | 8 + src/or/transports.c | 373 ++++++++++++++++++++++++++++++++++++++++++------- src/or/transports.h | 49 ++++--- 7 files changed, 360 insertions(+), 298 deletions(-)

1 0

[onionoo/master] Stop highlighting news from 1 month ago.
by karsten＠torproject.org 17 Jul '12

17 Jul '12

commit bd12cc0832de2d8329536aea6cc5165986f4740e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 17 18:11:20 2012 +0200 Stop highlighting news from 1 month ago. --- web/index.html | 35 ++++++++++++----------------------- 1 files changed, 12 insertions(+), 23 deletions(-) diff --git a/web/index.html b/web/index.html index fe937de..5365173 100755 --- a/web/index.html +++ b/web/index.html @@ -60,9 +60,7 @@ Required field.</li> <li>"a": Array of IPv4 or IPv6 addresses where the relay accepts onion-routing connections or which the relay used to exit to the Internet in the past 24 hours. -Required field. -Extended field to also contain exit addresses on June -15, 2012.</li> +Required field.</li> <li>"r": Boolean field saying whether this relay was listed as running in the last relay network status consensus. Required field.</li> @@ -76,11 +74,10 @@ Required field.</li> Required field. Each array object contains the following key-value pairs: <ul> -<li>"n": Bridge nickname consisting of -1–19 alphanumerical characters. +<li>"n": Bridge nickname consisting of 1–19 alphanumerical +characters. Optional field. -Omitted if the bridge nickname is "Unnamed". -Added field on June 14, 2012.</li> +Omitted if the bridge nickname is "Unnamed".</li> <li>"h": SHA-1 hash of the bridge fingerprint consisting of 40 upper-case hexadecimal characters. Required field.</li> @@ -247,14 +244,13 @@ the directory authorities. The unit is arbitrary; currently it's kilobytes per second, but that might change in the future. Required field.</li> -<li>"host_name": Host name as found in a -reverse DNS lookup of the relay IP address. +<li>"host_name": Host name as found in a reverse DNS lookup of the +relay IP address. This field is updated at most once in 12 hours, unless the relay IP address changes. Optional field. Omitted if the relay IP address was not looked up or if no lookup request -was successful yet. -Added field on June 18, 2012.</li> +was successful yet.</li> <li>"last_restarted": UTC timestamp (YYYY-MM-DD hh:mm:ss) when the relay was last (re-)started. Optional field.</li> @@ -290,11 +286,10 @@ Required field.</li> Required field. Each array object contains the following key-value pairs: <ul> -<li>"nickname": Bridge nickname -consisting of 1–19 alphanumerical characters. +<li>"nickname": Bridge nickname consisting of 1–19 +alphanumerical characters. Optional field. -Omitted if the bridge nickname is "Unnamed". -Added field on June 14, 2012.</li> +Omitted if the bridge nickname is "Unnamed".</li> <li>"hashed_fingerprint": SHA-1 hash of the bridge fingerprint consisting of 40 upper-case hexadecimal characters. Required field.</li> @@ -625,10 +620,6 @@ of all relays and bridges matching all search terms will be returned. Full fingerprints should always be hashed using SHA-1, regardless of searching for a relay or a bridge, in order to not accidentally leak non-hashed bridge fingerprints in the URL. -Extended search to bridge nicknames on June 14, -2012. -Extended search to multiple search terms on June 18, -2012. </td></tr> <tr><td>lookup</td><td>Return only the relay with the parameter value matching the fingerprint or the bridge with the parameter value @@ -637,10 +628,8 @@ Fingerprints should always be hashed using SHA-1, regardless of looking up a relay or a bridge, in order to not accidentally leak non-hashed bridge fingerprints in the URL. </td></tr> -<tr><td>country</td><td>Return only -relays which are located in the given country as identified by a -two-letter lower-case country code. -Added parameter on June 14, 2012. +<tr><td>country</td><td>Return only relays which are located in the +given country as identified by a two-letter lower-case country code. </td></tr> </table> Relay and/or bridge documents in the response can be ordered and

1 0

[onionoo/master] Stop supporting old-style URLs.
by karsten＠torproject.org 17 Jul '12

17 Jul '12

commit df282b4ddc4d89d622d41bf55c1b577229f687b3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 17 18:22:50 2012 +0200 Stop supporting old-style URLs. --- src/org/torproject/onionoo/ResourceServlet.java | 71 ++++------------------- web/index.html | 6 +- 2 files changed, 14 insertions(+), 63 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index ba1d434..43c2110 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -160,21 +160,14 @@ public class ResourceServlet extends HttpServlet { uri = uri.substring("/onionoo".length()); } String resourceType = null; - boolean isOldStyleUri = false; - if (uri.startsWith("/summary/")) { + if (uri.startsWith("/summary") && + !uri.startsWith("/summary/")) { resourceType = "summary"; - isOldStyleUri = true; - } else if (uri.startsWith("/details/")) { + } else if (uri.startsWith("/details") && + !uri.startsWith("/details/")) { resourceType = "details"; - isOldStyleUri = true; - } else if (uri.startsWith("/bandwidth/")) { - resourceType = "bandwidth"; - isOldStyleUri = true; - } else if (uri.startsWith("/summary")) { - resourceType = "summary"; - } else if (uri.startsWith("/details")) { - resourceType = "details"; - } else if (uri.startsWith("/bandwidth")) { + } else if (uri.startsWith("/bandwidth") && + !uri.startsWith("/bandwidth/")) { resourceType = "bandwidth"; } else { response.sendError(HttpServletResponse.SC_BAD_REQUEST); @@ -183,21 +176,11 @@ public class ResourceServlet extends HttpServlet { /* Extract parameters either from the old-style URI or from request * parameters. */ - Map<String, String> parameterMap; - if (isOldStyleUri) { - parameterMap = this.getParameterMapForOldStyleUri(uri, - resourceType); - if (parameterMap == null) { - response.sendError(HttpServletResponse.SC_BAD_REQUEST); - return; - } - } else { - parameterMap = new HashMap<String, String>(); - for (Object parameterKey : request.getParameterMap().keySet()) { - String[] parameterValues = - request.getParameterValues((String) parameterKey); - parameterMap.put((String) parameterKey, parameterValues[0]); - } + Map<String, String> parameterMap = new HashMap<String, String>(); + for (Object parameterKey : request.getParameterMap().keySet()) { + String[] parameterValues = + request.getParameterValues((String) parameterKey); + parameterMap.put((String) parameterKey, parameterValues[0]); } /* Make sure that the request doesn't contain any unknown @@ -372,38 +355,6 @@ public class ResourceServlet extends HttpServlet { pw.close(); } - private Map<String, String> getParameterMapForOldStyleUri(String uri, - String resourceType) { - Map<String, String> result = new HashMap<String, String>(); - if (uri.equals("/" + resourceType + "/all")) { - } else if (uri.equals("/" + resourceType + "/running")) { - result.put("running", "true"); - } else if (uri.equals("/" + resourceType + "/relays")) { - result.put("type", "relays"); - } else if (uri.equals("/" + resourceType + "/bridges")) { - result.put("type", "bridges"); - } else if (uri.startsWith("/" + resourceType + "/search/")) { - String[] searchParameters = this.parseSearchParameters( - uri.substring(("/" + resourceType + "/search/").length())); - if (searchParameters == null || searchParameters.length != 1) { - result = null; - } else { - result.put("search", searchParameters[0]); - } - } else if (uri.startsWith("/" + resourceType + "/lookup/")) { - String fingerprintParameter = this.parseFingerprintParameter( - uri.substring(("/" + resourceType + "/lookup/").length())); - if (fingerprintParameter == null) { - result = null; - } else { - result.put("lookup", fingerprintParameter); - } - } else { - result = null; - } - return result; - } - private static Pattern searchParameterPattern = Pattern.compile("^\\$?[0-9a-fA-F]{1,40}$|" /* Fingerprint. */ + "^[0-9a-zA-Z\\.]{1,19}$|" /* Nickname or IPv4 address. */ diff --git a/web/index.html b/web/index.html index 5365173..5788bf9 100755 --- a/web/index.html +++ b/web/index.html @@ -91,7 +91,7 @@ document. The method and its parameters determines which relay and/or bridge summaries are included in the response. These methods have been deprecated on May 14, 2012 and -will be removed after July 14, 2012. +have been removed on July 17, 2012. See the Methods section at the end of this page. <table border="0" cellpadding="4" cellspacing="0" summary=""> @@ -338,7 +338,7 @@ document. The method and its parameters determines which relay and/or bridge details are included in the response. These methods have been deprecated on May 14, 2012 and -will be removed after July 14, 2012. +have been removed on July 17, 2012. See the Methods section at the end of this page. <table border="0" cellpadding="4" cellspacing="0" summary=""> @@ -500,7 +500,7 @@ The specification of bandwidth history objects is similar to those in the The method and its parameters determines which relay and/or bridge bandwidth documents are included in the response. These methods have been deprecated on May 14, 2012 and -will be removed after July 14, 2012. +have been removed on July 17, 2012. See the Methods section at the end of this page. <table border="0" cellpadding="4" cellspacing="0" summary="">

1 0

[tor/master] Improve message on spurious SOCKSListenAddress
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit 4cac5df5548e0051a6927a778da3e6f01f45dc56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 12:02:55 2012 -0400 Improve message on spurious SOCKSListenAddress --- changes/port_doc | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/port_doc b/changes/port_doc new file mode 100644 index 0000000..0e8662f --- /dev/null +++ b/changes/port_doc @@ -0,0 +1,3 @@ + o Minor features (usability): + - Try to make the warning when giving an obsolete SOCKSListenAddress + a littel more useful. diff --git a/src/or/config.c b/src/or/config.c index f5b5c8f..bacb06e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5642,7 +5642,7 @@ parse_port_config(smartlist_t *out, mainport = (int)tor_parse_long(ports->value, 10, 0, 65535, &ok, NULL); if (!ok) { log_warn(LD_CONFIG, "%sListenAddress can only be used with a single " - "%sPort with value \"auto\" or 1-65535.", + "%sPort with value \"auto\" or 1-65535 and no options set.", portname, portname); return -1; }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit f9478b7a796a784a2d8f12fb9701ce7d1ea1ace2 Merge: 0b6fb5e 4cac5df Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 12:03:10 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/port_doc | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.3] Improve message on spurious SOCKSListenAddress
by nickm＠torproject.org 17 Jul '12

17 Jul '12

commit 4cac5df5548e0051a6927a778da3e6f01f45dc56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 12:02:55 2012 -0400 Improve message on spurious SOCKSListenAddress --- changes/port_doc | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/port_doc b/changes/port_doc new file mode 100644 index 0000000..0e8662f --- /dev/null +++ b/changes/port_doc @@ -0,0 +1,3 @@ + o Minor features (usability): + - Try to make the warning when giving an obsolete SOCKSListenAddress + a littel more useful. diff --git a/src/or/config.c b/src/or/config.c index f5b5c8f..bacb06e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5642,7 +5642,7 @@ parse_port_config(smartlist_t *out, mainport = (int)tor_parse_long(ports->value, 10, 0, 65535, &ok, NULL); if (!ok) { log_warn(LD_CONFIG, "%sListenAddress can only be used with a single " - "%sPort with value \"auto\" or 1-65535.", + "%sPort with value \"auto\" or 1-65535 and no options set.", portname, portname); return -1; }

1 0