- tor-commits - lists.torproject.org

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

05 Nov '12

commit 6a241ff3ffe7dc1f18c8a5d335a012aa20d763f7 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Oct 31 13:58:55 2012 +0100 Duplicate less code. --- src/or/geoip.c | 213 +++++++++++++++++++++++-------------------------------- src/or/geoip.h | 3 +- src/test/test.c | 26 +++---- 3 files changed, 101 insertions(+), 141 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index de8e280..8ba7b70 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -73,17 +73,18 @@ geoip_get_country(const char *country) return (country_t)idx; } -/** Add an entry to the GeoIP table, mapping all IPs between low and - * high, inclusive, to the 2-letter country code country. - */ +/** Add an entry to a GeoIP table, mapping all IP addresses between low and + * high, inclusive, to the 2-letter country code country. */ static void -geoip_ipv4_add_entry(uint32_t low, uint32_t high, const char *country) +geoip_add_entry(const tor_addr_t *low, const tor_addr_t *high, + const char *country) { intptr_t idx; - geoip_ipv4_entry_t *ent; void *idxplus1_; - if (high < low) + if (tor_addr_family(low) != tor_addr_family(high)) + return; + if (tor_addr_compare(high, low, CMP_EXACT) < 0) return; idxplus1_ = strmap_get_lc(country_idxplus1_by_lc_code, country); @@ -102,40 +103,89 @@ geoip_ipv4_add_entry(uint32_t low, uint32_t high, const char *country) geoip_country_t *c = smartlist_get(geoip_countries, idx); tor_assert(!strcasecmp(c->countrycode, country)); } - ent = tor_malloc_zero(sizeof(geoip_ipv4_entry_t)); - ent->ip_low = low; - ent->ip_high = high; - ent->country = idx; - smartlist_add(geoip_ipv4_entries, ent); + + if (tor_addr_family(low) == AF_INET) { + geoip_ipv4_entry_t *ent = tor_malloc_zero(sizeof(geoip_ipv4_entry_t)); + ent->ip_low = tor_addr_to_ipv4h(low); + ent->ip_high = tor_addr_to_ipv4h(high); + ent->country = idx; + smartlist_add(geoip_ipv4_entries, ent); + } else if (tor_addr_family(low) == AF_INET6) { + geoip_ipv6_entry_t *ent = tor_malloc_zero(sizeof(geoip_ipv6_entry_t)); + ent->ip_low = *tor_addr_to_in6(low); + ent->ip_high = *tor_addr_to_in6(high); + ent->country = idx; + smartlist_add(geoip_ipv6_entries, ent); + } } -/** Add an entry to the GeoIP table, parsing it from line. The - * format is as for geoip_load_file(). */ +/** Add an entry to the GeoIP table indicated by family, + * parsing it from line. The format is as for geoip_load_file(). */ /*private*/ int -geoip_ipv4_parse_entry(const char *line) +geoip_parse_entry(const char *line, sa_family_t family) { - unsigned int low, high; - char b[3]; + tor_addr_t low_addr, high_addr; + char c[3]; + char *country = NULL; + if (!geoip_countries) init_geoip_countries(); - if (!geoip_ipv4_entries) - geoip_ipv4_entries = smartlist_new(); + if (family == AF_INET) { + if (!geoip_ipv4_entries) + geoip_ipv4_entries = smartlist_new(); + } else if (family == AF_INET6) { + if (!geoip_ipv6_entries) + geoip_ipv6_entries = smartlist_new(); + } else { + log_warn(LD_GENERAL, "Unsupported family: %d", family); + return -1; + } while (TOR_ISSPACE(*line)) ++line; if (*line == '#') return 0; - if (tor_sscanf(line,"%u,%u,%2s", &low, &high, b) == 3) { - geoip_ipv4_add_entry(low, high, b); - return 0; - } else if (tor_sscanf(line,"\"%u\",\"%u\",\"%2s\",", &low, &high, b) == 3) { - geoip_ipv4_add_entry(low, high, b); - return 0; - } else { - log_warn(LD_GENERAL, "Unable to parse line from GEOIP file: %s", - escaped(line)); - return -1; + + if (family == AF_INET) { + unsigned int low, high; + if (tor_sscanf(line,"%u,%u,%2s", &low, &high, c) == 3 || + tor_sscanf(line,"\"%u\",\"%u\",\"%2s\",", &low, &high, c) == 3) { + tor_addr_from_ipv4h(&low_addr, low); + tor_addr_from_ipv4h(&high_addr, high); + } else + goto fail; + country = c; + } else { /* AF_INET6 */ + char buf[512]; + char *low_str, *high_str; + struct in6_addr low, high; + char *strtok_state; + strlcpy(buf, line, sizeof(buf)); + low_str = tor_strtok_r(buf, ",", &strtok_state); + if (!low_str) + goto fail; + high_str = tor_strtok_r(NULL, ",", &strtok_state); + if (!high_str) + goto fail; + country = tor_strtok_r(NULL, "\n", &strtok_state); + if (!country) + goto fail; + if (strlen(country) != 2) + goto fail; + if (tor_inet_pton(AF_INET6, low_str, &low) <= 0) + goto fail; + tor_addr_from_in6(&low_addr, &low); + if (tor_inet_pton(AF_INET6, high_str, &high) <= 0) + goto fail; + tor_addr_from_in6(&high_addr, &high); } + geoip_add_entry(&low_addr, &high_addr, country); + return 0; + + fail: + log_warn(LD_GENERAL, "Unable to parse line from GEOIP %s file: %s", + family == AF_INET ? "IPv4" : "IPv6", escaped(line)); + return -1; } /** Sorting helper: return -1, 1, or 0 based on comparison of two @@ -168,95 +218,6 @@ 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. */ -static void -geoip_ipv6_add_entry(struct in6_addr low, struct in6_addr high, - const char *country) -{ - intptr_t idx; - geoip_ipv6_entry_t *ent; - void *idxplus1_; - - if (memcmp(&high, &low, sizeof(struct in6_addr)) < 0) - return; - - idxplus1_ = strmap_get_lc(country_idxplus1_by_lc_code, country); - - if (!idxplus1_) { - geoip_country_t *c = tor_malloc_zero(sizeof(geoip_country_t)); - strlcpy(c->countrycode, country, sizeof(c->countrycode)); - tor_strlower(c->countrycode); - smartlist_add(geoip_countries, c); - idx = smartlist_len(geoip_countries) - 1; - strmap_set_lc(country_idxplus1_by_lc_code, country, (void*)(idx+1)); - } else { - idx = ((uintptr_t)idxplus1_)-1; - } - { - geoip_country_t *c = smartlist_get(geoip_countries, idx); - tor_assert(!strcasecmp(c->countrycode, country)); - } - ent = tor_malloc_zero(sizeof(geoip_ipv6_entry_t)); - ent->ip_low = low; - ent->ip_high = high; - ent->country = idx; - smartlist_add(geoip_ipv6_entries, ent); -} - -/** Add an entry to the GeoIP ipv6 table, parsing it from line. The - * format is as for geoip_load_file(). */ -/* XXX5053 Should this code also support parsing Maxmind's GeoIPv6.csv - * format directly, similar to how their v4 format is also accepted? That - * would enable people to use their commercial IPv6 databases instead of - * our free one, if they wanted. -KL */ -/*private*/ int -geoip_ipv6_parse_entry(const char *line) -{ - char buf[512]; - char *low_str, *high_str, *country; - struct in6_addr low, high; - char *strtok_state; - - strlcpy(buf, line, sizeof(buf)); - - if (!geoip_countries) - init_geoip_countries(); - if (!geoip_ipv6_entries) - geoip_ipv6_entries = smartlist_new(); - - while (TOR_ISSPACE(*line)) - ++line; - if (*line == '#') - return 0; - - low_str = tor_strtok_r(buf, ",", &strtok_state); - if (!low_str) - goto fail; - high_str = tor_strtok_r(NULL, ",", &strtok_state); - if (!high_str) - goto fail; - country = tor_strtok_r(NULL, "\n", &strtok_state); - if (!country) - goto fail; - if (strlen(country) != 2) - goto fail; - - if (tor_inet_pton(AF_INET6, low_str, &low) <= 0) - goto fail; - if (tor_inet_pton(AF_INET6, high_str, &high) <= 0) - goto fail; - - geoip_ipv6_add_entry(low, high, country); - return 0; - - fail: - log_warn(LD_GENERAL, "Unable to parse line from GEOIP IPV6 file: %s", - escaped(line)); - return -1; -} - /** Sorting helper: return -1, 1, or 0 based on comparison of two * geoip_ipv6_entry_t */ static int @@ -312,16 +273,21 @@ init_geoip_countries(void) strmap_set_lc(country_idxplus1_by_lc_code, "??", (void*)(1)); } -/** Clear the GeoIP database and reload it from the file - * filename. Return 0 on success, -1 on failure. +/** Clear appropriate GeoIP database, based on family, and + * reload it from the file filename. Return 0 on success, -1 on + * failure. * - * Recognized line formats are: + * Recognized line formats for IPv4 are: * INTIPLOW,INTIPHIGH,CC * and * "INTIPLOW","INTIPHIGH","CC","CC3","COUNTRY NAME" * where INTIPLOW and INTIPHIGH are IPv4 addresses encoded as 4-byte unsigned * integers, and CC is a country code. * + * Recognized line format for IPv6 is: + * IPV6LOW,IPV6HIGH,CC + * where IPV6LOW and IPV6HIGH are IPv6 addresses and CC is a country code. + * * It also recognizes, and skips over, blank lines and lines that start * with '#' (comments). */ @@ -362,17 +328,14 @@ geoip_load_file(sa_family_t family, const char *filename) geoip_digest_env = crypto_digest_new(); log_notice(LD_GENERAL, "Parsing GEOIP %s file %s.", - (family == AF_INET) ? "ipv4" : "ipv6", filename); + (family == AF_INET) ? "IPv4" : "IPv6", filename); while (!feof(f)) { char buf[512]; if (fgets(buf, (int)sizeof(buf), f) == NULL) break; crypto_digest_add_bytes(geoip_digest_env, buf, strlen(buf)); /* FFFF track full country name. */ - if (family == AF_INET) - geoip_ipv4_parse_entry(buf); - else /* AF_INET6 */ - geoip_ipv6_parse_entry(buf); + geoip_parse_entry(buf, family); } /*XXXX abort and return -1 if no entries/illformed?*/ fclose(f); diff --git a/src/or/geoip.h b/src/or/geoip.h index ea12342..5a17bc2 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -13,8 +13,7 @@ #define _TOR_GEOIP_H #ifdef GEOIP_PRIVATE -int geoip_ipv4_parse_entry(const char *line); -int geoip_ipv6_parse_entry(const char *line); +int geoip_parse_entry(const char *line, sa_family_t family); int geoip_get_country_by_ipv4(uint32_t ipaddr); int geoip_get_country_by_ipv6(const struct in6_addr *addr); #endif diff --git a/src/test/test.c b/src/test/test.c index b1f869d..8140c22 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1461,22 +1461,20 @@ test_geoip(void) /* 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 * fine uint32_t values. */ - test_eq(0, geoip_ipv4_parse_entry("10,50,AB")); - test_eq(0, geoip_ipv4_parse_entry("52,90,XY")); - test_eq(0, geoip_ipv4_parse_entry("95,100,AB")); - test_eq(0, geoip_ipv4_parse_entry("\"105\",\"140\",\"ZZ\"")); - test_eq(0, geoip_ipv4_parse_entry("\"150\",\"190\",\"XY\"")); - test_eq(0, geoip_ipv4_parse_entry("\"200\",\"250\",\"AB\"")); + test_eq(0, geoip_parse_entry("10,50,AB", AF_INET)); + test_eq(0, geoip_parse_entry("52,90,XY", AF_INET)); + test_eq(0, geoip_parse_entry("95,100,AB", AF_INET)); + test_eq(0, geoip_parse_entry("\"105\",\"140\",\"ZZ\"", AF_INET)); + test_eq(0, geoip_parse_entry("\"150\",\"190\",\"XY\"", AF_INET)); + test_eq(0, geoip_parse_entry("\"200\",\"250\",\"AB\"", AF_INET)); /* Populate the IPv6 DB equivalently with fake IPs in the same range */ - test_eq(0, geoip_ipv6_parse_entry("::a,::32,AB")); - test_eq(0, geoip_ipv6_parse_entry("::34,::5a,XY")); - test_eq(0, geoip_ipv6_parse_entry("::5f,::64,AB")); - /* XXX5053 If we plan to support parsing Maxmind's GeoIPv6.csv format, - * we should test it here. If not, remove this comment. -KL */ - test_eq(0, geoip_ipv6_parse_entry("::69,::8c,ZZ")); - test_eq(0, geoip_ipv6_parse_entry("::96,::be,XY")); - test_eq(0, geoip_ipv6_parse_entry("::c8,::fa,AB")); + test_eq(0, geoip_parse_entry("::a,::32,AB", AF_INET6)); + test_eq(0, geoip_parse_entry("::34,::5a,XY", AF_INET6)); + test_eq(0, geoip_parse_entry("::5f,::64,AB", AF_INET6)); + test_eq(0, geoip_parse_entry("::69,::8c,ZZ", AF_INET6)); + test_eq(0, geoip_parse_entry("::96,::be,XY", AF_INET6)); + test_eq(0, geoip_parse_entry("::c8,::fa,AB", AF_INET6)); /* We should have 4 countries: ??, ab, xy, zz. */ test_eq(4, geoip_get_n_countries());

1 0

[tor/master] Change some comments to reflect the multitude of GeoIP databases.
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit ffddd4de2a69a896be3886b8f48a218a70babbcc Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Oct 31 16:38:07 2012 +0100 Change some comments to reflect the multitude of GeoIP databases. --- src/or/geoip.c | 12 ++++++------ src/or/routerlist.c | 2 +- src/or/routerset.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 606bece..9aba3c9 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -21,7 +21,7 @@ static void clear_geoip_db(void); static void init_geoip_countries(void); -/** An entry from the GeoIP file: maps an IP range to a country. */ +/** An entry from the GeoIP IPv4 file: maps an IPv4 range to a country. */ typedef struct geoip_ipv4_entry_t { uint32_t ip_low; /**< The lowest IP in the range, in host order */ uint32_t ip_high; /**< The highest IP in the range, in host order */ @@ -56,9 +56,9 @@ static smartlist_t *geoip_ipv4_entries = NULL, *geoip_ipv6_entries = NULL; 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. - */ +/** Return the index of the country's entry in the GeoIP + * country list if it is a valid 2-letter country code, otherwise + * return -1. */ country_t geoip_get_country(const char *country) { @@ -408,7 +408,7 @@ geoip_get_country_by_addr(const tor_addr_t *addr) } } -/** Return the number of countries recognized by the GeoIP database. */ +/** Return the number of countries recognized by the GeoIP country list. */ int geoip_get_n_countries(void) { @@ -1641,7 +1641,7 @@ getinfo_helper_geoip(control_connection_t *control_conn, return 0; } -/** Release all storage held by the GeoIP database. */ +/** Release all storage held by the GeoIP databases and country list. */ static void clear_geoip_db(void) { diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 5327622..9537331 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4790,7 +4790,7 @@ routers_sort_by_identity(smartlist_t *routers) smartlist_sort(routers, _compare_routerinfo_by_id_digest); } -/** Called when we change a node set, or when we reload the geoip list: +/** Called when we change a node set, or when we reload the geoip IPv4 list: * recompute all country info in all configuration node sets and in the * routerlist. */ void diff --git a/src/or/routerset.c b/src/or/routerset.c index f9e3c9a..8a5ff21 100644 --- a/src/or/routerset.c +++ b/src/or/routerset.c @@ -74,7 +74,7 @@ routerset_get_countryname(const char *c) } /** Update the routerset's countries bitarray_t. Called whenever - * the GeoIP database is reloaded. + * the GeoIP IPv4 database is reloaded. */ void routerset_refresh_countries(routerset_t *target)

1 0

[tor/master] Don't memcmp struct in6_addr but rather its s6_addr member.
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit e7e68b80a74faa52fbf6e551bf373a405c6cdf97 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Oct 31 15:52:56 2012 +0100 Don't memcmp struct in6_addr but rather its s6_addr member. --- src/or/geoip.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 8ba7b70..606bece 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -224,24 +224,22 @@ static int 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)); + return memcmp(a->ip_low.s6_addr, b->ip_low.s6_addr, 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 */ + * (a pointer to a in6_addr) to a geoip_ipv6_entry_t */ static int 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 - * there could be. -KL */ - /* No alignment issue here, since _key really is a pointer to uint32_t */ const struct in6_addr *addr = (struct in6_addr *)_key; const geoip_ipv6_entry_t *entry = *_member; - if (memcmp(addr, &entry->ip_low, sizeof(struct in6_addr)) < 0) + if (memcmp(addr->s6_addr, entry->ip_low.s6_addr, + sizeof(struct in6_addr)) < 0) return -1; - else if (memcmp(addr, &entry->ip_high, sizeof(struct in6_addr)) > 0) + else if (memcmp(addr->s6_addr, entry->ip_high.s6_addr, + sizeof(struct in6_addr)) > 0) return 1; else return 0;

1 0

[tor/master] Merge remote-tracking branch 'linus/bug5053-bug5055'
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit 626a8b60d7752f38e6587bed9b614c6d039dd9f7 Merge: e5ca504 ffddd4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 4 21:44:31 2012 -0500 Merge remote-tracking branch 'linus/bug5053-bug5055' Conflicts: src/or/geoip.c changes/5053 | 4 + changes/5055 | 9 + doc/tor.1.txt | 5 +- src/config/geoip6 |11638 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/config.c | 69 +- src/or/geoip.c | 465 ++- src/or/geoip.h | 14 +- src/or/nodelist.c | 11 +- src/or/or.h | 3 +- src/or/policies.c | 6 +- src/or/router.c | 9 +- src/or/routerlist.c | 2 +- src/or/routerset.c | 6 +- src/test/test.c | 113 +- 14 files changed, 12146 insertions(+), 208 deletions(-) diff --cc src/or/geoip.c index bb3e011,9aba3c9..3036ee2 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@@ -231,15 -338,20 +338,20 @@@ geoip_load_file(sa_family_t family, con /*XXXX abort and return -1 if no entries/illformed?*/ fclose(f); - smartlist_sort(geoip_entries, geoip_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. */ - crypto_digest_get_digest(geoip_digest_env, geoip_digest, DIGEST_LEN); + /* 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_); + /* 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 */ ++ } else { ++ /* AF_INET6 */ + smartlist_sort(geoip_ipv6_entries, geoip_ipv6_compare_entries_); + crypto_digest_get_digest(geoip_digest_env, geoip6_digest, DIGEST_LEN); + } crypto_digest_free(geoip_digest_env); return 0; @@@ -559,10 -701,10 +701,10 @@@ typedef struct c_hist_t } c_hist_t; /** Sorting helper: return -1, 1, or 0 based on comparison of two - * geoip_entry_t. Sort in descending order of total, and then by country + * geoip_ipv4_entry_t. Sort in descending order of total, and then by country * code. */ static int -_c_hist_compare(const void **_a, const void **_b) +c_hist_compare_(const void **_a, const void **_b) { const c_hist_t *a = *_a, *b = *_b; if (a->total > b->total) @@@ -868,17 -1042,14 +1042,14 @@@ geoip_get_client_history(geoip_client_a } /* Sort entries. Note that we must do this _AFTER_ rounding, or else * the sort order could leak info. */ - smartlist_sort(entries, _c_hist_compare); + 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); } diff --cc src/or/geoip.h index bda5fe2,5a17bc2..2272486 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@@ -9,15 -9,16 +9,16 @@@ * \brief Header file for geoip.c. **/ -#ifndef _TOR_GEOIP_H -#define _TOR_GEOIP_H +#ifndef TOR_GEOIP_H +#define TOR_GEOIP_H #ifdef GEOIP_PRIVATE - int geoip_parse_entry(const char *line); + int geoip_parse_entry(const char *line, sa_family_t family); + 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(const char *filename, const or_options_t *options); - int geoip_get_country_by_ip(uint32_t ipaddr); + 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); diff --cc src/or/routerlist.c index 8c83149,9537331..1cefef9 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -4788,10 -4787,10 +4788,10 @@@ compare_routerinfo_by_id_digest_(const void routers_sort_by_identity(smartlist_t *routers) { - smartlist_sort(routers, _compare_routerinfo_by_id_digest); + smartlist_sort(routers, compare_routerinfo_by_id_digest_); } - /** Called when we change a node set, or when we reload the geoip list: + /** Called when we change a node set, or when we reload the geoip IPv4 list: * recompute all country info in all configuration node sets and in the * routerlist. */ void

1 0

[tor/master] Clean up nonsensical calling convention for config_load_geoip_file_
by nickm＠torproject.org 05 Nov '12

05 Nov '12

commit 98204729aafbbce550fd51dd601690cf60226e60 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 4 21:51:02 2012 -0500 Clean up nonsensical calling convention for config_load_geoip_file_ (How many "load a file" functions do you typically see where the function frees the filename argument?) --- src/or/config.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index be91440..338c670 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5566,27 +5566,28 @@ parse_outbound_addresses(or_options_t *options, int validate_only, char **msg) } /** 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 + * one. <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 */ + const char *fname, const char *default_fname) { - (void)default_fname; +#ifdef _WIN32 + char *free_fname = NULL; /* Used to hold any temporary-allocated value */ /* 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); - } + if (!strcmp(fname, "<default>")) { + const char *conf_root = get_windows_conf_root(); + tor_asprintf(&free_fname, "%s\\%s", conf_root, default_fname); + fname = free_fname; + } + geoip_load_file(family, fname); + tor_free(free_fname); +#else + (void)default_fname; + geoip_load_file(family, fname); #endif - geoip_load_file(family, fname); - tor_free(fname); } /** Load geoip files for IPv4 and IPv6 if <a>options</a> and @@ -5595,14 +5596,16 @@ static void config_maybe_load_geoip_files_(const or_options_t *options, const or_options_t *old_options) { + /* XXXX024 Reload GeoIPFile on SIGHUP. -NM */ + 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"); + config_load_geoip_file_(AF_INET, 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"); + config_load_geoip_file_(AF_INET6, options->GeoIPv6File, "geoip6"); }

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 05 Nov '12

05 Nov '12

commit 59bf5132c9fd040589bc8064563bd42108066c76 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 5 02:45:10 2012 +0000 Update translations for orbot_completed --- values-es/strings.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index 7129faf..c286109 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -168,14 +168,14 @@ <string name="bridges">Bridges (puentes en sombra hacia la red Tor) </string> <string name="use_bridges">Utilizar bridges (prevalece sobre la configuración de nodos de entrada) </string> <string name="bridges_obfuscated">Bridges (puentes entre subredes) ofuscados </string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada en la red Tor (que publican las restrictivas autoridades de bridge y no las de directorios públicos)</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada en la red Tor (cuyos descriptores propagan las autoridades de directorios bridge, más restrictivas que las del resto de nodos)</string> <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar si los bridges configurados están ofuscados </string> <string name="ip_address_and_port_of_bridges">Direcciones IP y puertos de los bridges </string> <string name="enter_bridge_addresses">Introduzca direcciones de bridge </string> <string name="relays">Repetidores de Tráfico (Relays)</string> <string name="relaying">Repitiendo tráfico </string> - <string name="enable_your_device_to_be_a_non_exit_relay">Deshabilitar su dispositivo como repetidor de salida (de la red Tor) </string> - <string name="relay_port">Puerto del repetidor </string> + <string name="enable_your_device_to_be_a_non_exit_relay">Deshabilitar que su dispositivo repetidor lo sea de salida (de la red Tor) </string> + <string name="relay_port">Puerto de su repetidor </string> <string name="listening_port_for_your_tor_relay">Puerto de escucha de su repetidor Tor </string> <string name="enter_or_port">Introduzca puerto para OR (Onion Router) </string> <string name="relay_nickname">Alias del repetidor </string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 05 Nov '12

05 Nov '12

commit 16f1e14d8ce668ee75cbd66fb0612d6911d0d031 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 5 02:45:07 2012 +0000 Update translations for orbot --- values-es/strings.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index 7129faf..c286109 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -168,14 +168,14 @@ <string name="bridges">Bridges (puentes en sombra hacia la red Tor) </string> <string name="use_bridges">Utilizar bridges (prevalece sobre la configuración de nodos de entrada) </string> <string name="bridges_obfuscated">Bridges (puentes entre subredes) ofuscados </string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada en la red Tor (que publican las restrictivas autoridades de bridge y no las de directorios públicos)</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada en la red Tor (cuyos descriptores propagan las autoridades de directorios bridge, más restrictivas que las del resto de nodos)</string> <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar si los bridges configurados están ofuscados </string> <string name="ip_address_and_port_of_bridges">Direcciones IP y puertos de los bridges </string> <string name="enter_bridge_addresses">Introduzca direcciones de bridge </string> <string name="relays">Repetidores de Tráfico (Relays)</string> <string name="relaying">Repitiendo tráfico </string> - <string name="enable_your_device_to_be_a_non_exit_relay">Deshabilitar su dispositivo como repetidor de salida (de la red Tor) </string> - <string name="relay_port">Puerto del repetidor </string> + <string name="enable_your_device_to_be_a_non_exit_relay">Deshabilitar que su dispositivo repetidor lo sea de salida (de la red Tor) </string> + <string name="relay_port">Puerto de su repetidor </string> <string name="listening_port_for_your_tor_relay">Puerto de escucha de su repetidor Tor </string> <string name="enter_or_port">Introduzca puerto para OR (Onion Router) </string> <string name="relay_nickname">Alias del repetidor </string>

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 05 Nov '12

05 Nov '12

commit 99bfb04cfc3f6a90e8d3cb1fd7b98bbe70ae37bf Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 5 02:15:13 2012 +0000 Update translations for orbot_completed --- values-es/strings.xml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index 7cbc857..7129faf 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -127,7 +127,7 @@ <string name="pref_node_configuration">Configuración de Nodos </string> <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a las rutas del tráfico propio que envíe a través de Tor, si repite tráfico ajeno estas configuraciones no afectan a esos circuitos. </string> <string name="pref_entrance_node">Nodos de Entrada </string> - <string name="pref_entrance_node_summary">Reglas de identificación de nodos, fingerprints (descriptores de nodo), nicks (alias), códigos de país y rangos de direcciones, para el primer salto. Prevalecen las configuraciones de exclusión de nodos y las de bridges.</string> + <string name="pref_entrance_node_summary">Reglas de identificación de nodos, fingerprints (descriptores de nodo), nicks (alias), códigos de país y rangos de direcciones, para el primer salto (a la red Tor). Prevalecen las configuraciones de exclusión de nodos y las de bridges.</string> <string name="pref_entrance_node_dialog">Introduzca reglas para nodos de entrada </string>  @@ -152,7 +152,7 @@ <string name="privoxy_is_running_on_port_">Privoxy se está ejecutando en el puerto: </string> <string name="setting_up_port_based_transparent_proxying_">Estableciendo proxyficación transparente por puertos... </string> <string name="bridge_error">Error de Bridge </string> - <string name="bridge_requires_ip">Para utilizar la funcion bridge (puente en sombra con la red Tor), debe introducir al menos una dirección IP de bridge. </string> + <string name="bridge_requires_ip">Para utilizar la funcion bridge (puente en sombra hacia la red Tor), debe introducir al menos una dirección IP de bridge. </string> <string name="send_email_for_bridges">Envie un correo a bridges(a)torproject.org sólo con el texto \"get bridges\" en el cuerpo del mensaje, desde una cuenta de gmail. </string> <string name="error">Error </string> <string name="your_reachableaddresses_settings_caused_an_exception_">¡Su configuración ReachableAdresses (direcciones alcanzables) ha producido una excepción! </string> @@ -161,14 +161,14 @@ <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Reglas de identificación de nodos, fingerprints (descriptores de nodo), nicks (alias), códigos de país y direcciones, para el último salto (de la red Tor) </string> <string name="enter_exit_nodes">Introduzca reglas para nodos de salida </string> <string name="exclude_nodes">Excluír Nodos (evitarlos en la red Tor) </string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Reglas de identificación de nodos (fingerprints (descriptores de nodo), nicks (alias), códigos de país y direcciones) a excluír excepto si provocan fallos de comunicación. Si se aplican prevalecen sobre la configuración de nodos de entrada.</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Reglas de identificación de nodos, fingerprints (descriptores de nodo), nicks (alias), códigos de país y direcciones a excluír (evitar en la red Tor) excepto si provocan fallos de comunicación. Si se aplican prevalecen sobre la configuración de nodos de entrada.</string> <string name="enter_exclude_nodes">Introduzca reglas para nodos a excluír </string> <string name="strict_nodes">Hacer Estricta la Exclusión de Nodos (incluso si hay fallos de comunicación) </string> <string name="use_only_these_specified_nodes">Usar *sólo* estos nodos especificados </string> - <string name="bridges">Bridges (puentes en sombra con la red Tor) </string> + <string name="bridges">Bridges (puentes en sombra hacia la red Tor) </string> <string name="use_bridges">Utilizar bridges (prevalece sobre la configuración de nodos de entrada) </string> <string name="bridges_obfuscated">Bridges (puentes entre subredes) ofuscados </string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada en la red Tor </string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada en la red Tor (que publican las restrictivas autoridades de bridge y no las de directorios públicos)</string> <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar si los bridges configurados están ofuscados </string> <string name="ip_address_and_port_of_bridges">Direcciones IP y puertos de los bridges </string> <string name="enter_bridge_addresses">Introduzca direcciones de bridge </string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 05 Nov '12

05 Nov '12

commit 99409728a6901ef1231e123ff2e2cc5d15e41bc4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 5 02:15:10 2012 +0000 Update translations for orbot --- values-es/strings.xml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index 7cbc857..7129faf 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -127,7 +127,7 @@ <string name="pref_node_configuration">Configuración de Nodos </string> <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a las rutas del tráfico propio que envíe a través de Tor, si repite tráfico ajeno estas configuraciones no afectan a esos circuitos. </string> <string name="pref_entrance_node">Nodos de Entrada </string> - <string name="pref_entrance_node_summary">Reglas de identificación de nodos, fingerprints (descriptores de nodo), nicks (alias), códigos de país y rangos de direcciones, para el primer salto. Prevalecen las configuraciones de exclusión de nodos y las de bridges.</string> + <string name="pref_entrance_node_summary">Reglas de identificación de nodos, fingerprints (descriptores de nodo), nicks (alias), códigos de país y rangos de direcciones, para el primer salto (a la red Tor). Prevalecen las configuraciones de exclusión de nodos y las de bridges.</string> <string name="pref_entrance_node_dialog">Introduzca reglas para nodos de entrada </string>  @@ -152,7 +152,7 @@ <string name="privoxy_is_running_on_port_">Privoxy se está ejecutando en el puerto: </string> <string name="setting_up_port_based_transparent_proxying_">Estableciendo proxyficación transparente por puertos... </string> <string name="bridge_error">Error de Bridge </string> - <string name="bridge_requires_ip">Para utilizar la funcion bridge (puente en sombra con la red Tor), debe introducir al menos una dirección IP de bridge. </string> + <string name="bridge_requires_ip">Para utilizar la funcion bridge (puente en sombra hacia la red Tor), debe introducir al menos una dirección IP de bridge. </string> <string name="send_email_for_bridges">Envie un correo a bridges(a)torproject.org sólo con el texto \"get bridges\" en el cuerpo del mensaje, desde una cuenta de gmail. </string> <string name="error">Error </string> <string name="your_reachableaddresses_settings_caused_an_exception_">¡Su configuración ReachableAdresses (direcciones alcanzables) ha producido una excepción! </string> @@ -161,14 +161,14 @@ <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Reglas de identificación de nodos, fingerprints (descriptores de nodo), nicks (alias), códigos de país y direcciones, para el último salto (de la red Tor) </string> <string name="enter_exit_nodes">Introduzca reglas para nodos de salida </string> <string name="exclude_nodes">Excluír Nodos (evitarlos en la red Tor) </string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Reglas de identificación de nodos (fingerprints (descriptores de nodo), nicks (alias), códigos de país y direcciones) a excluír excepto si provocan fallos de comunicación. Si se aplican prevalecen sobre la configuración de nodos de entrada.</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Reglas de identificación de nodos, fingerprints (descriptores de nodo), nicks (alias), códigos de país y direcciones a excluír (evitar en la red Tor) excepto si provocan fallos de comunicación. Si se aplican prevalecen sobre la configuración de nodos de entrada.</string> <string name="enter_exclude_nodes">Introduzca reglas para nodos a excluír </string> <string name="strict_nodes">Hacer Estricta la Exclusión de Nodos (incluso si hay fallos de comunicación) </string> <string name="use_only_these_specified_nodes">Usar *sólo* estos nodos especificados </string> - <string name="bridges">Bridges (puentes en sombra con la red Tor) </string> + <string name="bridges">Bridges (puentes en sombra hacia la red Tor) </string> <string name="use_bridges">Utilizar bridges (prevalece sobre la configuración de nodos de entrada) </string> <string name="bridges_obfuscated">Bridges (puentes entre subredes) ofuscados </string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada en la red Tor </string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada en la red Tor (que publican las restrictivas autoridades de bridge y no las de directorios públicos)</string> <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar si los bridges configurados están ofuscados </string> <string name="ip_address_and_port_of_bridges">Direcciones IP y puertos de los bridges </string> <string name="enter_bridge_addresses">Introduzca direcciones de bridge </string>

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 05 Nov '12

05 Nov '12

commit 4edd4fd0ff21a951877984e9cfaab5567021ec7b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 5 01:45:13 2012 +0000 Update translations for orbot_completed --- values-es/strings.xml | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index 3b018b3..7cbc857 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -126,42 +126,42 @@ <string name="pref_select_apps_summary">Escoja las aplicaciones a redirigir través de Tor </string> <string name="pref_node_configuration">Configuración de Nodos </string> <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a las rutas del tráfico propio que envíe a través de Tor, si repite tráfico ajeno estas configuraciones no afectan a esos circuitos. </string> - <string name="pref_entrance_node">Nodos de Entrada (a la red Tor) </string> - <string name="pref_entrance_node_summary">Reglas de identificación de nodos (fingerprints (huellas digitales), nicks (alias), códigos de país y rangos de direcciones) para el primer salto. Prevalecen las configuraciones de exclusión de nodos y las de bridges.</string> + <string name="pref_entrance_node">Nodos de Entrada </string> + <string name="pref_entrance_node_summary">Reglas de identificación de nodos, fingerprints (descriptores de nodo), nicks (alias), códigos de país y rangos de direcciones, para el primer salto. Prevalecen las configuraciones de exclusión de nodos y las de bridges.</string> <string name="pref_entrance_node_dialog">Introduzca reglas para nodos de entrada </string>  <string name="pref_proxy_title">Proxy al Exterior (outbound) en la Red </string> - <string name="pref_proxy_type_title">Tipo de Proxy Saliente (a internet, no a Tor) </string> - <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente: HTTP, HTTPS, SOCKS4, SOCKS5 </string> + <string name="pref_proxy_type_title">Tipo de Proxy Saliente</string> + <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente (si su conexión sale a internet por proxy): HTTP, HTTPS, SOCKS4, SOCKS5 </string> <string name="pref_proxy_type_dialog">Introduzca tipo de proxy</string> <string name="pref_proxy_host_title">Servidor Proxy Saliente</string> - <string name="pref_proxy_host_summary">Nombre del servidor proxy saliente (a internet, no a Tor) </string> + <string name="pref_proxy_host_summary">Nombre del servidor proxy saliente (si su conexión sale a internet por proxy) </string> <string name="pref_proxy_host_dialog">Introduzca la dirección del proxy </string> <string name="pref_proxy_port_title">Puerto del Proxy Saliente </string> - <string name="pref_proxy_port_summary">Puerto del servidor proxy saliente (a internet, no a Tor) </string> + <string name="pref_proxy_port_summary">Puerto del servidor proxy saliente (si su conexión sale a internet por proxy) </string> <string name="pref_proxy_port_dialog">Introduzca el puerto del proxy </string> <string name="status">Estado </string> <string name="setting_up_full_transparent_proxying_">Estableciendo proxyficación transparente completa... </string> <string name="setting_up_app_based_transparent_proxying_">Estableciendo proxyficación transparente por aplicaciones... </string> <string name="transparent_proxying_enabled">Proxyficación transparente ACTIVADA </string> - <string name="transproxy_enabled_for_tethering_">¡TransProxy habilitado para Tethering! (pasarela a internet para otros dispositivos) </string> + <string name="transproxy_enabled_for_tethering_">¡TransProxy habilitado para Tethering (pasarela a internet para otros dispositivos)! </string> <string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: ¡Error al iniciar la proxyficación transparente! </string> <string name="transproxy_rules_cleared">Reglas de TransProxy borradas </string> <string name="couldn_t_start_tor_process_">No se pudo iniciar el proceso Tor: </string> <string name="privoxy_is_running_on_port_">Privoxy se está ejecutando en el puerto: </string> <string name="setting_up_port_based_transparent_proxying_">Estableciendo proxyficación transparente por puertos... </string> - <string name="bridge_error">Error de Bridge (puente en sombra con la red Tor) </string> + <string name="bridge_error">Error de Bridge </string> <string name="bridge_requires_ip">Para utilizar la funcion bridge (puente en sombra con la red Tor), debe introducir al menos una dirección IP de bridge. </string> <string name="send_email_for_bridges">Envie un correo a bridges(a)torproject.org sólo con el texto \"get bridges\" en el cuerpo del mensaje, desde una cuenta de gmail. </string> <string name="error">Error </string> <string name="your_reachableaddresses_settings_caused_an_exception_">¡Su configuración ReachableAdresses (direcciones alcanzables) ha producido una excepción! </string> <string name="your_relay_settings_caused_an_exception_">¡Su configuración de repetidor de tráfico (relay) ha producido una excepción! </string> - <string name="exit_nodes">Nodos de Salida (de la red Tor) </string> - <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Reglas de identificación de nodos (fingerprints (huellas digitales), nicks (alias), códigos de país y direcciones) para el último salto </string> + <string name="exit_nodes">Nodos de Salida </string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Reglas de identificación de nodos, fingerprints (descriptores de nodo), nicks (alias), códigos de país y direcciones, para el último salto (de la red Tor) </string> <string name="enter_exit_nodes">Introduzca reglas para nodos de salida </string> <string name="exclude_nodes">Excluír Nodos (evitarlos en la red Tor) </string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Reglas de identificación de nodos (fingerprints (huellas digitales), nicks (alias), códigos de país y direcciones) a excluír excepto si provocan fallos de comunicación. Si se aplican prevalecen sobre la configuración de nodos de entrada.</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Reglas de identificación de nodos (fingerprints (descriptores de nodo), nicks (alias), códigos de país y direcciones) a excluír excepto si provocan fallos de comunicación. Si se aplican prevalecen sobre la configuración de nodos de entrada.</string> <string name="enter_exclude_nodes">Introduzca reglas para nodos a excluír </string> <string name="strict_nodes">Hacer Estricta la Exclusión de Nodos (incluso si hay fallos de comunicación) </string> <string name="use_only_these_specified_nodes">Usar *sólo* estos nodos especificados </string>

1 0