March 2011 - tor-commits - lists.torproject.org

r24422: {website} fix a missing "> in the arabic language faq-abuse page. (website/trunk/docs/ar)
by Andrew Lewman 23 Mar '11

23 Mar '11

Author: phobos Date: 2011-03-23 18:45:02 +0000 (Wed, 23 Mar 2011) New Revision: 24422 Modified: website/trunk/docs/ar/faq-abuse.wml Log: fix a missing "> in the arabic language faq-abuse page. Modified: website/trunk/docs/ar/faq-abuse.wml =================================================================== --- website/trunk/docs/ar/faq-abuse.wml 2011-03-23 16:18:32 UTC (rev 24421) +++ website/trunk/docs/ar/faq-abuse.wml 2011-03-23 18:45:02 UTC (rev 24422) @@ -150,7 +150,7 @@ <li>يمكن أن يتصل شخص ما بشبكة IRC ويزعج الناس. سوف يتلقى مزود خدمة الإنترنت لك بريدًا مهذبًا عن أن حاسوبك مُخترق و/أو مستغل للهجوم. [المنفذ 6667]</li> <li>يمكن أن يستخدم شخص ما تور لتنزيل فيلم Vin Diesel ليتقلى مزود خدمة الإنترنت -لك شكوى لخرق حقوق النشر. راجع <a href="<page eff/tor-dmca-response>قالب EFF +لك شكوى لخرق حقوق النشر. راجع <a href="<page eff/tor-dmca-response>">قالب EFF للرد على تهديدات خرق حقوق النشر لتور</a> والتي تشرح لمزود خدمة الإنترنت لك أن بإمكانه على الأرجح تجاهل الإشعار دون أي خطر قانوني. [منافذ متعددة]</li> </ul>

1 0

r24421: {arm} Fix bundle, thanks to Fabian Keil fix: preventing PROGRAM an (in arm/trunk/src: interface/connections util)
by Damian Johnson 23 Mar '11

23 Mar '11

Author: atagar Date: 2011-03-23 16:18:32 +0000 (Wed, 23 Mar 2011) New Revision: 24421 Modified: arm/trunk/src/interface/connections/connEntry.py arm/trunk/src/util/torTools.py Log: Fix bundle, thanks to Fabian Keil fix: preventing PROGRAM and CONTROL connections from being expanded (patch by Fabian Keil) fix: reversing src and dst addresses of PROGRAM and CONTROL connections (caught by Fabian Keil) fix: changing the 'APPLICATION' type to 'PROGRAM' since the previous label was too long (caught by Fabian Keil) fix: exit policy should only be respected for determining exit connections if the ORPort is set Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-03-23 15:15:43 UTC (rev 24420) +++ arm/trunk/src/interface/connections/connEntry.py 2011-03-23 16:18:32 UTC (rev 24421) @@ -14,14 +14,14 @@ # Outbound Relay connection, leaving us. # Exit Outbound relay connection leaving the Tor network. # Client Circuits for our client traffic. -# Application Socks connections using Tor. +# Program Socks connections for applications using Tor. # Directory Fetching tor consensus information. # Control Tor controller (arm, vidalia, etc). -Category = enum.Enum("INBOUND", "OUTBOUND", "EXIT", "CLIENT", "APPLICATION", "DIRECTORY", "CONTROL") +Category = enum.Enum("INBOUND", "OUTBOUND", "EXIT", "CLIENT", "PROGRAM", "DIRECTORY", "CONTROL") CATEGORY_COLOR = {Category.INBOUND: "green", Category.OUTBOUND: "blue", Category.EXIT: "red", Category.CLIENT: "cyan", - Category.APPLICATION: "yellow", Category.DIRECTORY: "magenta", + Category.PROGRAM: "yellow", Category.DIRECTORY: "magenta", Category.CONTROL: "red"} # static data for listing format @@ -208,7 +208,7 @@ self.baseType = Category.INBOUND self.local.isORPort = True elif lPort == mySocksPort: - self.baseType = Category.APPLICATION + self.baseType = Category.PROGRAM elif lPort == myCtlPort: self.baseType = Category.CONTROL else: @@ -498,6 +498,16 @@ myExternalIpAddr = conn.getInfo("address", self.local.getIpAddr()) addrDiffer = myExternalIpAddr != self.local.getIpAddr() + # Expanding doesn't make sense, if the connection isn't actually + # going through Tor's external IP address. As there isn't a known + # method for checking if it is, we're checking the type instead. + # + # This isn't entirely correct. It might be a better idea to check if + # the source and destination addresses are both private, but that might + # not be perfectly reliable either. + + isExpansionType = not myType in (Category.PROGRAM, Category.CONTROL) + srcAddress = myExternalIpAddr + localPort src = "%-21s" % srcAddress # ip:port = max of 21 characters dst = "%-26s" % dstAddress # ip:port (xx) = max of 26 characters @@ -512,7 +522,7 @@ if isExpandedAddrVisible and CONFIG["features.connection.showColumn.fingerprint"]: isExpandedAddrVisible = width < usedSpace + 42 or width > usedSpace + 70 - if addrDiffer and isExpandedAddrVisible and self.includeExpandedIpAddr and CONFIG["features.connection.showColumn.expandedIp"]: + if addrDiffer and isExpansionType and isExpandedAddrVisible and self.includeExpandedIpAddr and CONFIG["features.connection.showColumn.expandedIp"]: # include the internal address in the src (extra 28 characters) internalAddress = self.local.getIpAddr() + localPort src = "%-21s --> %s" % (internalAddress, src) @@ -570,7 +580,7 @@ # pads dst entry to its max space dst = ("%%-%is" % (baseSpace - len(src))) % dst - if myType == Category.INBOUND: src, dst = dst, src + if myType in (Category.INBOUND, Category.PROGRAM, Category.CONTROL): src, dst = dst, src padding = " " * (width - usedSpace + LABEL_MIN_PADDING) return LABEL_FORMAT % (src, dst, etc, padding) Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-03-23 15:15:43 UTC (rev 24420) +++ arm/trunk/src/util/torTools.py 2011-03-23 16:18:32 UTC (rev 24421) @@ -784,31 +784,35 @@ result = None if self.isAlive(): - policyEntries = [] - for exitPolicy in self.getOption("ExitPolicy", [], True): - policyEntries += [policy.strip() for policy in exitPolicy.split(",")] - - # appends the default exit policy - defaultExitPolicy = self.getInfo("exit-policy/default") - - if defaultExitPolicy: - policyEntries += defaultExitPolicy.split(",") - - # construct the policy chain backwards - policyEntries.reverse() - - for entry in policyEntries: - result = ExitPolicy(entry, result) - - # Checks if we are rejecting private connections. If set, this appends - # 'reject private' and 'reject <my ip>' to the start of our policy chain. - isPrivateRejected = self.getOption("ExitPolicyRejectPrivate", True) - - if isPrivateRejected: - result = ExitPolicy("reject private", result) + if self.getOption("ORPort"): + policyEntries = [] + for exitPolicy in self.getOption("ExitPolicy", [], True): + policyEntries += [policy.strip() for policy in exitPolicy.split(",")] - myAddress = self.getInfo("address") - if myAddress: result = ExitPolicy("reject %s" % myAddress, result) + # appends the default exit policy + defaultExitPolicy = self.getInfo("exit-policy/default") + + if defaultExitPolicy: + policyEntries += defaultExitPolicy.split(",") + + # construct the policy chain backwards + policyEntries.reverse() + + for entry in policyEntries: + result = ExitPolicy(entry, result) + + # Checks if we are rejecting private connections. If set, this appends + # 'reject private' and 'reject <my ip>' to the start of our policy chain. + isPrivateRejected = self.getOption("ExitPolicyRejectPrivate", True) + + if isPrivateRejected: + result = ExitPolicy("reject private", result) + + myAddress = self.getInfo("address") + if myAddress: result = ExitPolicy("reject %s" % myAddress, result) + else: + # no ORPort is set so all relaying is disabled + result = ExitPolicy("reject *:*") self.connLock.release()

1 0

r24420: {website} sync my local working copy of publish with the world. (website/trunk)
by Andrew Lewman 23 Mar '11

23 Mar '11

Author: phobos Date: 2011-03-23 15:15:43 +0000 (Wed, 23 Mar 2011) New Revision: 24420 Modified: website/trunk/publish Log: sync my local working copy of publish with the world. Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2011-03-23 11:04:06 UTC (rev 24419) +++ website/trunk/publish 2011-03-23 15:15:43 UTC (rev 24420) @@ -1,13 +1,16 @@ #!/bin/sh set -e # stop if we encounter an error -svn update -make -j3 +make clean # clean cruft +svn update # get changes + +make -j3 # abuse the cores + # don't copy over stuff with permissions that make it useless chmod a+r * -R -rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum.torproject.org:/srv/www-master.torproject.org/htdocs +rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update" -ssh vescum.torproject.org '/home/mirroradm/bin/trigger-mirrors' -ssh vescum.torproject.org chmod g+w -R /srv/www-master.torproject.org/htdocs +ssh vescum '/home/mirroradm/bin/trigger-mirrors' +ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs

1 0

[torbrowser/master] bump firefox to 3.6.16, along with libevent (2.0.10) and most extensions for tbb osx 1.0.14-dev
by erinn＠torproject.org 23 Mar '11

23 Mar '11

commit 337458ff4078aef15f0549cfa94e13d36e345dc8 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Mar 23 13:01:04 2011 +0100 bump firefox to 3.6.16, along with libevent (2.0.10) and most extensions for tbb osx 1.0.14-dev --- README.OSX | 17 ++++++++++++----- build-scripts/osx.mk | 10 +++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/README.OSX b/README.OSX index 18ebffb..061a366 100644 --- a/README.OSX +++ b/README.OSX @@ -5,13 +5,13 @@ Included applications --------------------- Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.2.23-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) +Tor 0.2.2.23-alpha (with libevent-2.0.10-stable, zlib-1.2.3 and openssl-0.9.8p) Polipo 1.0.4.1 -Firefox 3.6.15 +Firefox 3.6.16 \_ Torbutton 1.2.5 - |_ NoScript 2.0.9.8 - |_ HTTPS-Everywhere 0.9.9.development.3 - |_ BetterPrivacy 1.48.3 + |_ NoScript 2.0.9.9 + |_ HTTPS-Everywhere 0.9.9.development.4 + |_ BetterPrivacy 1.49 Usage ----- @@ -24,6 +24,13 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.14: Released 2011-03-23 + Update Firefox to 3.6.16 + Update Libevent to 2.0.10-stable + Update NoScript to 2.0.9.9 + Update HTTPS-Everywhere to 0.9.9.development.4 + Update BetterPrivacy to 1.49 + 1.0.13: Released 2011-03-09 Update Tor to 0.2.2.23-alpha Update Firefox to 3.6.15, and use the Mozilla version until I get it to build on diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 611f66f..3dcb011 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -41,11 +41,11 @@ BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages -HTTPSEVERY_VER=0.9.9.development.3 -FIREFOX_VER=3.6.15 -LIBEVENT_VER=1.4.13-stable +HTTPSEVERY_VER=0.9.9.development.4 +FIREFOX_VER=3.6.16 +LIBEVENT_VER=2.0.10-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.0.9.8 +NOSCRIPT_VER=2.0.9.9 OPENSSL_VER=0.9.8p OTR_VER=3.2.0 PIDGIN_VER=2.6.4 @@ -208,7 +208,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.13-dev +VERSION=1.0.14-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/master] bump firefox to 3.6.16, along with libevent (2.0.10) and most extensions for tbb osx 1.1.6-dev
by erinn＠torproject.org 23 Mar '11

23 Mar '11

commit 018351a68a8673842adc76e35439bc2e4ef8c4a1 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Mar 23 13:04:49 2011 +0100 bump firefox to 3.6.16, along with libevent (2.0.10) and most extensions for tbb osx 1.1.6-dev --- README.Linux | 15 +++++++++++---- build-scripts/linux.mk | 10 +++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/README.Linux b/README.Linux index ddf2561..7f4c091 100644 --- a/README.Linux +++ b/README.Linux @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.10 (with Qt 4.6.2) -Tor 0.2.2.23-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) +Tor 0.2.2.23-alpha (with libevent-2.0.10-stable, zlib-1.2.3 and openssl-0.9.8p) Firefox 3.6.15 \_ Torbutton 1.2.5 - |_ NoScript 2.0.9.8 - |_ BetterPrivacy 1.48.3 - |_ HTTPS Everywhere 0.9.9.development.3 + |_ NoScript 2.0.9.9 + |_ BetterPrivacy 1.49 + |_ HTTPS Everywhere 0.9.9.development.4 Usage ----- @@ -29,6 +29,13 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- +1.1.6: Released 2011-03-23 + Update Firefox to 3.6.16 + Update Libevent to 2.0.10-stable + Update NoScript to 2.0.9.9 + Update HTTPS-Everywhere to 0.9.9.development.4 + Update BetterPrivacy to 1.49 + 1.1.5: Released 2011-03-09 Update Tor to 0.2.2.23-alpha Update Firefox to 3.6.15 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index e554f3d..463d972 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -41,11 +41,11 @@ BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages -HTTPSEVERY_VER=0.9.9.development.3 -FIREFOX_VER=3.6.15 -LIBEVENT_VER=1.4.13-stable +HTTPSEVERY_VER=0.9.9.development.4 +FIREFOX_VER=3.6.16 +LIBEVENT_VER=2.0.10-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.0.9.8 +NOSCRIPT_VER=2.0.9.9 OPENSSL_VER=0.9.8p OTR_VER=3.2.0 PIDGIN_VER=2.6.4 @@ -216,7 +216,7 @@ NAME=tor-browser DISTDIR=tbbl-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.1.5-dev +VERSION=1.1.6-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/master] update windows and osx makefiles to fix version population and building
by erinn＠torproject.org 23 Mar '11

23 Mar '11

commit 84e1f32a0dace1ef960fc1b328b4bcad61dbc41f Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Mar 23 13:41:21 2011 +0100 update windows and osx makefiles to fix version population and building --- build-scripts/Makefile | 4 ++-- build-scripts/osx.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/Makefile b/build-scripts/Makefile index 419ca1d..b505df3 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -25,8 +25,8 @@ PIDGIN_VERSION=2.7.5 VIDALIA=/e/build/vidalia-0.2.10 TOR=/e/build/tor-0.2.1.30 POLIPO=/e/build/polipo-1.0.4.1 -FIREFOX_SRC=/e/build/FirefoxPortable-3.6.16 -PIDGIN_SRC=/e/build/PidginPortable-2.7.5 +FIREFOX_SRC=/e/build/FirefoxPortable-$(FIREFOX_VERSION) +PIDGIN_SRC=/e/build/PidginPortable-$(PIDGIN_VERSION) ## Location of utility applications PWD:=$(shell pwd) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 3dcb011..a155d7d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -144,8 +144,8 @@ build-libevent: cd $(LIBEVENT_DIR) && make install TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) -TOR_CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" -TOR_LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" +TOR_CFLAGS="-I$(BUILT_DIR)/lib -O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" +TOR_LDFLAGS="-L$(BUILT_DIR)/lib -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" TOR_OPTS=--enable-static-openssl --enable-static-zlib --enable-static-libevent --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) CC="gcc-4.0" build-tor: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) @@ -229,7 +229,7 @@ NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCR… BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/662… HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi ## Where to download Mozilla language packs -MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest/mac/xpi +MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/mac/xpi ## Put more extensions here EXTENSIONS_DIR=extensions

1 0

[torbrowser/master] bump firefox to 3.6.16 for windows tbb 1.3.21
by erinn＠torproject.org 23 Mar '11

23 Mar '11

commit 9f0009d6b27ddb2b002a2529eca30fd979725bcb Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Mar 23 12:56:29 2011 +0100 bump firefox to 3.6.16 for windows tbb 1.3.21 --- README | 7 +++++-- build-scripts/Makefile | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README b/README index 9bc21fd..190a8e0 100644 --- a/README +++ b/README @@ -7,8 +7,8 @@ Included applications Vidalia 0.2.10 (with Qt 4.6.2) Tor 0.2.1.30 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) Polipo 1.0.4.1 -FirefoxPortable 3.6.15 - \_ Firefox 3.6.15 +FirefoxPortable 3.6.16 + \_ Firefox 3.6.16 \_ Torbutton 1.2.5 \_ HTTPS Everywhere 0.9.9.development.3 PidginPortable 2.7.4 @@ -330,3 +330,6 @@ Changelog 1.3.20: Released 2011-03-07 Update Firefox to 3.6.15 + +1.3.21: Released 2011-03-23 + Update Firefox to 3.6.16 diff --git a/build-scripts/Makefile b/build-scripts/Makefile index f847211..419ca1d 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -18,14 +18,14 @@ OPENSSL=/e/build/openssl-0.9.8p/ ## Versions TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.15 +FIREFOX_VERSION=3.6.16 PIDGIN_VERSION=2.7.5 ## Location of bundle components VIDALIA=/e/build/vidalia-0.2.10 TOR=/e/build/tor-0.2.1.30 POLIPO=/e/build/polipo-1.0.4.1 -FIREFOX_SRC=/e/build/FirefoxPortable-3.6.15 +FIREFOX_SRC=/e/build/FirefoxPortable-3.6.16 PIDGIN_SRC=/e/build/PidginPortable-2.7.5 ## Location of utility applications @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser" ## Version and name of the compressed bundle (also used for source) -VERSION=1.3.20 +VERSION=1.3.21 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

r24419: {website} list available languages / translations in the footer of the (website/trunk/include/ar)
by Runa Sandvik 23 Mar '11

23 Mar '11

Author: runa Date: 2011-03-23 11:04:06 +0000 (Wed, 23 Mar 2011) New Revision: 24419 Modified: website/trunk/include/ar/foot.wmi Log: list available languages / translations in the footer of the page - rtl version Modified: website/trunk/include/ar/foot.wmi =================================================================== --- website/trunk/include/ar/foot.wmi 2011-03-23 10:55:36 UTC (rev 24418) +++ website/trunk/include/ar/foot.wmi 2011-03-23 11:04:06 UTC (rev 24419) @@ -1,4 +1,6 @@ #!/usr/bin/env wml +#use "functions.wmi" + <div id="footer"> <div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div> <div class="about"> @@ -69,6 +71,19 @@ </ul> </div>  + +  + <div class="col"> + <h4>Languages</h4> + <: if (has_translations()) { :> + <p> + This page is also available in the following languages: + <: print list_translations() :>.<br /> + How to set <a href="http://www.debian.org/intro/cn#howtoset">the default document language</a>. + </p> + <: }; :> + </div> + <!-- LANGUAGE SWITCH CGI <div class="col wider"> <h4>لغات</h4>

1 0

r24418: {website} list available languages / translations in the footer of the (website/trunk/include)
by Runa Sandvik 23 Mar '11

23 Mar '11

Author: runa Date: 2011-03-23 10:55:36 +0000 (Wed, 23 Mar 2011) New Revision: 24418 Modified: website/trunk/include/foot.wmi Log: list available languages / translations in the footer of the page Modified: website/trunk/include/foot.wmi =================================================================== --- website/trunk/include/foot.wmi 2011-03-23 03:21:22 UTC (rev 24417) +++ website/trunk/include/foot.wmi 2011-03-23 10:55:36 UTC (rev 24418) @@ -1,4 +1,6 @@ #!/usr/bin/env wml +#use "functions.wmi" + <div id="footer"> <div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div> <div class="about"> @@ -69,6 +71,19 @@ </ul> </div>  + +  + <div class="col wider"> + <h4>Languages</h4> + <: if (has_translations()) { :> + <p> + This page is also available in the following languages: + <: print list_translations() :>.<br /> + How to set <a href="http://www.debian.org/intro/cn#howtoset">the default document language</a>. + </p> + <: }; :> + </div> + <!-- LANGUAGE SWITCH CGI <div class="col wider"> <h4>Languages</h4>

1 0

r24417: {arm} Marking the uptimes for intial connections (arm only tracks (in arm/trunk: . src/interface/connections)
by Damian Johnson 23 Mar '11

23 Mar '11

Author: atagar Date: 2011-03-23 03:21:22 +0000 (Wed, 23 Mar 2011) New Revision: 24417 Modified: arm/trunk/armrc.sample arm/trunk/src/interface/connections/connEntry.py arm/trunk/src/interface/connections/connPanel.py Log: Marking the uptimes for intial connections (arm only tracks connection uptimes since starting, so these uptimes are just minimum durations) Modified: arm/trunk/armrc.sample =================================================================== --- arm/trunk/armrc.sample 2011-03-22 15:51:53 UTC (rev 24416) +++ arm/trunk/armrc.sample 2011-03-23 03:21:22 UTC (rev 24417) @@ -175,6 +175,12 @@ # connection resolution rate then reducing this won't casue new data to # appear more frequently - just increase the rate at which the uptime field # is updated) +# markInitialConnections +# if true, the uptime of the initial connections when we start are marked +# with a '+' (these uptimes are estimates since arm can only track a +# connection's duration while it runs) +# showExitPort +# shows port related information of exit connections we relay if true # showColumn.* # toggles the visability of the connection table columns @@ -183,6 +189,7 @@ features.connection.listingType 0 features.connection.order 0, 2, 1 features.connection.refreshRate 10 +features.connection.markInitialConnections true features.connection.showExitPort true features.connection.showColumn.fingerprint true features.connection.showColumn.nickname true Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-03-22 15:51:53 UTC (rev 24416) +++ arm/trunk/src/interface/connections/connEntry.py 2011-03-23 03:21:22 UTC (rev 24417) @@ -29,7 +29,8 @@ LABEL_FORMAT = "%s --> %s %s%s" LABEL_MIN_PADDING = 2 # min space between listing label and following data -CONFIG = {"features.connection.showExitPort": True, +CONFIG = {"features.connection.markInitialConnections": True, + "features.connection.showExitPort": True, "features.connection.showColumn.fingerprint": True, "features.connection.showColumn.nickname": True, "features.connection.showColumn.destination": True, @@ -181,6 +182,7 @@ self.local = Endpoint(lIpAddr, lPort) self.foreign = Endpoint(fIpAddr, fPort) self.startTime = time.time() + self.isInitialConnection = False # True if the connection has matched the properties of a client/directory # connection every time we've checked. The criteria we check is... @@ -261,8 +263,12 @@ myListing = entries.ConnectionPanelLine.getListingEntry(self, width, currentTime, listingType) # fill in the current uptime and return the results + if CONFIG["features.connection.markInitialConnections"]: + timePrefix = "+" if self.isInitialConnection else " " + else: timePrefix = "" + timeEntry = myListing.getNext() - timeEntry.text = "%5s" % uiTools.getTimeLabel(currentTime - self.startTime, 1) + timeEntry.text = timePrefix + "%5s" % uiTools.getTimeLabel(currentTime - self.startTime, 1) return myListing @@ -277,12 +283,13 @@ # postType - ") " lineFormat = uiTools.getColor(CATEGORY_COLOR[entryType]) + timeWidth = 6 if CONFIG["features.connection.markInitialConnections"] else 5 drawEntry = uiTools.DrawEntry(")" + " " * (9 - len(entryType)), lineFormat) drawEntry = uiTools.DrawEntry(entryType.upper(), lineFormat | curses.A_BOLD, drawEntry) drawEntry = uiTools.DrawEntry(" (", lineFormat, drawEntry) - drawEntry = uiTools.DrawEntry(" " * 5, lineFormat, drawEntry) - drawEntry = uiTools.DrawEntry(self._getListingContent(width - 17, listingType), lineFormat, drawEntry) + drawEntry = uiTools.DrawEntry(" " * timeWidth, lineFormat, drawEntry) + drawEntry = uiTools.DrawEntry(self._getListingContent(width - (12 + timeWidth), listingType), lineFormat, drawEntry) return drawEntry def _getDetails(self, width): Modified: arm/trunk/src/interface/connections/connPanel.py =================================================================== --- arm/trunk/src/interface/connections/connPanel.py 2011-03-22 15:51:53 UTC (rev 24416) +++ arm/trunk/src/interface/connections/connPanel.py 2011-03-23 03:21:22 UTC (rev 24417) @@ -65,6 +65,11 @@ self._update() # populates initial entries + # mark the initially exitsing connection uptimes as being estimates + for entry in self._entries: + if isinstance(entry, connEntry.ConnectionEntry): + entry.getLines()[0].isInitialConnection = True + # TODO: should listen for tor shutdown # TODO: hasn't yet had its pausing functionality tested (for instance, the # key handler still accepts events when paused)

1 0