- tor-commits - lists.torproject.org

r25578: {website} move the image outside the text infoblock (website/trunk/press/en)
by Andrew Lewman 27 Mar '12

27 Mar '12

Author: phobos Date: 2012-03-27 18:50:02 +0000 (Tue, 27 Mar 2012) New Revision: 25578 Modified: website/trunk/press/en/info.wmi Log: move the image outside the text infoblock Modified: website/trunk/press/en/info.wmi =================================================================== --- website/trunk/press/en/info.wmi 2012-03-27 18:44:44 UTC (rev 25577) +++ website/trunk/press/en/info.wmi 2012-03-27 18:50:02 UTC (rev 25578) @@ -4,16 +4,16 @@ #!/usr/bin/env wml <div class="img-shadow"> <div class="infoblock"> - <h2 class="media">Press Contact</h2> + <h2 class="media">Press Contact</h2> <p> <b>Andrew Lewman</b><br> execdir(a)torproject.org<br> +1-781-948-1982<br> </p> + <p></p> <p>Our contact information as a qrcode:</p> -<img src="$(IMGROOT)/contact-info.png" alt="qrcode of contact - info"> - </div> -  + </div> + <img src="$(IMGROOT)/contact-info.png" alt="qrcode of contact info"> +  </div>

1 0

r25577: {website} try to fix up the qrcode. (website/trunk/press/en)
by Andrew Lewman 27 Mar '12

27 Mar '12

Author: phobos Date: 2012-03-27 18:44:44 +0000 (Tue, 27 Mar 2012) New Revision: 25577 Modified: website/trunk/press/en/info.wmi Log: try to fix up the qrcode. Modified: website/trunk/press/en/info.wmi =================================================================== --- website/trunk/press/en/info.wmi 2012-03-27 18:36:45 UTC (rev 25576) +++ website/trunk/press/en/info.wmi 2012-03-27 18:44:44 UTC (rev 25577) @@ -10,8 +10,9 @@ execdir(a)torproject.org<br> +1-781-948-1982<br> </p> - <p><img src="$(IMGROOT)/contact-info.png" alt="qrcode of contact - info"></p> + <p>Our contact information as a qrcode:</p> +<img src="$(IMGROOT)/contact-info.png" alt="qrcode of contact + info"> </div>  </div>

1 0

r25576: {website} add a qrcode for easier info sharing. (in website/trunk: images press/en)
by Andrew Lewman 27 Mar '12

27 Mar '12

Author: phobos Date: 2012-03-27 18:36:45 +0000 (Tue, 27 Mar 2012) New Revision: 25576 Added: website/trunk/images/contact-info.png Modified: website/trunk/press/en/info.wmi Log: add a qrcode for easier info sharing. Added: website/trunk/images/contact-info.png =================================================================== (Binary files differ) Property changes on: website/trunk/images/contact-info.png ___________________________________________________________________ Added: svn:mime-type + image/png Modified: website/trunk/press/en/info.wmi =================================================================== --- website/trunk/press/en/info.wmi 2012-03-27 16:34:15 UTC (rev 25575) +++ website/trunk/press/en/info.wmi 2012-03-27 18:36:45 UTC (rev 25576) @@ -7,10 +7,11 @@ <h2 class="media">Press Contact</h2> <p> <b>Andrew Lewman</b><br> - Executive Director<br> execdir(a)torproject.org<br> +1-781-948-1982<br> </p> + <p><img src="$(IMGROOT)/contact-info.png" alt="qrcode of contact + info"></p> </div>  </div>

1 0

r25575: {website} and a new phone number while we migrate to a new phone compa (in website/trunk: about/en press/en)
by Andrew Lewman 27 Mar '12

27 Mar '12

Author: phobos Date: 2012-03-27 16:34:15 +0000 (Tue, 27 Mar 2012) New Revision: 25575 Modified: website/trunk/about/en/contact.wml website/trunk/press/en/info.wmi Log: and a new phone number while we migrate to a new phone company. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2012-03-27 14:10:52 UTC (rev 25574) +++ website/trunk/about/en/contact.wml 2012-03-27 16:34:15 UTC (rev 25575) @@ -86,7 +86,7 @@ <a id="phone"></a> <h3><a class="anchor" href="#phone">Telephone</a></h3> - <p>If none of the above appeal to you, calling +1-781-352-0568 + <p>If none of the above appeal to you, calling +1-781-948-1982 will reach the Tor office. Should there be no answer, please leave a message with a way to reach you.</p> Modified: website/trunk/press/en/info.wmi =================================================================== --- website/trunk/press/en/info.wmi 2012-03-27 14:10:52 UTC (rev 25574) +++ website/trunk/press/en/info.wmi 2012-03-27 16:34:15 UTC (rev 25575) @@ -9,7 +9,7 @@ <b>Andrew Lewman</b><br> Executive Director<br> execdir(a)torproject.org<br> - +1-781-352-0568<br> + +1-781-948-1982<br> </p> </div>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 27 Mar '12

27 Mar '12

commit 039c3ad97ad52589f0b708f50fce8c48da5eff20 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 27 15:45:04 2012 +0000 Update translations for orbot --- values-eu/strings.xml | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/values-eu/strings.xml b/values-eu/strings.xml index ec83d3b..c72e025 100644 --- a/values-eu/strings.xml +++ b/values-eu/strings.xml @@ -14,7 +14,7 @@ <string name="tor_process_starting">Tor bezeroa hasten...</string> <string name="tor_process_complete">eginda.</string> <string name="tor_process_waiting">itxaroten.</string> - <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> + <string name="not_anonymous_yet">ABISUA: Zure trafikoa ez da anonimoa oraindik! Mesedez konfigura itzazu zure aplikazioak 127.0.0.1:8118 HTTP proxya edo 127.0.0.1:9050 SOCKS4 edo SOCKS5 proxyak erabiltzeko</string> <string name="menu_home">Etxea</string> <string name="menu_browse">Arakatu</string> <string name="menu_settings">Ezarpenak</string> @@ -43,7 +43,7 @@ <string name="pref_transparent_port_title">Portu Zerrenda</string> <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> - <string name="pref_has_root">Request Root Access</string> + <string name="pref_has_root">Root sarrera eskatu</string> <string name="pref_has_root_summary">Request root access for transparent proxying</string> <string name="status_install_success">Tor bitarrak zuzen instalatuta!</string> <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> @@ -68,10 +68,10 @@ <string name="wizard_configure">Torifikazioa Konfiguratu</string> <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> <string name="wizard_configure_all">Proxy All Apps Through Tor</string> - <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> + <string name="wizard_configure_select_apps">Hautatu Banakako Aplikazioak Torentzat</string> <string name="wizard_tips_tricks">Orbot-gaitutako Aplikazioak</string> <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string> - <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> + <string name="wizard_tips_otrchat">Gibberbot - Andriodrentzako berehalako mezulari bezero ziurra</string> <string name="wizard_tips_proxy">Proxy Ezarpenak - Ikasi zure aplikazioak Orbotekin funtziona dezaten nola konfiguratu</string> <string name="wizard_proxy_help_info">Proxy Ezarpenak</string> <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> @@ -88,7 +88,7 @@  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>  - <string name="wizard_warning_title">Warning</string> + <string name="wizard_warning_title">Abisua</string> <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>  <string name="wizard_permissions_title">Baimenak</string> @@ -96,10 +96,10 @@ <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> + <string name="wizard_tips_title">Orbot-Gaitutako Aplikazioak</string> <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> + <string name="wizard_tips_orweb">Orweb - Tor bidez lan egiten duen pribatutasun-hobetua duen nabigatzailea</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> @@ -112,15 +112,15 @@ <string name="wizard_transproxy_none">Bat ere ez</string> <string name="pref_transparent_tethering_title">Tor Tethering</string> <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string> - <string name="button_grant_superuser">Request Superuser Access</string> + <string name="button_grant_superuser">Supererabiltzaile sarrera eskatu</string> <string name="pref_select_apps">Aplikazioak hautatu</string> <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string> - <string name="pref_node_configuration">Node Configuration</string> + <string name="pref_node_configuration">Nodo Konfigurazioa</string> <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> - <string name="pref_entrance_node">Entrance Nodes</string> + <string name="pref_entrance_node">Sarrera Nodoak</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> - <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> + <string name="pref_entrance_node_dialog">Sartu Sarrera Nodoak</string> + <string name="pref_use_whispercore">WhisperCore erabili</string> <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> <string name="pref_proxy_type_title">Proxy mota</string> <string name="pref_proxy_type_summary">Proxy zerbitzariarentzako erabiltzeko protokoloak: HTTP, HTTPS, Socks4, Socks5</string> @@ -154,14 +154,14 @@ <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> <string name="enter_exclude_nodes">Enter Exclude Nodes</string> <string name="strict_nodes">Strict Nodes</string> - <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> + <string name="use_only_these_specified_nodes">*Bakarrik* zehaztutako nodo hauek erabili</string> <string name="bridges">Zubiak</string> <string name="use_bridges">Zubiak erabili</string> <string name="bridges_obfuscated">Nahasitako Zubiak</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> <string name="enable_if_configured_bridges_are_obfuscated_bridges">Gaitu konfiguratutako zubiak nahasitako zubiak badira</string> - <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> - <string name="enter_bridge_addresses">Enter Bridge Addresses</string> + <string name="ip_address_and_port_of_bridges">IP helbidea eta zubien portua</string> + <string name="enter_bridge_addresses">Sartu Zubi Helbideak</string> <string name="relays">Erreleak</string> <string name="relaying">Erreleatzea</string> <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>

1 0

[tor/master] Simply geoip_get_country_by_addr based on arma's comment.
by nickm＠torproject.org 27 Mar '12

27 Mar '12

commit cc94a48ff47a59fb6d7ce0a61aebeb6f8f859b2b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 9 15:22:02 2012 +0100 Simply geoip_get_country_by_addr based on arma's comment. --- src/or/geoip.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index a72319d..5e3735c 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -269,13 +269,11 @@ geoip_get_country_by_ip(uint32_t ipaddr) int geoip_get_country_by_addr(const tor_addr_t *addr) { - uint32_t ipaddr; if (tor_addr_family(addr) != AF_INET) { /*XXXX IP6 support ipv6 geoip.*/ return -1; } - ipaddr = tor_addr_to_ipv4h(addr); - return geoip_get_country_by_ip(ipaddr); + return geoip_get_country_by_ip(tor_addr_to_ipv4h(addr)); } /** Return the number of countries recognized by the GeoIP database. */

1 0

[tor/master] Add braces around a two-line code block.
by nickm＠torproject.org 27 Mar '12

27 Mar '12

commit 218193d38d2cebc72123255f8035fe3fa02d3dc5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 9 11:25:48 2012 +0100 Add braces around a two-line code block. --- src/or/geoip.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index d3dcc4f..a72319d 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -270,9 +270,10 @@ int geoip_get_country_by_addr(const tor_addr_t *addr) { uint32_t ipaddr; - if (tor_addr_family(addr) != AF_INET) + if (tor_addr_family(addr) != AF_INET) { /*XXXX IP6 support ipv6 geoip.*/ return -1; + } ipaddr = tor_addr_to_ipv4h(addr); return geoip_get_country_by_ip(ipaddr); }

1 0

[tor/master] Count IPv6 connections in bridge and entry stats.
by nickm＠torproject.org 27 Mar '12

27 Mar '12

commit 4aca55efd2ac627a0311cd5cb00d5ad02e765da2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 9 11:12:30 2012 +0100 Count IPv6 connections in bridge and entry stats. --- changes/bug5053 | 5 +++++ src/or/connection_or.c | 7 ++----- src/or/directory.c | 25 ++++++++++--------------- src/or/geoip.c | 35 ++++++++++++++++++++++++++--------- src/or/geoip.h | 3 ++- src/test/test.c | 46 +++++++++++++++++++++++++++++++--------------- 6 files changed, 76 insertions(+), 45 deletions(-) diff --git a/changes/bug5053 b/changes/bug5053 new file mode 100644 index 0000000..88d82cd --- /dev/null +++ b/changes/bug5053 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Resolve IPv6 addresses in bridge and entry statistics to country code + "??" which means we at least count them. Fixes bug 5053; bugfix on + 0.2.3.9-alpha. + diff --git a/src/or/connection_or.c b/src/or/connection_or.c index a815928..30d92b2 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1713,11 +1713,8 @@ connection_or_set_state_open(or_connection_t *conn) } else { /* only report it to the geoip module if it's not a known router */ if (!router_get_by_id_digest(conn->identity_digest)) { - if (tor_addr_family(&TO_CONN(conn)->addr) == AF_INET) { - /*XXXX IP6 support ipv6 geoip.*/ - uint32_t a = tor_addr_to_ipv4h(&TO_CONN(conn)->addr); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, a, now); - } + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &TO_CONN(conn)->addr, + now); } } diff --git a/src/or/directory.c b/src/or/directory.c index c6a527c..8d4ac63 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2843,21 +2843,16 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, goto done; } - { - struct in_addr in; - if (tor_inet_aton((TO_CONN(conn))->address, &in)) { - geoip_note_client_seen(act, ntohl(in.s_addr), time(NULL)); - geoip_note_ns_response(act, GEOIP_SUCCESS); - /* Note that a request for a network status has started, so that we - * can measure the download time later on. */ - if (TO_CONN(conn)->dirreq_id) - geoip_start_dirreq(TO_CONN(conn)->dirreq_id, dlen, act, - DIRREQ_TUNNELED); - else - geoip_start_dirreq(TO_CONN(conn)->global_identifier, dlen, act, - DIRREQ_DIRECT); - } - } + geoip_note_client_seen(act, &TO_CONN(conn)->addr, time(NULL)); + geoip_note_ns_response(act, GEOIP_SUCCESS); + /* Note that a request for a network status has started, so that we + * can measure the download time later on. */ + if (TO_CONN(conn)->dirreq_id) + geoip_start_dirreq(TO_CONN(conn)->dirreq_id, dlen, act, + DIRREQ_TUNNELED); + else + geoip_start_dirreq(TO_CONN(conn)->global_identifier, dlen, act, + DIRREQ_DIRECT); // note_request(request_type,dlen); (void) request_type; diff --git a/src/or/geoip.c b/src/or/geoip.c index 6d33c39..d3dcc4f 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -261,6 +261,22 @@ geoip_get_country_by_ip(uint32_t ipaddr) return ent ? (int)ent->country : 0; } +/** Given an IP address, return a number representing the country to which + * that address belongs, -1 for "No geoip information available", or 0 for + * the 'unknown country'. The return value will always be less than + * geoip_get_n_countries(). To decode it, call geoip_get_country_name(). + */ +int +geoip_get_country_by_addr(const tor_addr_t *addr) +{ + uint32_t ipaddr; + if (tor_addr_family(addr) != AF_INET) + /*XXXX IP6 support ipv6 geoip.*/ + return -1; + ipaddr = tor_addr_to_ipv4h(addr); + return geoip_get_country_by_ip(ipaddr); +} + /** Return the number of countries recognized by the GeoIP database. */ int geoip_get_n_countries(void) @@ -303,7 +319,7 @@ geoip_db_digest(void) * countries have them blocked. */ typedef struct clientmap_entry_t { HT_ENTRY(clientmap_entry_t) node; - uint32_t ipaddr; + tor_addr_t addr; /** Time when we last saw this IP address, in MINUTES since the epoch. * * (This will run out of space around 4011 CE. If Tor is still in use around @@ -325,13 +341,14 @@ static HT_HEAD(clientmap, clientmap_entry_t) client_history = static INLINE unsigned clientmap_entry_hash(const clientmap_entry_t *a) { - return ht_improve_hash((unsigned) a->ipaddr); + return ht_improve_hash(tor_addr_hash(&a->addr)); } /** Hashtable helper: compare two clientmap_entry_t values for equality. */ static INLINE int clientmap_entries_eq(const clientmap_entry_t *a, const clientmap_entry_t *b) { - return a->ipaddr == b->ipaddr && a->action == b->action; + return !tor_addr_compare(&a->addr, &b->addr, CMP_EXACT) && + a->action == b->action; } HT_PROTOTYPE(clientmap, clientmap_entry_t, node, clientmap_entry_hash, @@ -417,12 +434,12 @@ geoip_get_mean_shares(time_t now, double *v2_share_out, return 0; } -/** Note that we've seen a client connect from the IP <b>addr</b> (host order) +/** Note that we've seen a client connect from the IP <b>addr</b> * at time <b>now</b>. Ignored by all but bridges and directories if * configured accordingly. */ void geoip_note_client_seen(geoip_client_action_t action, - uint32_t addr, time_t now) + const tor_addr_t *addr, time_t now) { const or_options_t *options = get_options(); clientmap_entry_t lookup, *ent; @@ -437,12 +454,12 @@ geoip_note_client_seen(geoip_client_action_t action, return; } - lookup.ipaddr = addr; + tor_addr_copy(&lookup.addr, addr); lookup.action = (int)action; ent = HT_FIND(clientmap, &client_history, &lookup); if (! ent) { ent = tor_malloc_zero(sizeof(clientmap_entry_t)); - ent->ipaddr = addr; + tor_addr_copy(&ent->addr, addr); ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); } @@ -453,7 +470,7 @@ geoip_note_client_seen(geoip_client_action_t action, if (action == GEOIP_CLIENT_NETWORKSTATUS || action == GEOIP_CLIENT_NETWORKSTATUS_V2) { - int country_idx = geoip_get_country_by_ip(addr); + int country_idx = geoip_get_country_by_addr(addr); if (country_idx < 0) country_idx = 0; /** unresolved requests are stored at index 0. */ if (country_idx >= 0 && country_idx < smartlist_len(geoip_countries)) { @@ -823,7 +840,7 @@ geoip_get_client_history(geoip_client_action_t action) int country; if ((*ent)->action != (int)action) continue; - country = geoip_get_country_by_ip((*ent)->ipaddr); + country = geoip_get_country_by_addr(&(*ent)->addr); if (country < 0) country = 0; /** unresolved requests are stored at index 0. */ tor_assert(0 <= country && country < n_countries); diff --git a/src/or/geoip.h b/src/or/geoip.h index ce38419..7c2eddc 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -18,6 +18,7 @@ int geoip_parse_entry(const char *line); int should_record_bridge_info(const or_options_t *options); int geoip_load_file(const char *filename, const or_options_t *options); int geoip_get_country_by_ip(uint32_t ipaddr); +int geoip_get_country_by_addr(const tor_addr_t *addr); int geoip_get_n_countries(void); const char *geoip_get_country_name(country_t num); int geoip_is_loaded(void); @@ -25,7 +26,7 @@ const char *geoip_db_digest(void); country_t geoip_get_country(const char *countrycode); void geoip_note_client_seen(geoip_client_action_t action, - uint32_t addr, time_t now); + const tor_addr_t *addr, time_t now); void geoip_remove_old_clients(time_t cutoff); void geoip_note_ns_response(geoip_client_action_t action, diff --git a/src/test/test.c b/src/test/test.c index 2ecf6ff..7f196aa 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1452,6 +1452,7 @@ test_geoip(void) *entry_stats_2 = "entry-stats-end 2010-08-12 13:27:30 (86400 s)\n" "entry-ips \n"; + tor_addr_t addr; /* Populate the DB a bit. Add these in order, since we can't do the final * 'sort' step. These aren't very good IP addresses, but they're perfectly @@ -1480,16 +1481,23 @@ test_geoip(void) get_options_mutable()->BridgeRelay = 1; get_options_mutable()->BridgeRecordUsageByCountry = 1; /* Put 9 observations in AB... */ - for (i=32; i < 40; ++i) - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now-7200); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, 225, now-7200); + for (i=32; i < 40; ++i) { + tor_addr_from_ipv4h(&addr, (uint32_t) i); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now-7200); + } + tor_addr_from_ipv4h(&addr, (uint32_t) 225); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now-7200); /* and 3 observations in XY, several times. */ for (j=0; j < 10; ++j) - for (i=52; i < 55; ++i) - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now-3600); + for (i=52; i < 55; ++i) { + tor_addr_from_ipv4h(&addr, (uint32_t) i); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now-3600); + } /* and 17 observations in ZZ... */ - for (i=110; i < 127; ++i) - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now); + for (i=110; i < 127; ++i) { + tor_addr_from_ipv4h(&addr, (uint32_t) i); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now); + } s = geoip_get_client_history(GEOIP_CLIENT_CONNECT); test_assert(s); test_streq("zz=24,ab=16,xy=8", s); @@ -1528,14 +1536,16 @@ test_geoip(void) /* Start testing dirreq statistics by making sure that we don't collect * dirreq stats without initializing them. */ - geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, 100, now); + tor_addr_from_ipv4h(&addr, (uint32_t) 100); + geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, now); s = geoip_format_dirreq_stats(now + 86400); test_assert(!s); /* Initialize stats, note one connecting client, and generate the * dirreq-stats history string. */ geoip_dirreq_stats_init(now); - geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, 100, now); + tor_addr_from_ipv4h(&addr, (uint32_t) 100); + geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, now); s = geoip_format_dirreq_stats(now + 86400); test_streq(dirreq_stats_1, s); tor_free(s); @@ -1543,14 +1553,16 @@ test_geoip(void) /* Stop collecting stats, add another connecting client, and ensure we * don't generate a history string. */ geoip_dirreq_stats_term(); - geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, 101, now); + tor_addr_from_ipv4h(&addr, (uint32_t) 101); + geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, now); s = geoip_format_dirreq_stats(now + 86400); test_assert(!s); /* Re-start stats, add a connecting client, reset stats, and make sure * that we get an all empty history string. */ geoip_dirreq_stats_init(now); - geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, 100, now); + tor_addr_from_ipv4h(&addr, (uint32_t) 100); + geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, now); geoip_reset_dirreq_stats(now); s = geoip_format_dirreq_stats(now + 86400); test_streq(dirreq_stats_2, s); @@ -1577,14 +1589,16 @@ test_geoip(void) /* Start testing entry statistics by making sure that we don't collect * anything without initializing entry stats. */ - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, 100, now); + tor_addr_from_ipv4h(&addr, (uint32_t) 100); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now); s = geoip_format_entry_stats(now + 86400); test_assert(!s); /* Initialize stats, note one connecting client, and generate the * entry-stats history string. */ geoip_entry_stats_init(now); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, 100, now); + tor_addr_from_ipv4h(&addr, (uint32_t) 100); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now); s = geoip_format_entry_stats(now + 86400); test_streq(entry_stats_1, s); tor_free(s); @@ -1592,14 +1606,16 @@ test_geoip(void) /* Stop collecting stats, add another connecting client, and ensure we * don't generate a history string. */ geoip_entry_stats_term(); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, 101, now); + tor_addr_from_ipv4h(&addr, (uint32_t) 101); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now); s = geoip_format_entry_stats(now + 86400); test_assert(!s); /* Re-start stats, add a connecting client, reset stats, and make sure * that we get an all empty history string. */ geoip_entry_stats_init(now); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, 100, now); + tor_addr_from_ipv4h(&addr, (uint32_t) 100); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now); geoip_reset_entry_stats(now); s = geoip_format_entry_stats(now + 86400); test_streq(entry_stats_2, s);

1 0

[tor/master] Roger notes that address and addr are two different things.
by nickm＠torproject.org 27 Mar '12

27 Mar '12

commit 4741aa48a252db050435ca88e1a013a19a4ab3ed Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 9 15:54:00 2012 +0100 Roger notes that address and addr are two different things. --- src/or/directory.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 8d4ac63..cc5f1bd 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2843,16 +2843,23 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, goto done; } - geoip_note_client_seen(act, &TO_CONN(conn)->addr, time(NULL)); - geoip_note_ns_response(act, GEOIP_SUCCESS); - /* Note that a request for a network status has started, so that we - * can measure the download time later on. */ - if (TO_CONN(conn)->dirreq_id) - geoip_start_dirreq(TO_CONN(conn)->dirreq_id, dlen, act, - DIRREQ_TUNNELED); - else - geoip_start_dirreq(TO_CONN(conn)->global_identifier, dlen, act, - DIRREQ_DIRECT); + { + struct in_addr in; + tor_addr_t addr; + if (tor_inet_aton((TO_CONN(conn))->address, &in)) { + tor_addr_from_ipv4h(&addr, ntohl(in.s_addr)); + geoip_note_client_seen(act, &addr, time(NULL)); + geoip_note_ns_response(act, GEOIP_SUCCESS); + /* Note that a request for a network status has started, so that we + * can measure the download time later on. */ + if (TO_CONN(conn)->dirreq_id) + geoip_start_dirreq(TO_CONN(conn)->dirreq_id, dlen, act, + DIRREQ_TUNNELED); + else + geoip_start_dirreq(TO_CONN(conn)->global_identifier, dlen, act, + DIRREQ_DIRECT); + } + } // note_request(request_type,dlen); (void) request_type;

1 0

[tor/master] Merge remote-tracking branch 'karsten/bug5053'
by nickm＠torproject.org 27 Mar '12

27 Mar '12

commit 342e753d31a91752da19fbcef92e07373b30fac6 Merge: 582f747 4741aa4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 27 11:22:32 2012 -0400 Merge remote-tracking branch 'karsten/bug5053' changes/bug5053 | 5 +++++ src/or/connection_or.c | 7 ++----- src/or/directory.c | 4 +++- src/or/geoip.c | 34 +++++++++++++++++++++++++--------- src/or/geoip.h | 3 ++- src/test/test.c | 46 +++++++++++++++++++++++++++++++--------------- 6 files changed, 68 insertions(+), 31 deletions(-)

1 0