- tor-commits - lists.torproject.org

[tor/master] Rename reserved C identifiers.
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit 19ab7b16396804694355923b2254a8e10970f9b2 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Oct 17 10:38:03 2012 +0200 Rename reserved C identifiers. --- src/or/geoip.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 15eeb54..c037d32 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -140,7 +140,7 @@ geoip_ipv4_parse_entry(const char *line) /** Sorting helper: return -1, 1, or 0 based on comparison of two * geoip_ipv4_entry_t */ static int -_geoip_ipv4_compare_entries(const void **_a, const void **_b) +geoip_ipv4_compare_entries_(const void **_a, const void **_b) { const geoip_ipv4_entry_t *a = *_a, *b = *_b; if (a->ip_low < b->ip_low) @@ -154,7 +154,7 @@ _geoip_ipv4_compare_entries(const void **_a, const void **_b) /** bsearch helper: return -1, 1, or 0 based on comparison of an IP (a pointer * to a uint32_t in host order) to a geoip_ipv4_entry_t */ static int -_geoip_ipv4_compare_key_to_entry(const void *_key, const void **_member) +geoip_ipv4_compare_key_to_entry_(const void *_key, const void **_member) { /* No alignment issue here, since _key really is a pointer to uint32_t */ const uint32_t addr = *(uint32_t *)_key; @@ -258,7 +258,7 @@ geoip_ipv6_parse_entry(const char *line) /** Sorting helper: return -1, 1, or 0 based on comparison of two * geoip_ipv6_entry_t */ static int -_geoip_ipv6_compare_entries(const void **_a, const void **_b) +geoip_ipv6_compare_entries_(const void **_a, const void **_b) { const geoip_ipv6_entry_t *a = *_a, *b = *_b; return memcmp(&a->ip_low, &b->ip_low, sizeof(struct in6_addr)); @@ -267,7 +267,7 @@ _geoip_ipv6_compare_entries(const void **_a, const void **_b) /** bsearch helper: return -1, 1, or 0 based on comparison of an IPv6 (a pointer * to a in6_addr in host order) to a geoip_ipv6_entry_t */ static int -_geoip_ipv6_compare_key_to_entry(const void *_key, const void **_member) +geoip_ipv6_compare_key_to_entry_(const void *_key, const void **_member) { /* XXX5053 The following comment isn't correct anymore and I'm not 100% * certain how to fix it, because I don't know what alignment issues @@ -372,9 +372,9 @@ geoip_load_file(sa_family_t family, const char *filename, const or_options_t *op fclose(f); if (family == AF_INET) - smartlist_sort(geoip_ipv4_entries, _geoip_ipv4_compare_entries); + smartlist_sort(geoip_ipv4_entries, geoip_ipv4_compare_entries_); else /* AF_INET6 */ - smartlist_sort(geoip_ipv6_entries, _geoip_ipv6_compare_entries); + smartlist_sort(geoip_ipv6_entries, geoip_ipv6_compare_entries_); /* Okay, now we need to maybe change our mind about what is in which * country. */ @@ -404,7 +404,7 @@ geoip_get_country_by_ipv4(uint32_t ipaddr) geoip_ipv4_entry_t *ent; if (!geoip_ipv4_entries) return -1; - ent = smartlist_bsearch(geoip_ipv4_entries, &ipaddr, _geoip_ipv4_compare_key_to_entry); + ent = smartlist_bsearch(geoip_ipv4_entries, &ipaddr, geoip_ipv4_compare_key_to_entry_); return ent ? (int)ent->country : 0; } @@ -420,7 +420,7 @@ geoip_get_country_by_ipv6(const struct in6_addr *addr) if (!geoip_ipv6_entries) return -1; - ent = smartlist_bsearch(geoip_ipv6_entries, addr, _geoip_ipv6_compare_key_to_entry); + ent = smartlist_bsearch(geoip_ipv6_entries, addr, geoip_ipv6_compare_key_to_entry_); return ent ? (int)ent->country : 0; }

1 0

[tor/master] Two changes lost in rebase resurrected.
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit 74c6dafed63a3e51441dd484d652c0e337585949 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Oct 17 12:13:49 2012 +0200 Two changes lost in rebase resurrected. --- src/or/nodelist.c | 11 +++++++---- src/or/routerset.c | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 29b6047..f386303 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -921,12 +921,15 @@ node_get_pref_ipv6_orport(const node_t *node, tor_addr_port_t *ap_out) void node_set_country(node_t *node) { + tor_addr_t addr = TOR_ADDR_NULL; + + /* XXXXipv6 */ if (node->rs) - node->country = geoip_get_country_by_ip(node->rs->addr); + tor_addr_from_ipv4h(&addr, node->rs->addr); else if (node->ri) - node->country = geoip_get_country_by_ip(node->ri->addr); - else - node->country = -1; + tor_addr_from_ipv4h(&addr, node->ri->addr); + + node->country = geoip_get_country_by_addr(&addr); } /** Set the country code of all routers in the routerlist. */ diff --git a/src/or/routerset.c b/src/or/routerset.c index 263cf79..f3cd592 100644 --- a/src/or/routerset.c +++ b/src/or/routerset.c @@ -216,7 +216,7 @@ routerset_contains(const routerset_t *set, const tor_addr_t *addr, return 3; if (set->countries) { if (country < 0 && addr) - country = geoip_get_country_by_ip(tor_addr_to_ipv4h(addr)); + country = geoip_get_country_by_addr(addr); if (country >= 0 && country < set->n_countries && bitarray_is_set(set->countries, country))

1 0

[tor/master] White space.
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit e2313d8622aebc2704ce016dfef2be975fa535c3 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Oct 17 14:01:02 2012 +0200 White space. --- src/or/config.c | 4 +- src/or/geoip.c | 58 +++++++++++++++++++++++++++++++++--------------------- src/or/geoip.h | 6 +++- src/test/test.c | 30 +++++++++++++++------------- 4 files changed, 57 insertions(+), 41 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index d5df5e7..3b95909 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1532,7 +1532,8 @@ options_act(const or_options_t *old_options) } /* And maybe load geoip ipv6 file */ if (options->GeoIPv6File && - ((!old_options || !opt_streq(old_options->GeoIPv6File, options->GeoIPv6File)) + ((!old_options || !opt_streq(old_options->GeoIPv6File, + options->GeoIPv6File)) || !geoip_is_loaded())) { /* XXXX Don't use this "<default>" junk; make our filename options * understand prefixes somehow. See also comment for GeoIPFile. */ @@ -1549,7 +1550,6 @@ options_act(const or_options_t *old_options) geoip_load_file(AF_INET6, actual_fname, options); tor_free(actual_fname); } - if (options->CellStatistics || options->DirReqStatistics || options->EntryStatistics || options->ExitPortStatistics || diff --git a/src/or/geoip.c b/src/or/geoip.c index c037d32..7507918 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -167,11 +167,12 @@ geoip_ipv4_compare_key_to_entry_(const void *_key, const void **_member) return 0; } -/** Add an entry to the GeoIP IPv6 table, mapping all IPs between low and - * high, inclusive, to the 2-letter country code country. - */ +/** Add an entry to the GeoIP IPv6 table, mapping all IPs between + * low and high, inclusive, to the 2-letter country code + * country. */ static void -geoip_ipv6_add_entry(struct in6_addr low, struct in6_addr high, const char *country) +geoip_ipv6_add_entry(struct in6_addr low, struct in6_addr high, + const char *country) { intptr_t idx; geoip_ipv6_entry_t *ent; @@ -264,8 +265,8 @@ geoip_ipv6_compare_entries_(const void **_a, const void **_b) return memcmp(&a->ip_low, &b->ip_low, sizeof(struct in6_addr)); } -/** bsearch helper: return -1, 1, or 0 based on comparison of an IPv6 (a pointer - * to a in6_addr in host order) to a geoip_ipv6_entry_t */ +/** bsearch helper: return -1, 1, or 0 based on comparison of an IPv6 + * (a pointer to a in6_addr in host order) to a geoip_ipv6_entry_t */ static int geoip_ipv6_compare_key_to_entry_(const void *_key, const void **_member) { @@ -324,7 +325,8 @@ init_geoip_countries(void) * with '#' (comments). */ int -geoip_load_file(sa_family_t family, const char *filename, const or_options_t *options) +geoip_load_file(sa_family_t family, const char *filename, + const or_options_t *options) { FILE *f; const char *msg = ""; @@ -343,20 +345,23 @@ geoip_load_file(sa_family_t family, const char *filename, const or_options_t *op if (family == AF_INET) { if (geoip_ipv4_entries) { - SMARTLIST_FOREACH(geoip_ipv4_entries, geoip_ipv4_entry_t *, e, tor_free(e)); + SMARTLIST_FOREACH(geoip_ipv4_entries, geoip_ipv4_entry_t *, e, + tor_free(e)); smartlist_free(geoip_ipv4_entries); } geoip_ipv4_entries = smartlist_new(); } else { /* AF_INET6 */ if (geoip_ipv6_entries) { - SMARTLIST_FOREACH(geoip_ipv6_entries, geoip_ipv6_entry_t *, e, tor_free(e)); + SMARTLIST_FOREACH(geoip_ipv6_entries, geoip_ipv6_entry_t *, e, + tor_free(e)); smartlist_free(geoip_ipv6_entries); } geoip_ipv6_entries = smartlist_new(); } geoip_digest_env = crypto_digest_new(); - - log_notice(LD_GENERAL, "Parsing GEOIP %s file %s.", (family == AF_INET) ? "ipv4" : "ipv6", filename); + + log_notice(LD_GENERAL, "Parsing GEOIP %s file %s.", + (family == AF_INET) ? "ipv4" : "ipv6", filename); while (!feof(f)) { char buf[512]; if (fgets(buf, (int)sizeof(buf), f) == NULL) @@ -404,7 +409,8 @@ geoip_get_country_by_ipv4(uint32_t ipaddr) geoip_ipv4_entry_t *ent; if (!geoip_ipv4_entries) return -1; - ent = smartlist_bsearch(geoip_ipv4_entries, &ipaddr, geoip_ipv4_compare_key_to_entry_); + ent = smartlist_bsearch(geoip_ipv4_entries, &ipaddr, + geoip_ipv4_compare_key_to_entry_); return ent ? (int)ent->country : 0; } @@ -420,11 +426,11 @@ geoip_get_country_by_ipv6(const struct in6_addr *addr) if (!geoip_ipv6_entries) return -1; - ent = smartlist_bsearch(geoip_ipv6_entries, addr, geoip_ipv6_compare_key_to_entry_); + ent = smartlist_bsearch(geoip_ipv6_entries, addr, + geoip_ipv6_compare_key_to_entry_); 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 @@ -470,7 +476,8 @@ geoip_is_loaded(void) /* XXX5053 Saying that we have loaded a GeoIP database if have _either_ * a v4 or v6 database might be problematic. Maybe we need to add an * address parameter to this function? -KL */ - return geoip_countries != NULL && (geoip_ipv4_entries != NULL || geoip_ipv6_entries != NULL); + return geoip_countries != NULL && + (geoip_ipv4_entries != NULL || geoip_ipv6_entries != NULL); } /** Return the hex-encoded SHA1 digest of the loaded GeoIP file. The @@ -990,7 +997,8 @@ geoip_get_dirreq_history(geoip_client_action_t action, * to export geoip data yet. This counts both IPv4 and IPv6 clients * since they're in the same clientmap list. */ char * -geoip_get_client_history(geoip_client_action_t action, int *total_ipv4, int *total_ipv6) +geoip_get_client_history(geoip_client_action_t action, int *total_ipv4, + int *total_ipv6) { char *result = NULL; unsigned granularity = IP_GRANULARITY; @@ -1412,16 +1420,17 @@ geoip_format_bridge_stats(time_t now) return NULL; /* Not initialized. */ format_iso_time(written, now); - data = geoip_get_client_history(GEOIP_CLIENT_CONNECT, &total_ipv4, &total_ipv6); + data = geoip_get_client_history(GEOIP_CLIENT_CONNECT, &total_ipv4, + &total_ipv6); tor_asprintf(&out, "bridge-stats-end %s (%ld s)\n" "bridge-ips %s\n" - "bridge-ip-versions v4=%d,v6=%d\n", + "bridge-ip-versions v4=%d,v6=%d\n", written, duration, data ? data : "", - total_ipv4, - total_ipv6); + total_ipv4, + total_ipv6); tor_free(data); return out; @@ -1571,7 +1580,8 @@ geoip_format_entry_stats(time_t now) tor_assert(now >= start_of_entry_stats_interval); - data = geoip_get_client_history(GEOIP_CLIENT_CONNECT, &total_ipv4, &total_ipv6); + data = geoip_get_client_history(GEOIP_CLIENT_CONNECT, &total_ipv4, + &total_ipv6); format_iso_time(t, now); tor_asprintf(&result, "entry-stats-end %s (%u s)\n" @@ -1658,11 +1668,13 @@ clear_geoip_db(void) strmap_free(country_idxplus1_by_lc_code, NULL); if (geoip_ipv4_entries) { - SMARTLIST_FOREACH(geoip_ipv4_entries, geoip_ipv4_entry_t *, ent, tor_free(ent)); + SMARTLIST_FOREACH(geoip_ipv4_entries, geoip_ipv4_entry_t *, ent, + tor_free(ent)); smartlist_free(geoip_ipv4_entries); } if (geoip_ipv6_entries) { - SMARTLIST_FOREACH(geoip_ipv6_entries, geoip_ipv6_entry_t *, ent, tor_free(ent)); + SMARTLIST_FOREACH(geoip_ipv6_entries, geoip_ipv6_entry_t *, ent, + tor_free(ent)); smartlist_free(geoip_ipv6_entries); } geoip_countries = NULL; diff --git a/src/or/geoip.h b/src/or/geoip.h index 4cde32e..38f1289 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -19,7 +19,8 @@ int geoip_get_country_by_ipv4(uint32_t ipaddr); int geoip_get_country_by_ipv6(const struct in6_addr *addr); #endif int should_record_bridge_info(const or_options_t *options); -int geoip_load_file(sa_family_t family, const char *filename, const or_options_t *options); +int geoip_load_file(sa_family_t family, const char *filename, + const or_options_t *options); 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); @@ -33,7 +34,8 @@ void geoip_remove_old_clients(time_t cutoff); void geoip_note_ns_response(geoip_client_action_t action, geoip_ns_response_t response); -char *geoip_get_client_history(geoip_client_action_t action, int *total_ipv4, int *total_ipv6); +char *geoip_get_client_history(geoip_client_action_t action, int *total_ipv4, + int *total_ipv6); char *geoip_get_request_history(geoip_client_action_t action); int getinfo_helper_geoip(control_connection_t *control_conn, const char *question, char **answer, diff --git a/src/test/test.c b/src/test/test.c index f34a22c..0c5e84d 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1485,13 +1485,15 @@ test_geoip(void) /* Make sure that country ID actually works. */ #define SET_TEST_IPV6(i) in6.s6_addr32[3] = htonl((uint32_t) i) -#define CHECK_COUNTRY(country, val) do { \ - /* test ipv4 country lookup */ \ - test_streq(country, geoip_get_country_name(geoip_get_country_by_ipv4(val))); \ - /* test ipv6 country lookup */ \ - SET_TEST_IPV6(val); \ - test_streq(country, geoip_get_country_name(geoip_get_country_by_ipv6(&in6))); \ - } while(0) +#define CHECK_COUNTRY(country, val) do { \ + /* test ipv4 country lookup */ \ + test_streq(country, \ + geoip_get_country_name(geoip_get_country_by_ipv4(val))); \ + /* test ipv6 country lookup */ \ + SET_TEST_IPV6(val); \ + test_streq(country, \ + geoip_get_country_name(geoip_get_country_by_ipv6(&in6))); \ + } while (0) CHECK_COUNTRY("??", 3); CHECK_COUNTRY("ab", 32); @@ -1511,14 +1513,14 @@ test_geoip(void) * using ipv4. Since our fake geoip database is the same between * ipv4 and ipv6, we should get the same result no matter which * address family we pick for each IP. */ -#define SET_TEST_ADDRESS(i) do { \ - if ((i) & 1) { \ - SET_TEST_IPV6(i); \ - tor_addr_from_in6(&addr, &in6); \ - } else { \ +#define SET_TEST_ADDRESS(i) do { \ + if ((i) & 1) { \ + SET_TEST_IPV6(i); \ + tor_addr_from_in6(&addr, &in6); \ + } else { \ tor_addr_from_ipv4h(&addr, (uint32_t) i); \ - } \ - } while(0) + } \ + } while (0) get_options_mutable()->BridgeRelay = 1; get_options_mutable()->BridgeRecordUsageByCountry = 1;

1 0

[tor/master] Separate IPv4 and IPv6 geoip file loading.
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit 817ff962f830188ec4c1a907ebc389a856ea3288 Author: Linus Nordberg <linus(a)torproject.org> Date: Sat Oct 20 18:48:58 2012 +0200 Separate IPv4 and IPv6 geoip file loading. Also add IPv6 geoip file digest to extra info. Also also, add support for IPv6 addresses in control command "ip-to-country". --- src/or/config.c | 12 ++++---- src/or/geoip.c | 78 +++++++++++++++++++++++++++++---------------------- src/or/geoip.h | 4 +- src/or/router.c | 9 ++++-- src/or/routerset.c | 2 +- 5 files changed, 59 insertions(+), 46 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 3b95909..5b1f1ee 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1512,10 +1512,10 @@ options_act(const or_options_t *old_options) connection_or_update_token_buckets(get_connection_array(), options); } - /* Maybe load geoip file */ + /* Maybe load IPv4 geoip file */ if (options->GeoIPFile && ((!old_options || !opt_streq(old_options->GeoIPFile, options->GeoIPFile)) - || !geoip_is_loaded())) { + || !geoip_is_loaded(AF_INET))) { /* XXXX Don't use this "<default>" junk; make our filename options * understand prefixes somehow. -NM */ /* XXXX024 Reload GeoIPFile on SIGHUP. -NM */ @@ -1530,11 +1530,11 @@ options_act(const or_options_t *old_options) geoip_load_file(AF_INET, actual_fname, options); tor_free(actual_fname); } - /* And maybe load geoip ipv6 file */ + /* And maybe load IPv6 geoip file */ if (options->GeoIPv6File && ((!old_options || !opt_streq(old_options->GeoIPv6File, options->GeoIPv6File)) - || !geoip_is_loaded())) { + || !geoip_is_loaded(AF_INET6))) { /* XXXX Don't use this "<default>" junk; make our filename options * understand prefixes somehow. See also comment for GeoIPFile. */ /* XXXX024 Reload GeoIPV6File on SIGHUP. See also comment for @@ -1573,7 +1573,7 @@ options_act(const or_options_t *old_options) } if ((!old_options || !old_options->DirReqStatistics) && options->DirReqStatistics) { - if (geoip_is_loaded()) { + if (geoip_is_loaded(AF_INET)) { geoip_dirreq_stats_init(now); print_notice = 1; } else { @@ -1588,7 +1588,7 @@ options_act(const or_options_t *old_options) } if ((!old_options || !old_options->EntryStatistics) && options->EntryStatistics && !should_record_bridge_info(options)) { - if (geoip_is_loaded()) { + if (geoip_is_loaded(AF_INET) || geoip_is_loaded(AF_INET6)) { geoip_entry_stats_init(now); print_notice = 1; } else { diff --git a/src/or/geoip.c b/src/or/geoip.c index 7507918..e1c0009 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -52,8 +52,9 @@ static strmap_t *country_idxplus1_by_lc_code = NULL; * by their respective ip_low. */ static smartlist_t *geoip_ipv4_entries = NULL, *geoip_ipv6_entries = NULL; -/** SHA1 digest of the GeoIP file to include in extra-info descriptors. */ +/** SHA1 digest of the GeoIP files to include in extra-info descriptors. */ static char geoip_digest[DIGEST_LEN]; +static char geoip6_digest[DIGEST_LEN]; /** Return the index of the country's entry in the GeoIP DB * if it is a valid 2-letter country code, otherwise return -1. @@ -376,22 +377,20 @@ geoip_load_file(sa_family_t family, const char *filename, /*XXXX abort and return -1 if no entries/illformed?*/ fclose(f); - if (family == AF_INET) + /* Sort list and remember file digests so that we can include it in + * our extra-info descriptors. */ + if (family == AF_INET) { smartlist_sort(geoip_ipv4_entries, geoip_ipv4_compare_entries_); - else /* AF_INET6 */ + /* Okay, now we need to maybe change our mind about what is in + * which country. We do this for IPv4 only since that's what we + * store in node->country. */ + refresh_all_country_info(); + crypto_digest_get_digest(geoip_digest_env, geoip_digest, DIGEST_LEN); + } + else { /* AF_INET6 */ smartlist_sort(geoip_ipv6_entries, geoip_ipv6_compare_entries_); - - /* Okay, now we need to maybe change our mind about what is in which - * country. */ - refresh_all_country_info(); - - /* Remember file digest so that we can include it in our extra-info - * descriptors. */ - /* XXX5053 This is a bug! We overwrite geoip_digest with whichever file - * we parse last. We'll want to add a separate geoip6_digest and write - * a geoip6-db-digest line to our extra-info descriptor. Needs a - * dir-spec.txt patch, too. -KL */ - crypto_digest_get_digest(geoip_digest_env, geoip_digest, DIGEST_LEN); + crypto_digest_get_digest(geoip_digest_env, geoip6_digest, DIGEST_LEN); + } crypto_digest_free(geoip_digest_env); return 0; @@ -471,22 +470,28 @@ geoip_get_country_name(country_t num) /** Return true iff we have loaded a GeoIP database.*/ int -geoip_is_loaded(void) +geoip_is_loaded(sa_family_t family) { - /* XXX5053 Saying that we have loaded a GeoIP database if have _either_ - * a v4 or v6 database might be problematic. Maybe we need to add an - * address parameter to this function? -KL */ - return geoip_countries != NULL && - (geoip_ipv4_entries != NULL || geoip_ipv6_entries != NULL); + tor_assert(family == AF_INET || family == AF_INET6); + if (geoip_countries == NULL) + return 0; + if (family == AF_INET) + return geoip_ipv4_entries != NULL; + else /* AF_INET6 */ + return geoip_ipv6_entries != NULL; } /** Return the hex-encoded SHA1 digest of the loaded GeoIP file. The * result does not need to be deallocated, but will be overwritten by the * next call of hex_str(). */ const char * -geoip_db_digest(void) +geoip_db_digest(sa_family_t family) { - return hex_str(geoip_digest, DIGEST_LEN); + tor_assert(family == AF_INET || family == AF_INET6); + if (family == AF_INET) + return hex_str(geoip_digest, DIGEST_LEN); + else /* AF_INET6 */ + return hex_str(geoip6_digest, DIGEST_LEN); } /** Entry in a map from IP address to the last time we've seen an incoming @@ -1011,7 +1016,7 @@ geoip_get_client_history(geoip_client_action_t action, int *total_ipv4, unsigned total = 0; unsigned ipv4_count = 0, ipv6_count = 0; - if (!geoip_is_loaded()) + if (!geoip_is_loaded(AF_INET) && !geoip_is_loaded(AF_INET6)) return NULL; counts = tor_malloc_zero(sizeof(unsigned)*n_countries); @@ -1639,20 +1644,25 @@ getinfo_helper_geoip(control_connection_t *control_conn, const char **errmsg) { (void)control_conn; - if (!geoip_is_loaded()) { - *errmsg = "GeoIP data not loaded"; - return -1; - } if (!strcmpstart(question, "ip-to-country/")) { int c; - uint32_t ip; - struct in_addr in; + sa_family_t family; + tor_addr_t addr; question += strlen("ip-to-country/"); - if (tor_inet_aton(question, &in) != 0) { - ip = ntohl(in.s_addr); - c = geoip_get_country_by_ipv4(ip); - *answer = tor_strdup(geoip_get_country_name(c)); + family = tor_addr_parse(&addr, question); + if (family != AF_INET && family != AF_INET6) { + *errmsg = "Invalid address family"; + return -1; + } + if (!geoip_is_loaded(family)) { + *errmsg = "GeoIP data not loaded"; + return -1; } + if (family == AF_INET) + c = geoip_get_country_by_ipv4(tor_addr_to_ipv4h(&addr)); + else /* AF_INET6 */ + c = geoip_get_country_by_ipv6(tor_addr_to_in6(&addr)); + *answer = tor_strdup(geoip_get_country_name(c)); } return 0; } diff --git a/src/or/geoip.h b/src/or/geoip.h index 38f1289..1d0012f 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -24,8 +24,8 @@ int geoip_load_file(sa_family_t family, const char *filename, 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); -const char *geoip_db_digest(void); +int geoip_is_loaded(sa_family_t family); +const char *geoip_db_digest(sa_family_t family); country_t geoip_get_country(const char *countrycode); void geoip_note_client_seen(geoip_client_action_t action, diff --git a/src/or/router.c b/src/or/router.c index 2e80c54..926bf26 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2313,9 +2313,12 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo, tor_free(bandwidth_usage); smartlist_add(chunks, pre); - if (geoip_is_loaded()) { - smartlist_add_asprintf(chunks, "geoip-db-digest %s\n", geoip_db_digest()); - } + if (geoip_is_loaded(AF_INET)) + smartlist_add_asprintf(chunks, "geoip-db-digest %s\n", + geoip_db_digest(AF_INET)); + if (geoip_is_loaded(AF_INET6)) + smartlist_add_asprintf(chunks, "geoip6-db-digest %s\n", + geoip_db_digest(AF_INET6)); if (options->ExtraInfoStatistics && write_stats_to_extrainfo) { log_info(LD_GENERAL, "Adding stats to extra-info descriptor."); diff --git a/src/or/routerset.c b/src/or/routerset.c index f3cd592..f9e3c9a 100644 --- a/src/or/routerset.c +++ b/src/or/routerset.c @@ -82,7 +82,7 @@ routerset_refresh_countries(routerset_t *target) int cc; bitarray_free(target->countries); - if (!geoip_is_loaded()) { + if (!geoip_is_loaded(AF_INET)) { target->countries = NULL; target->n_countries = 0; return;

1 0

[tor/master] Duplicate less code.
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit af175fa7e4ee3ffd1d91d463ba77a3c10d95c654 Author: Linus Nordberg <linus(a)torproject.org> Date: Sat Oct 20 19:35:00 2012 +0200 Duplicate less code. --- src/or/config.c | 76 +++++++++++++++++++++++++++--------------------------- src/or/geoip.c | 4 +- src/or/geoip.h | 3 +- 3 files changed, 41 insertions(+), 42 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 5b1f1ee..b83b6f7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -482,6 +482,8 @@ static void init_libevent(const or_options_t *options); static int opt_streq(const char *s1, const char *s2); static int parse_outbound_addresses(or_options_t *options, int validate_only, char **msg); +static void config_maybe_load_geoip_files_(const or_options_t *options, + const or_options_t *old_options); /** Magic value for or_options_t. */ #define OR_OPTIONS_MAGIC 9090909 @@ -1512,44 +1514,7 @@ options_act(const or_options_t *old_options) connection_or_update_token_buckets(get_connection_array(), options); } - /* Maybe load IPv4 geoip file */ - if (options->GeoIPFile && - ((!old_options || !opt_streq(old_options->GeoIPFile, options->GeoIPFile)) - || !geoip_is_loaded(AF_INET))) { - /* XXXX Don't use this "<default>" junk; make our filename options - * understand prefixes somehow. -NM */ - /* XXXX024 Reload GeoIPFile on SIGHUP. -NM */ - char *actual_fname = tor_strdup(options->GeoIPFile); -#ifdef _WIN32 - if (!strcmp(actual_fname, "<default>")) { - const char *conf_root = get_windows_conf_root(); - tor_free(actual_fname); - tor_asprintf(&actual_fname, "%s\\geoip", conf_root); - } -#endif - geoip_load_file(AF_INET, actual_fname, options); - tor_free(actual_fname); - } - /* And maybe load IPv6 geoip file */ - if (options->GeoIPv6File && - ((!old_options || !opt_streq(old_options->GeoIPv6File, - options->GeoIPv6File)) - || !geoip_is_loaded(AF_INET6))) { - /* XXXX Don't use this "<default>" junk; make our filename options - * understand prefixes somehow. See also comment for GeoIPFile. */ - /* XXXX024 Reload GeoIPV6File on SIGHUP. See also comment for - * GeoIPFile. */ - char *actual_fname = tor_strdup(options->GeoIPv6File); -#ifdef _WIN32 - if (!strcmp(actual_fname, "<default>")) { - const char *conf_root = get_windows_conf_root(); - tor_free(actual_fname); - tor_asprintf(&actual_fname, "%s\\geoip6", conf_root); - } -#endif - geoip_load_file(AF_INET6, actual_fname, options); - tor_free(actual_fname); - } + config_maybe_load_geoip_files_(options, old_options); if (options->CellStatistics || options->DirReqStatistics || options->EntryStatistics || options->ExitPortStatistics || @@ -5599,3 +5564,38 @@ parse_outbound_addresses(or_options_t *options, int validate_only, char **msg) return 0; } +static void +config_load_geoip_file_(sa_family_t family, + char *fname, /* will be freed */ + const char *default_fname) +{ + (void)default_fname; + /* XXXX Don't use this "<default>" junk; make our filename options + * understand prefixes somehow. -NM */ + /* XXXX024 Reload GeoIPFile on SIGHUP. -NM */ +#ifdef _WIN32 + if (!strcmp(fname, "<default>")) { + const char *conf_root = get_windows_conf_root(); + tor_free(fname); + tor_asprintf(&fname, "%s\\%s", conf_root, default_fname); + } +#endif + geoip_load_file(family, fname); + tor_free(fname); +} + +static void +config_maybe_load_geoip_files_(const or_options_t *options, + const or_options_t *old_options) +{ + if (options->GeoIPFile && + ((!old_options || !opt_streq(old_options->GeoIPFile, + options->GeoIPFile)) + || !geoip_is_loaded(AF_INET))) + config_load_geoip_file_(AF_INET, tor_strdup(options->GeoIPFile), "geoip"); + if (options->GeoIPv6File && + ((!old_options || !opt_streq(old_options->GeoIPv6File, + options->GeoIPv6File)) + || !geoip_is_loaded(AF_INET6))) + config_load_geoip_file_(AF_INET6, tor_strdup(options->GeoIPv6File), "geoip6"); +} diff --git a/src/or/geoip.c b/src/or/geoip.c index e1c0009..5459b55 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -326,11 +326,11 @@ init_geoip_countries(void) * with '#' (comments). */ int -geoip_load_file(sa_family_t family, const char *filename, - const or_options_t *options) +geoip_load_file(sa_family_t family, const char *filename) { FILE *f; const char *msg = ""; + const or_options_t *options = get_options(); int severity = options_need_geoip_info(options, &msg) ? LOG_WARN : LOG_INFO; crypto_digest_t *geoip_digest_env = NULL; diff --git a/src/or/geoip.h b/src/or/geoip.h index 1d0012f..3c91617 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -19,8 +19,7 @@ int geoip_get_country_by_ipv4(uint32_t ipaddr); int geoip_get_country_by_ipv6(const struct in6_addr *addr); #endif int should_record_bridge_info(const or_options_t *options); -int geoip_load_file(sa_family_t family, const char *filename, - const or_options_t *options); +int geoip_load_file(sa_family_t family, const char *filename); 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);

1 0

[tor/master] Document two functions.
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit 9d71d97e9dc32789693df135c06574a16d1ebfea Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Oct 19 23:23:04 2012 +0200 Document two functions. --- src/or/config.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index b83b6f7..b81f319 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5564,6 +5564,10 @@ parse_outbound_addresses(or_options_t *options, int validate_only, char **msg) return 0; } +/** Load one of the geoip files, <a>family</a> determining which + * one. Note that <a>fname</a> will be freed by this + * function. <a>default_fname</a> is used if on Windows and + * <a>fname</a> equals "<default>". */ static void config_load_geoip_file_(sa_family_t family, char *fname, /* will be freed */ @@ -5584,6 +5588,8 @@ config_load_geoip_file_(sa_family_t family, tor_free(fname); } +/** Load geoip files for IPv4 and IPv6 if <a>options</a> and + * <a>old_options</a> indicate we should. */ static void config_maybe_load_geoip_files_(const or_options_t *options, const or_options_t *old_options)

1 0

[tor/master] Name variables more consistently.
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit 8c9b4274255beb7b6397a4303fbb054fb55a4f11 Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Oct 19 23:23:04 2012 +0200 Name variables more consistently. --- src/or/geoip.c | 12 ++++++------ src/or/or.h | 2 +- src/or/policies.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 0097a7e..de8e280 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1428,7 +1428,7 @@ static char *bridge_stats_extrainfo = NULL; char * geoip_format_bridge_stats(time_t now) { - char *out = NULL, *data = NULL, *ipver = NULL; + char *out = NULL, *country_data = NULL, *ipver_data = NULL; long duration = now - start_of_bridge_stats_interval; char written[ISO_TIME_LEN+1]; @@ -1438,17 +1438,17 @@ geoip_format_bridge_stats(time_t now) return NULL; /* Not initialized. */ format_iso_time(written, now); - geoip_get_client_history(GEOIP_CLIENT_CONNECT, &data, &ipver); + geoip_get_client_history(GEOIP_CLIENT_CONNECT, &country_data, &ipver_data); tor_asprintf(&out, "bridge-stats-end %s (%ld s)\n" "bridge-ips %s\n" "bridge-ip-versions %s\n", written, duration, - data ? data : "", - ipver ? ipver : ""); - tor_free(data); - tor_free(ipver); + country_data ? country_data : "", + ipver_data ? ipver_data : ""); + tor_free(country_data); + tor_free(ipver_data); return out; } diff --git a/src/or/or.h b/src/or/or.h index 26b8973..5c6e998 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3657,7 +3657,7 @@ typedef struct { * the bridge authority guess which countries have blocked access to us. */ int BridgeRecordUsageByCountry; - /** Optionally, IPv4 and IPv6 GeoIP data */ + /** Optionally, IPv4 and IPv6 GeoIP data. */ char *GeoIPFile; char *GeoIPv6File; diff --git a/src/or/policies.c b/src/or/policies.c index 8187249..ecf1f68 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -323,7 +323,7 @@ addr_is_in_cc_list(uint32_t addr, const smartlist_t *cc_list) if (!cc_list) return 0; - /* XXX: ipv4 specific */ + /* XXXXipv6 */ tor_addr_from_ipv4h(&tar, addr); country = geoip_get_country_by_addr(&tar); name = geoip_get_country_name(country);

1 0

[tor/master] Add "IPVersions" to control command "status/clients-seen".
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit cb51807236844f208b94d53dce7fbc5183180f1d Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Oct 19 23:23:04 2012 +0200 Add "IPVersions" to control command "status/clients-seen". --- src/or/geoip.c | 119 ++++++++++++++++++++++++++++++------------------------ src/or/geoip.h | 4 +- src/test/test.c | 18 +++++---- 3 files changed, 78 insertions(+), 63 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 5459b55..005a381 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -994,20 +994,25 @@ geoip_get_dirreq_history(geoip_client_action_t action, return result; } -/** Return a newly allocated comma-separated string containing entries for - * all the countries from which we've seen enough clients connect as a - * bridge, directory server, or entry guard. The entry format is cc=num - * where num is the number of IPs we've seen connecting from that country, - * and cc is a lowercased country code. Returns NULL if we don't want - * to export geoip data yet. This counts both IPv4 and IPv6 clients - * since they're in the same clientmap list. */ -char * -geoip_get_client_history(geoip_client_action_t action, int *total_ipv4, - int *total_ipv6) +/** Store a newly allocated comma-separated string in + * *<a>country_str</a> containing entries for all the countries from + * which we've seen enough clients connect as a bridge, directory + * server, or entry guard. The entry format is cc=num where num is the + * number of IPs we've seen connecting from that country, and cc is a + * lowercased country code. *<a>country_str</a> is set to NULL if + * we're not ready to export per country data yet. + * + * Store a newly allocated comma-separated string in <a>ipver_str</a> + * containing entries for clients connecting over IPv4 and IPv6. The + * format is family=num where num is the nubmer of IPs we've seen + * connecting over that protocol family, and family is 'v4' or 'v6'. + * + * Return 0 on success and -1 if we're missing geoip data. */ +int +geoip_get_client_history(geoip_client_action_t action, + char **country_str, char **ipver_str) { - char *result = NULL; unsigned granularity = IP_GRANULARITY; - smartlist_t *chunks = NULL; smartlist_t *entries = NULL; int n_countries = geoip_get_n_countries(); int i; @@ -1017,7 +1022,7 @@ geoip_get_client_history(geoip_client_action_t action, int *total_ipv4, unsigned ipv4_count = 0, ipv6_count = 0; if (!geoip_is_loaded(AF_INET) && !geoip_is_loaded(AF_INET6)) - return NULL; + return -1; counts = tor_malloc_zero(sizeof(unsigned)*n_countries); HT_FOREACH(ent, clientmap, &client_history) { @@ -1039,13 +1044,25 @@ geoip_get_client_history(geoip_client_action_t action, int *total_ipv4, break; } } - if (total_ipv4) - (*total_ipv4) = round_to_next_multiple_of(ipv4_count, granularity); - if (total_ipv6) - (*total_ipv6) = round_to_next_multiple_of(ipv6_count, granularity); - /* Don't record anything if we haven't seen enough IPs. */ - if (total < MIN_IPS_TO_NOTE_ANYTHING) - goto done; + if (ipver_str) { + smartlist_t *chunks = smartlist_new(); + smartlist_add_asprintf(chunks, "v4=%u", + round_to_next_multiple_of(ipv4_count, granularity)); + smartlist_add_asprintf(chunks, "v6=%u", + round_to_next_multiple_of(ipv6_count, granularity)); + *ipver_str = smartlist_join_strings(chunks, ",", 0, NULL); + SMARTLIST_FOREACH(chunks, char *, c, tor_free(c)); + smartlist_free(chunks); + } + + /* Don't record per country data if we haven't seen enough IPs. */ + if (total < MIN_IPS_TO_NOTE_ANYTHING) { + tor_free(counts); + if (country_str) + *country_str = NULL; + return 0; + } + /* Make a list of c_hist_t */ entries = smartlist_new(); for (i = 0; i < n_countries; ++i) { @@ -1066,23 +1083,21 @@ geoip_get_client_history(geoip_client_action_t action, int *total_ipv4, * the sort order could leak info. */ smartlist_sort(entries, _c_hist_compare); - /* Build the result. */ - chunks = smartlist_new(); - SMARTLIST_FOREACH(entries, c_hist_t *, ch, { - smartlist_add_asprintf(chunks, "%s=%u", ch->country, ch->total); - }); - result = smartlist_join_strings(chunks, ",", 0, NULL); - done: - tor_free(counts); - if (chunks) { + if (country_str) { + smartlist_t *chunks = smartlist_new(); + SMARTLIST_FOREACH(entries, c_hist_t *, ch, { + smartlist_add_asprintf(chunks, "%s=%u", ch->country, ch->total); + }); + *country_str = smartlist_join_strings(chunks, ",", 0, NULL); SMARTLIST_FOREACH(chunks, char *, c, tor_free(c)); smartlist_free(chunks); } - if (entries) { - SMARTLIST_FOREACH(entries, c_hist_t *, c, tor_free(c)); - smartlist_free(entries); - } - return result; + + SMARTLIST_FOREACH(entries, c_hist_t *, c, tor_free(c)); + smartlist_free(entries); + tor_free(counts); + + return 0; } /** Return a newly allocated string holding the per-country request history @@ -1205,10 +1220,9 @@ geoip_format_dirreq_stats(time_t now) tor_assert(now >= start_of_dirreq_stats_interval); format_iso_time(t, now); - v2_ips_string = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2, - NULL, NULL); - v3_ips_string = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS, - NULL, NULL); + geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2, &v2_ips_string, + NULL); + geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS, &v3_ips_string, NULL); v2_reqs_string = geoip_get_request_history( GEOIP_CLIENT_NETWORKSTATUS_V2); v3_reqs_string = geoip_get_request_history(GEOIP_CLIENT_NETWORKSTATUS); @@ -1414,10 +1428,9 @@ static char *bridge_stats_extrainfo = NULL; char * geoip_format_bridge_stats(time_t now) { - char *out = NULL, *data = NULL; + char *out = NULL, *data = NULL, *ipver = NULL; long duration = now - start_of_bridge_stats_interval; char written[ISO_TIME_LEN+1]; - int total_ipv4 = 0, total_ipv6 = 0; if (duration < 0) return NULL; @@ -1425,18 +1438,17 @@ geoip_format_bridge_stats(time_t now) return NULL; /* Not initialized. */ format_iso_time(written, now); - data = geoip_get_client_history(GEOIP_CLIENT_CONNECT, &total_ipv4, - &total_ipv6); + geoip_get_client_history(GEOIP_CLIENT_CONNECT, &data, &ipver); tor_asprintf(&out, "bridge-stats-end %s (%ld s)\n" "bridge-ips %s\n" - "bridge-ip-versions v4=%d,v6=%d\n", + "bridge-ip-versions %s\n", written, duration, data ? data : "", - total_ipv4, - total_ipv6); + ipver ? ipver : ""); tor_free(data); + tor_free(ipver); return out; } @@ -1447,17 +1459,20 @@ geoip_format_bridge_stats(time_t now) static char * format_bridge_stats_controller(time_t now) { - char *out = NULL, *data = NULL; + char *out = NULL, *country_data = NULL, *ipver_data = NULL; char started[ISO_TIME_LEN+1]; (void) now; format_iso_time(started, start_of_bridge_stats_interval); - data = geoip_get_client_history(GEOIP_CLIENT_CONNECT, NULL, NULL); + geoip_get_client_history(GEOIP_CLIENT_CONNECT, &country_data, &ipver_data); tor_asprintf(&out, - "TimeStarted=\"%s\" CountrySummary=%s", - started, data ? data : ""); - tor_free(data); + "TimeStarted=\"%s\" CountrySummary=%s IPVersions=%s", + started, + country_data ? country_data : "", + ipver_data ? ipver_data : ""); + tor_free(country_data); + tor_free(ipver_data); return out; } @@ -1578,15 +1593,13 @@ geoip_format_entry_stats(time_t now) char t[ISO_TIME_LEN+1]; char *data = NULL; char *result; - int total_ipv4, total_ipv6; if (!start_of_entry_stats_interval) return NULL; /* Not initialized. */ tor_assert(now >= start_of_entry_stats_interval); - data = geoip_get_client_history(GEOIP_CLIENT_CONNECT, &total_ipv4, - &total_ipv6); + geoip_get_client_history(GEOIP_CLIENT_CONNECT, &data, NULL); format_iso_time(t, now); tor_asprintf(&result, "entry-stats-end %s (%u s)\n" diff --git a/src/or/geoip.h b/src/or/geoip.h index 3c91617..ea12342 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -33,8 +33,8 @@ void geoip_remove_old_clients(time_t cutoff); void geoip_note_ns_response(geoip_client_action_t action, geoip_ns_response_t response); -char *geoip_get_client_history(geoip_client_action_t action, int *total_ipv4, - int *total_ipv6); +int geoip_get_client_history(geoip_client_action_t action, + char **country_str, char **ipver_str); char *geoip_get_request_history(geoip_client_action_t action); int getinfo_helper_geoip(control_connection_t *control_conn, const char *question, char **answer, diff --git a/src/test/test.c b/src/test/test.c index 0c5e84d..b1f869d 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1388,7 +1388,7 @@ test_geoip(void) { int i, j; time_t now = 1281533250; /* 2010-08-11 13:27:30 UTC */ - char *s = NULL; + char *s = NULL, *v = NULL; const char *bridge_stats_1 = "bridge-stats-end 2010-08-12 13:27:30 (86400 s)\n" "bridge-ips zz=24,xy=8\n" @@ -1457,7 +1457,6 @@ test_geoip(void) "entry-ips \n"; tor_addr_t addr; struct in6_addr in6; - int total_ipv4, total_ipv6; /* 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 @@ -1542,20 +1541,23 @@ test_geoip(void) SET_TEST_ADDRESS(i); geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now); } - s = geoip_get_client_history(GEOIP_CLIENT_CONNECT, &total_ipv4, &total_ipv6); + geoip_get_client_history(GEOIP_CLIENT_CONNECT, &s, &v); test_assert(s); + test_assert(v); test_streq("zz=24,ab=16,xy=8", s); - test_eq(total_ipv4, 16); - test_eq(total_ipv6, 16); + test_streq("v4=16,v6=16", v); tor_free(s); + tor_free(v); /* Now clear out all the AB observations. */ geoip_remove_old_clients(now-6000); - s = geoip_get_client_history(GEOIP_CLIENT_CONNECT, &total_ipv4, &total_ipv6); + geoip_get_client_history(GEOIP_CLIENT_CONNECT, &s, &v); test_assert(s); + test_assert(v); test_streq("zz=24,xy=8", s); - test_eq(total_ipv4, 16); - test_eq(total_ipv6, 16); + test_streq("v4=16,v6=16", v); + tor_free(s); + tor_free(v); /* Start testing bridge statistics by making sure that we don't output * bridge stats without initializing them. */

1 0

[tor/master] Rename C reserved identifiers missed before.
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit 172aac62ed13233072499dc4ae746f69333814c6 Author: Linus Nordberg <linus(a)torproject.org> Date: Sat Oct 20 18:43:50 2012 +0200 Rename C reserved identifiers missed before. --- src/or/geoip.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 005a381..0097a7e 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -62,14 +62,14 @@ static char geoip6_digest[DIGEST_LEN]; country_t geoip_get_country(const char *country) { - void *_idxplus1; + void *idxplus1_; intptr_t idx; - _idxplus1 = strmap_get_lc(country_idxplus1_by_lc_code, country); - if (!_idxplus1) + idxplus1_ = strmap_get_lc(country_idxplus1_by_lc_code, country); + if (!idxplus1_) return -1; - idx = ((uintptr_t)_idxplus1)-1; + idx = ((uintptr_t)idxplus1_)-1; return (country_t)idx; } @@ -81,14 +81,14 @@ geoip_ipv4_add_entry(uint32_t low, uint32_t high, const char *country) { intptr_t idx; geoip_ipv4_entry_t *ent; - void *_idxplus1; + void *idxplus1_; if (high < low) return; - _idxplus1 = strmap_get_lc(country_idxplus1_by_lc_code, country); + idxplus1_ = strmap_get_lc(country_idxplus1_by_lc_code, country); - if (!_idxplus1) { + if (!idxplus1_) { geoip_country_t *c = tor_malloc_zero(sizeof(geoip_country_t)); strlcpy(c->countrycode, country, sizeof(c->countrycode)); tor_strlower(c->countrycode); @@ -96,7 +96,7 @@ geoip_ipv4_add_entry(uint32_t low, uint32_t high, const char *country) idx = smartlist_len(geoip_countries) - 1; strmap_set_lc(country_idxplus1_by_lc_code, country, (void*)(idx+1)); } else { - idx = ((uintptr_t)_idxplus1)-1; + idx = ((uintptr_t)idxplus1_)-1; } { geoip_country_t *c = smartlist_get(geoip_countries, idx); @@ -177,14 +177,14 @@ geoip_ipv6_add_entry(struct in6_addr low, struct in6_addr high, { intptr_t idx; geoip_ipv6_entry_t *ent; - void *_idxplus1; + void *idxplus1_; if (memcmp(&high, &low, sizeof(struct in6_addr)) < 0) return; - _idxplus1 = strmap_get_lc(country_idxplus1_by_lc_code, country); + idxplus1_ = strmap_get_lc(country_idxplus1_by_lc_code, country); - if (!_idxplus1) { + if (!idxplus1_) { geoip_country_t *c = tor_malloc_zero(sizeof(geoip_country_t)); strlcpy(c->countrycode, country, sizeof(c->countrycode)); tor_strlower(c->countrycode); @@ -192,7 +192,7 @@ geoip_ipv6_add_entry(struct in6_addr low, struct in6_addr high, idx = smartlist_len(geoip_countries) - 1; strmap_set_lc(country_idxplus1_by_lc_code, country, (void*)(idx+1)); } else { - idx = ((uintptr_t)_idxplus1)-1; + idx = ((uintptr_t)idxplus1_)-1; } { geoip_country_t *c = smartlist_get(geoip_countries, idx);

1 0

[tor/master] Changes files for tickets 5053 and 5055.
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit 46c76e6bddfc6ea7a3859ddc93774e95d891845e Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Oct 19 23:23:04 2012 +0200 Changes files for tickets 5053 and 5055. --- changes/5053 | 4 ++++ changes/5055 | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/changes/5053 b/changes/5053 new file mode 100644 index 0000000..c695f3c --- /dev/null +++ b/changes/5053 @@ -0,0 +1,4 @@ + o Minor features (IPv6): + - Bridge clients connecting over IPv6 are now counted in bridge + statistics. Implementation by shkoo, addressing ticket 5053. + Included in 0.2.3.14-alpha. diff --git a/changes/5055 b/changes/5055 new file mode 100644 index 0000000..d51fef4 --- /dev/null +++ b/changes/5055 @@ -0,0 +1,9 @@ + o Minor features (IPv6): + - Add GeoIP database for IPv6 addresses and use it. The new config + option is GeoIPv6File. + Bridge clients connecting over IPv6 are now counted in bridge + statistics. Bridge statistics files now list "bridge-ip-versions" + and extra-info documents list "geoip6-db-digest". + The control protocol has been extended to support more IPv6 + ("CLIENTS_SEEN" and "ip-to-country"). + Initial implementation by shkoo, addressing ticket 5055.

1 0