- tor-commits - lists.torproject.org

[tor/master] Fix a couple of compile warnings on OS X 10.6
by nickm＠torproject.org 24 Feb '11

24 Feb '11

commit 303c04109b9044715c2f0b7e8cd9f18027ee7d5f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 24 07:19:09 2011 +0100 Fix a couple of compile warnings on OS X 10.6 --- src/or/status.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/status.c b/src/or/status.c index 36b3f7b..054567f 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -33,8 +33,8 @@ static char * secs_to_uptime(long secs) { long int days = secs / 86400; - int hours = (secs - (days * 86400)) / 3600; - int minutes = (secs - (days * 86400) - (hours * 3600)) / 60; + int hours = (int)((secs - (days * 86400)) / 3600); + int minutes = (int)((secs - (days * 86400) - (hours * 3600)) / 60); char *uptime_string = NULL; switch (days) {

1 0

[tor/master] Merge remote branch 'sebastian/osx_compile'
by nickm＠torproject.org 24 Feb '11

24 Feb '11

commit feaa0120d0d08591d3c9e720438d8f2fc34ed736 Merge: 9265164 303c041 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 24 09:27:04 2011 -0500 Merge remote branch 'sebastian/osx_compile' src/or/status.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[torperf/master] Fix extra_stats.py to output more useful data.
by karsten＠torproject.org 24 Feb '11

24 Feb '11

commit 71069e738bc69647f57987db5c5584473d219baf Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 00:23:43 2011 -0800 Fix extra_stats.py to output more useful data. Documentation follows in next commit. Also requires a TorCtl update to latest origin/master. --- extra_stats.py | 140 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 120 insertions(+), 20 deletions(-) diff --git a/extra_stats.py b/extra_stats.py old mode 100644 new mode 100755 index eac037b..fb8d38a --- a/extra_stats.py +++ b/extra_stats.py @@ -1,45 +1,144 @@ -import sys, time, math +#!/usr/bin/python + +import sys, time +import TorCtl.TorUtil as TorUtil import TorCtl.TorCtl as TorCtl HOST = "127.0.0.1" +class Circuit: + def __init__(self, launch_time, circ_id): + self.circ_id = circ_id + self.launch_time = launch_time + self.close_time = launch_time + self.stream_end_time = 0 + self.path = [] + self.build_times = [] + self.failed = False + self.fail_reason = None + self.used = False + self.strm_id = 0 + self.stream_failed = False + self.stream_fail_reason = None + class WriteStats(TorCtl.PostEventListener): def __init__(self, port, filename): TorCtl.PostEventListener.__init__(self) self._port = int(port) self._filename = filename self._conn = None + self.all_circs = {} + self.ignore_streams = {} + self.current_timeout = None + self.current_quantile = None def connect(self): self._conn = TorCtl.connect(HOST, self._port) + self._conn.debug(file("control.log", "w")) if not self._conn: sys.exit(2) def setup_listener(self): - self._conn.set_events(["Stream"]) + try: + # buildtimeout_set will not be available in 0.2.1 + self._conn.set_events(["STREAM", "CIRC", "BUILDTIMEOUT_SET"], + extended=True) + except: + self._conn.set_events(["STREAM", "CIRC"], extended=True) self._conn.add_event_listener(self) + def buildtimeout_set_event(self, b): + self.current_timeout = b.timeout_ms + self.current_quantile = b.cutoff_quantile + result = b.event_name + " " +b.body + self.write_result(result) + + def circ_status_event(self, c): + if c.status == "LAUNCHED": + self.all_circs[c.circ_id] = Circuit(c.arrived_at, c.circ_id) + elif c.circ_id not in self.all_circs: + return + + circ = self.all_circs[c.circ_id] + if c.status == "EXTENDED": + circ.build_times.append(c.arrived_at-circ.launch_time) + elif c.status == "BUILT": + circ.path = c.path + elif c.status == "FAILED": + circ.fail_reason = c.reason + if c.remote_reason: circ.fail_reason += ":"+c.remote_reason + circ.path = c.path + circ.close_time = c.arrived_at + circ.failed = True + self.write_circ(circ) + del self.all_circs[c.circ_id] + elif c.status == "CLOSED": + circ.close_time = c.arrived_at + self.write_circ(circ) + del self.all_circs[c.circ_id] + + def write_circ(self, circ): + result = "CIRC_ID=%d LAUNCH=%s PATH=%s BUILDTIMES=%s " \ + % (circ.circ_id, str(circ.launch_time), ",".join(circ.path), + ",".join(map(str, circ.build_times))) + if circ.failed: + result += "FAIL_REASONS=%s " % circ.fail_reason + if circ.stream_failed: + result += "STREAM_FAIL_REASONS=%s " % circ.stream_fail_reason + elif circ.used: + result += "USED_AT=%s USED_BY=%d " % \ + (str(circ.stream_end_time), circ.strm_id) + + if self.current_timeout: + result += "TIMEOUT=%d QUANTILE=%f " % \ + (self.current_timeout, self.current_quantile) + + self.write_result(result) + def stream_status_event(self, event): - if event.source == 'EXIT' or \ - event.status == 'DETACHED': - for circs in self._conn.get_info("circuit-status").itervalues(): - for circ in circs.split("\n"): - entry = circ.split(" ") - if entry[0] == str(event.circ_id): - if event.source == 'EXIT': - self.write_result(True, event.arrived_at, entry[2].split(",")) - else: - self.write_result(False, event.arrived_at, entry[2].split(",")) - - def write_result(self, successful, now, relays): - success = "" - if successful: - success = "ok" - else: - success = "error" + if event.status == "NEW": + if event.purpose != "USER": + self.ignore_streams[event.strm_id] = True + return + if event.strm_id in self.ignore_streams: + if event.status == "CLOSED": + del self.ignore_streams[event.strm_id] + return + if event.circ_id not in self.all_circs: + if event.circ_id: + TorUtil.plog("WARN", + "Unknown circuit id %d has a stream event %d %s" % \ + (event.circ_id, event.strm_id, event.status)) + return + circ = self.all_circs[event.circ_id] + if event.status == 'DETACHED' or event.status == 'FAILED': + # Detached usually means there was some failure + assert not circ.strm_id + circ.used = True + circ.strm_id = event.strm_id + circ.stream_failed = True + circ.stream_end_time = event.arrived_at + if event.reason: + circ.stream_fail_reason = event.reason + if event.remote_reason: + circ.stream_fail_reason += " "+event.remote_reason + self.write_circ(circ) + # We have no explicit assurance here that tor will not + # try to reuse this circuit later... But we should + # print out a warn above if that happens. + del self.all_circs[event.circ_id] + if event.status == 'CLOSED': + assert not circ.strm_id or circ.stream_failed + circ.used = True + circ.strm_id = event.strm_id + circ.stream_end_time = event.arrived_at + self.write_circ(circ) + del self.all_circs[event.circ_id] + def write_result(self, result): + # XXX: hrmm. seems wasteful to keep opening+closing.. statsfile = open(self._filename, 'a') - statsfile.write("%s %d %s\n" % (success, math.floor(now), " ".join(relays))) + statsfile.write(result+"\n") statsfile.close() def main(): @@ -54,6 +153,7 @@ def main(): stats.connect() stats.setup_listener() try: + # XXX: join instead while True: time.sleep(500) except:

1 0

[torperf/master] Update measurements doc for new extra_stats.py.
by karsten＠torproject.org 24 Feb '11

24 Feb '11

commit e02ad69c67f858c551fb307bb43c6405dd6b4b1d Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 00:27:55 2011 -0800 Update measurements doc for new extra_stats.py. --- measurements-HOWTO | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/measurements-HOWTO b/measurements-HOWTO index 9c78992..c91894a 100644 --- a/measurements-HOWTO +++ b/measurements-HOWTO @@ -163,26 +163,33 @@ startsec startusec writebytes readbytes The 50kb.extradata, 1mb.extradata, and 5mb.extradata files should -accumulate lines like this (linebreaks for formatting reasons): +accumulate lines with KEY=value pairs describing the following properties: -ok 1284059486 $ED16C4DD8E9BCACDE829E6B6571B58095383897A=PPrivCom030 - $80818E35A46DEED6889818ADC596404AB94E392A=Pandora14 - $4C23C8C30C66C87E1C875A949B4841E4305FFC57~Amunet11 +CIRC_ID: The circuit id from the control port +LAUNCH: The launch time +PATH: The identity fingerprints of the members of the path +BUILDTIMES: Cumulative timer of how long before each hop was completed +USED_AT: Closing time for the Torperf stream +USED_BY: Control port stream id for this Torperf stream +TIMEOUT: The current CircuitBuildTimeout (in ms, pre-rounding) +QUANTILE: The current CircuitBuildTimeout quantile cutoff -with column headers: +In the event of error, the following fields may be present in lieu of +completion data: -ok|error timestamp firsthop secondhop thirdhop [fourthhop ...] +FAIL_REASONS: Reasons for circuit failure +STREAM_FAIL_REASONS: Reasons for stream failure -The first column indicates if this circuit was actually used to fetch -the data or if Tor chose a different circuit because this one was -problematic. For every error entry there should be a following ok -entry, unless the network of the torperf instance is totally dead or -the resource it wants to fetch is unavailable. +The files will also contain direct copies of the control port event +BUILDTIMEOUT_SET. See control-spec.txt for details of this. -The timestamp will NOT necessarily match the timestamps in the .data file -exactly, because additional processing is necessary. You should allow -for up to a minute of slack when matching the two files up. See the -consolidate_stats.py script that fulfills this job. +The USED_AT timestamp will NOT necessarily match the timestamps in the .data +file exactly, because additional processing is necessary. The timestamp from +the .data files that is closest to USED_AT is "datacompletesec +datacompleteusec". If the times are more than a second apart, something is +really wrong. + +XXX: consolidate-stats needs update, and no longer works. Call it like this:

1 0

[torperf/master] Fix annoying formatting in example start script.
by karsten＠torproject.org 24 Feb '11

24 Feb '11

commit add8b1f470562ab958294789c62987f6f4ae6698 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 00:28:12 2011 -0800 Fix annoying formatting in example start script. Bonus commit! ;) --- example_start-tors_fastslow.txt | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example_start-tors_fastslow.txt b/example_start-tors_fastslow.txt index 2226cb0..4887868 100755 --- a/example_start-tors_fastslow.txt +++ b/example_start-tors_fastslow.txt @@ -8,14 +8,14 @@ mkdir -p regular50kb regular1mb regular5mb BASEPORT=9000 SIZENUM=0 for SIZE in 50kb 1mb 5mb; do -SPEEDNUM=0 -let SIZENUM=10+$SIZENUM -for SPEED in slow slowratio regular fast fastratio; do -let SPEEDNUM=1+$SPEEDNUM -let PORT=$BASEPORT+$SIZENUM+$SPEEDNUM -let CONTROLPORT=1000+$PORT -cd ~/torperf/$SPEED$SIZE -cat <<EOF >torrc + SPEEDNUM=0 + let SIZENUM=10+$SIZENUM + for SPEED in slow slowratio regular fast fastratio; do + let SPEEDNUM=1+$SPEEDNUM + let PORT=$BASEPORT+$SIZENUM+$SPEEDNUM + let CONTROLPORT=1000+$PORT + cd ~/torperf/$SPEED$SIZE + cat <<EOF >torrc DataDirectory . SocksPort $PORT MaxCircuitDirtiness 1 minute @@ -24,7 +24,7 @@ Log notice file log ControlPort $CONTROLPORT CookieAuthentication 1 EOF -done + done done cd ~/torperf/slow50kb && tor -f ~/torperf/slow50kb/torrc

1 0

[torperf/master] Clarify some fields of extradata.
by karsten＠torproject.org 24 Feb '11

24 Feb '11

commit b240ae1ad416b42eeba37d0442471b9858ad2821 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 13:28:05 2011 -0800 Clarify some fields of extradata. --- measurements-HOWTO | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/measurements-HOWTO b/measurements-HOWTO index c91894a..e72969e 100644 --- a/measurements-HOWTO +++ b/measurements-HOWTO @@ -166,10 +166,10 @@ The 50kb.extradata, 1mb.extradata, and 5mb.extradata files should accumulate lines with KEY=value pairs describing the following properties: CIRC_ID: The circuit id from the control port -LAUNCH: The launch time +LAUNCH: The launch time of the circuit PATH: The identity fingerprints of the members of the path BUILDTIMES: Cumulative timer of how long before each hop was completed -USED_AT: Closing time for the Torperf stream +USED_AT: Closing time for the Torperf stream (should match datacomplete*sec) USED_BY: Control port stream id for this Torperf stream TIMEOUT: The current CircuitBuildTimeout (in ms, pre-rounding) QUANTILE: The current CircuitBuildTimeout quantile cutoff

1 0

[torperf/master] Fix a spurious WARN in extra_data.py
by karsten＠torproject.org 24 Feb '11

24 Feb '11

commit 34362200e773ad22c893079a933df558e330d49a Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 13:27:49 2011 -0800 Fix a spurious WARN in extra_data.py --- extra_stats.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/extra_stats.py b/extra_stats.py index fb8d38a..1ae0142 100755 --- a/extra_stats.py +++ b/extra_stats.py @@ -127,6 +127,9 @@ class WriteStats(TorCtl.PostEventListener): # try to reuse this circuit later... But we should # print out a warn above if that happens. del self.all_circs[event.circ_id] + # Some STREAM FAILED events are paired with a CLOSED, some are not :( + if event.status == "FAILED": + self.ignore_streams[event.strm_id] = True if event.status == 'CLOSED': assert not circ.strm_id or circ.stream_failed circ.used = True

1 0

[pytorctl/master] Fix a python 2.5 traceback in recent 'body' commit.
by mikeperry＠torproject.org 24 Feb '11

24 Feb '11

commit 96133c805d3e5402f6444e71a4555c6b410986e7 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Feb 24 03:49:05 2011 -0800 Fix a python 2.5 traceback in recent 'body' commit. --- TorCtl.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index 4319242..5403a95 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -266,8 +266,8 @@ class ORConnEvent(Event): self.ncircs = ncircs class StreamBwEvent(Event): - def __init__(self, event_name, strm_id, written, read, body): - Event.__init__(self, event_name, body) + def __init__(self, event_name, saved_body, strm_id, written, read): + Event.__init__(self, event_name, saved_body) self.strm_id = int(strm_id) self.bytes_read = int(read) self.bytes_written = int(written) @@ -1431,7 +1431,7 @@ class EventHandler(EventSink): m = re.match(r"(\d+)\s+(\d+)\s+(\d+)", body) if not m: raise ProtocolError("STREAM_BW event misformatted.") - event = StreamBwEvent(evtype, *m.groups(), body=body) + event = StreamBwEvent(evtype, body, *m.groups()) elif evtype == "BW": m = re.match(r"(\d+)\s+(\d+)", body) if not m:

1 0

[torbutton/master] Bug #2359: Fix XHTML DTD errors on FF4
by mikeperry＠torproject.org 24 Feb '11

24 Feb '11

commit 156e3a62ffaebc55d8b8b10b54b9567ad9d1b608 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 23:38:25 2011 -0800 Bug #2359: Fix XHTML DTD errors on FF4 Allow content sourcing of resource urls with a host of 'gre'. --- src/components/cssblocker.js | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/components/cssblocker.js b/src/components/cssblocker.js index 51f7b98..ad2b1ac 100644 --- a/src/components/cssblocker.js +++ b/src/components/cssblocker.js @@ -259,6 +259,19 @@ ContentPolicy.prototype = { } } + // Fix bug #2359: Firefox now loads dtd's from + // resource urls with a valid host. We must + // check for this and allow it. + if (contentLocation.scheme == "resource") { + try { + targetHost = contentLocation.host; + } catch(e) { + this.logger.safe_log(3, "No resource host from: ", + requestOrigin.spec + " for: " + + contentLocation.spec); + } + } + if (("about:blank" == contentLocation.spec)) { // ok, but don't return } else if (("chrome" == targetScheme) && (targetHost in browserSources)) { @@ -266,8 +279,9 @@ ContentPolicy.prototype = { requestOrigin.spec + " for: " + contentLocation.spec); return ok; - } else if ("file" == targetScheme) { - // This fix is for bug 1014. XHTML documents need to source + } else if ("file" == targetScheme || + ("resource" == targetScheme && targetHost == "gre")) { + // This fix is for bugs 1014+2359. XHTML documents need to source // a special dtd as a file url. The same origin policy should // prevent other access to file urls, so this should be ok // to just allow.

1 0

[torbutton/master] Bug #2465: Fix Javascript hooks+exception on FF4.0b11
by mikeperry＠torproject.org 24 Feb '11

24 Feb '11

commit 0b96be3008ff894bf1e04dbf96103da78b601013 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 22:58:23 2011 -0800 Bug #2465: Fix Javascript hooks+exception on FF4.0b11 The javascript hooks work again, and we've removed a nasty popup exception on FF4.0b11 too. --- src/chrome/content/jshooks.js | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/jshooks.js b/src/chrome/content/jshooks.js index b856922..32c446d 100644 --- a/src/chrome/content/jshooks.js +++ b/src/chrome/content/jshooks.js @@ -3,6 +3,7 @@ window.__HookObjects = function() { return false; } + /* For reference/debugging only: if(false && window.__tb_set_uagent===true) { var tmp_oscpu = window.__tb_oscpu; @@ -326,11 +327,14 @@ window.__HookObjects = function() { // to be a 'Window' but is not the same class as 'window'...) and // hide XPCNativeWrapper there. // This seems no longer necessary in FF2.0.0.13+, and may break FF3? - with(window.valueOf.call().__proto__) { - XPCNativeWrapper = function(a) { return a; }; - } - - window.__proto__ = null; // Prevent delete from unmasking our properties. + //with(window.valueOf.call().__proto__) { + // XPCNativeWrapper = function(a) { return a; }; + //} + + // FIXME: Commenting this may open us to unmasking, but allows the hooks to + // work on FF4. Since we lost the bulletproof resolution masking battle to + // CSS3 anyways, let's just do what we can. + //window.__proto__ = null; // Prevent delete from unmasking our properties. return true; }

1 0