tor-commits June 2020

tor-commits@lists.torproject.org

17 participants
1326 discussions

[tor/master] Merge remote-tracking branch 'tor-github/pr/1902/head'
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 1fb9be53969011a10c453a36099583f631dc8a09 Merge: b335ef178 3e4814ede Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 5 10:08:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1902/head' changes/ticket33788 | 4 ++ src/app/config/resolve_addr.c | 2 +- src/core/or/connection_edge.c | 5 +- src/feature/client/circpathbias.c | 5 ++ src/feature/control/control_getinfo.c | 1 + src/feature/dirauth/… [View More]

1 0

[tor/master] Fix some checks of tor_inet_ntoa() return value
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 3e4814edeb563535b0f3bf658c01d7c10d6b4aa2 Author: rl1987 <rl1987(a)users.noreply.github.com> Date: Fri Jun 5 11:49:24 2020 +0300 Fix some checks of tor_inet_ntoa() return value Also, fix a format string. --- src/feature/relay/dns.c | 2 +- src/lib/net/address.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 26e9c6bf1..b83bd9b75 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/… [View More]

1 0

[tor/master] Check for NULL from tor_dup_ip()
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit a5d28bf88f839c21fbefde8391d777fd9610abd3 Author: rl1987 <rl1987(a)users.noreply.github.com> Date: Thu May 21 14:17:15 2020 +0300 Check for NULL from tor_dup_ip() --- src/app/config/resolve_addr.c | 2 +- src/core/or/connection_edge.c | 5 ++-- src/feature/client/circpathbias.c | 5 ++++ src/feature/control/control_getinfo.c | 1 + src/feature/dirauth/dirvote.c | 5 ++++ src/feature/nodelist/authcert.c | 12 ++++++---- src/feature/… [View More]nodelist/dirlist.c | 3 +++ src/feature/relay/relay_periodic.c | 43 +++++++++++++++++++---------------- src/feature/relay/router.c | 3 +++ src/feature/relay/selftest.c | 12 ++++++++++ src/feature/rend/rendservice.c | 25 +++++++++++--------- 11 files changed, 78 insertions(+), 38 deletions(-) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index b551615c0..aa978e230 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -192,7 +192,7 @@ resolve_my_address(int warn_severity, const or_options_t *options, tor_addr_from_ipv4h(&myaddr,addr); addr_string = tor_dup_ip(addr); - if (tor_addr_is_internal(&myaddr, 0)) { + if (addr_string && tor_addr_is_internal(&myaddr, 0)) { /* make sure we're ok with publishing an internal IP */ if (using_default_dir_authorities(options)) { /* if they are using the default authorities, disallow internal IPs diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 5c9bf64e8..fc77db833 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -3459,8 +3459,9 @@ tell_controller_about_resolved_result(entry_connection_t *conn, expires = time(NULL) + ttl; if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { char *cp = tor_dup_ip(ntohl(get_uint32(answer))); - control_event_address_mapped(conn->socks_request->address, - cp, expires, NULL, 0); + if (cp) + control_event_address_mapped(conn->socks_request->address, + cp, expires, NULL, 0); tor_free(cp); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && answer_len < 256) { char *cp = tor_strndup(answer, answer_len); diff --git a/src/feature/client/circpathbias.c b/src/feature/client/circpathbias.c index 4ac5cb8fc..74260171f 100644 --- a/src/feature/client/circpathbias.c +++ b/src/feature/client/circpathbias.c @@ -826,6 +826,11 @@ pathbias_send_usable_probe(circuit_t *circ) ocirc->pathbias_probe_nonce &= 0x00ffffff; probe_nonce = tor_dup_ip(ocirc->pathbias_probe_nonce); + if (!probe_nonce) { + log_err(LD_BUG, "Failed to generate nonce"); + return -1; + } + tor_snprintf(payload,RELAY_PAYLOAD_SIZE, "%s:25", probe_nonce); payload_len = (int)strlen(payload)+1; diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index 685deb8ec..3605c23dc 100644 --- a/src/feature/control/control_getinfo.c +++ b/src/feature/control/control_getinfo.c @@ -137,6 +137,7 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, return -1; } *answer = tor_dup_ip(addr); + tor_assert_nonfatal(*answer); } else if (!strcmp(question, "traffic/read")) { tor_asprintf(answer, "%"PRIu64, (get_bytes_read())); } else if (!strcmp(question, "traffic/written")) { diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 0a9ade132..85a23a12f 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4501,6 +4501,11 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, hostname = tor_dup_ip(addr); } + if (!hostname) { + log_err(LD_BUG, "Failed to determine hostname AND duplicate address"); + return NULL; + } + if (d_options->VersioningAuthoritativeDirectory) { client_versions = format_recommended_version_list(d_options->RecommendedClientVersions, 0); diff --git a/src/feature/nodelist/authcert.c b/src/feature/nodelist/authcert.c index 9c7525b6e..97e44d53e 100644 --- a/src/feature/nodelist/authcert.c +++ b/src/feature/nodelist/authcert.c @@ -464,11 +464,13 @@ trusted_dirs_load_certs_from_string(const char *contents, int source, (ds->addr != cert->addr || ds->dir_port != cert->dir_port)) { char *a = tor_dup_ip(cert->addr); - log_notice(LD_DIR, "Updating address for directory authority %s " - "from %s:%d to %s:%d based on certificate.", - ds->nickname, ds->address, (int)ds->dir_port, - a, cert->dir_port); - tor_free(a); + if (a) { + log_notice(LD_DIR, "Updating address for directory authority %s " + "from %s:%d to %s:%d based on certificate.", + ds->nickname, ds->address, (int)ds->dir_port, + a, cert->dir_port); + tor_free(a); + } ds->addr = cert->addr; ds->dir_port = cert->dir_port; } diff --git a/src/feature/nodelist/dirlist.c b/src/feature/nodelist/dirlist.c index d7069bb0e..33d1bfc4d 100644 --- a/src/feature/nodelist/dirlist.c +++ b/src/feature/nodelist/dirlist.c @@ -358,6 +358,9 @@ trusted_dir_server_new(const char *nickname, const char *address, } if (!hostname) hostname = tor_dup_ip(a); + + if (!hostname) + return NULL; } else { if (tor_lookup_hostname(address, &a)) { log_warn(LD_CONFIG, diff --git a/src/feature/relay/relay_periodic.c b/src/feature/relay/relay_periodic.c index b751323e0..08ad110cf 100644 --- a/src/feature/relay/relay_periodic.c +++ b/src/feature/relay/relay_periodic.c @@ -203,29 +203,34 @@ reachability_warnings_callback(time_t now, const or_options_t *options) const routerinfo_t *me = router_get_my_routerinfo(); if (me && !check_whether_orport_reachable(options)) { char *address = tor_dup_ip(me->addr); - log_warn(LD_CONFIG,"Your server (%s:%d) has not managed to confirm that " - "its ORPort is reachable. Relays do not publish descriptors " - "until their ORPort and DirPort are reachable. Please check " - "your firewalls, ports, address, /etc/hosts file, etc.", - address, me->or_port); - control_event_server_status(LOG_WARN, - "REACHABILITY_FAILED ORADDRESS=%s:%d", - address, me->or_port); - tor_free(address); + if (address) { + log_warn(LD_CONFIG, + "Your server (%s:%d) has not managed to confirm that " + "its ORPort is reachable. Relays do not publish descriptors " + "until their ORPort and DirPort are reachable. Please check " + "your firewalls, ports, address, /etc/hosts file, etc.", + address, me->or_port); + control_event_server_status(LOG_WARN, + "REACHABILITY_FAILED ORADDRESS=%s:%d", + address, me->or_port); + tor_free(address); + } } if (me && !check_whether_dirport_reachable(options)) { char *address = tor_dup_ip(me->addr); - log_warn(LD_CONFIG, - "Your server (%s:%d) has not managed to confirm that its " - "DirPort is reachable. Relays do not publish descriptors " - "until their ORPort and DirPort are reachable. Please check " - "your firewalls, ports, address, /etc/hosts file, etc.", - address, me->dir_port); - control_event_server_status(LOG_WARN, - "REACHABILITY_FAILED DIRADDRESS=%s:%d", - address, me->dir_port); - tor_free(address); + if (address) { + log_warn(LD_CONFIG, + "Your server (%s:%d) has not managed to confirm that its " + "DirPort is reachable. Relays do not publish descriptors " + "until their ORPort and DirPort are reachable. Please check " + "your firewalls, ports, address, /etc/hosts file, etc.", + address, me->dir_port); + control_event_server_status(LOG_WARN, + "REACHABILITY_FAILED DIRADDRESS=%s:%d", + address, me->dir_port); + tor_free(address); + } } } diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 267dee848..34d8163c3 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2784,6 +2784,9 @@ router_dump_router_to_string(routerinfo_t *router, } address = tor_dup_ip(router->addr); + if (!address) + goto err; + chunks = smartlist_new(); /* Generate the easy portion of the router descriptor. */ diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 402ce0e3d..18fe25b98 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -224,7 +224,11 @@ inform_testing_reachability(void) const routerinfo_t *me = router_get_my_routerinfo(); if (!me) return 0; + address = tor_dup_ip(me->addr); + if (!address) + return 0; + control_event_server_status(LOG_NOTICE, "CHECKING_REACHABILITY ORADDRESS=%s:%d", address, me->or_port); @@ -255,6 +259,10 @@ router_orport_found_reachable(void) const or_options_t *options = get_options(); if (!can_reach_or_port && me) { char *address = tor_dup_ip(me->addr); + + if (!address) + return; + log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from " "the outside. Excellent.%s", options->PublishServerDescriptor_ != NO_DIRINFO @@ -282,6 +290,10 @@ router_dirport_found_reachable(void) const or_options_t *options = get_options(); if (!can_reach_dir_port && me) { char *address = tor_dup_ip(me->addr); + + if (!address) + return; + log_notice(LD_DIRSERV,"Self-testing indicates your DirPort is reachable " "from the outside. Excellent.%s", options->PublishServerDescriptor_ != NO_DIRINFO diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 9d7ff2d17..a88c2080f 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -3715,20 +3715,23 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc, base32_encode(desc_id_base32, sizeof(desc_id_base32), desc->desc_id, DIGEST_LEN); hs_dir_ip = tor_dup_ip(hs_dir->addr); - log_info(LD_REND, "Launching upload for v2 descriptor for " - "service '%s' with descriptor ID '%s' with validity " - "of %d seconds to hidden service directory '%s' on " - "%s:%d.", - safe_str_client(service_id), - safe_str_client(desc_id_base32), - seconds_valid, - hs_dir->nickname, - hs_dir_ip, - hs_dir->or_port); + if (hs_dir_ip) { + log_info(LD_REND, "Launching upload for v2 descriptor for " + "service '%s' with descriptor ID '%s' with validity " + "of %d seconds to hidden service directory '%s' on " + "%s:%d.", + safe_str_client(service_id), + safe_str_client(desc_id_base32), + seconds_valid, + hs_dir->nickname, + hs_dir_ip, + hs_dir->or_port); + tor_free(hs_dir_ip); + } + control_event_hs_descriptor_upload(service_id, hs_dir->identity_digest, desc_id_base32, NULL); - tor_free(hs_dir_ip); /* Remember successful upload to this router for next time. */ if (!smartlist_contains_digest(successful_uploads, hs_dir->identity_digest)) [View Less]

1 0

[tor/master] Tweak format string
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 7a004fce8d375b7c89703a3292634af4a221691a Author: rl1987 <rl1987(a)users.noreply.github.com> Date: Thu May 21 14:26:08 2020 +0300 Tweak format string --- src/lib/net/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/net/address.c b/src/lib/net/address.c index b24fe6c91..d99a1795f 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -2018,7 +2018,7 @@ tor_dup_ip(uint32_t addr) in.s_addr = htonl(addr); ip_str = … [View More]

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 05 Jun '20

05 Jun '20

commit 20089afb699ffe8bdf02528d284ff5c4b4a08f62 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 5 12:23:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+el.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/contents+el.po b/contents+el.po index b6d5292a47..e1cad015f4 100644 --- a/contents+el.po +++ b/contents+el.po @@ -229,7 +229,7 @@ msgstr "" #: https//www.… [View More]torproject.org/download/tor/ #: (content/download/tor/contents+en.lrpage.title) msgid "Download Tor Source Code" -msgstr "" +msgstr "Λήψη του πηγαίου κώδικα Tor" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.title) @@ -936,15 +936,15 @@ msgstr "" #: templates/download-android.html:27 templates/download-android.html:30 #: templates/download-android.html:33 templates/download-android.html:36 msgid "Download .apk" -msgstr "" +msgstr "Λήψη .apk" #: templates/download-android.html:39 msgid "Go to Google Play" -msgstr "" +msgstr "Μετάβαση στο Google Play" #: templates/download-android.html:41 msgid "Go to F-Droid" -msgstr "" +msgstr "Μετάβαση στο F-Droid" #: templates/download-android.html:48 msgid "Are you an iOS user? We encourage you to try Onion Browser." @@ -960,11 +960,11 @@ msgstr "Windows" #: templates/download-languages.html:13 msgid "macOS" -msgstr "" +msgstr "macOS" #: templates/download-languages.html:14 templates/download-options.html:14 msgid "GNU/Linux" -msgstr "" +msgstr "GNU/Linux" #: templates/download-options.html:13 msgid "MacOS" @@ -972,11 +972,11 @@ msgstr "MacOS" #: templates/download-options.html:43 msgid "Tor Browser for Android Alpha" -msgstr "" +msgstr "Περιηγητής Tor για Android Alpha" #: templates/download-options.html:49 msgid "Google Play" -msgstr "" +msgstr "Google Play" #: templates/download-tor.html:8 msgid "Tor Source" @@ -1000,7 +1000,7 @@ msgstr "" #: templates/download-tor.html:46 msgid "Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE" -msgstr "" +msgstr "Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME,και Windows 98SE" #: templates/download-tor.html:47 msgid "Contains just Tor and nothing else." @@ -1107,11 +1107,11 @@ msgstr "" #: templates/hero-download.html:43 msgid "Download for Android" -msgstr "" +msgstr "Λήψη για Android" #: templates/hero-download.html:49 msgid "Download in another language or platform" -msgstr "" +msgstr "Λήψη για άλλη γλώσσα ή πλατφόρμα" #: templates/hero-download.html:50 msgid "Download the latest alpha build" [View Less]

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 05 Jun '20

05 Jun '20

commit c0f0a915653e5d4c0258fbbc14c237bf49677abd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 5 12:20:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+el.po | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/contents+el.po b/contents+el.po index 118733effe..6735debe90 100644 --- a/contents+el.po +++ b/contents+el.po @@ -1,3 +1,4 @@ +# # Translators: # A … [View More]Papac <ap909219(a)protonmail.com>, 2019 # LaScapigliata <ditri2000(a)hotmail.com>, 2019 @@ -9,6 +10,7 @@ # erinm, 2020 # Adrian Pappas <pappasadrian(a)gmail.com>, 2020 # Sofia K., 2020 +# george k <norhorn(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -16,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Sofia K., 2020\n" +"Last-Translator: george k <norhorn(a)gmail.com>, 2020\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,7 +88,7 @@ msgstr "Γίνεται λήψη" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Running Tor Browser for the First Time" -msgstr "" +msgstr "Εκτέλεση του περιηγητή Tor για πρώτη φορά" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -106,7 +108,7 @@ msgstr "Γέφυρες" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Managing Identities" -msgstr "" +msgstr "Διαχείριση ταυτοτήτων" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -165,7 +167,7 @@ msgstr "Πως να γίνετε μεταφραστής του Tor" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Making Tor Browser Portable" -msgstr "" +msgstr "Κάντε τον περιηγητή Tor φορητό" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -614,6 +616,10 @@ msgid "" "at a certain point, see the [Troubleshooting](../troubleshooting) page for " "help solving the problem." msgstr "" +"Εάν βρίσκεστε σε σχετικά γρήγορη σύνδεση, αλλά αυτή η μπάρα φαίνεται να " +"κολλάει σε κάποιο σημείο, ανατρέξτε στη σελίδα " +"[Troubleshooting](../troubleshooting) για βοήθεια σχετικά με την επίλυση του" +" προβλήματος." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -631,6 +637,8 @@ msgid "" "If you know that your connection is censored or uses a proxy, you should " "select this option." msgstr "" +"Αν γνωρίζετε πως η σύνδεσή σας λογοκρίνεται ή χρησιμοποιεί proxy, επιλέξτε " +"αυτή την επιλογή." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -647,7 +655,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">" -msgstr "" +msgstr "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) [View Less]

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 05 Jun '20

05 Jun '20

commit 31d10bc62b24b6aef8b683da93ac59048e588c7b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 5 11:18:53 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- el.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el.po b/el.po index 4b1b2a391e..00a1b081b5 100644 --- a/el.po +++ b/el.po @@ -30,7 +30,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" "PO-… [View More]

1 0

[onionperf/master] Removes unused traffic-model argument
by karsten＠torproject.org 05 Jun '20

05 Jun '20

commit 3e9dc4a577b3772dd7716d30cf8c5a22d110a839 Author: Ana Custura <ana(a)netstat.org.uk> Date: Thu Jun 4 15:55:24 2020 +0100 Removes unused traffic-model argument --- onionperf/onionperf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/onionperf/onionperf b/onionperf/onionperf index bc95e2b..6078d46 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -212,13 +212,6 @@ def main(): action="store", dest="nickname", default=hostname) - … [View More]

1 0

[onionperf/master] Remove documentation for --traffic-model parameter.
by karsten＠torproject.org 05 Jun '20

05 Jun '20

commit 17b0cf422adc81d356d1db4aba46b495e9487d0b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 5 09:14:02 2020 +0200 Remove documentation for --traffic-model parameter. --- onionperf/docs/onionperf.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/onionperf/docs/onionperf.rst b/onionperf/docs/onionperf.rst index 51e30a6..b16c79e 100644 --- a/onionperf/docs/onionperf.rst +++ b/onionperf/docs/onionperf.rst @@ -168,11 +168,6 @@ A oneshot measurement will … [View More]

1 0

[onionperf/master] Make -o/-i arguments mutually exclusive.
by karsten＠torproject.org 05 Jun '20

05 Jun '20

commit 2a506d6ab1c626d70f00d45fb310c0c59bca4907 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 26 23:05:02 2020 +0200 Make -o/-i arguments mutually exclusive. Right now, it's possible to specify both -o and -i at the same time, which doesn't make any sense. Also, it's rather non-intuitive that both argument defaults are True and that setting either of them changes their value to False. This patch fixes both issues above. … [View More] Fixes #34316. --- onionperf/onionperf | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/onionperf/onionperf b/onionperf/onionperf index f430c3f..bc95e2b 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -194,15 +194,17 @@ def main(): action="store", dest="tgenconnectport", default=8080) - measure_parser.add_argument('-o', '--onion-only', - help="""disable measuring download times over Tor back to {0}""".format(hostname), - action="store_false", dest="do_inet", - default=True) + onion_or_inet_only_group = measure_parser.add_mutually_exclusive_group() - measure_parser.add_argument('-i', '--inet-only', - help="""disable measuring download times over Tor to an ephemeral onion service""", - action="store_false", dest="do_onion", - default=True) + onion_or_inet_only_group.add_argument('-o', '--onion-only', + help="""only measure download times over Tor to an ephemeral onion service""", + action="store_true", dest="onion_only", + default=False) + + onion_or_inet_only_group.add_argument('-i', '--inet-only', + help="""only measure download times over Tor exiting to a public webserver""", + action="store_true", dest="inet_only", + default=False) measure_parser.add_argument('-n', '--nickname', help="""the 'SOURCE' STRING to use in measurement result files produced by OnionPerf""", @@ -352,7 +354,7 @@ def measure(args): server_tor_socks_port = util.get_random_free_port() meas = Measurement(args.torpath, args.tgenpath, args.prefix, args.private_prefix, args.nickname, args.oneshot, args.additional_client_conf, args.torclient_conf_file, args.torserver_conf_file) - meas.run(do_onion=args.do_onion, do_inet=args.do_inet, + meas.run(do_onion=not args.inet_only, do_inet=not args.onion_only, client_tgen_listen_port=client_tgen_port, client_tgen_connect_ip=client_connect_ip, client_tgen_connect_port=client_connect_port, client_tor_ctl_port=client_tor_ctl_port, client_tor_socks_port=client_tor_socks_port, server_tgen_listen_port=server_tgen_port, server_tor_ctl_port=server_tor_ctl_port, server_tor_socks_port=server_tor_socks_port) else: [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2020