April 2012 - tor-commits - lists.torproject.org

[metrics-lib/master] Add an upper limit of 100 descriptors in the queue.
by karsten＠torproject.org 19 Apr '12

19 Apr '12

commit f154c86a316cff0180ed551041927273691e5bee Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 19 20:01:54 2012 +0200 Add an upper limit of 100 descriptors in the queue. --- .../descriptor/impl/BlockingIteratorImpl.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java b/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java index c023aec..e23034a 100644 --- a/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java +++ b/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java @@ -19,13 +19,20 @@ public class BlockingIteratorImpl<T> implements Iterator<T> { protected BlockingIteratorImpl() { } - /* Add an object to the queue. */ + /* Add an object to the queue if there's still room. */ + final int MAX_DESCRIPTORS = 100; protected synchronized void add(T object) { if (this.outOfDescriptors) { throw new IllegalStateException("Internal error: Adding results to " + "descriptor queue not allowed after sending end-of-stream " + "object."); } + while (this.queue.size() >= this.MAX_DESCRIPTORS) { + try { + wait(); + } catch (InterruptedException e) { + } + } this.queue.offer(object); notifyAll(); } @@ -68,6 +75,7 @@ public class BlockingIteratorImpl<T> implements Iterator<T> { if (this.queue.peek() == null) { throw new NoSuchElementException(); } + notifyAll(); return this.queue.remove(); }

1 0

[stem/master] Allowing for negative uptimes prior to tor 0.1.2.7
by atagar＠torproject.org 19 Apr '12

19 Apr '12

commit e1a3aba733313c842c24c40ac235c073a548030d Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 19 09:23:27 2012 -0700 Allowing for negative uptimes prior to tor 0.1.2.7 Tor 0.1.2.7 fixed a bug which could result in negative uptime values. Making our descriptor parser accept negative uptimes for tor versions with the bug, and fail validation for later versions. This includes a test with one of the problematic descriptors, checking that we can both parse it, and will fail validation if it was for a later version. Thanks to Karsten for figuring out where these values were coming from! --- stem/descriptor/server_descriptor.py | 24 +++++++++++++-- test/integ/descriptor/data/negative_uptime | 45 ++++++++++++++++++++++++++++ test/integ/descriptor/server_descriptor.py | 24 +++++++++++++++ 3 files changed, 90 insertions(+), 3 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 7823cf0..f3023a2 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -473,11 +473,22 @@ class ServerDescriptorV3(stem.descriptor.Descriptor): else: self.hidden_service_dir = ["2"] elif keyword == "uptime": - if not value.isdigit(): + # We need to be tolerant of negative uptimes to accomidate a past tor + # bug... + # + # Changes in version 0.1.2.7-alpha - 2007-02-06 + # - If our system clock jumps back in time, don't publish a negative + # uptime in the descriptor. Also, don't let the global rate limiting + # buckets go absurdly negative. + # + # After parsing all of the attributes we'll double check that negative + # uptimes only occured prior to this fix. + + try: + self.uptime = int(value) + except ValueError: if not validate: continue raise ValueError("Uptime line must have an integer value: %s" % value) - - self.uptime = int(value) elif keyword == "contact": self.contact = value elif keyword == "protocols": @@ -533,6 +544,13 @@ class ServerDescriptorV3(stem.descriptor.Descriptor): else: break else: self._unrecognized_lines.append(line) + + # if we have a negative uptime and a tor version that shouldn't exhibit + # this bug then fail validation + + if validate and self.uptime and self.tor_version: + if self.uptime < 0 and self.tor_version >= stem.version.Version("0.1.2.7"): + raise ValueError("Descriptor for version '%s' had a negative uptime value: %i" % (self.tor_version, self.uptime)) def _check_constraints(self, entries, first_keyword, last_keyword): """ diff --git a/test/integ/descriptor/data/negative_uptime b/test/integ/descriptor/data/negative_uptime new file mode 100644 index 0000000..4140d75 --- /dev/null +++ b/test/integ/descriptor/data/negative_uptime @@ -0,0 +1,45 @@ +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 +opt fingerprint 1379 62D4 931D BF08 A24E 8432 88B8 A155 D6D2 AEDD +uptime -31081285 +bandwidth 102400 153600 124131 +onion-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBAOAG0OI7xLpz3gAkJoJdRzKYOvOZ7PL5dQQZJGw+pXVUnXfchwTXLm5o +rAoYolziFjUU+EDaDXCHq1MrQBNbT1kQHqv+OcVjTwuameNVOCgPTIDOxiXfxxoO +zDAEQ91gzcDIBZdV9V64KV8Oz4+NYK3zrGDkIg00pAQjNuwvmZqlAgMBAAE= +-----END RSA PUBLIC KEY----- +signing-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBAKjCkU3eAwbW9ZU42B1l+Itqy4yKoQpRjt6N42mfNFfKZ8Ywd789/jiK +J31QYBhW3JBn1ZFkRwpfKYlbOm0XS2CjlqHuT0Ycp9iphtCIHADIM+3shaSKAIwA +8/wQ2GN9zYiTneUNWRJN5sDja+oU7XfkRI46cpV1Y1lVJyEoKQWpAgMBAAE= +-----END RSA PUBLIC KEY----- +opt write-history 2006-12-18 22:36:20 (900 s) 85896196,91917257,89966503,91506428,91213104,88921400,91039183,91716023,91147326,86173405,88624130,87211145,90976203,91765274,91904016,92475836,91436900,91811938,86244782,91228827,91939844,89829330,89107239,89019495,88925780,91247327,90406742,91088221,91065780,91770795,91408136,89981571,88663478,91555300,91664187,91916304,92079918,87826691,87836934,91162457,91904383,91508890,90270067,91314943,91856008,84648838,86133485,81010341,78078954,85039584,91951911,91327645,92042781,87120087,76812012,87759151,91627062,91881873,91965911,91523086,86332304,86299595,90915708,89321373,91093137,91654532,91836129,91819440,92049427,92014514,89481483,91098381,88852717,91601581,89729803,91256453,89604862,91881660,91942891,91769572,91896895,92224718,91431715,91762404,91709273,92046002,91866341,91561459,91673622,91700186,91659511,92402879,90926431,87060230,91076389,89573325 +opt read-history 2006-12-18 22:36:20 (900 s) 69091643,77959428,74322746,75132861,74637737,68249949,73224421,72744339,73893094,69049631,71480325,68334060,72775510,79560093,78273066,75799097,76810596,78186192,67593073,75998559,77654399,70612520,74383546,74734217,74966593,75402221,80000519,80112418,79005070,80831698,76082779,73232671,71056247,75135941,71903141,78060009,79742551,70250313,66205769,78319432,73988994,74372922,71546410,73545171,74220510,63051559,66646384,68538308,59360208,63812166,75673274,72347320,76357687,66600939,56487705,70648976,70968064,74698003,75944759,74122368,67485399,63305556,68515366,71145401,69625041,68993028,71537081,75025172,75155755,70871549,69489568,74027234,72162369,74396503,76005043,72708060,70567406,73291632,75536033,73865170,69322880,73918987,72020474,76681275,76604577,77208720,75252120,75305805,76861569,77278013,77057424,76937746,72642470,65754315,70138397,73236479 +contact rbr(a)tip-informatik.at +reject 0.0.0.0/8:* +reject 169.254.0.0/16:* +reject 127.0.0.0/8:* +reject 192.168.0.0/16:* +reject 10.0.0.0/8:* +reject 172.16.0.0/12:* +reject *:25 +reject *:119 +reject *:135-139 +reject *:445 +reject *:465 +reject *:587 +reject *:1214 +reject *:4661-4666 +reject *:6346-6429 +reject *:6699 +reject *:6881-6999 +accept *:* +router-signature +-----BEGIN SIGNATURE----- +XAy56NzQm+LGMnaxBZC0ulmyZxoTNTFxZN0834V/hrfBdEOwMuBZMSsS613OfRK1 +3K/StL29NdLChHt71XCPyxsnbzguBE0Pma6cX4aSNa1WJO4wpc1WipmWdmuVKXHD +RoxIVSJU3qwfjzSbwJiNSLPs4mmQFecsVmG94cZSITY= +-----END SIGNATURE----- diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 815674a..84732b8 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -268,6 +268,30 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertTrue(desc.contact.startswith(contact_start)) self.assertTrue(desc.contact.endswith(contact_end)) + def test_negative_uptime(self): + """ + Parses a descriptor where we are tolerant of a negative uptime, and another + where we shouldn't be. + """ + + descriptor_path = os.path.join(DESCRIPTOR_TEST_DATA, "negative_uptime") + + descriptor_file = open(descriptor_path) + descriptor_contents = descriptor_file.read() + descriptor_file.close() + + desc = stem.descriptor.server_descriptor.RelayDescriptorV3(descriptor_contents) + + self.assertEquals("TipTor", desc.nickname) + self.assertEquals("137962D4931DBF08A24E843288B8A155D6D2AEDD", desc.fingerprint) + self.assertEquals("62.99.247.83", desc.address) + + # modify the relay version so it's after when the negative uptime bug + # should appear + + descriptor_contents = descriptor_contents.replace("Tor 0.1.1.25", "Tor 0.1.2.7") + self.assertRaises(ValueError, stem.descriptor.server_descriptor.RelayDescriptorV3, descriptor_contents) + def test_bridge_descriptor(self): """ Parses a bridge descriptor.

1 0

[flashproxy/master] -new-instance will be in Firefox 12 I guess.
by dcf＠torproject.org 19 Apr '12

19 Apr '12

commit cc2de156826999fe8a7f534d54155243dde1f6aa Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 19 02:39:19 2012 -0700 -new-instance will be in Firefox 12 I guess. This changeset: https://hg.mozilla.org/mozilla-central/rev/dce4363cb7ce adds it but it's not in Firefox 11. --- experiments/README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/README b/experiments/README index 69d3d83..26eb0d8 100644 --- a/experiments/README +++ b/experiments/README @@ -17,7 +17,7 @@ https://github.com/kanaka/websockify/. Firefox versions 9 and 10 will not work; these versions have a change to the -no-remote option that prevents the tests from running. This is -supposed to be fixed in version 11. +supposed to be fixed with a -new-instance option in version 12. You need to create some dedicated Firefox profiles. Create profiles named flashexp1 and flashexp2 by running

1 0

[flashproxy/master] Firefox 8.0.1 download link.
by dcf＠torproject.org 19 Apr '12

19 Apr '12

commit 6d755e9fcc9e142a665459d96abee5825f9ecd59 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 19 02:40:49 2012 -0700 Firefox 8.0.1 download link. --- experiments/README | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/experiments/README b/experiments/README index 26eb0d8..0599fcd 100644 --- a/experiments/README +++ b/experiments/README @@ -13,7 +13,8 @@ You need to have installed certain software before running the tests. socat, Wget, and Python are easily installed on most GNU/Linux distributions. thttpd can be compiled from the packages at http://acme.com/software/thttpd/. websockify is from -https://github.com/kanaka/websockify/. +https://github.com/kanaka/websockify/. The old Firefox is from +http://download.mozilla.org/?product=firefox-8.0.1&os=linux&lang=en-US. Firefox versions 9 and 10 will not work; these versions have a change to the -no-remote option that prevents the tests from running. This is

1 0

r25613: {} commit the stockholm internet forum presentation for dfri.se (in projects/presentations: . images)
by Andrew Lewman 19 Apr '12

19 Apr '12

Author: phobos Date: 2012-04-19 07:58:56 +0000 (Thu, 19 Apr 2012) New Revision: 25613 Added: projects/presentations/2012-04-18-dfri-presentation.pdf projects/presentations/2012-04-18-dfri-presentation.tex projects/presentations/images/2009-knowprivacy-report-webbug-domains.png projects/presentations/images/2011-10-29-wsj-bluecoat-article.png projects/presentations/images/2011-10-arstechnica-major-isps-usa-6strikes.png Log: commit the stockholm internet forum presentation for dfri.se. Added: projects/presentations/2012-04-18-dfri-presentation.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/2012-04-18-dfri-presentation.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/2012-04-18-dfri-presentation.tex =================================================================== --- projects/presentations/2012-04-18-dfri-presentation.tex (rev 0) +++ projects/presentations/2012-04-18-dfri-presentation.tex 2012-04-19 07:58:56 UTC (rev 25613) @@ -0,0 +1,212 @@ +\documentclass{beamer} +\mode<presentation> +\usetheme{Boadilla} +\title{DFRI, Swedish Internet Forum 2012} +\author{Andrew Lewman \\ andrew(a)torproject.org} +\date{April 18, 2012} +\begin{document} + +\begin{frame} +\maketitle +\begin{center} +\includegraphics[height=3cm]{./images/2009-tor-logo} +\end{center} +\end{frame} + +\begin{frame}[plain] + \begin{centering} + \pgfimage[height=\paperheight]{./images/1984first} + \par + \end{centering} +\end{frame} + +\begin{frame} +\frametitle{George Orwell was an optimist} +\begin{quotation} +\noindent \includegraphics[width=1cm]{./images/opquo}\quad Who controls the past, controls the future: who controls the present controls the past +\end{quotation} +\flushright --- George Orwell, Nineteen Eighty Four, 1949 +\end{frame} + +\begin{frame} +\frametitle{Internet Surveillance is getting more advanced} +\begin{center} +\includegraphics<1>[scale=0.5]{./images/procera-evolved-dpi} +\includegraphics<2>[scale=0.5]{./images/iran-ssl-dpi-26-seconds-to-death} +\includegraphics<3>[scale=0.6]{./images/2011-infoweek-comodo-hacker} +\includegraphics<4>[scale=0.6]{./images/2011-06-08-china-net-censorship-piracy-porn} +\includegraphics<5>[scale=0.6]{./images/2011-10-arstechnica-major-isps-usa-6strikes} +\includegraphics<6>[scale=0.4]{./images/dataflow-futureprivacychart} +\includegraphics<7>[scale=0.6]{./images/2009-knowprivacy-report-webbug-domains} +\includegraphics<8>[scale=0.3]{./images/mediacom-ad-injection-apple} +\includegraphics<9>[scale=0.3]{./images/mediacom-ad-injection-google} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Twitter in Iran: Good.} +\includegraphics[scale=0.5]{./images/twitter-iran-protests-time} +\flushright{\tiny From http://www.time.com/time/world/article/0,8599,1905125,00.html} +\end{frame} + +\begin{frame} +\frametitle{Twitter in USA: Bad.} +\includegraphics[scale=0.45]{./images/twitter-g20-pittsburgh-gothamist} +\flushright{\tiny from http://gothamist.com/2009/10/05/fbi\_raids\_queens\_home\_in\_g20\_protes.p… +\end{frame} + +\begin{frame}[plain] + \begin{centering} + \pgfimage[height=\paperheight]{./images/paco-primera-pagina-oleo-lienzo-110-x-150-cms-2008-red} + \par + \end{centering} +\end{frame} + +\begin{frame} +\frametitle{The Tor Project, Inc.} +501(c)(3) non-profit organization dedicated to the research and development of technologies for online anonymity and privacy +\begin{center} +\includegraphics[height=5cm]{./images/2009-oval_sticker_new} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{What is Tor?} +\begin{itemize} +\item online anonymity software and network +\pause \item open source, freely available (3-clause BSD license) +\pause \item active research environment: \\ +Drexel, Univ of Waterloo, Georgia Tech, Princeton, Boston University, University College London, Univ of Minnesota, National Science Foundation, Naval Research Labs, Cambridge UK, Bamberg Germany, MIT... +\pause \item increasingly diverse toolset: \\ +Tor, Tor Browser Bundle, Tails LiveCD, obfsproxy, Tor Weather, Tor auto-responder, Secure Updater, Orbot, Torora, Tor Check, Arm, Nymble, Tor Control, and so on. +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Other Systems} +\begin{itemize} +\item VPN - Virtual Private Network, 1 to 1 connection, can redirect all traffic, generally encrypted +\pause \item Proxy - 1 to 1 connection, per application traffic redirection, sometimes encrypted +\pause \item I2P - Garlic routing, closed network, anonymity and reputation +\pause \item Freenet - closed network, anonymity, distributed file storage and sharing +\pause \item GNUnet - closed network, anonymity, distributed file storage and sharing +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{How is Tor different from other systems?} +\begin{overlayarea}{9cm}{6cm} +\only<1>{\includegraphics[height=7cm]{./images/single_hop_relay}} +\only<2>{\includegraphics[height=7cm]{./images/evil_single_hop_relay}} +\only<3>{\includegraphics[height=7cm]{./images/data_snooping_single_hop_relay}} +\end{overlayarea} +\end{frame} + +\begin{frame} +\frametitle{Who uses Tor?} +\parbox{8cm}{\sloppy \setbeamercolor{background}[\includegraphics[scale=0.35]{./images/anonymousman}} +\parbox{3cm}{\sloppy +\begin{flushleft} +\begin{itemize} +\begin{small} +\item Normal people +\item Law Enforcement +\item Human Rights Activists +\item Business Execs +\item Militaries +\item Abuse Victims +\end{small} +\end{itemize} +\end{flushleft} +} +\end{frame} + +\begin{frame} +\frametitle{Who uses Tor?} +\begin{itemize} +\item <1> \textit{Normal users} \\ linking sensitive information to their current identities, online advertising networks, search engines, censorship circumvention +\item <2> \textit{Law enforcement}\\ accidental disclosure to targets, family and friend concerns, separating work from home life +\item <3> \textit{Rights Activists}\\ Personal safety, family safety, narrowly-defined publicity, censorship circumvention +\item <4> \textit{Business Execs}\\ separating work from home life, competitor research, censorship circumvention +\item <5> \textit{Abuse Victims and Survivors}\\ complete separation of past abuse and current life, finding help and safety, need to help others anonymously +\item <6> \textit{Militaries}\\ intelligence gathering, separating work from home life, other activities +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Online and Offline change happens} +\includegraphics[scale=0.5]{./images/egypt} +\end{frame} + +\begin{frame} +\frametitle{You missed a use case} +\includegraphics<1>[scale=0.5]{./images/zscaler-research-security-blocks-dec2011} +\includegraphics<2>[scale=0.8]{./images/ScreenHunter_03_Jun_26_18_11} +\includegraphics<3>[scale=1.0]{./images/tripoli-internet-monitoring-room-sign} +\includegraphics<4>[scale=0.5]{./images/zhejiang-china-brick-workers-tie-up-their-children-01-560x399} +\end{frame} + +\begin{frame}[plain] +\frametitle{estimated 400k to 800k daily users} +\includegraphics[scale=0.4]{./images/huge-crowd} +\end{frame} + +\begin{frame} +\frametitle{Tor hides communication patterns by relaying data through volunteer servers} +\begin{center} +\begin{overlayarea}{9cm}{6cm} +\only<1>{\includegraphics[width=9cm]{./images/tor-network}} +\only<2>{\includegraphics[width=9cm]{./images/tor-safe-selection}} +\only<3>{\includegraphics[width=9cm]{./images/tor-safe-path}} +\only<4>{\includegraphics[width=9cm]{./images/tor-keys1}} +\end{overlayarea} +\flushright{\tiny Diagram: Robert Watson} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Vidalia Network Map} +\includegraphics[scale=0.4]{./images/vidalia-network-map} +\end{frame} + +\begin{frame} +\frametitle{Metrics} +\begin{itemize} +\item Measuring metrics anonymously +\item NSF research grant +\item Archive of hourly consensus, ExoneraTor, VisiTor +\item Metrics portal: \\ \url{https://metrics.torproject.org/} +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Tor hidden services allow privacy enhanced hosting} +\includegraphics[scale=0.5]{./images/hidden-federalist} +\end{frame} + +\begin{frame} +\frametitle{dot onion you say?} +\includegraphics[scale=0.6]{./images/hidden-federalist-zoom} +\end{frame} + +\begin{frame} +\frametitle{Thanks!} +\includegraphics[scale=0.6]{./images/thankyou_img} +\flushright +Visit \url{https://www.torproject.org/} for more information, links, and ideas. +\end{frame} + +\begin{frame} +\frametitle{Credits \& Thanks} +\begin{itemize} +\item applied theory, third image: Information Week,2011-04-09, http://www.informationweek.com/news/security/attacks/229400850 +\item applied theory, fourth image: Al Jazeera, February 2011 +\item six strikes, ars technica, \url{http://arstechnica.com/tech-policy/news/2011/07/major-isps-agree-to-six-strikes-copyright-enforcement-plan.ars} +\item spring is in the air, Paco Pomet, http://pacopomet.wordpress.com/ +\item who uses tor? \url{http://www.flickr.com/photos/mattw/2336507468/siz}, Matt Westervelt, CC-BY-SA. +\item danger!, \url{http://flickr.com/photos/hmvh/58185411/sizes/o/}, hmvh, CC-BY-SA. +\item 500k, \url{http://www.flickr.com/photos/lukaskracic/334850378/sizes/l/}, Luka Skracic, used with permission. +\end{itemize} +\end{frame} + +\end{document} Property changes on: projects/presentations/2012-04-18-dfri-presentation.tex ___________________________________________________________________ Added: svn:mime-type + text/x-tex Added: projects/presentations/images/2009-knowprivacy-report-webbug-domains.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2009-knowprivacy-report-webbug-domains.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/2011-10-29-wsj-bluecoat-article.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2011-10-29-wsj-bluecoat-article.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/2011-10-arstechnica-major-isps-usa-6strikes.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2011-10-arstechnica-major-isps-usa-6strikes.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

[torperf/master] Update the ChangeLog, too.
by karsten＠torproject.org 19 Apr '12

19 Apr '12

commit 8a10242887e3c1d69d468a6b4618fad7209b5e98 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 19 09:48:41 2012 +0200 Update the ChangeLog, too. --- ChangeLog | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0ae8c3..e6ae46e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,12 @@ Torperf change log: -Changes in version 0.0.2 - 2011-??-?? +Changes in version 0.0.2 - 2012-??-?? - Include <arpa/inet.h> for the BSDs that don't get ntohl from any of the other includes. - Fix compilation for GCC 4.6 and Mac OS X. + - Add an extra_stats.py switch and a new truncate-data.py script to + truncate .data and .extradata files to contain only the last 4 days. + - Log timestamps for every 10% of received bytes to .data files. Changes in version 0.0.1 - 2011-04-12 - Initial release

1 0

[metrics-web/master] Handle and document new Torperf timestamps.
by karsten＠torproject.org 19 Apr '12

19 Apr '12

commit 7ca42aef9ed47f675a9ba7463a4f099d40b44fa8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 19 09:32:51 2012 +0200 Handle and document new Torperf timestamps. --- .../torproject/ernie/cron/TorperfProcessor.java | 2 +- web/WEB-INF/formats.jsp | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/ernie/cron/TorperfProcessor.java b/src/org/torproject/ernie/cron/TorperfProcessor.java index 0242b1b..377fede 100644 --- a/src/org/torproject/ernie/cron/TorperfProcessor.java +++ b/src/org/torproject/ernie/cron/TorperfProcessor.java @@ -118,7 +118,7 @@ public class TorperfProcessor { String key = source + "," + dateTime; String value = key; if ((parts.length == 20 && parts[16].equals("0")) || - (parts.length == 21 && parts[20].equals("1"))) { + (parts.length >= 21 && parts[20].equals("1"))) { value += ",-2"; // -2 for timeout } else if (Long.parseLong(parts[19]) < receivedBytes) { value += ",-1"; // -1 for failure diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 84b7dac..f2a55ff 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -698,7 +698,7 @@ file (reformatted and annotated with comments): <tt>1293543301 762678 # Connection process started</tt> <tt>1293543301 762704 # After socket is created</tt> <tt>1293543301 763074 # After socket is connected</tt> -<tt>1293543301 763190 # After authentication methods are (SOCKS 5 only)</tt> +<tt>1293543301 763190 # After authentication methods are negotiated (SOCKS 5 only)</tt> <tt>1293543301 763816 # After SOCKS request is sent</tt> <tt>1293543302 901783 # After SOCKS response is received</tt> <tt>1293543302 901818 # After HTTP request is written</tt> @@ -706,6 +706,16 @@ file (reformatted and annotated with comments): <tt>1293543305 456664 # After payload is complete</tt> <tt>75 # Written bytes</tt> <tt>51442 # Read bytes</tt> +<tt>0 # Timeout (optional field)</tt> +<tt>1293543304 546828 # After 10% of expected bytes are read (optional field)</tt> +<tt>1293543304 647924 # After 20% of expected bytes are read (optional field)</tt> +<tt>1293543304 749012 # After 30% of expected bytes are read (optional field)</tt> +<tt>1293543304 850109 # After 40% of expected bytes are read (optional field)</tt> +<tt>1293543304 951201 # After 50% of expected bytes are read (optional field)</tt> +<tt>1293543305 052293 # After 60% of expected bytes are read (optional field)</tt> +<tt>1293543305 153381 # After 70% of expected bytes are read (optional field)</tt> +<tt>1293543305 254482 # After 80% of expected bytes are read (optional field)</tt> +<tt>1293543305 355579 # After 90% of expected bytes are read (optional field)</tt> <tt></tt> <tt># Path information contained in .extradata files:</tt> <tt>ok # Status code</tt>

1 0

[torperf/master] Replace tabs with spaces.
by karsten＠torproject.org 19 Apr '12

19 Apr '12

commit e2a3d77ab3670e3180fde4e760adc2aae933319a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 16 19:56:56 2012 +0200 Replace tabs with spaces. --- trivsocks-client.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/trivsocks-client.c b/trivsocks-client.c index d68aaca..9b19aae 100644 --- a/trivsocks-client.c +++ b/trivsocks-client.c @@ -117,7 +117,7 @@ parse_socks4a_connect_response(const char *response, size_t len, static int parse_socks5_connect_response(const char *response, size_t len, int s, - uint32_t *result_addr, char **result_hostname) + uint32_t *result_addr, char **result_hostname) { char reply_buf[4]; uint16_t port; @@ -132,7 +132,7 @@ parse_socks5_connect_response(const char *response, size_t len, int s, } if (response[1] != 0) { fprintf(stderr, "Got status response '%u': SOCKS5 request failed\n", - (unsigned)response[1]); + (unsigned)response[1]); return -1; } @@ -190,9 +190,9 @@ do_socks5_negotiate(int s){ int do_http_get(int s, const char *path, const char *hostname, size_t *read_bytes, size_t *write_bytes, - struct timeval *datarequesttime, - struct timeval *dataresponsetime, - struct timeval *datacompletetime) { + struct timeval *datarequesttime, + struct timeval *dataresponsetime, + struct timeval *datacompletetime) { char buf[HTTP_BUF_LEN]; int len; // Length of request, not including \0 char is_first = 1; @@ -232,8 +232,8 @@ do_http_get(int s, const char *path, const char *hostname, size_t *read_bytes, s if (is_first) { is_first = 0; if (gettimeofday(dataresponsetime, NULL)) { - perror("getting dataresponsetime"); - return -1; + perror("getting dataresponsetime"); + return -1; } } } @@ -293,7 +293,7 @@ output_status_information(void) */ static int do_connect(const char *hostname, const char *filename, uint32_t sockshost, uint16_t socksport, - int reverse, int version, + int reverse, int version, uint32_t *result_addr, char **result_hostname) { @@ -390,7 +390,7 @@ do_connect(const char *hostname, const char *filename, uint32_t sockshost, uint1 return -1; } if (parse_socks5_connect_response(reply_buf, RESPONSE_LEN_5, s, - result_addr, result_hostname)<0){ + result_addr, result_hostname)<0){ return -1; } } @@ -409,7 +409,7 @@ do_connect(const char *hostname, const char *filename, uint32_t sockshost, uint1 // Request a file using HTTP do_http_get(s, filename, hostname, &read_bytes, &write_bytes, - &datarequesttime, &dataresponsetime, &datacompletetime); + &datarequesttime, &dataresponsetime, &datacompletetime); didtimeout = 0;

1 0

[torperf/master] Add a comment to the while loop.
by karsten＠torproject.org 19 Apr '12

19 Apr '12

commit cb096fd8e6fd212e3d06836d0ab738c6804cc30d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 17 13:59:59 2012 +0200 Add a comment to the while loop. --- trivsocks-client.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/trivsocks-client.c b/trivsocks-client.c index 9a32c1e..81e4583 100644 --- a/trivsocks-client.c +++ b/trivsocks-client.c @@ -239,6 +239,9 @@ do_http_get(int s, const char *path, const char *hostname, return -1; } } + // Get when the next 10% of expected bytes are received; this is a + // while loop for cases when we expect only very few bytes and read + // more than 10% of them in a single read_all() call. while (*read_bytes < expected_bytes && (*read_bytes * 10) / expected_bytes > perc_logged + 1) { if (gettimeofday(&dataperctime[++perc_logged], NULL)) {

1 0

[torperf/master] Document trivsocks-client's new command-line parameter.
by karsten＠torproject.org 19 Apr '12

19 Apr '12

commit cdf5279d0d1181011f51069d240425867c86605e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 19 09:37:03 2012 +0200 Document trivsocks-client's new command-line parameter. --- measurements-HOWTO | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/measurements-HOWTO b/measurements-HOWTO index 30c0206..3627e5d 100644 --- a/measurements-HOWTO +++ b/measurements-HOWTO @@ -127,14 +127,17 @@ for formatting purposes here): $ crontab -e */5 * * * * timeout -s2 295 ~/torperf/trivsocks-client - torperf.torproject.org 127.0.0.1:9020 /.50kbfile >> ~/torperf/50kb.data - 2>/dev/null; python ~/torperf/truncate-data.py ~/torperf/50kb.data + torperf.torproject.org 127.0.0.1:9020 /.50kbfile 51200 >> + ~/torperf/50kb.data 2>/dev/null; + python ~/torperf/truncate-data.py ~/torperf/50kb.data 2,32 * * * * timeout -s2 1795 ~/torperf/trivsocks-client - torperf.torproject.org 127.0.0.1:9021 /.1mbfile >> ~/torperf/1mb.data - 2>/dev/null; python ~/torperf/truncate-data.py ~/torperf/1mb.data + torperf.torproject.org 127.0.0.1:9021 /.1mbfile 1048576 >> + ~/torperf/1mb.data 2>/dev/null; + python ~/torperf/truncate-data.py ~/torperf/1mb.data 8 * * * * timeout -s2 3595 ~/torperf/trivsocks-client - torperf.torproject.org 127.0.0.1:9022 /.5mbfile >> ~/torperf/5mb.data - 2>/dev/null; python ~/torperf/truncate-data.py ~/torperf/5mb.data + torperf.torproject.org 127.0.0.1:9022 /.5mbfile 5242880 >> + ~/torperf/5mb.data 2>/dev/null; + python ~/torperf/truncate-data.py ~/torperf/5mb.data (Omit the truncate-data.py command if you don't want .data files to be truncated once per week to contain only the last 4 days of data.) @@ -249,40 +252,40 @@ three entries above (linebreaks for formatting reasons): 1,6,11,16,21,26,31,36,41,46,51,56 * * * * timeout -2 295 ~/torperf/trivsocks-client torperf.torproject.org 127.0.0.1:9023 - /.50kbfile >> ~/torperf/slow50kb.data 2>/dev/null + /.50kbfile 51200 >> ~/torperf/slow50kb.data 2>/dev/null 2,7,12,17,22,27,32,37,42,47,52,57 * * * * timeout -2 295 ~/torperf/trivsocks-client torperf.torproject.org 127.0.0.1:9026 - /.50kbfile >> ~/torperf/slowratio50kb.data 2>/dev/null + /.50kbfile 51200 >> ~/torperf/slowratio50kb.data 2>/dev/null 3,8,13,18,23,28,33,38,43,48,53,58 * * * * timeout -2 295 ~/torperf/trivsocks-client torperf.torproject.org 127.0.0.1:9029 - /.50kbfile >> ~/torperf/fast50kb.data 2>/dev/null + /.50kbfile 51200 >> ~/torperf/fast50kb.data 2>/dev/null 4,9,14,19,24,29,34,39,44,49,54,59 * * * * timeout -2 295 ~/torperf/trivsocks-client torperf.torproject.org 127.0.0.1:9032 - /.50kbfile >> ~/torperf/fastratio50kb.data 2>/dev/null + /.50kbfile 51200 >> ~/torperf/fastratio50kb.data 2>/dev/null 8,38 * * * * timeout -2 1795 ~/torperf/trivsocks-client - torperf.torproject.org 127.0.0.1:9024 /.1mbfile >> + torperf.torproject.org 127.0.0.1:9024 /.1mbfile 1048576 >> ~/torperf/slow1mb.data 2>/dev/null 14,44 * * * * timeout -2 1795 ~/torperf/trivsocks-client - torperf.torproject.org 127.0.0.1:9027 /.1mbfile >> + torperf.torproject.org 127.0.0.1:9027 /.1mbfile 1048576 >> ~/torperf/slowratio1mb.data 2>/dev/null 20,50 * * * * timeout -2 1795 ~/torperf/trivsocks-client - torperf.torproject.org 127.0.0.1:9030 /.1mbfile >> + torperf.torproject.org 127.0.0.1:9030 /.1mbfile 1048576 >> ~/torperf/fast1mb.data 2>/dev/null 26,56 * * * * timeout -2 1795 ~/torperf/trivsocks-client - torperf.torproject.org 127.0.0.1:9033 /.1mbfile >> + torperf.torproject.org 127.0.0.1:9033 /.1mbfile 1048576 >> ~/torperf/fastratio1mb.data 2>/dev/null 20 * * * * timeout -2 3595 ~/torperf/trivsocks-client - torperf.torproject.org 127.0.0.1:9025 /.5mbfile >> + torperf.torproject.org 127.0.0.1:9025 /.5mbfile 5242880 >> ~/torperf/slow5mb.data 2>/dev/null 32 * * * * timeout -2 3595 ~/torperf/trivsocks-client - torperf.torproject.org 127.0.0.1:9028 /.5mbfile >> + torperf.torproject.org 127.0.0.1:9028 /.5mbfile 5242880 >> ~/torperf/slowratio5mb.data 2>/dev/null 44 * * * * timeout -2 3595 ~/torperf/trivsocks-client - torperf.torproject.org 127.0.0.1:9031 /.5mbfile >> + torperf.torproject.org 127.0.0.1:9031 /.5mbfile 5242880 >> ~/torperf/fast5mb.data 2>/dev/null 56 * * * * timeout -2 3595 ~/torperf/trivsocks-client - torperf.torproject.org 127.0.0.1:9034 /.5mbfile >> + torperf.torproject.org 127.0.0.1:9034 /.5mbfile 5242880 >> ~/torperf/fastratio5mb.data 2>/dev/null

1 0