- tor-commits - lists.torproject.org

[tor/release-0.2.2] changes file for branch bug5346
by arma＠torproject.org 18 May '12

18 May '12

commit 7ae798ac3850008942472a0e9ad4f0c691433c8a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 8 21:26:48 2012 -0500 changes file for branch bug5346 --- changes/bug5346 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug5346 b/changes/bug5346 new file mode 100644 index 0000000..490eb35 --- /dev/null +++ b/changes/bug5346 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Correct parsing of certain date types in parse_http_time(). + Without this patch, If-Modified-Since would behave + incorrectly. Fix for bug 5346; bugfix on 0.2.0.2-alpha. Patch from + Esteban Manchado Velázques. +

1 0

[tor/release-0.2.2] Fix parse_http_time and add tests
by arma＠torproject.org 18 May '12

18 May '12

commit d0d9c3d71e1fb88557d684c59cf8a920712b16f1 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Mon Feb 20 17:40:37 2012 +0100 Fix parse_http_time and add tests * It seems parse_http_time wasn't parsing correctly any date with commas (RFCs 1123 and 850). Fix that. * It seems parse_http_time was reporting the wrong month (they start at 0, not 1). Fix that. * Add some tests for parse_http_time, covering all three formats. --- src/common/util.c | 8 ++++---- src/test/test_util.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 7d2fc4d..391b02f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1416,13 +1416,13 @@ parse_http_time(const char *date, struct tm *tm) /* First, try RFC1123 or RFC850 format: skip the weekday. */ if ((cp = strchr(date, ','))) { - ++cp; - if (tor_sscanf(date, "%2u %3s %4u %2u:%2u:%2u GMT", + cp += 2; + if (tor_sscanf(cp, "%2u %3s %4u %2u:%2u:%2u GMT", &tm_mday, month, &tm_year, &tm_hour, &tm_min, &tm_sec) == 6) { /* rfc1123-date */ tm_year -= 1900; - } else if (tor_sscanf(date, "%2u-%3s-%2u %2u:%2u:%2u GMT", + } else if (tor_sscanf(cp, "%2u-%3s-%2u %2u:%2u:%2u GMT", &tm_mday, month, &tm_year, &tm_hour, &tm_min, &tm_sec) == 6) { /* rfc850-date */ @@ -1449,7 +1449,7 @@ parse_http_time(const char *date, struct tm *tm) /* Okay, now decode the month. */ for (i = 0; i < 12; ++i) { if (!strcasecmp(MONTH_NAMES[i], month)) { - tm->tm_mon = i+1; + tm->tm_mon = i; } } diff --git a/src/test/test_util.c b/src/test/test_util.c index ee745c5..5845d77 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -87,6 +87,53 @@ test_util_time(void) } static void +test_util_parse_http_time(void *arg) +{ + struct tm a_time; + + (void)arg; + + /* Test parse_http_time */ + + test_eq(-1, parse_http_time("", &a_time)); + test_eq(-1, parse_http_time("Sunday, 32 Aug 2004 00:48:22 GMT", &a_time)); + test_eq(-1, parse_http_time("Sunday, 3 Aug 1869 00:48:22 GMT", &a_time)); + test_eq(-1, parse_http_time("Sunday, 32-Aug-94 00:48:22 GMT", &a_time)); + test_eq(-1, parse_http_time("Sunday, 3-Ago-04 00:48:22", &a_time)); + test_eq(-1, parse_http_time("Sunday, August the third", &a_time)); + + test_eq(0, parse_http_time("Wednesday, 04 Aug 1994 00:48:22 GMT", &a_time)); + test_eq((time_t)775961302UL, tor_timegm(&a_time)); + test_eq(0, parse_http_time("Wednesday, 4 Aug 1994 0:48:22 GMT", &a_time)); + test_eq((time_t)775961302UL, tor_timegm(&a_time)); + test_eq(0, parse_http_time("Miercoles, 4 Aug 1994 0:48:22 GMT", &a_time)); + test_eq((time_t)775961302UL, tor_timegm(&a_time)); + test_eq(0, parse_http_time("Wednesday, 04-Aug-94 00:48:22 GMT", &a_time)); + test_eq((time_t)775961302UL, tor_timegm(&a_time)); + test_eq(0, parse_http_time("Wednesday, 4-Aug-94 0:48:22 GMT", &a_time)); + test_eq((time_t)775961302UL, tor_timegm(&a_time)); + test_eq(0, parse_http_time("Miercoles, 4-Aug-94 0:48:22 GMT", &a_time)); + test_eq((time_t)775961302UL, tor_timegm(&a_time)); + test_eq(0, parse_http_time("Wed Aug 04 00:48:22 1994", &a_time)); + test_eq((time_t)775961302UL, tor_timegm(&a_time)); + test_eq(0, parse_http_time("Wed Aug 4 0:48:22 1994", &a_time)); + test_eq((time_t)775961302UL, tor_timegm(&a_time)); + test_eq(0, parse_http_time("Mie Aug 4 0:48:22 1994", &a_time)); + test_eq((time_t)775961302UL, tor_timegm(&a_time)); + test_eq(-1, parse_http_time("2004-08-zz 99-99x99 GMT", &a_time)); + test_eq(-1, parse_http_time("2011-03-32 00:00:00 GMT", &a_time)); + test_eq(-1, parse_http_time("2011-03-30 24:00:00 GMT", &a_time)); + test_eq(-1, parse_http_time("2011-03-30 23:60:00 GMT", &a_time)); + test_eq(-1, parse_http_time("2011-03-30 23:59:62 GMT", &a_time)); + test_eq(-1, parse_http_time("1969-03-30 23:59:59 GMT", &a_time)); + test_eq(-1, parse_http_time("2011-00-30 23:59:59 GMT", &a_time)); + test_eq(-1, parse_http_time("2011-03-30 23:59", &a_time)); + + done: + ; +} + +static void test_util_config_line(void) { char buf[1024]; @@ -1314,6 +1361,7 @@ test_util_di_ops(void) struct testcase_t util_tests[] = { UTIL_LEGACY(time), + UTIL_TEST(parse_http_time, 0), UTIL_LEGACY(config_line), UTIL_LEGACY(strmisc), UTIL_LEGACY(pow2),

1 0

[tor/release-0.2.2] Make the succeeding parse_http_time tests more obviously right
by arma＠torproject.org 18 May '12

18 May '12

commit 75fc4dbbcabaedc715f0f9e883ccab1c9634e787 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:19:56 2012 -0400 Make the succeeding parse_http_time tests more obviously right (When the correct answer is given in terms of seconds since the epoch, it's hard to be sure that it really is the right answer just by reading the code.) --- src/test/test_util.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index cc0181c..f9a83a3 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -90,9 +90,15 @@ static void test_util_parse_http_time(void *arg) { struct tm a_time; - + char b[ISO_TIME_LEN+1]; (void)arg; +#define T(s) do { \ + format_iso_time(b, tor_timegm(&a_time)); \ + tt_str_op(b, ==, (s)); \ + b[0]='\0'; \ + } while (0) + /* Test parse_http_time */ test_eq(-1, parse_http_time("", &a_time)); @@ -105,26 +111,37 @@ test_util_parse_http_time(void *arg) test_eq(0, parse_http_time("Wednesday, 04 Aug 1994 00:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wednesday, 4 Aug 1994 0:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Miercoles, 4 Aug 1994 0:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wednesday, 04-Aug-94 00:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wednesday, 4-Aug-94 0:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Miercoles, 4-Aug-94 0:48:22 GMT", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wed Aug 04 00:48:22 1994", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Wed Aug 4 0:48:22 1994", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Mie Aug 4 0:48:22 1994", &a_time)); test_eq((time_t)775961302UL, tor_timegm(&a_time)); + T("1994-08-04 00:48:22"); test_eq(0, parse_http_time("Sun, 1 Jan 2012 00:00:00 GMT", &a_time)); test_eq((time_t)1325376000UL, tor_timegm(&a_time)); + T("2012-01-01 00:00:00"); test_eq(0, parse_http_time("Mon, 31 Dec 2012 00:00:00 GMT", &a_time)); test_eq((time_t)1356912000UL, tor_timegm(&a_time)); + T("2012-12-31 00:00:00"); test_eq(-1, parse_http_time("2004-08-zz 99-99x99 GMT", &a_time)); test_eq(-1, parse_http_time("2011-03-32 00:00:00 GMT", &a_time)); test_eq(-1, parse_http_time("2011-03-30 24:00:00 GMT", &a_time)); @@ -134,6 +151,7 @@ test_util_parse_http_time(void *arg) test_eq(-1, parse_http_time("2011-00-30 23:59:59 GMT", &a_time)); test_eq(-1, parse_http_time("2011-03-30 23:59", &a_time)); +#undef T done: ; }

1 0

[tor/release-0.2.2] Merge branch 'bug5346_squashed' into maint-0.2.2
by arma＠torproject.org 18 May '12

18 May '12

commit dd749798a436688cbbe3fc23fe6d4f5041a3e015 Merge: 3ed4c5d 679aa93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:15:35 2012 -0400 Merge branch 'bug5346_squashed' into maint-0.2.2 changes/bug5346 | 8 +++++++ src/common/util.c | 26 +++++++++++++++--------- src/test/test_util.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 10 deletions(-)

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 18 May '12

18 May '12

commit 975dd009ec011f9c301c10f7483b661b172f9a96 Merge: 0daad3e 75fc4db Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 18 16:49:50 2012 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug5259 | 3 + changes/bug5346 | 8 + changes/bug5796 | 4 + changes/geoip-may2012 | 3 + changes/routerlist_ins_replace | 5 + doc/tor.1.txt | 5 +- src/common/util.c | 26 +- src/config/geoip | 748 ++++++++++++++++++++++++++++++++++------ src/or/control.c | 4 + src/or/routerlist.c | 7 + src/test/test_util.c | 71 ++++ 11 files changed, 768 insertions(+), 116 deletions(-)

1 0

[tor/release-0.2.2] Update to the May 2012 GeoIP database.
by arma＠torproject.org 18 May '12

18 May '12

commit 24731ce6a779d67af832d882425bf7a6c6a6f9d2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon May 7 12:50:47 2012 +0200 Update to the May 2012 GeoIP database. --- changes/geoip-may2012 | 3 + src/config/geoip | 748 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 647 insertions(+), 104 deletions(-) diff --git a/changes/geoip-may2012 b/changes/geoip-may2012 new file mode 100644 index 0000000..1575ece --- /dev/null +++ b/changes/geoip-may2012 @@ -0,0 +1,3 @@ + o Minor features: + - Update to the May 1 2012 Maxmind GeoLite Country database. + diff --git a/src/config/geoip b/src/config/geoip index a4223ea..ebaf7ce 100644 --- a/src/config/geoip +++ b/src/config/geoip @@ -1,4 +1,4 @@ -# Last updated based on April 3 2012 Maxmind GeoLite Country +# Last updated based on May 1 2012 Maxmind GeoLite Country # wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip # cut -d, -f3-5 < GeoIPCountryWhois.csv|sed 's/"//g' > geoip 16777216,16777471,AU @@ -217,6 +217,37 @@ 72348928,72349055,US 72349056,72349119,BM 72349120,83886079,US +83886080,83951615,SY +83951616,83959807,UA +83959808,83961855,ES +83961856,83963903,CY +83963904,83965951,RU +83965952,83967999,CZ +83968000,83976191,DE +83976192,83978239,CH +83978240,83980287,IQ +83980288,83982335,CH +83982336,84017151,DE +84017152,84021247,IT +84021248,84023295,GB +84023296,84025343,ES +84025344,84033535,RU +84033536,84037631,NL +84041728,84049919,GB +84049920,84082687,RO +84082688,84148223,RU +84148224,84410367,DE +84410368,84443135,RU +84443136,84451327,LB +84451328,84457471,RU +84457472,84459519,ES +84459520,84471807,RU +84471808,84473855,IQ +84473856,84475903,HU +84475904,84541439,DE +84557824,84574207,NL +84672512,84934655,RO +84934656,85196799,RU 100663296,121195295,US 121195296,121195327,IT 121195328,134693119,US @@ -648,6 +679,7 @@ 387164416,387164671,CA 387164672,387825663,US 387825664,387833855,CA +387833856,387842047,US 387973120,390332415,US 402653184,405012479,US 405012480,405143551,CA @@ -743,6 +775,7 @@ 411172864,411303935,US 411303936,411369471,NL 411369472,411435007,TR +411435008,411500543,DE 411566080,411639807,US 411639808,411643903,CA 411648000,411664383,CA @@ -872,7 +905,6 @@ 456554496,456555519,PK 456555520,456556543,JP 456556544,456560639,AU -456560640,456562687,IN 456562688,456564735,CN 456564736,456572927,IN 456572928,456589311,CN @@ -2745,6 +2777,7 @@ 622870528,622874623,AZ 622874624,622878719,IT 622878720,622880767,FR +622880768,622882815,IT 622882816,622886911,IR 622886912,622919679,GR 622919680,622985215,FI @@ -4588,10 +4621,130 @@ 634503168,634505215,GB 634505216,634507263,IT 634507264,634511359,GB +634511360,634517503,RU +634517504,634519551,LB 634519552,634650623,QA 634650624,634912767,BY 634912768,635043839,RO 635043840,635076607,ES +635076608,635092991,KG +635092992,635097087,TR +635097088,635101183,PS +635101184,635103231,AE +635103232,635105279,HU +635105280,635107327,NL +635107328,635109375,DE +635109376,635174911,FI +635174912,635183103,GB +635183104,635185151,NL +635185152,635187199,IT +635187200,635191295,FR +635191296,635195391,RS +635195392,635197439,RU +635197440,635203583,GB +635203584,635207679,JO +635207680,635211775,HU +635211776,635213823,NL +635213824,635217919,RU +635217920,635219967,NL +635219968,635224063,RU +635224064,635240447,HU +635240448,635256831,IR +635256832,635273215,GB +635273216,635281407,UA +635281408,635285503,RO +635285504,635287551,ME +635287552,635289599,RU +635289600,635291647,DE +635291648,635293695,RU +635293696,635295743,HU +635295744,635297791,GB +635297792,635299839,SE +635299840,635301887,ES +635301888,635305983,CZ +635305984,635437055,NL +635437056,635502591,RO +635502592,635568127,PL +635568128,635699199,IT +635699200,635715583,PL +635715584,635717631,KZ +635717632,635719679,NL +635719680,635723775,RU +635723776,635725823,ES +635727872,635729919,RU +635729920,635731967,GB +635731968,635748351,DE +635748352,635764735,IE +635764736,635830271,UA +635830272,635842559,DE +635842560,635846655,GB +635846656,635854847,ES +635854848,635856895,NL +635856896,635858943,TR +635858944,635860991,LU +635860992,635863039,BE +635863040,635895807,RU +635895808,635961343,KW +635961344,635994111,GE +635994112,636026879,RU +636026880,636043263,MD +636043264,636047359,SE +636047360,636049407,RU +636049408,636051455,FI +636051456,636055551,PL +636055552,636057599,RU +636057600,636059647,CH +636059648,636092415,GE +636092416,636157951,HU +636157952,636159999,AT +636160000,636162047,NL +636162048,636166143,IR +636166144,636168191,ES +636168192,636170239,GB +636170240,636174335,AT +636174336,636176383,RU +636176384,636178431,TR +636178432,636180479,NL +636180480,636182527,FR +636182528,636186623,CZ +636186624,636188671,NL +636188672,636190719,GB +636190720,636223487,RU +636223488,636485631,IQ +636485632,636747775,SA +636747776,636780543,DE +636780544,636813311,HR +636813312,636878847,AE +636878848,636944383,MD +636944384,636952575,SE +636952576,636956671,NL +636956672,636958719,IT +636958720,636960767,PL +636960768,636968959,DE +636968960,636975103,TR +636975104,636977151,ES +636977152,637140991,PL +637140992,637206527,SE +637206528,637239295,NL +637239296,637272063,RO +637272064,637276159,GB +637276160,637278207,RU +637278208,637288447,GB +637288448,637296639,AM +637296640,637298687,ES +637298688,637300735,DE +637300736,637302783,NO +637304832,637313023,CH +637313024,637317119,EU +637317120,637319167,CH +637319168,637321215,AT +637321216,637323263,GB +637323264,637325311,FR +637325312,637327359,NO +637327360,637329407,IR +637329408,637337599,AT +637337600,637403135,NO +637403136,637534207,IR 637534208,644067391,US 644067392,644067455,CA 644067456,644835071,US @@ -4625,6 +4778,8 @@ 691621888,691625983,LR 691625984,691630079,KE 691630080,691631103,ZA +691632128,691633151,NG +691633152,691634175,ZW 691634176,691650559,ZA 691650560,691666943,GH 691666944,691732479,NG @@ -4741,6 +4896,8 @@ 692955136,692957183,NG 692957184,692959231,DZ 692959232,692961279,GN +692961280,692963327,TZ +692963328,692965375,ZA 692967424,692968447,NG 692968448,692969471,CD 692969472,692971519,TZ @@ -13580,6 +13737,9 @@ 1045748480,1045748735,SE 1045748736,1045749503,GB 1045749504,1045749759,SE +1045749760,1045753855,SI +1045753856,1045755903,NL +1045755904,1045757951,UA 1045757952,1045790719,LV 1045790720,1045798911,FR 1045798912,1045889023,IT @@ -43398,6 +43558,7 @@ 1307189248,1307191295,DE 1307191296,1307193343,CZ 1307193344,1307195391,NO +1307195392,1307197439,CH 1307197440,1307205631,HU 1307205632,1307213823,FI 1307213824,1307219239,SI @@ -52207,6 +52368,7 @@ 1398833152,1398840447,NL 1398840448,1398840575,GB 1398840576,1398865919,NL +1398865920,1398867967,CZ 1398867968,1398870015,NL 1398870016,1398872063,PL 1398872064,1398874111,BG @@ -63230,7 +63392,7 @@ 1539711744,1539711999,DE 1539712000,1539712255,UA 1539712256,1539712511,NL -1539712512,1539712767,RU +1539712512,1539713023,RU 1539713024,1539713279,UA 1539713280,1539713535,FR 1539713536,1539713791,DK @@ -63273,6 +63435,7 @@ 1539724032,1539724287,UA 1539724288,1539724543,IT 1539724544,1539724799,RU +1539724800,1539725055,GB 1539725056,1539725311,NL 1539725312,1539725567,FR 1539725568,1539725823,PL @@ -63318,6 +63481,7 @@ 1539736576,1539736831,BG 1539736832,1539737087,UA 1539737088,1539737343,KW +1539737344,1539737599,SE 1539737600,1539737855,RO 1539737856,1539738111,DE 1539738112,1539738367,DK @@ -63576,6 +63740,7 @@ 1539807744,1539807999,GB 1539808000,1539808255,HU 1539808256,1539808511,RU +1539808512,1539808767,GB 1539808768,1539809023,DE 1539809024,1539809279,GB 1539809280,1539809535,EU @@ -65203,6 +65368,7 @@ 1540743680,1540743935,PL 1540743936,1540744191,CH 1540744192,1540744447,GR +1540744448,1540744703,FR 1540744704,1540744959,GB 1540744960,1540745215,UA 1540745216,1540745471,DE @@ -65415,7 +65581,6 @@ 1540906752,1540907007,BG 1540907008,1540907263,RU 1540907264,1540907519,MD -1540907520,1540907775,CZ 1540907776,1540908031,PL 1540908032,1540908287,NL 1540908288,1540908543,DK @@ -66027,6 +66192,7 @@ 1541195264,1541195519,UA 1541195520,1541195775,GB 1541195776,1541196031,FR +1541196032,1541196287,CZ 1541196288,1541196543,RU 1541196544,1541197055,UA 1541197056,1541197311,PL @@ -66120,6 +66286,8 @@ 1541233664,1541234175,SK 1541234176,1541234687,RO 1541234688,1541235199,NL +1541235200,1541235455,RU +1541235456,1541235711,CZ 1541235712,1541236223,AT 1541236224,1541236735,RU 1541236736,1541237247,DE @@ -66801,7 +66969,7 @@ 1541631488,1541631999,SI 1541632000,1541632511,RU 1541632512,1541632767,NL -1541633024,1541634303,PL +1541632768,1541634303,PL 1541634304,1541634559,MD 1541634560,1541635071,PL 1541635072,1541636095,GB @@ -67869,6 +68037,7 @@ 1542253056,1542253567,RU 1542253568,1542253823,LB 1542253824,1542254079,RO +1542254080,1542254335,RU 1542254336,1542254591,FR 1542254592,1542255615,RO 1542255616,1542256127,BE @@ -67975,8 +68144,131 @@ 1542315008,1542316031,RU 1542316032,1542317567,PL 1542317568,1542317823,RU +1542317824,1542318079,GB 1542318080,1542319103,UA -1542319104,1542320127,CZ +1542319104,1542321151,CZ +1542321152,1542322175,UA +1542322176,1542322431,EU +1542322432,1542322687,CZ +1542322688,1542322943,UA +1542322944,1542323199,IL +1542323200,1542323711,RU +1542323712,1542324479,IR +1542324480,1542325247,RU +1542325248,1542325503,EU +1542325504,1542325759,UA +1542325760,1542326271,RS +1542326272,1542326527,GB +1542326528,1542326783,UA +1542326784,1542327295,RU +1542327296,1542328319,CZ +1542328320,1542328831,UA +1542328832,1542329087,TR +1542329088,1542329343,AT +1542329344,1542329855,RU +1542329856,1542330111,GB +1542330112,1542330367,UA +1542330368,1542331903,RU +1542331904,1542332671,BE +1542332672,1542332927,RU +1542332928,1542333439,CZ +1542333440,1542333695,PL +1542333696,1542335487,RO +1542335488,1542337023,RU +1542337024,1542337279,RO +1542337280,1542337535,SE +1542337536,1542339839,PL +1542339840,1542340095,RS +1542340096,1542340607,PL +1542340608,1542342143,RU +1542342144,1542342655,RO +1542342656,1542343167,FR +1542343168,1542343679,UA +1542343680,1542344447,PL +1542344448,1542345215,RU +1542345216,1542345727,UA +1542345728,1542345983,CZ +1542345984,1542346239,PL +1542346240,1542346751,RU +1542346752,1542348287,CZ +1542348288,1542348799,MD +1542348800,1542349823,RU +1542349824,1542351359,CZ +1542351360,1542351615,BG +1542351616,1542351871,PL +1542351872,1542352895,RU +1542352896,1542353151,CZ +1542353152,1542353407,SA +1542353408,1542353663,UA +1542353664,1542353919,RU +1542353920,1542354943,IT +1542354944,1542355711,RU +1542355712,1542355967,GB +1542355968,1542356479,PL +1542356480,1542356735,ES +1542356736,1542356991,RU +1542356992,1542357503,CZ +1542357504,1542357759,GB +1542357760,1542358015,FR +1542358016,1542358271,UA +1542358272,1542358527,CZ +1542358528,1542359039,PL +1542359040,1542360063,CZ +1542360064,1542360319,RU +1542360320,1542360575,NL +1542360576,1542361087,PL +1542361088,1542361343,CH +1542361344,1542361599,PL +1542361600,1542362111,UA +1542362112,1542362623,EU +1542362624,1542363135,FR +1542363136,1542363647,DK +1542363648,1542364159,NL +1542364160,1542365183,CZ +1542365184,1542366719,GB +1542366720,1542367231,PL +1542367232,1542368255,CZ +1542368256,1542369279,PL +1542369280,1542369791,NL +1542369792,1542370303,PL +1542370304,1542370815,DE +1542370816,1542371839,RU +1542371840,1542372351,RO +1542372352,1542373375,RU +1542373376,1542374399,CZ +1542374400,1542375167,GB +1542375168,1542375423,BG +1542375424,1542376447,RU +1542376448,1542376959,BG +1542377216,1542377471,RU +1542377472,1542377983,GB +1542377984,1542378495,RU +1542378496,1542378751,DK +1542378752,1542379007,RU +1542379008,1542379519,GB +1542379520,1542379775,PL +1542379776,1542380031,RU +1542380032,1542380287,EU +1542380288,1542380543,BE +1542380544,1542380799,FR +1542381056,1542381823,RU +1542381824,1542382079,AT +1542382080,1542382335,BE +1542382336,1542383615,RU +1542383616,1542384639,PL +1542384640,1542384895,DE +1542384896,1542385151,RU +1542385152,1542385663,CH +1542385664,1542386687,PL +1542386688,1542387199,CZ +1542387200,1542387711,PL +1542387712,1542387967,CZ +1542387968,1542388223,RU +1542388224,1542388479,IT +1542388480,1542388735,BG +1542388736,1542389247,RU +1542389248,1542389503,PL +1542389504,1542389759,BG 1543503872,1545601023,GB 1545601024,1545673167,SE 1545673168,1545673175,FI @@ -72860,7 +73152,7 @@ 1680539648,1680564223,US 1680564224,1680572415,CA 1680572416,1681915903,US -1686110208,1687158783,US +1686110208,1688207359,US 1694498816,1694499839,CN 1694499840,1694500863,ID 1694500864,1694507007,JP @@ -73371,8 +73663,78 @@ 1728561152,1728562175,AU 1728562176,1728562431,VN 1728562432,1728562687,VU +1728562688,1728563199,JP 1728563200,1728564223,SG 1728564224,1728565247,IN +1728565248,1728566271,JP +1728566272,1728569343,CN +1728569344,1728569599,PH +1728569600,1728571391,ID +1728571392,1728572415,AU +1728572416,1728573439,JP +1728573440,1728574463,HK +1728574464,1728575487,KR +1728575488,1728576511,BD +1728576512,1728577535,BT +1728577536,1728578559,KH +1728578560,1728580607,CN +1728580608,1728580863,ID +1728580864,1728581119,VN +1728581120,1728581631,PK +1728581632,1728582655,NZ +1728582656,1728583679,JP +1728583680,1728584703,MY +1728584704,1728585215,AU +1728585216,1728585727,SG +1728585728,1728586751,CN +1728586752,1728589823,IN +1728589824,1728590847,JP +1728590848,1728591871,CN +1728591872,1728592895,ID +1728592896,1728593151,MN +1728593152,1728593407,AU +1728593408,1728593663,IN +1728593664,1728593919,ID +1728593920,1728595967,JP +1728595968,1728596479,NZ +1728596480,1728598015,ID +1728598016,1728599039,NZ +1728599040,1728602111,JP +1728602112,1728603135,ID +1728603136,1728604159,KR +1728604160,1728605183,TW +1728605184,1728606207,CN +1728606208,1728607231,PK +1728607232,1728608255,IN +1728608256,1728608511,SG +1728608512,1728608767,IN +1728608768,1728609023,ID +1728609024,1728610303,IN +1728610304,1728611327,TH +1728611328,1728613375,AU +1728613376,1728614399,NZ +1728614400,1728615423,MY +1728615424,1728616447,IN +1728616448,1728617471,SG +1728617472,1728618495,CN +1728618496,1728619519,MY +1728619520,1728620543,IN +1728620544,1728622591,AU +1728622592,1728624639,SG +1728624640,1728625663,JP +1728625664,1728626175,IN +1728626176,1728626431,JP +1728626432,1728626687,HK +1728626688,1728627711,IN +1728627712,1728628735,JP +1728628736,1728630783,CN +1728630784,1728631807,TH +1728631808,1728632319,SG +1728632320,1728632575,PK +1728632576,1728633855,IN +1728633856,1728634879,CN +1728634880,1728636159,ID +1728636160,1728636415,AU 1728708608,1728709631,CN 1728709632,1728710655,TW 1728710656,1728710911,AU @@ -74000,7 +74362,7 @@ 1796263168,1796325375,US 1796325376,1796325631,PR 1796325632,1803550719,US -1809842176,1815805951,US +1807745024,1815805951,US 1815805952,1815806207,FR 1815806208,1815806253,US 1815806254,1815806261,FR @@ -76746,7 +77108,7 @@ 2001559552,2001567743,KR 2001567744,2001600511,TW 2001600512,2001797119,CN -2001797120,2001862655,HK +2001797120,2001862655,SG 2001862656,2001864703,AU 2001864704,2001870847,JP 2001870848,2001879039,KR @@ -77085,7 +77447,9 @@ 2053515264,2053519359,ID 2053519360,2053521407,JP 2053521408,2053529599,CN -2053529600,2053533695,AU +2053529600,2053532671,AU +2053532672,2053533183,NZ +2053533184,2053533695,AU 2053533696,2053534719,VN 2053534720,2053537791,IN 2053537792,2053636095,JP @@ -78397,7 +78761,40 @@ 2258305024,2258370559,DE 2258370560,2258436095,US 2258436096,2258567167,FR -2258567168,2258632703,HK +2258567168,2258567679,US +2258567680,2258567935,HK +2258567936,2258583551,US +2258583552,2258591743,GB +2258591744,2258593375,AU +2258593376,2258593535,HK +2258593536,2258594303,AU +2258594304,2258594559,HK +2258594560,2258596095,AU +2258596096,2258596607,HK +2258596608,2258597375,AU +2258597376,2258597439,HK +2258597440,2258598079,AU +2258598080,2258598087,TW +2258598088,2258598639,AU +2258598640,2258598655,TW +2258598656,2258601471,AU +2258601472,2258601983,JP +2258601984,2258602431,AU +2258602432,2258602447,HK +2258602448,2258602879,AU +2258602880,2258603007,HK +2258603008,2258604863,AU +2258604864,2258604927,HK +2258604928,2258606079,AU +2258606080,2258606335,HK +2258606336,2258607871,AU +2258607872,2258609151,HK +2258609152,2258609407,AU +2258609408,2258610303,HK +2258610304,2258610431,IN +2258610432,2258610943,HK +2258610944,2258611071,JP +2258611072,2258632703,HK 2258632704,2258698239,JP 2258698240,2259222527,US 2259222528,2259288063,DE @@ -78459,7 +78856,9 @@ 2264924160,2264989695,CA 2264989696,2265710591,US 2265710592,2265776127,CA -2265776128,2276786175,US +2265776128,2266169343,US +2266169344,2266234879,CA +2266234880,2276786175,US 2276786176,2276851711,CA 2276851712,2277769215,US 2277769216,2277834751,GB @@ -79235,7 +79634,7 @@ 2382364672,2385903615,CA 2385903616,2385915903,US 2385915904,2385919999,CA -2385952768,2385969151,US +2385920000,2385969151,US 2385969152,2386067455,CA 2386067456,2386083839,US 2386083840,2386624511,CA @@ -82627,6 +83026,7 @@ 2870585344,2870587391,UA 2870587392,2870587647,CZ 2870587648,2870587903,RU +2870587904,2870588159,DE 2870588160,2870588415,NL 2870588416,2870588927,HU 2870588928,2870589439,PL @@ -82698,6 +83098,8 @@ 2899378176,2899443711,GB 2899443712,2899574783,FR 2899574784,2899902463,GB +2899902464,2899967999,US +2899968000,2900099071,CA 2902458368,2902461439,A1 2902461440,2902461695,US 2902461696,2902462463,A1 @@ -89448,7 +89850,6 @@ 2946367488,2946375679,KR 2946375680,2946383871,ID 2946383872,2946392063,IN -2946392064,2946393087,BD 2946394112,2946396159,AU 2946396160,2946400255,JP 2946400256,2946416639,NC @@ -92480,7 +92881,8 @@ 2959763456,2959765503,PL 2959765504,2959767551,RU 2959767552,2959769599,RS -2959773696,2959777791,RU +2959769600,2959771647,CZ +2959771648,2959777791,RU 2959777792,2959783935,LV 2959783936,2959785983,SK 2959785984,2959794175,UA @@ -92561,6 +92963,26 @@ 2960207872,2960211967,RU 2960211968,2960224255,RO 2960224256,2960228351,RU +2960228352,2960232447,CZ +2960232448,2960240639,UA +2960240640,2960244735,RO +2960244736,2960248831,PL +2960248832,2960252927,UA +2960252928,2960261119,EU +2960261120,2960265215,UA +2960265216,2960269311,CZ +2960269312,2960273407,UA +2960273408,2960275455,CZ +2960275456,2960277503,RO +2960277504,2960285695,RU +2960285696,2960289791,RO +2960289792,2960320511,CZ +2960320512,2960322559,PL +2960322560,2960326655,CZ +2960326656,2960334847,PL +2960334848,2960347135,CZ +2960347136,2960349183,PL +2960349184,2960361471,CZ 2961178624,2965372927,FR 2965372928,2965766143,RU 2965766144,2965897215,DE @@ -98920,6 +99342,8 @@ 3047424000,3047686143,AR 3047948288,3048079359,CL 3048210432,3048275967,PE +3048341504,3048472575,PA +3048472576,3048734719,VE 3053453312,3054501887,ID 3054501888,3054534655,HK 3054534656,3054537727,PH @@ -100298,7 +100722,9 @@ 3120840704,3120857087,AR 3120857088,3120922623,EC 3120922624,3120930815,PA -3120939008,3120947199,AR +3120939008,3120949247,AR +3120949248,3120951295,CL +3120951296,3120955391,AR 3120955392,3121086463,DO 3121086464,3121151999,UY 3121152000,3121348607,CL @@ -100315,9 +100741,13 @@ 3122298880,3122331647,VE 3122331648,3122364415,BO 3122364416,3122659327,CO -3122659328,3122675711,GT -3122675712,3122683903,SV -3122683904,3122724863,GT +3122659328,3122675711,CR +3122675712,3122692095,SV +3122692096,3122700287,HN +3122700288,3122716671,CR +3122716672,3122720767,HN +3122720768,3122722815,GT +3122722816,3122724863,SV 3122724864,3122741247,AR 3122741248,3122757631,DO 3122757632,3122774015,EC @@ -102570,11 +103000,9 @@ 3188473856,3188482047,PE 3188482048,3188490239,AR 3188490240,3188498431,CO -3188498432,3188516351,AR -3188516352,3188516607,US -3188516608,3188517119,AR -3188517120,3188517375,US -3188517376,3188523007,AR +3188498432,3188517119,AR +3188517120,3188517247,US +3188517248,3188523007,AR 3188523008,3188539391,CO 3188539392,3188543487,CL 3188543488,3188545535,PA @@ -102615,14 +103043,16 @@ 3191091200,3191093247,BO 3191093248,3191095295,AR 3191095296,3191099391,EC +3191099392,3191103487,AR 3191107584,3191111679,PE 3191111680,3191128063,PY 3191128064,3191132159,EC 3191132160,3191136255,AR 3191136256,3191144447,DO -3191144448,3191193599,SV -3191193600,3191197695,HN -3191197696,3191209983,SV +3191144448,3191156735,SV +3191156736,3191169023,HN +3191169024,3191193599,SV +3191193600,3191209983,HN 3191209984,3191275519,CL 3191275520,3191341055,AR 3191341056,3191406591,GT @@ -102642,7 +103072,6 @@ 3192946688,3192979455,DO 3192979456,3193044991,PE 3193044992,3193110527,CL -3193110528,3193143295,CO 3193143296,3193176063,TT 3193176064,3193307135,CO 3193307136,3193438207,SV @@ -102690,7 +103119,7 @@ 3194130432,3194134527,BR 3194134528,3194142719,AR 3194142720,3194159103,CL -3194159104,3194165247,GT +3194159104,3194165247,HN 3194165248,3194175487,SV 3194175488,3194177535,AR 3194177536,3194179583,EC @@ -102715,6 +103144,7 @@ 3194441728,3194445823,AR 3194445824,3194454015,CO 3194454016,3194458111,AR +3194458112,3194462207,CL 3194466304,3194467327,AR 3194467328,3194468351,DO 3194468352,3194469375,US @@ -102739,13 +103169,14 @@ 3194609664,3194613759,AR 3194613760,3194617855,PE 3194617856,3194626047,NI -3194626048,3194628095,AR +3194626048,3194630143,AR 3194630144,3194634239,NI 3194634240,3194638335,CR 3194638336,3194640383,AR +3194640384,3194642431,BZ 3194642432,3194646527,AR 3194646528,3194648575,DO -3194650624,3194659839,AR +3194648576,3194659839,AR 3194659840,3194660095,US 3194660096,3194663167,AR 3194663168,3194663423,US @@ -102754,6 +103185,7 @@ 3194666240,3194667007,AR 3194667008,3194675199,GT 3194675200,3194679295,PA +3194679296,3194683391,BO 3194683392,3194687487,CU 3194687488,3194691583,CO 3194691584,3194699775,BO @@ -102785,6 +103217,7 @@ 3194929152,3194937343,EC 3194937344,3194945535,AR 3194945536,3194953727,GT +3194953728,3194961919,AR 3194961920,3194970111,EC 3194970112,3194974207,PA 3194974208,3194976255,AR @@ -102844,7 +103277,7 @@ 3195756544,3195763711,AR 3195763712,3195764735,BO 3195764736,3195768831,CR -3195772928,3195777023,VE +3195772928,3195781119,VE 3195781120,3195797503,PA 3195797504,3195801599,AR 3195805696,3195807743,NI @@ -102895,10 +103328,11 @@ 3198877696,3198894079,CR 3198910464,3198926847,CL 3198943232,3199467519,AR -3199500288,3199516671,AR +3199504384,3199505407,AR 3199533056,3199549439,BO 3199549440,3199565823,AR 3199565824,3199582207,NI +3199582208,3199598591,HN 3199598592,3199631359,CO 3199631360,3199729663,AR 3199729664,3199762431,NI @@ -103040,7 +103474,9 @@ 3222075136,3222075391,CH 3222075392,3222274047,US 3222290432,3222305535,US -3222305536,3222313727,SE +3222305536,3222309119,SE +3222309120,3222309375,DE +3222309376,3222313727,SE 3222313728,3222316799,CH 3222316800,3222319615,US 3222319616,3222320127,JP @@ -103473,7 +103909,9 @@ 3224798976,3224799231,AU 3224799744,3224799999,US 3224800000,3224800255,DE -3224800256,3224820735,FR +3224800256,3224816639,FR +3224816640,3224816895,IL +3224816896,3224820735,FR 3224820736,3224820991,PL 3224820992,3224821247,DE 3224821248,3224822015,US @@ -103500,7 +103938,9 @@ 3224855808,3224856063,IT 3224856064,3224856575,US 3224856832,3224857087,NL -3224857088,3224858623,US +3224857088,3224857855,US +3224857856,3224858111,PL +3224858368,3224858623,US 3224858624,3224858879,AU 3224858880,3224859391,US 3224859392,3224859647,NL @@ -103579,6 +104019,7 @@ 3225423872,3225424383,US 3225426944,3225427199,AT 3225429504,3225429759,CA +3225431040,3225431551,CZ 3225431552,3225433087,US 3225436160,3225444607,US 3225445376,3225446399,BE @@ -103680,7 +104121,8 @@ 3225687808,3225688063,GB 3225688064,3225689343,US 3225689600,3225689855,US -3225689856,3225695231,NL +3225689856,3225694975,NL +3225694976,3225695231,PL 3225695232,3225695487,US 3225695488,3225701119,CA 3225701120,3225701375,US @@ -104236,6 +104678,7 @@ 3227443712,3227443967,EU 3227443968,3227444223,AU 3227444224,3227445503,US +3227445504,3227445759,CZ 3227445760,3227446015,US 3227446016,3227446271,GB 3227446272,3227446783,US @@ -105252,7 +105695,9 @@ 3231050496,3231051263,US 3231051264,3231051519,GB 3231051776,3231070463,US -3231070720,3231077631,SE +3231070720,3231077119,SE +3231077120,3231077375,PL +3231077376,3231077631,SE 3231078144,3231078655,US 3231078656,3231078911,GB 3231078912,3231079423,CA @@ -105611,6 +106056,7 @@ 3231761408,3231763711,US 3231763712,3231763967,AU 3231763968,3231768575,US +3231768576,3231768831,RU 3231768832,3231769087,NO 3231769344,3231769855,US 3231769856,3231770111,AU @@ -106530,7 +106976,23 @@ 3238018304,3238018559,UA 3238018560,3238018815,FR 3238018816,3238019071,DE -3238019072,3238035455,PL +3238019072,3238035711,PL +3238035712,3238036479,RU +3238036480,3238037503,CZ +3238037504,3238039039,LV +3238039040,3238039551,RU +3238039552,3238039807,PL +3238051840,3238053375,PL +3238053376,3238053631,CZ +3238053632,3238053887,GB +3238053888,3238055935,CZ +3238055936,3238056959,PL +3238056960,3238057215,CZ +3238057216,3238057471,BG +3238057472,3238057983,RU +3238057984,3238059519,CZ +3238059520,3238059775,NO +3238059776,3238060031,CZ 3238060032,3238060287,CH 3238060288,3238060543,RO 3238060544,3238060799,HU @@ -106712,6 +107174,7 @@ 3239108096,3239109887,DE 3239109888,3239110143,PL 3239110144,3239110655,DE +3239110656,3239110911,RU 3239110912,3239111167,UA 3239111168,3239111423,NL 3239111424,3239111935,DE @@ -107230,6 +107693,7 @@ 3239859712,3239859967,HU 3239859968,3239860223,CA 3239860224,3239860479,DE +3239860480,3239860735,FI 3239860736,3239860991,DE 3239860992,3239861247,AT 3239861248,3239861503,UA @@ -107339,7 +107803,7 @@ 3239968768,3239969023,NO 3239969024,3239974911,DE 3239974912,3239975935,GB -3239975936,3239978751,DE +3239976960,3239978751,DE 3239978752,3239979007,RU 3239979008,3239979263,UA 3239979264,3239979519,GB @@ -107560,6 +108024,8 @@ 3240278016,3240278527,RU 3240278528,3240279039,GB 3240279040,3240279551,CH +3240279552,3240279807,RU +3240279808,3240280063,CZ 3240280064,3240280191,DE 3240280192,3240280319,SE 3240280320,3240280447,PL @@ -107902,6 +108368,7 @@ 3240861696,3240866815,IT 3240866816,3240867071,RU 3240867072,3240867327,PL +3240867328,3240867583,RU 3240867584,3240867839,CH 3240867840,3240873983,IT 3240873984,3240874495,RU @@ -108415,6 +108882,7 @@ 3244834048,3244834303,CH 3244834304,3244834559,IL 3244834560,3244834815,GB +3244834816,3244835071,RU 3244835072,3244835327,AT 3244835328,3244835583,DE 3244835584,3244835839,UA @@ -108423,6 +108891,7 @@ 3244836608,3244836863,PL 3244836864,3244837119,FR 3244837120,3244837375,RO +3244837376,3244837631,CZ 3244837632,3244837887,RU 3244837888,3244838143,CY 3244838144,3244838399,IL @@ -108485,7 +108954,6 @@ 3244853760,3244854015,TR 3244854016,3244854271,NL 3244854272,3244854527,GB -3244854528,3244854783,CZ 3244854784,3244855295,RU 3244855296,3244855551,GB 3244855552,3244855807,UA @@ -108576,7 +109044,6 @@ 3244879872,3244880127,SI 3244880128,3244880383,RU 3244880384,3244880639,UA -3244880640,3244880895,CZ 3244880896,3244881151,PL 3244881152,3244881407,RU 3244881408,3244881663,DK @@ -108605,6 +109072,7 @@ 3244887296,3244887551,GB 3244887552,3244887807,RU 3244887808,3244888063,BE +3244888064,3244888319,PL 3244888320,3244888575,DE 3244888576,3244888831,FR 3244888832,3244889087,DE @@ -109150,6 +109618,7 @@ 3245211136,3245211647,GB 3245211648,3245212159,RU 3245212160,3245212671,NG +3245212672,3245213183,GB 3245213184,3245213695,DE 3245213696,3245214207,LV 3245214208,3245214719,AT @@ -109480,7 +109949,6 @@ 3247054592,3247054847,DE 3247054848,3247063039,SI 3247063040,3247063295,FR -3247063296,3247063551,GR 3247063552,3247063807,DE 3247063808,3247064063,BG 3247064064,3247064319,DE @@ -109492,6 +109960,7 @@ 3247065600,3247065855,SE 3247065856,3247066111,GB 3247066112,3247066367,DK +3247066368,3247066623,LV 3247066624,3247066879,CZ 3247066880,3247067135,RU 3247067136,3247067647,DE @@ -109523,7 +109992,7 @@ 3247074560,3247074815,SE 3247074816,3247075071,PL 3247075072,3247075327,IE -3247075328,3247075839,DE +3247075328,3247076095,DE 3247076096,3247076351,DK 3247076352,3247076607,RU 3247076608,3247076863,DE @@ -110371,6 +110840,7 @@ 3249722112,3249722367,GB 3249722368,3249722623,FR 3249722624,3249723135,PL +3249723136,3249723391,RU 3249723392,3249723647,IT 3249723648,3249723903,GB 3249723904,3249724159,TR @@ -111008,7 +111478,6 @@ 3251213696,3251213759,LV 3251213760,3251213823,TR 3251213824,3251213887,GB -3251213952,3251214015,FI 3251214016,3251214079,UA 3251214080,3251214143,FR 3251214144,3251214207,AF @@ -111024,6 +111493,7 @@ 3251215488,3251215615,SE 3251215616,3251215743,TR 3251215744,3251215871,GB +3251215872,3251216127,RO 3251216128,3251216255,FI 3251216256,3251216383,RU 3251216384,3251216639,GB @@ -111973,6 +112443,9 @@ 3253602304,3253603327,DE 3253603328,3253605375,PL 3253605376,3253606399,UA +3253606400,3253606655,PL +3253606656,3253606911,TR +3253606912,3253607167,DE 3253607424,3253608447,NG 3253608448,3253610495,UA 3253610496,3253611519,PL @@ -112079,7 +112552,6 @@ 3253710848,3253711359,DK 3253711360,3253712383,UA 3253712384,3253712895,MD -3253712896,3253713407,GR 3253713408,3253713919,NL 3253713920,3253714431,AT 3253714432,3253714943,RO @@ -112101,7 +112573,6 @@ 3253723648,3253724159,AT 3253724160,3253724671,UA 3253724672,3253725183,RO -3253725184,3253725695,EU 3253725696,3253726207,UA 3253726208,3253726719,RO 3253726720,3253727231,UA @@ -112162,9 +112633,7 @@ 3253964800,3253965311,SE 3253965312,3253966335,PL 3253966336,3253966847,DE -3253966848,3253967359,UA -3253967360,3253967871,GR -3253967872,3253968895,UA +3253966848,3253968895,UA 3253968896,3253969407,DE 3253969408,3253969919,AT 3253969920,3253970431,NL @@ -112398,8 +112867,12 @@ 3254788096,3254788351,BG 3254788352,3254789119,ES 3254789120,3254789375,FR +3254789376,3254789631,BE 3254789632,3254790655,TK 3254790656,3254790911,LU +3254790912,3254791423,BE +3254791424,3254791679,SK +3254791680,3254792191,DK 3254796288,3254797311,SE 3254797312,3254798335,RU 3254798336,3254799359,AT @@ -112565,6 +113038,7 @@ 3254892288,3254892543,BE 3254892544,3254892799,RU 3254892800,3254893567,SK +3254893568,3254894079,CZ 3254894080,3254894335,CH 3254894336,3254894591,SK 3254894592,3254894847,DK @@ -113096,6 +113570,7 @@ 3255544576,3255544831,AT 3255544832,3255558143,CH 3255558144,3255558399,BE +3255558400,3255558655,UA 3255558656,3255564031,CH 3255564032,3255564287,RU 3255564288,3255566335,CH @@ -113384,7 +113859,10 @@ 3256864768,3256870911,DE 3256870912,3256871167,RU 3256871168,3256875007,DE -3256877056,3256915455,GB +3256877056,3256898559,GB +3256898560,3256899071,TR +3256899072,3256899583,CZ +3256899584,3256915455,GB 3256915456,3256915967,SE 3256915968,3256945663,GB 3256945664,3256945919,UA @@ -113413,6 +113891,10 @@ 3257059072,3257139199,GB 3257139200,3257139455,DK 3257139456,3257143295,GB +3257143296,3257143807,RU +3257143808,3257144063,DE +3257144064,3257144319,RU +3257144320,3257144575,AT 3257144576,3257144831,GB 3257144832,3257145087,FR 3257145088,3257180159,GB @@ -114355,7 +114837,12 @@ 3257987584,3257991167,AT 3257991168,3258003967,DE 3258003968,3258004479,RU -3258004480,3258056703,DE +3258004480,3258021887,DE +3258021888,3258022911,RU +3258022912,3258023167,PL +3258023168,3258023679,DE +3258023680,3258023935,RU +3258023936,3258056703,DE 3258056704,3258056959,UA 3258056960,3258058239,CZ 3258058240,3258058495,RU @@ -114951,7 +115438,12 @@ 3259814400,3259814655,AT 3259814656,3259821823,DE 3259821824,3259822079,AT -3259822080,3259851823,DE +3259822080,3259823103,DE +3259823104,3259823359,RO +3259823360,3259823615,EU +3259823616,3259823871,NO +3259823872,3259824127,IE +3259824128,3259851823,DE 3259851824,3259851831,GB 3259851832,3259891711,DE 3259891712,3259957247,BE @@ -115151,6 +115643,8 @@ 3261697024,3261698047,RO 3261698048,3261698559,UA 3261698560,3261699071,DE +3261699072,3261699327,RU +3261699328,3261699583,GB 3261699584,3261700095,NL 3261700096,3261700607,FR 3261700608,3261701119,GB @@ -118274,7 +118768,6 @@ 3263087104,3263087871,DE 3263087872,3263088127,SI 3263088128,3263088383,DE -3263088384,3263088639,GB 3263088640,3263089151,CH 3263089152,3263089407,RO 3263089408,3263089663,RU @@ -118677,7 +119170,11 @@ 3264447744,3264447999,DE 3264448000,3264463871,CH 3264463872,3264466943,LI -3264466944,3264483071,CH +3264466944,3264476671,CH +3264476672,3264477183,CZ +3264477184,3264477439,PL +3264477440,3264477695,RU +3264477696,3264483071,CH 3264483072,3264483327,LI 3264483328,3264486527,CH 3264486528,3264486559,LI @@ -119074,6 +119571,7 @@ 3265603328,3265603583,MD 3265603584,3265603839,DE 3265603840,3265604095,PL +3265604096,3265604351,IL 3265604352,3265604607,FR 3265604608,3265604863,CH 3265604864,3265605119,RU @@ -122033,6 +122531,7 @@ 3273437184,3273437695,RO 3273437696,3273438207,PL 3273438208,3273438719,IL +3273438720,3273439231,CZ 3273439232,3273439743,RO 3273439744,3273440255,DE 3273440256,3273440767,RO @@ -130132,6 +130631,7 @@ 3279078912,3279084543,ES 3279084544,3279085567,IT 3279085568,3279089663,NL +3279089664,3279093759,KG 3279093760,3279103103,FR 3279103104,3279103135,GB 3279103136,3279119295,FR @@ -130630,6 +131130,8 @@ 3280595968,3280596479,DK 3280596480,3280596991,AT 3280596992,3280597503,UA +3280597504,3280597759,NL +3280597760,3280598015,BE 3280598016,3280598527,UA 3280598528,3280599039,PL 3280599040,3280599551,FR @@ -130657,7 +131159,7 @@ 3280653056,3280653311,CH 3280653312,3280653823,GB 3280653824,3280654079,RU -3280654336,3280654591,PL +3280654080,3280654591,PL 3280654592,3280654847,ES 3280654848,3280655103,RU 3280655104,3280655359,PL @@ -130973,6 +131475,7 @@ 3280996608,3280996863,PL 3280996864,3280997119,NL 3280997120,3280997375,FR +3280997376,3280997631,PL 3280997632,3280997887,SE 3280997888,3280998143,UA 3280998144,3280998399,DE @@ -131399,8 +131902,7 @@ 3283226112,3283226623,DK 3283226624,3283227135,RU 3283227136,3283227647,UA -3283227648,3283228159,RU -3283228672,3283229183,RU +3283227648,3283229183,RU 3283229184,3283229695,PL 3283229696,3283230207,IT 3283230208,3283230719,UA @@ -131460,7 +131962,6 @@ 3283484672,3283484927,UA 3283484928,3283485183,NL 3283485184,3283485439,DE -3283485440,3283485695,RU 3283485696,3283485951,GB 3283485952,3283486207,US 3283486208,3283486463,AT @@ -134066,7 +134567,6 @@ 3286326272,3286327295,PL 3286327296,3286329343,NL 3286329344,3286330367,DE -3286330368,3286331391,EU 3286331392,3286332415,UA 3286332416,3286333439,CH 3286333440,3286334463,PL @@ -135173,6 +135673,7 @@ 3291211776,3291212287,NG 3291212288,3291212543,MZ 3291212544,3291212799,NG +3291212800,3291213055,MA 3291216896,3291217919,MU 3291217920,3291230207,ZA 3291230208,3291234303,GH @@ -135357,7 +135858,9 @@ 3302490624,3302491135,MU 3302492160,3302494207,MW 3302494208,3302496255,ZA -3302498304,3302506495,NA +3302498304,3302502399,NA +3302502400,3302503423,AO +3302503424,3302506495,NA 3302506496,3302514687,KE 3302522880,3302523903,KE 3302525952,3302526975,EG @@ -135448,12 +135951,16 @@ 3315400704,3315417087,UG 3315417088,3315425279,ZA 3315425280,3315433471,SC +3315433472,3315449855,RW 3315449856,3315450879,BI 3315450880,3315451903,AO 3315451904,3315452927,LS 3315452928,3315453951,ZW 3315453952,3315454975,CD -3315463168,3315464191,MU +3315454976,3315455999,RW +3315456000,3315457023,NG +3315457024,3315458047,ZA +3315458048,3315459071,SL 3315466240,3315482623,MZ 3315531776,3315539967,CM 3315539968,3315548159,ZA @@ -135493,9 +136000,11 @@ 3320643584,3320709119,KE 3320709120,3320774655,ZA 3320840192,3320905727,NG +3320987648,3320995839,ZA 3320995840,3321004031,NG 3321004032,3321008127,GM 3321008128,3321012223,ZA +3321012224,3321016319,MZ 3321036800,3321069567,RW 3321069568,3321102335,NA 3321102336,3321167871,NG @@ -135617,15 +136126,14 @@ 3324259840,3324260095,US 3324264448,3324379135,US 3324379136,3324380159,CA -3324380160,3324391423,US -3324395520,3324399615,US +3324380160,3324403711,US 3324411904,3324470271,US 3324470272,3324473599,GB 3324473600,3324473855,US 3324473856,3324474367,GB 3324474368,3324579839,US 3324583936,3324588031,CL -3324592128,3324596223,US +3324588032,3324600319,US 3324641280,3324642303,US 3324642304,3324642559,CA 3324642560,3324645887,US @@ -135858,8 +136366,7 @@ 3328433664,3328433919,CH 3328433920,3328475135,US 3328475136,3328477183,CA -3328507904,3328524287,US -3328573440,3328617983,US +3328507904,3328617983,US 3328617984,3328618239,CA 3328618240,3328630783,US 3328630784,3328631807,CA @@ -135943,7 +136450,9 @@ 3331102464,3331102719,CA 3331102720,3331194879,US 3331194880,3331260415,AU -3331260416,3331563519,US +3331260416,3331362815,US +3331362816,3331366911,CA +3331366912,3331563519,US 3331563520,3331563775,CH 3331563776,3331633407,US 3331633408,3331633919,CH @@ -135955,7 +136464,10 @@ 3331798272,3331798527,AU 3331798528,3331818495,US 3331818496,3331818751,MX -3331818752,3332440063,US +3331818752,3332001791,US +3332001792,3332005887,CA +3332014080,3332030463,US +3332046848,3332440063,US 3332440064,3332460543,CA 3332460544,3332460799,US 3332460800,3332461311,CA @@ -136076,7 +136588,8 @@ 3337653760,3337654783,CH 3337654784,3337655039,AU 3337655040,3337682943,CH -3337682944,3337961471,US +3337682944,3337957375,US +3337957376,3337961471,CA 3337977856,3337980671,US 3337980672,3337980927,PR 3337980928,3337986047,US @@ -136169,7 +136682,10 @@ 3338271488,3338271743,CA 3338271744,3338271999,US 3338272000,3338272255,CA -3338272256,3338686463,US +3338272256,3338348543,US +3338350592,3338354687,CA +3338371072,3338403839,CA +3338403840,3338686463,US 3338686464,3338688511,AW 3338688512,3338770431,US 3338770432,3338772479,PR @@ -136991,8 +137507,7 @@ 3349645312,3349647359,CA 3349647360,3349649407,US 3349649408,3349653503,CA -3349653504,3349692415,US -3349708800,3349723260,US +3349653504,3349723260,US 3349723261,3349723265,CA 3349723266,3349723360,US 3349723361,3349723367,CA @@ -137014,16 +137529,17 @@ 3350042880,3350043135,KW 3350043136,3350134783,US 3350134784,3350146047,CA -3350146048,3350147071,US -3350151168,3350181887,CA +3350146048,3350150143,US +3350150144,3350181887,CA 3350181888,3350182911,US 3350182912,3350200319,CA 3350200320,3350469119,US 3350469632,3350470655,CA 3350470656,3350475775,US 3350475776,3350476799,CA -3350476800,3350478847,US -3350495232,3350495577,US +3350476800,3350487039,US +3350487040,3350488063,CA +3350488064,3350495577,US 3350495578,3350495585,GB 3350495586,3350495602,US 3350495603,3350495604,BD @@ -137044,9 +137560,22 @@ 3350514656,3350515135,US 3350515136,3350515167,GB 3350515168,3350593535,US -3350593536,3350609919,CA -3350614016,3350618111,US -3350626304,3350790143,US +3350593536,3350605823,CA +3350605824,3350606847,US +3350606848,3350607871,CA +3350607872,3350618111,US +3350618112,3350619135,CA +3350619136,3350623231,US +3350623232,3350624255,CA +3350624256,3350626303,US +3350626304,3350628351,CA +3350628352,3350642687,US +3350642688,3350643711,TC +3350643712,3350645759,US +3350645760,3350646783,CA +3350646784,3350648831,US +3350648832,3350649855,CA +3350650880,3350790143,US 3350790144,3350825727,CA 3350825728,3350825983,GB 3350825984,3350855679,CA @@ -137058,7 +137587,7 @@ 3350979584,3350980607,CA 3350980608,3350994943,US 3350994944,3350998015,CA -3350998016,3350999039,US +3350998016,3351001087,US 3351019520,3351026439,US 3351026440,3351026447,CA 3351026448,3351030783,US @@ -137277,7 +137806,9 @@ 3354066944,3354132479,CA 3354132480,3354591231,US 3354591232,3354656767,CA -3354656768,3354782719,US +3354656768,3354770687,US +3354770688,3354770943,CA +3354770944,3354782719,US 3354782720,3354782975,CA 3354782976,3354788095,US 3354788096,3354806399,CA @@ -138008,7 +138539,9 @@ 3358151272,3358151423,AR 3358151424,3358151551,EC 3358151552,3358151679,AR -3358151680,3358152191,PE +3358151680,3358151807,PE +3358151808,3358151935,AR +3358151936,3358152191,PE 3358152192,3358152559,AR 3358152560,3358152575,PE 3358152576,3358152703,AR @@ -138253,9 +138786,7 @@ 3360687984,3360687999,AR 3360688000,3360688127,CO 3360688128,3360688383,AR -3360688384,3360688639,CO -3360688640,3360688767,AR -3360688768,3360690623,CO +3360688384,3360690623,CO 3360690624,3360690687,AR 3360690688,3360690703,CO 3360690704,3360690719,AR @@ -138458,7 +138989,7 @@ 3363601920,3363602175,AR 3363602176,3363602431,PA 3363602432,3363610623,AN -3363618816,3363622911,UY +3363618816,3363627007,UY 3363627008,3363635199,EC 3363635200,3363651583,UY 3363651584,3363667967,AR @@ -138505,7 +139036,8 @@ 3386548224,3386556415,CR 3386556416,3386572799,PA 3386572800,3386589183,EC -3386589184,3386605567,AR +3386589184,3386601471,AR +3386601472,3386605567,CO 3386605568,3386613759,CL 3386613760,3386621951,AR 3386621952,3386630143,CO @@ -138879,7 +139411,7 @@ 3389661184,3389669375,IN 3389669376,3389673471,CN 3389673472,3389677567,AU -3389677568,3389685759,JP +3389677568,3389681663,JP 3389685760,3389718527,AU 3389718528,3389784063,JP 3389784064,3389784319,NZ @@ -139872,7 +140404,7 @@ 3394634752,3394635775,IN 3394635776,3394637823,KR 3394637824,3394641919,AF -3394646016,3394648063,AU +3394641920,3394648063,AU 3394648064,3394650111,JP 3394650112,3394658303,HK 3394658304,3394662399,NZ @@ -141410,9 +141942,7 @@ 3407089920,3407090175,CN 3407090176,3407095807,AU 3407095808,3407096319,CN -3407096320,3407096831,AU -3407096832,3407097087,JP -3407097088,3407097855,AU +3407096320,3407097855,AU 3407097856,3407098111,CN 3407098112,3407101183,AU 3407101184,3407101439,CN @@ -142488,7 +143018,9 @@ 3411509248,3411542015,PH 3411542016,3411550207,IN 3411550208,3411558399,CN -3411558400,3411566591,HK +3411558400,3411561727,HK +3411561728,3411561983,AU +3411561984,3411566591,HK 3411566592,3411570687,BD 3411570688,3411574783,AU 3411574784,3411582975,IN @@ -142825,7 +143357,9 @@ 3414670592,3414670847,SG 3414670848,3414671359,MY 3414671360,3415080959,JP -3415080960,3415089151,SG +3415080960,3415083007,SG +3415083008,3415083519,AU +3415083520,3415089151,SG 3415089152,3415097343,MY 3415097344,3415103487,ID 3415103488,3415113727,HK @@ -143168,7 +143702,8 @@ 3418206208,3418208255,IN 3418208256,3418210303,LK 3418210304,3418218495,CN -3418218496,3418227711,BD +3418218496,3418220543,BD +3418226688,3418227711,BD 3418227712,3418228735,KR 3418228736,3418230783,BD 3418230784,3418232831,TW @@ -145449,9 +145984,13 @@ 3449222656,3449224959,CA 3449224960,3449225471,US 3449225472,3449254143,CA -3449254144,3449254399,US -3449254912,3449290751,CA -3449290752,3449598207,US +3449254144,3449254911,US +3449254912,3449273599,CA +3449273600,3449273855,US +3449273856,3449278975,CA +3449278976,3449279487,US +3449279488,3449290495,CA +3449290496,3449598207,US 3449598208,3449598463,GB 3449598464,3449638911,US 3449638912,3449639359,GB @@ -145982,8 +146521,7 @@ 3454563624,3454563631,NC 3454563632,3454599423,US 3454599424,3454601215,CA -3454601216,3454602239,US -3454602752,3454603007,US +3454601216,3454603007,US 3454603008,3454603519,CA 3454603520,3454604031,US 3454604032,3454604799,CA @@ -146069,6 +146607,7 @@ 3454810368,3454814975,CA 3454814976,3454815231,US 3454815232,3454815743,CA +3454815744,3454816255,US 3454816256,3454816511,CA 3454816512,3454816767,US 3454816768,3454828287,CA @@ -146080,8 +146619,8 @@ 3454867968,3454881535,CA 3454881536,3454881791,US 3454881792,3454883839,CA -3454883840,3454914559,US -3454914560,3454926591,CA +3454883840,3454915071,US +3454915072,3454926591,CA 3454926592,3455096831,US 3455096832,3455097855,EC 3455097856,3455109119,US @@ -156081,7 +156620,7 @@ 3524157440,3524161535,AU 3524161536,3524247551,CN 3524247552,3524263935,AU -3524263936,3524296703,PH +3524263936,3524280319,PH 3524296704,3524313087,CN 3524313088,3524329471,KR 3524329472,3524362239,TW @@ -156118,6 +156657,7 @@ 3526901760,3526909951,AU 3526909952,3526918143,IN 3526918144,3526922239,SG +3526922240,3526924287,IN 3526924288,3526926335,AU 3526926336,3526934527,JP 3526934528,3526942719,CN

1 0

[stem/master] Utilising metrics descriptor type annotations
by atagar＠torproject.org 18 May '12

18 May '12

commit 301401360337e4c02a5fd5e4e8520cc1ecf88633 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 18 10:25:49 2012 -0700 Utilising metrics descriptor type annotations Using the @type annotations added by Karsten to the metrics descriptors as per ticket 5651. --- stem/descriptor/__init__.py | 52 ++++++++++++++------ stem/descriptor/server_descriptor.py | 14 ----- test/integ/descriptor/data/bridge_descriptor | 1 + test/integ/descriptor/data/cr_in_contact_line | 1 + test/integ/descriptor/data/descriptor_archive.tar | Bin 20480 -> 20480 bytes .../descriptor/data/descriptor_archive.tar.bz2 | Bin 3322 -> 3352 bytes .../descriptor/data/descriptor_archive.tar.gz | Bin 2844 -> 2874 bytes test/integ/descriptor/data/example_descriptor | 1 + test/integ/descriptor/data/extrainfo_descriptor | 1 + test/integ/descriptor/data/negative_uptime | 1 + test/integ/descriptor/data/non-ascii_descriptor | 1 + test/integ/descriptor/data/old_descriptor | 1 + test/integ/descriptor/extrainfo_descriptor.py | 1 + test/integ/descriptor/reader.py | 2 + test/integ/descriptor/server_descriptor.py | 6 ++ 15 files changed, 52 insertions(+), 30 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index f3a5983..1de1dac 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -35,30 +35,50 @@ def parse_file(path, descriptor_file): IOError if unable to read from the descriptor_file """ - import stem.descriptor.extrainfo_descriptor import stem.descriptor.server_descriptor + import stem.descriptor.extrainfo_descriptor # The tor descriptor specifications do not provide a reliable method for # identifying a descriptor file's type and version so we need to guess - # based on... - # - its filename for resources from the tor data directory - # - first line of our contents for files provided by metrics + # based on its filename. Metrics descriptors, however, can be identified + # by an annotation on their first line... + # https://trac.torproject.org/5651 - filename = os.path.basename(path) - first_line = descriptor_file.readline() - descriptor_file.seek(0) + # Cached descriptor handling. These contain mulitple descriptors per file. - if filename == "cached-descriptors" or first_line.startswith("router "): - for desc in stem.descriptor.server_descriptor.parse_file(descriptor_file): - desc._set_path(path) - yield desc - elif filename == "cached-extrainfo" or first_line.startswith("extra-info "): - for desc in stem.descriptor.extrainfo_descriptor.parse_file(descriptor_file): + filename, file_parser = os.path.basename(path), None + + if filename == "cached-descriptors": + file_parser = stem.descriptor.server_descriptor.parse_file + elif filename == "cached-extrainfo": + file_parser = stem.descriptor.extrainfo_descriptor.parse_file + + if file_parser: + for desc in file_parser(descriptor_file): desc._set_path(path) yield desc - else: - # unrecognized descriptor type - raise TypeError("Unable to determine the descriptor's type. filename: '%s', first line: '%s'" % (filename, first_line)) + + return + + # Metrics descriptor handling. These contain a single descriptor per file. + + first_line, desc = descriptor_file.readline().strip(), None + + if first_line == "@type server-descriptor 1.0": + desc = stem.descriptor.server_descriptor.RelayDescriptor(descriptor_file.read()) + elif first_line == "@type bridge-server-descriptor 1.0": + desc = stem.descriptor.server_descriptor.BridgeDescriptor(descriptor_file.read()) + elif first_line in ("@type extra-info 1.0", "@type bridge-extra-info 1.0"): + desc = stem.descriptor.extrainfo_descriptor.ExtraInfoDescriptor(descriptor_file.read()) + + if desc: + desc._set_path(path) + yield desc + return + + # Not recognized as a descriptor file. + + raise TypeError("Unable to determine the descriptor's type. filename: '%s', first line: '%s'" % (filename, first_line)) class Descriptor: """ diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index d347b15..9a91d60 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -80,20 +80,6 @@ def parse_file(descriptor_file, validate = True): IOError if the file can't be read """ - # Handler for bridge descriptors - # - # Bridge descriptors are scrubbed so their nickname is 'Unnamed' and their - # ip address is in the 10.x.x.x space, which is normally reserved for private - # networks. Bridge descriptors only come from metrics so a file only contains - # a single descriptor. - - first_line = descriptor_file.readline() - descriptor_file.seek(0) - - if first_line.startswith("router Unnamed 10."): - yield BridgeDescriptor(descriptor_file.read()) - return - # Handler for relay descriptors # # Cached descriptors consist of annotations followed by the descriptor diff --git a/test/integ/descriptor/data/bridge_descriptor b/test/integ/descriptor/data/bridge_descriptor index d28ccfa..07dffe2 100644 --- a/test/integ/descriptor/data/bridge_descriptor +++ b/test/integ/descriptor/data/bridge_descriptor @@ -1,3 +1,4 @@ +@type bridge-server-descriptor 1.0 router Unnamed 10.45.227.253 9001 0 0 or-address [fd9f:2e19:3bcf::02:9970]:9001 platform Tor 0.2.3.12-alpha (git-800942b4176ca31c) on Linux x86_64 diff --git a/test/integ/descriptor/data/cr_in_contact_line b/test/integ/descriptor/data/cr_in_contact_line index f1d93fb..ca6636c 100644 --- a/test/integ/descriptor/data/cr_in_contact_line +++ b/test/integ/descriptor/data/cr_in_contact_line @@ -1,3 +1,4 @@ +@type server-descriptor 1.0 router pogonip 75.5.248.48 9001 0 0 platform Tor 0.1.2.17 on Darwin i386 published 2007-09-03 10:15:53 diff --git a/test/integ/descriptor/data/descriptor_archive.tar b/test/integ/descriptor/data/descriptor_archive.tar index 2c40716..55d29d1 100644 Binary files a/test/integ/descriptor/data/descriptor_archive.tar and b/test/integ/descriptor/data/descriptor_archive.tar differ diff --git a/test/integ/descriptor/data/descriptor_archive.tar.bz2 b/test/integ/descriptor/data/descriptor_archive.tar.bz2 index ba1f239..2950c57 100644 Binary files a/test/integ/descriptor/data/descriptor_archive.tar.bz2 and b/test/integ/descriptor/data/descriptor_archive.tar.bz2 differ diff --git a/test/integ/descriptor/data/descriptor_archive.tar.gz b/test/integ/descriptor/data/descriptor_archive.tar.gz index 63a6a57..325adb7 100644 Binary files a/test/integ/descriptor/data/descriptor_archive.tar.gz and b/test/integ/descriptor/data/descriptor_archive.tar.gz differ diff --git a/test/integ/descriptor/data/example_descriptor b/test/integ/descriptor/data/example_descriptor index 5ab4f57..6ee442c 100644 --- a/test/integ/descriptor/data/example_descriptor +++ b/test/integ/descriptor/data/example_descriptor @@ -1,3 +1,4 @@ +@type server-descriptor 1.0 router caerSidi 71.35.133.197 9001 0 0 platform Tor 0.2.1.30 on Linux x86_64 opt protocols Link 1 2 Circuit 1 diff --git a/test/integ/descriptor/data/extrainfo_descriptor b/test/integ/descriptor/data/extrainfo_descriptor index 4525afe..ecaabe0 100644 --- a/test/integ/descriptor/data/extrainfo_descriptor +++ b/test/integ/descriptor/data/extrainfo_descriptor @@ -1,3 +1,4 @@ +@type extra-info 1.0 extra-info NINJA B2289C3EAB83ECD6EB916A2F481A02E6B76A0A48 published 2012-05-05 17:03:50 write-history 2012-05-05 17:02:45 (900 s) 1082368,19456,50176,272384,485376,1850368,1132544,1790976,2459648,4091904,6310912,13701120,3209216,3871744,7873536,5440512,7287808,10561536,9979904,11247616,11982848,7590912,10611712,20728832,38534144,6839296,3173376,16678912 diff --git a/test/integ/descriptor/data/negative_uptime b/test/integ/descriptor/data/negative_uptime index 4140d75..388d44b 100644 --- a/test/integ/descriptor/data/negative_uptime +++ b/test/integ/descriptor/data/negative_uptime @@ -1,3 +1,4 @@ +@type server-descriptor 1.0 router TipTor 62.99.247.83 9001 0 9030 platform Tor 0.1.1.25 on Darwin Power Macintosh published 2006-12-18 22:42:40 diff --git a/test/integ/descriptor/data/non-ascii_descriptor b/test/integ/descriptor/data/non-ascii_descriptor index 7758276..2cd2a6b 100644 --- a/test/integ/descriptor/data/non-ascii_descriptor +++ b/test/integ/descriptor/data/non-ascii_descriptor @@ -1,3 +1,4 @@ +@type server-descriptor 1.0 router torrelay389752132 130.243.230.116 9001 0 0 platform Tor 0.2.2.35 (git-4f42b0a93422f70e) on Linux x86_64 opt protocols Link 1 2 Circuit 1 diff --git a/test/integ/descriptor/data/old_descriptor b/test/integ/descriptor/data/old_descriptor index 5407aa8..8be82f9 100644 --- a/test/integ/descriptor/data/old_descriptor +++ b/test/integ/descriptor/data/old_descriptor @@ -1,3 +1,4 @@ +@type server-descriptor 1.0 router krypton 212.37.39.59 8000 0 0 platform Tor 0.1.0.14 on FreeBSD i386 published 2005-12-16 18:01:03 diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index 479ff01..a753d27 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -19,6 +19,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): descriptor_path = test.integ.descriptor.get_resource("extrainfo_descriptor") descriptor_file = open(descriptor_path) + descriptor_file.readline() # strip header descriptor_contents = descriptor_file.read() descriptor_file.close() diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 81635e0..0ae882e 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -51,6 +51,7 @@ def _get_raw_tar_descriptors(): for tar_entry in tar_file: if tar_entry.isfile(): entry = tar_file.extractfile(tar_entry) + entry.readline() # strip header raw_descriptors.append(entry.read()) entry.close() @@ -149,6 +150,7 @@ class TestDescriptorReader(unittest.TestCase): descriptor_path = os.path.join(DESCRIPTOR_TEST_DATA, "example_descriptor") with open(descriptor_path) as descriptor_file: + descriptor_file.readline() # strip header descriptor_entries.append(descriptor_file.read()) # running this test multiple times to flush out concurrency issues diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 5d7e62d..afe3c93 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -21,6 +21,7 @@ class TestServerDescriptor(unittest.TestCase): descriptor_path = test.integ.descriptor.get_resource("example_descriptor") descriptor_file = open(descriptor_path) + descriptor_file.readline() # strip header descriptor_contents = descriptor_file.read() descriptor_file.close() @@ -92,6 +93,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= descriptor_path = test.integ.descriptor.get_resource("old_descriptor") descriptor_file = open(descriptor_path) + descriptor_file.readline() # strip header descriptor_contents = descriptor_file.read() descriptor_file.close() @@ -176,6 +178,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= descriptor_path = test.integ.descriptor.get_resource("non-ascii_descriptor") descriptor_file = open(descriptor_path) + descriptor_file.readline() # strip header descriptor_contents = descriptor_file.read() descriptor_file.close() @@ -217,6 +220,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= descriptor_path = test.integ.descriptor.get_resource("cr_in_contact_line") descriptor_file = open(descriptor_path) + descriptor_file.readline() # strip header descriptor_contents = descriptor_file.read() descriptor_file.close() @@ -244,6 +248,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= descriptor_path = test.integ.descriptor.get_resource("negative_uptime") descriptor_file = open(descriptor_path) + descriptor_file.readline() # strip header descriptor_contents = descriptor_file.read() descriptor_file.close() @@ -267,6 +272,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= descriptor_path = test.integ.descriptor.get_resource("bridge_descriptor") descriptor_file = open(descriptor_path) + descriptor_file.readline() # strip header descriptor_contents = descriptor_file.read() descriptor_file.close()

1 0

[tor/master] Use a more helpful log message when we can't find a proxy.
by nickm＠torproject.org 18 May '12

18 May '12

commit 5dc9acb5e5d630372da991cb4c9569c593355273 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri May 18 03:07:46 2012 +0300 Use a more helpful log message when we can't find a proxy. --- src/or/circuitbuild.c | 15 +++++++++++++++ src/or/circuitbuild.h | 3 +++ src/or/connection_or.c | 23 +++++++++++++++++++++-- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 403f65f..82ff327 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4972,6 +4972,21 @@ find_bridge_by_digest(const char *digest) return NULL; } +const char * +find_transport_name_by_bridge_addrport(const tor_addr_t *addr, uint16_t port) +{ + if (!bridge_list) + return NULL; + + SMARTLIST_FOREACH_BEGIN(bridge_list, const bridge_info_t *, bridge) { + if (tor_addr_eq(&bridge->addr, addr) && + (bridge->port == port)) + return bridge->transport_name; + } SMARTLIST_FOREACH_END(bridge); + + return NULL; +} + /** If addr and port match the address and port of a * bridge of ours that uses pluggable transports, place its transport * in transport. diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index a7fd208..2ef5be8 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -157,6 +157,9 @@ void transport_free(transport_t *transport); transport_t *transport_new(const tor_addr_t *addr, uint16_t port, const char *name, int socks_ver); +const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr, + uint16_t port); + int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, const transport_t **transport); transport_t *transport_get_by_name(const char *name); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 0d3f9d8..81df70e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1051,8 +1051,27 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, conn->_base.proxy_state = PROXY_INFANT; } } else { - log_warn(LD_GENERAL, "Tried to connect through proxy, but proxy address " - "could not be found."); + /* get_proxy_addrport() might fail if we have a Bridge line that + references a transport, but no ClientTransportPlugin lines + defining its transport proxy. If this is the case, let's try to + output a useful log message to the user. */ + const char *transport_name = + find_transport_name_by_bridge_addrport(&TO_CONN(conn)->addr, + TO_CONN(conn)->port); + + if (transport_name) { + log_warn(LD_GENERAL, "We were supposed to connect to bridge '%s:%u' " + "using pluggable transport '%s', but it seems that we can't " + "find a pluggable transport proxy supporting '%s'. Please make " + "sure that your configuration file is valid.", + fmt_addr(&TO_CONN(conn)->addr), TO_CONN(conn)->port, + transport_name, transport_name); + } else { + log_warn(LD_GENERAL, "Tried to connect to '%s:%u' through a proxy, but " + "the proxy address could not be found.", + fmt_addr(&TO_CONN(conn)->addr), TO_CONN(conn)->port); + } + connection_free(TO_CONN(conn)); return NULL; }

1 0

[tor/master] Merge remote-tracking branch 'asn/bug5602'
by nickm＠torproject.org 18 May '12

18 May '12

commit 466276faa50c4cb31857dfea2ae9e1612aae3911 Merge: c1da29e 5dc9acb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 18 12:36:04 2012 -0400 Merge remote-tracking branch 'asn/bug5602' src/or/circuitbuild.c | 15 +++++++++++++++ src/or/circuitbuild.h | 3 +++ src/or/connection_or.c | 23 +++++++++++++++++++++-- 3 files changed, 39 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'asn/bug5646'
by nickm＠torproject.org 18 May '12

18 May '12

commit c1da29e22d138bb30b6ade452aa0e0321330efe3 Merge: a8a862c 153b989 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 18 12:10:40 2012 -0400 Merge remote-tracking branch 'asn/bug5646' src/or/command.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

1 0