tor-commits

tor-commits@lists.torproject.org

1 participants
212404 discussions

[tor/maint-0.2.2] Futz with the clang patch a bit and tidy some geoip.c stuff
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 547635c0049ec92e929e0f360f729b5dd308a215 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 17 14:06:04 2011 -0400 Futz with the clang patch a bit and tidy some geoip.c stuff --- src/or/geoip.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index f3e0b72..a991654 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -278,19 +278,24 @@ geoip_is_loaded(void) return geoip_countries != NULL && geoip_entries != NULL; } -#define MAX_LAST_SEEN_IN_MINUTES 0x3FFFFFFFu - /** Entry in a map from IP address to the last time we've seen an incoming * connection from that IP address. Used by bridges only, to track which * countries have them blocked. */ typedef struct clientmap_entry_t { HT_ENTRY(clientmap_entry_t) node; uint32_t ipaddr; + /** Time when we last saw this IP address, in MINUTES since the epoch. + * + * (This will run out of space around 4011 CE. If Tor is still in use around + * 4000 CE, please remember to add more bits to last_seen_in_minutes.) */ unsigned int last_seen_in_minutes:30; unsigned int action:2; } clientmap_entry_t; -#define ACTION_MASK 3 +/** Largest allowable value for last_seen_in_minutes. (It's a 30-bit field, + * so it can hold up to (1u<<30)-1, or 0x3fffffffu. + */ +#define MAX_LAST_SEEN_IN_MINUTES 0X3FFFFFFFu /** Map from client IP address to last time seen. */ static HT_HEAD(clientmap, clientmap_entry_t) client_history = @@ -415,16 +420,16 @@ geoip_note_client_seen(geoip_client_action_t action, lookup.ipaddr = addr; lookup.action = (int)action; ent = HT_FIND(clientmap, &client_history, &lookup); - tor_assert(now / 60 <= MAX_LAST_SEEN_IN_MINUTES); - if (ent) { - ent->last_seen_in_minutes = (unsigned)(now/60); - } else { + if (! ent) { ent = tor_malloc_zero(sizeof(clientmap_entry_t)); ent->ipaddr = addr; - ent->last_seen_in_minutes = (unsigned)(now/60); ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); } + if (now / 60 <= MAX_LAST_SEEN_IN_MINUTES && now >= 0) + ent->last_seen_in_minutes = (unsigned)(now/60); + else + ent->last_seen_in_minutes = 0; if (action == GEOIP_CLIENT_NETWORKSTATUS || action == GEOIP_CLIENT_NETWORKSTATUS_V2) {

1 0

[tor/maint-0.2.2] Remove superfluous -g -O2 compiler argument
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 3f94c4a1cb284ad177bbf2171d6d1c955d8baa85 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Mar 18 17:04:01 2011 +0100 Remove superfluous -g -O2 compiler argument Autoconf adds -g -O2 by default, so adding it ourselves is not required. It also caused a warning with clang for every source file, so remove it here. Fixes last issue of ticket 2696. --- configure.in | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 9999f60..4436fe2 100644 --- a/configure.in +++ b/configure.in @@ -865,12 +865,13 @@ fi # Set CFLAGS _after_ all the above checks, since our warnings are stricter # than autoconf's macros like. if test "$GCC" = yes; then - CFLAGS="$CFLAGS -Wall -g -O2" # Disable GCC's strict aliasing checks. They are an hours-to-debug # accident waiting to happen. - CFLAGS="$CFLAGS -fno-strict-aliasing" + CFLAGS="$CFLAGS -Wall -fno-strict-aliasing" else - CFLAGS="$CFLAGS -g -O" + # Autoconf sets -g -O2 by default. Override optimization level + # for non-gcc compilers + CFLAGS="$CFLAGS -O" enable_gcc_warnings=no enable_gcc_warnings_advisory=no fi

1 0

[tor/maint-0.2.2] Add 2696 changes file
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 4aac35cafa9843d10b05921da51dcc42bc3e9176 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Mar 18 17:13:43 2011 +0100 Add 2696 changes file --- changes/bug2696 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug2696 b/changes/bug2696 new file mode 100644 index 0000000..6ea41d4 --- /dev/null +++ b/changes/bug2696 @@ -0,0 +1,5 @@ + o Minor features: + - Make compilation with clang possible when using + --enable-gcc-warnings by removing two warnings that clang hasn't + implemented yet and by fixing a few warnings. Implements ticket + 2696.

1 0

[tor/maint-0.2.2] Merge remote branch 'sebastian/bug2696' into maint-0.2.2
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit f3d666366555226ec2ad0f647489a1d42145a2eb Merge: 9dfa244 4aac35c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 18 12:39:40 2011 -0400 Merge remote branch 'sebastian/bug2696' into maint-0.2.2 changes/bug2696 | 5 +++++ configure.in | 24 +++++++++++++++++++----- src/or/geoip.c | 18 +++++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-)

1 0

[tor/maint-0.2.2] Fix signed/unsigned compare warning
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit fe86be61b6d84fbb442b13aa52139e6a3892dac0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 18 12:42:00 2011 -0400 Fix signed/unsigned compare warning --- src/or/geoip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index a991654..654241c 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -426,7 +426,7 @@ geoip_note_client_seen(geoip_client_action_t action, ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); } - if (now / 60 <= MAX_LAST_SEEN_IN_MINUTES && now >= 0) + if (now / 60 <= (int)MAX_LAST_SEEN_IN_MINUTES && now >= 0) ent->last_seen_in_minutes = (unsigned)(now/60); else ent->last_seen_in_minutes = 0;

1 0

[tor/maint-0.2.2] Fix compilation under LLVM/clang with --enable-gcc-warnings
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 56bdc844ba68ac0911efc7ad3398f1eafeaaac76 Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Wed Mar 9 19:05:51 2011 +0000 Fix compilation under LLVM/clang with --enable-gcc-warnings - When compiling using clang (2.9 or lower) do not enable -Wnormalized=id or -Woverride-init when --enable-gcc-warnings or --enable-gcc-warnings-advisory is set as these options are unsupported. --- configure.in | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index f30402d..9999f60 100644 --- a/configure.in +++ b/configure.in @@ -894,6 +894,11 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy #error #endif])], have_gcc43=yes, have_gcc43=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ +#if !defined(__clang__) || (__clang_major__ > 2) || (__clang_major__ == 2 && __clang_minor__ > 9) +#error +#endif])], have_clang29orlower=yes, have_clang29orlower=no) + save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wshorten-64-to-32" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], have_shorten64_flag=yes, @@ -924,11 +929,19 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy if test x$have_gcc42 = xyes ; then # These warnings break gcc 4.0.2 and work on gcc 4.2 # XXXX020 See if any of these work with earlier versions. - CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wnormalized=id -Woverride-init -Wstrict-overflow=1" + CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wstrict-overflow=1" + # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3. fi - if test x$have_gcc43 = xyes ; then + if test x$have_gcc42 = xyes && test x$have_clang29orlower = xno; then + # These warnings break gcc 4.0.2 and clang, but work on gcc 4.2 + # We only disable these for clang 2.9 and lower, in case they are + # supported in later versions. + CFLAGS="$CFLAGS -Wnormalized=id -Woverride-init" + fi + + if test x$have_gcc43 = xyes ; then # These warnings break gcc 4.2 and work on gcc 4.3 # XXXX020 See if any of these work with earlier versions. CFLAGS="$CFLAGS -Wextra -Warray-bounds"

1 0

[tor/maint-0.2.2] Fix two compile warnings when using clang
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 473ff2656355a796761e9eb5e15b30cd853c58b6 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Mar 10 01:47:00 2011 +0100 Fix two compile warnings when using clang Issue found by Steven Murdoch --- src/or/geoip.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index e5694b9..f3e0b72 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -278,6 +278,8 @@ geoip_is_loaded(void) return geoip_countries != NULL && geoip_entries != NULL; } +#define MAX_LAST_SEEN_IN_MINUTES 0x3FFFFFFFu + /** Entry in a map from IP address to the last time we've seen an incoming * connection from that IP address. Used by bridges only, to track which * countries have them blocked. */ @@ -413,12 +415,13 @@ geoip_note_client_seen(geoip_client_action_t action, lookup.ipaddr = addr; lookup.action = (int)action; ent = HT_FIND(clientmap, &client_history, &lookup); + tor_assert(now / 60 <= MAX_LAST_SEEN_IN_MINUTES); if (ent) { - ent->last_seen_in_minutes = now / 60; + ent->last_seen_in_minutes = (unsigned)(now/60); } else { ent = tor_malloc_zero(sizeof(clientmap_entry_t)); ent->ipaddr = addr; - ent->last_seen_in_minutes = now / 60; + ent->last_seen_in_minutes = (unsigned)(now/60); ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); }

1 0

r24394: {website} small css fix for index.html.ar (website/trunk/css)
by Runa Sandvik 18 Mar '11

18 Mar '11

Author: runa Date: 2011-03-18 16:11:18 +0000 (Fri, 18 Mar 2011) New Revision: 24394 Modified: website/trunk/css/layout-rtl.css Log: small css fix for index.html.ar Modified: website/trunk/css/layout-rtl.css =================================================================== --- website/trunk/css/layout-rtl.css 2011-03-18 15:59:02 UTC (rev 24393) +++ website/trunk/css/layout-rtl.css 2011-03-18 16:11:18 UTC (rev 24394) @@ -72,7 +72,7 @@ #home #maincol { float: right; margin-left: 20px; - margin-right: none; + margin-right: 0; } #maincol {

1 0

r24393: {projects} remove excito from the list of machines. (projects/misc-sysadmin)
by Andrew Lewman 18 Mar '11

18 Mar '11

Author: phobos Date: 2011-03-18 15:59:02 +0000 (Fri, 18 Mar 2011) New Revision: 24393 Modified: projects/misc-sysadmin/namelist Log: remove excito from the list of machines. Modified: projects/misc-sysadmin/namelist =================================================================== --- projects/misc-sysadmin/namelist 2011-03-18 15:39:36 UTC (rev 24392) +++ projects/misc-sysadmin/namelist 2011-03-18 15:59:02 UTC (rev 24393) @@ -40,7 +40,6 @@ majus - 38.229.70.46 - 2GB - blog.torproject.org majus - 2620:0:6b0:b:250:56ff:fe99:64 macppc - 74.95.122.145 - 2GB - ppc host -excito-b3 - 74.95.122.147 - 512MB - embedded test bridge tui - 38.229.70.48 - 48GB - build server tui-ipmi - 38.229.70.50 - - mgt card tui - 2620:0:6b0:b:225:90ff:fe0e:30fb

1 0

r24392: {website} updated script and new translation for ar/index.wml (in website/trunk: . ar)
by Runa Sandvik 18 Mar '11

18 Mar '11

Author: runa Date: 2011-03-18 15:39:36 +0000 (Fri, 18 Mar 2011) New Revision: 24392 Added: website/trunk/ar/index.wml Modified: website/trunk/po2wml.sh Log: updated script and new translation for ar/index.wml Added: website/trunk/ar/index.wml =================================================================== --- website/trunk/ar/index.wml (rev 0) +++ website/trunk/ar/index.wml 2011-03-18 15:39:36 UTC (rev 24392) @@ -0,0 +1,163 @@ + + + + + + +## translation metadata +# Revision: $Revision: 24343 $ +# Translation-Priority: 1-high +#include "ar/head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" ANNOUNCE_RSS="yes" STYLESHEET="css/master-rtl.css" +<div id="home"> + <div id="content" class="clearfix"> + <div id="maincol"> + <div id="banner"> + <ul> + <li>يمنع تور كل من يحاول معرفة مكانك أو ما تتصفح.</li> + <li>تور معد لمتصفحات الوب وبرمجيات التراسل الفوري وللدخول عن بعد وغيرها الكثير.</li> + <li>تور حر ومفتوح المصدر لأنظمة ويندوز وماك ولينكس/يونكس وآندرويد.</li> + </ul> + <h1 class="headline">السرية على الإنترنت</h1> + <p class="desc">احمِ خصوصيتك. دافع عن نفسك من الرقابة على الشبكات ومن تحليل بيانتها.</p> + + <div id="download"> + <a href="<page download/download>"> <span class="download-tor">نزّل +تور</span></a> + </div> + </div> + <div class="subcol-container clearfix"> + <div class="subcol first"> + <h2>ما هو تور؟</h2> <p>تور برمجية حرة وشبكة مفتوحة تساعدم على الدفاع عن نفسك من إحدى أنواع رقابة +الشبكات التي تهدد حريتك الشخصية وخصوصيتك وتهدد النشاطات والشراكات التجارية +السرية وأمن الدولة المعروف باسم <a href="<page about/overview>">تحليل +البيانات</a><br><span class="continue"><a href="<page about/overview>">تعلم +المزيد عن تور «</a></span></p> + </div> + +  +<div class="subcol"> + <h2>لماذا السرية ضرورية</h2> + <p>يحميك تور بتمرير اتصالك في شبكة موزعة من تحويلات يشغلها متطوعون في شتى أنحاء +العالم وهي تمنع من يحاول مراقبة اتصالك بالإنترنت من معرفة المواقع التي +تزورها وتمنع المواقع التي تزورها من معرفة مكانك الفعلي. يعمل تور مع كثير من +التطبيقات المنتشرة اليوم بما فيها متصفحات الوب وعملاء التراسل الفوري ووسائل +الدخول عن بعد وغيرها من التطبيقات المبنية على ميفاق TCP. <br><span +class="continue"><a href="<page getinvolved/volunteer>">انضم إلى تور +«</a></span></p> </div> + </div> + +  +<div id="home-our-projects" class="clearfix"> + <h2>مشاريعنا</h2> + <div class="fauxhead"></div> + <table style="table-layout: fixed;"> + <tr> + <td> + <img src="$(IMGROOT)/icon-TorButton.jpg" alt="أيقونة زر تور"> + <h3><a href="<page torbutton/index>">زر تور</a></h3> + <p>زر تور وسيلة يمكن من خلالها لمستخدمي فيرفكس تفعيل أو تعطيل تور.</p> + </td> + <td> + <img src="$(IMGROOT)/icon-TorCheck.jpg" alt="أيقونة التحقق من تور"> + <h3><a href="https://check.torproject.org/">الفحص</a></h3> + <p>يُمكّنك التحقق من معرفة إن كنت تتصفح بأمان باستخدام تور.</p> + </td> + </tr> + <tr> + <td> + <img src="$(IMGROOT)/icon-Vidalia.jpg" alt="أيقونة ڤيداليا"> + <h3><a href="<page projects/vidalia>">ڤيداليا</a></h3> + <p>ڤيداليا وسيلة رسومية للتحكم بتور وعرض اتصالاته وإعدادته.</p> + </td> + <td> + <img src="$(IMGROOT)/icon-TorBrowser.jpg" alt="أيقونة متصفح تور"> + <h3><a href="<page projects/torbrowser>">متصفح تور</a></h3> + <p>يحتوي متصفح تور كل ما تحتاج للتصفح الإنترنت بأمان. </p> + </td> + </tr> + </table> + </div> + +  +</div> + + +  +<div id="sidecol"> + <div id="torusers"> + <h2>من يستخدم تور؟</h2> + <div class="user"> + <h3> + <a href="<page about/torusers>#normalusers"><img src="$(IMGROOT)/family.jpg" +alt="أشخاص عاديون">العائلة والأصدقاء</a> + </h3> + <p>يستخدم أناس مثلك ومثل عائلتك تور ليحموا أنفسهم وأطفالهم وكرامتهم أثاء +استخدام الإنترنت.</p> + </div> + <div class="user"> + <h3> + <a href="<page about/torusers>#executives"><img +src="$(IMGROOT)/consumers.jpg" alt="التجار">التجار</a> + </h3> + <p>تستخدم الشركات تور لتدرس المنافسة ولتحافظ على سرية الاستراتيجيات التجارية +ولتفعل المحاسبة الداخلية.</p> + </div> + <div class="user"> + <h3> + <a href="<page about/torusers>#activists"><img +src="$(IMGROOT)/activists.jpg" alt="النشطاء والمخبرون">النشطاء</a> + </h3> + <p>يستخدم النشطاء تور ليبلغوا بسرية عن الإساءات التي تحدث في مناطق +الخطر. يستخدم المسربون تور ليبلغوا عن الفساد بأمان.</p> + </div> + <div class="user"> + <h3> + <a href="<page about/torusers>#journalist"><img src="$(IMGROOT)/media.jpg" +alt="الصحفيون والإعلاميون">الإعلام</a> + </h3> + <p>يستخدم الصحفيون والإعلاميون تور ليحموا أبحاثهم ومصادرهم على الإنترنت.</p> + </div> + <div class="user"> + <h3> + <a href="<page about/torusers>#military"><img src="$(IMGROOT)/military.jpg" +alt="الجيوش وسلطات فرض القانون">الجيوش وسلطات فرض القانون</a> + </h3> + <p>تستخدم الجيوش وسلطات فرض القانون تور لحماية اتصالهم وتحقيقاتهم وتحرياتهم على +الإنترنت.</p> + </div> + </div> + <div id="home-announcements" class="clearfix"> + <h2>إعلانات</h2> + <div class="fauxhead"></div> + <table> + <tr> + <td> + <div class="calendar"><span class="day">23</span><br><span class="month">فبراير</span></div> + <p>آخر إصدار ثابت لتور (0.2.1.30) <a +href="https://lists.torproject.org/pipermail/tor-announce/2011-February/000000.ht…">أطلق</a>. +يعالج تور 0.2.1.30 عددا من المشاكل قليلة الخطورة ويشمل تغييرا بسيطا في +مصافحة TLS التي تمكن الإيرانيين من الوصول إلى التحويلات والجسور التي تعمل +بهذه النسخة الجديدة. لا نتوقع أن ينجح ذلك التغيير على الأمد الطويل، لكنه +يمنحنا بعض الوقت لإيجاد حل أفضل. + </p> + <div class="calendar"><span class="day">30</span><br><span class="month">يناير</span></div> + <p>تور يساعد مصر. هنا ما تعلمنا <a +href="https://blog.torproject.org/blog/recent-events-egypt">من مستجدات +مصر</a> ولا زلنا نحدث صفحة <a href="<page press/inthemedia>">في الإعلام</a> +بأحدث الأخبار التي تتناول السبل التي يساعد بها المشروع العالم.</p> + </td> + </tr> + </table> + </div> + +  +</div> + +  +</div> + +  +</div> + + +#include "ar/foot.wmi" Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-03-18 15:32:36 UTC (rev 24391) +++ website/trunk/po2wml.sh 2011-03-18 15:39:36 UTC (rev 24392) @@ -64,7 +64,7 @@ # Validate input and write results to a log file validate_script="`dirname $wmldir`/translation/tools/validate.py" - validate_log="`dirname $wmldir`/website-validate.log" + validate_log="`dirname $wmldir`/validate/website-validate.log" python "$validate_script" -i "$file" -l "$validate_log" # Get the basename of the file we are dealing with

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits