- tor-commits - lists.torproject.org

r24357: {website} add translated wmi files (in website/trunk: . about/ar ar docs/ar getinvolved getinvolved/ar)
by Runa Sandvik 16 Mar '11

16 Mar '11

Author: runa Date: 2011-03-16 16:36:41 +0000 (Wed, 16 Mar 2011) New Revision: 24357 Added: website/trunk/ar/ website/trunk/ar/navigation.wmi website/trunk/getinvolved/ar/ website/trunk/getinvolved/ar/sidenav.wmi Modified: website/trunk/about/ar/sidenav.wmi website/trunk/docs/ar/sidenav.wmi Log: add translated wmi files Modified: website/trunk/about/ar/sidenav.wmi =================================================================== --- website/trunk/about/ar/sidenav.wmi 2011-03-14 22:25:22 UTC (rev 24356) +++ website/trunk/about/ar/sidenav.wmi 2011-03-16 16:36:41 UTC (rev 24357) @@ -1,5 +1,5 @@ ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision: 24336 $ # Translation-Priority: 2-medium # this structure defines the side nav bar for the /about pages @@ -18,39 +18,39 @@ my $sidenav; $sidenav = [ {'url' => 'about/overview', - 'txt' => 'Tor Overview', + 'txt' => 'لمحة عامة', }, {'url' => 'about/torusers', - 'txt' => 'Users of Tor', + 'txt' => 'مستخدمو تور', }, {'url' => 'about/corepeople', - 'txt' => 'Tor People', + 'txt' => 'مطورو تور', 'subelements' => [ {'url' => 'about/board', - 'txt' => 'Board of Directors', + 'txt' => 'مجلس الإدارة', }, {'url' => 'about/translators', - 'txt' => 'Translators', + 'txt' => 'المترجون', }, {'url' => 'about/volunteers', - 'txt' => 'Volunteers', + 'txt' => 'المتطوعون', }, {'url' => 'about/contributors', - 'txt' => 'Past Contributors', + 'txt' => 'المساهمون السابقون', }] }, {'url' => 'about/sponsors', - 'txt' => 'Sponsors', + 'txt' => 'الممولون', }, {'url' => 'about/financials', - 'txt' => 'Financial Reports', + 'txt' => 'التقارير المالية', }, {'url' => 'projects/projects', - 'txt' => 'Projects', + 'txt' => 'المشاريع', }, {'url' => 'docs/documentation', - 'txt' => 'Documentation', + 'txt' => 'التوثيق', }, ]; :> Added: website/trunk/ar/navigation.wmi =================================================================== --- website/trunk/ar/navigation.wmi (rev 0) +++ website/trunk/ar/navigation.wmi 2011-03-16 16:36:41 UTC (rev 24357) @@ -0,0 +1,24 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 24336 $ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'الرئيسية', + 'about/overview' , 'عن تور', + 'docs/documentation' , 'التوثيق', + 'projects/projects' , 'المشاريع', + 'press/press' , 'صحافة', + '<blog>' , 'المدونة', + 'http://printfection.com/torprojectstore' , 'المتجر', + ); + my @calltoaction = ( + 'download/download' , 'نزّل', + 'donate/donate' , 'تبرّع', + 'getinvolved/volunteer' , 'انضم', + ); + +:> Modified: website/trunk/docs/ar/sidenav.wmi =================================================================== --- website/trunk/docs/ar/sidenav.wmi 2011-03-14 22:25:22 UTC (rev 24356) +++ website/trunk/docs/ar/sidenav.wmi 2011-03-16 16:36:41 UTC (rev 24357) @@ -1,5 +1,5 @@ ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision: 24336 $ # Translation-Priority: 2-medium # this structure defines the side nav bar for the /about pages @@ -18,80 +18,80 @@ my $sidenav; $sidenav = [ {'url' => 'docs/documentation', - 'txt' => 'Documentation Overview', + 'txt' => 'لمحة عامة عن التوثيق', }, { 'url' => 'docs/installguide', - 'txt' => 'Installation Guides', + 'txt' => 'أدلة التثبيت', 'subelements' => [ {'url' => 'docs/tor-doc-windows', - 'txt' => 'Installing on Windows', + 'txt' => 'التثبيت على ويندوز', }, {'url' => 'docs/tor-doc-unix', - 'txt' => 'Installing on Linux/BSD/Unix', + 'txt' => 'التثبيت على لينكس/بي إس دي/يونكس', }, {'url' => 'docs/tor-doc-osx', - 'txt' => 'Installing on Mac OS X', + 'txt' => 'التثبيت على Mac OS X', }, {'url' => 'docs/android', - 'txt' => 'Installing on Android', + 'txt' => 'التثبيت على آندرويد', }, {'url' => 'docs/N900', - 'txt' => 'Installing on Maemo/N900', + 'txt' => 'التثبيت على Maemo/N900', }, {'url' => 'docs/verifying-signatures', - 'txt' => 'Verify our GPG signatures', + 'txt' => 'التحقق من تواقيع GPG', }, {'url' => 'docs/tor-doc-web', - 'txt' => 'Configuring your browser to use Tor', + 'txt' => 'اضبط متصفحك على استخدام تور', }], }, {'url' => 'docs/manual', - 'txt' => 'Manuals', + 'txt' => 'الأدلة', 'subelements' => [ {'url' => 'docs/tor-doc-relay', - 'txt' => 'Configuring a Relay', + 'txt' => 'ضبط تحويلة', }, {'url' => 'docs/tor-hidden-service', - 'txt' => 'Configuring a Hidden Service', + 'txt' => 'ضبط خدمة مخفية', }, {'url' => 'docs/bridges', - 'txt' => 'Configuring a Bridge Relay', + 'txt' => 'ضبط تحويلة جسرية', }, {'url' => 'docs/running-a-mirror', - 'txt' => 'Configuring a Mirror', + 'txt' => 'ضبط مرآة', }, # {'url' => 'docs/tor-manual', -# 'txt' => 'Tor -stable Manual', +# 'txt' => 'تور- دليل الإصدارة الثابتة', # }, {'url' => 'docs/tor-manual-dev', - 'txt' => 'Tor -alpha Manual', + 'txt' => 'تور- دليل الإصدارة ألفا', }, {'url' => 'docs/proxychain', - 'txt' => 'Configuring Tor to use a Proxy Server', + 'txt' => 'ضبط تور على استخدام خادوم وسيط', }], }, { 'url' => '<wiki>', - 'txt' => 'Tor Wiki', + 'txt' => 'ويكي تور', }, {'url' => 'docs/faq', - 'txt' => 'General FAQ', + 'txt' => 'الأسئلة الشائعة العامة', }, {'url' => 'torbutton/torbutton-faq', - 'txt' => 'Torbutton FAQ', + 'txt' => 'الأسئلة الشائعة عن زر تور', }, {'url' => 'docs/faq-abuse', - 'txt' => 'Abuse FAQ', + 'txt' => 'الأسئلة الشائعة عن إساءة الاستخدام', }, {'url' => 'docs/trademark-faq', - 'txt' => 'Trademark FAQ', + 'txt' => 'الأسئلة الشائعة عن العلامة التجارية', }, {'url' => 'eff/tor-legal-faq', - 'txt' => 'Tor Legal FAQ', + 'txt' => 'الأسئلة القانونية الشائعة عن تور', }, {'url' => 'eff/tor-dmca-response', - 'txt' => 'Tor DMCA Response', + 'txt' => 'رد DMCA لتور', }, ]; :> Added: website/trunk/getinvolved/ar/sidenav.wmi =================================================================== --- website/trunk/getinvolved/ar/sidenav.wmi (rev 0) +++ website/trunk/getinvolved/ar/sidenav.wmi 2011-03-16 16:36:41 UTC (rev 24357) @@ -0,0 +1,32 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 24336 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'getinvolved/volunteer', + 'txt' => 'انضم', + }, + {'url' => 'getinvolved/research', + 'txt' => 'ابحث', + }, + {'url' => 'donate/donate', + 'txt' => 'تبرع', + }, + ]; +:>

1 0

[metrics-web/master] Support Torperf's new .data format, too.
by karsten＠torproject.org 16 Mar '11

16 Mar '11

commit bb0e124a8e8c32bf6c4481a4f0d642fb2260f25f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Mar 16 15:30:03 2011 +0100 Support Torperf's new .data format, too. Torperf's new .data format has a 21st column that says whether the run timeout out or not. At the same time, the timestamp in columns 17 and 18 (datacompletesec and datacompleteusec) is set even in the timeout case. We now support both .data formats (even in a single file) by checking how many columns a row has and detecting timeouts accordingly. --- .../torproject/ernie/cron/TorperfProcessor.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/ernie/cron/TorperfProcessor.java b/src/org/torproject/ernie/cron/TorperfProcessor.java index 1883e9c..7caccf6 100644 --- a/src/org/torproject/ernie/cron/TorperfProcessor.java +++ b/src/org/torproject/ernie/cron/TorperfProcessor.java @@ -86,7 +86,7 @@ public class TorperfProcessor { while ((line = br.readLine()) != null) { String[] parts = line.split(" "); // remove defective lines as they occurred on gabelmoo - if (parts.length == 20 && parts[0].length() == 10) { + if (parts.length >= 20 && parts[0].length() == 10) { long startSec = Long.parseLong(parts[0]); String dateTime = formatter.format(startSec * 1000L); long completeMillis = Long.parseLong(parts[16]) @@ -95,7 +95,8 @@ public class TorperfProcessor { + Long.parseLong(parts[1]) / 1000L; String key = source + "," + dateTime; String value = key; - if (parts[16].equals("0")) { + if ((parts.length == 20 && parts[16].equals("0")) || + (parts.length == 21 && parts[20].equals("1"))) { value += ",-2"; // -2 for timeout } else if (Long.parseLong(parts[19]) < receivedBytes) { value += ",-1"; // -1 for failure

1 0

[torperf/master] Update consolidate_stats to new .data and .extradata formats.
by karsten＠torproject.org 16 Mar '11

16 Mar '11

commit 17182144e3f597b74772b1ff9299385f4695fd0d Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Mar 4 18:57:24 2011 -0800 Update consolidate_stats to new .data and .extradata formats. --- consolidate_stats.py | 150 ++++++++++++++++++++++++++++++++++---------------- measurements-HOWTO | 10 +-- 2 files changed, 106 insertions(+), 54 deletions(-) diff --git a/consolidate_stats.py b/consolidate_stats.py old mode 100644 new mode 100755 index 40e8d0a..4c8a990 --- a/consolidate_stats.py +++ b/consolidate_stats.py @@ -1,29 +1,49 @@ -### -# Call this with 4 parameters: the file to read data from, the file to read -# extradata from, the file to write the combined data to, the slack interval -# to match data and extradata timestamps. +#!/usr/bin/python +# +# This script consolidates a .data file and an .extradata file together, +# matching the lines based on the completion time. # -# IMPORTANT: You need to manually sort -g the data file, because torperf -# might screw up ordering and this script expects sorted lines! +# The resulting output will be the union of both files. It will match lines +# where possible, and include unmatched lines from both files as well. +# +# Usage: +# ./consolidate-stats.py <.data file> <.extradata file> <.mergedata file> ### -import sys, time +import sys class Data: def __init__(self, filename, mode="r"): self._filename = filename self._file = open(filename, mode) + self._curData = None + self._retCurrent = False def prepline(self): + if self._retCurrent: + self._retCurrent = False + return self._curData line = self._file.readline() if line == "" or line == "\n": raise StopIteration - if line[-1] == "\n": - line = line[:-1] - return line.split(" ") + line = line.strip() + self._curData = line.split(" ") + return self._curData + + def keepCurrent(self): + self._retCurrent = True + +class TorperfData(Data): + def __init__(self, filename): + Data.__init__(self, filename) + self.fields = "STARTSEC STARTUSEC SOCKETSEC SOCKETUSEC CONNECTSEC CONNECTUSEC NEGOTIATESEC NEGOTIATEUSEC REQUESTSEC REQUESTUSEC RESPONSESEC RESPONSEUSEC DATAREQUESTSEC DATAREQUESTUSEC DATARESPONSESEC DATARESPONSEUSEC DATACOMPLETESEC DATACOMPLETEUSEC WRITEBYTES READBYTES DIDTIMEOUT".split(" ") def next(self): - return self.prepline() + ret = {} + values = self.prepline() + for i in xrange(len(values)): + ret[self.fields[i]] = values[i] + return ret def __iter__(self): return self @@ -31,58 +51,94 @@ class Data: class ExtraData(Data): def __init__(self, filename): Data.__init__(self, filename) - self._curData = None - self._retCurrent = False def next(self): - if self._retCurrent == True: - self._retCurrent = False - return self._curData cont = self.prepline() - if cont[0] == "ok": - self._curData = cont[1:] - return self._curData - print('Ignoring line "' + " ".join(cont) + '"') - return self.next() - def keepCurrent(self): - self._retCurrent = True + ret = {} + for i in cont: + if not "=" in i: + ret[i] = "" + continue + pair = i.split("=") + ret[pair[0]] = pair[1] -class NormalData(Data): - def __init__(self, filename): - Data.__init__(self, filename) + if not "CIRC_ID" in ret: + #print('Ignoring line "' + " ".join(cont) + '"') + return self.next() + return ret -class BetterData(Data): + def __iter__(self): + return self + +class MergeData(Data): def __init__(self, filename): Data.__init__(self, filename, "w") - def writeLine(self, line): + def writeLine(self, data): + line = [] + for key in data.iterkeys(): + line.append(key+"="+data[key]) + line.sort() self._file.write(" ".join(line) + "\n") def main(): - if len(sys.argv) < 5: - print("Bad arguments") + if len(sys.argv) != 4: + print("See script header for usage") sys.exit(1) - normalData = NormalData(sys.argv[1]) - extraData = ExtraData(sys.argv[2]) - betterData = BetterData(sys.argv[3]) - slack = int(sys.argv[4]) - for normal in normalData: - normalTime = int(normal[0]) - for extra in extraData: - extraTime = int(extra[0]) - if normalTime > extraTime: - print("Got unexpected extradata entry" + " ".join(extra)) - continue - if normalTime + slack < extraTime: - print("Got a data entry without extradata " + " ".join(normal)) - extraData.keepCurrent() + torperfdata = TorperfData(sys.argv[1]) + extradata = ExtraData(sys.argv[2]) + mergedata = MergeData(sys.argv[3]) + slack = 1.0 # More than 1s means something is really, really wrong + lastDataTime = 0 + lastExtraTime = 0 + dataLine = 0 + extraLine = 0 + mergedYet = False + for data in torperfdata: + dataLine += 1 + dataEndTime = int(data["DATACOMPLETESEC"]) + dataEndTime += int(data["DATACOMPLETEUSEC"])/1000000.0 + if not dataEndTime: + # Skip failures + continue + + if lastDataTime > dataEndTime: + print "Torperf .data is not monotonic! Sort it by completion time!" + print "Line "+str(dataLine)+" "+str(lastDataTime)+" > "+str(dataEndTime) + sys.exit(0) + lastDataTime = dataEndTime + for extra in extradata: + extraLine += 1 + if not "USED_AT" in extra or not extra["USED_AT"]: + mergedata.writeLine(extra) + continue # Failed circ + + extraEndTime = float(extra["USED_AT"]) + if lastExtraTime > extraEndTime: + print "The .extradata is not monotonic! Sort it by USED_AT!" + print "Line "+str(extraLine)+" "+str(lastExtraTime)+" > "+str(extraEndTime) + sys.exit(0) + lastExtraTime = extraEndTime + if abs(dataEndTime - extraEndTime) > slack: + if dataEndTime < extraEndTime: + if mergedYet: + print("Got a data line at "+str(dataLine)+ " without extradata (line "+str(extraLine)+")") + extradata.keepCurrent() + extraLine -= 1 + mergedata.writeLine(data) + else: + torperfdata.keepCurrent() + dataLine -= 1 + mergedata.writeLine(extra) break - normal.extend(extra) - betterData.writeLine(normal) + + mergedYet = True + data.update(extra) + mergedata.writeLine(data) break - + if __name__ == "__main__": main() diff --git a/measurements-HOWTO b/measurements-HOWTO index 8fc3a24..e8978e3 100644 --- a/measurements-HOWTO +++ b/measurements-HOWTO @@ -211,14 +211,10 @@ 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. +You may want to consolidate a .data file and an .extradata file together +by calling the consolidate-stats script like this: -Call it like this: - -$ ~/torperf/consolidate-stats DATAFILE EXTRADATAFILE OUTFILE SLACK - -Relays are written as $fingerprint=nickname for Named relays and as -$fingerprint~nickname for relays without the Named flag. +$ ~/torperf/consolidate-stats DATAFILE EXTRADATAFILE OUTFILE If everything works, you might want to let your system start these Tor clients on system startup. On Debian, this can be done using a crontab

1 0

[torperf/master] Add a ':' to keep the reasons all part of the 'value' string.
by karsten＠torproject.org 16 Mar '11

16 Mar '11

commit 847b56cce13794adad2f56bb087fca230dbc7f98 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Mar 4 02:12:05 2011 -0800 Add a ':' to keep the reasons all part of the 'value' string. --- extra_stats.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/extra_stats.py b/extra_stats.py index 1ae0142..69bb8a5 100755 --- a/extra_stats.py +++ b/extra_stats.py @@ -121,7 +121,7 @@ class WriteStats(TorCtl.PostEventListener): if event.reason: circ.stream_fail_reason = event.reason if event.remote_reason: - circ.stream_fail_reason += " "+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

1 0

[torperf/master] Add a didtimeout field to .data.
by karsten＠torproject.org 16 Mar '11

16 Mar '11

commit ca4daf2c8d3943d46d84cc2f782fe19244af2553 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Mar 10 02:19:48 2011 -0800 Add a didtimeout field to .data. --- measurements-HOWTO | 2 ++ trivsocks-client.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/measurements-HOWTO b/measurements-HOWTO index ddd014b..8fc3a24 100644 --- a/measurements-HOWTO +++ b/measurements-HOWTO @@ -168,6 +168,7 @@ formatting purposes): 1244638817 164531 1244638826 335235 84 51466 + 0 The column headers might be: @@ -181,6 +182,7 @@ startsec startusec dataresponsesec dataresponseusec datacompletesec datacompleteusec writebytes readbytes + didtimeout The 50kb.extradata, 1mb.extradata, and 5mb.extradata files should accumulate lines with KEY=value pairs describing the following properties: diff --git a/trivsocks-client.c b/trivsocks-client.c index 1310ff9..1c3d895 100644 --- a/trivsocks-client.c +++ b/trivsocks-client.c @@ -267,6 +267,9 @@ struct timeval datacompletetime; // After payload is complete size_t read_bytes; size_t write_bytes; +// Did we get killed by the bash 'timeout' widget? +int didtimeout; + static void output_status_information(void) { @@ -280,7 +283,8 @@ output_status_information(void) print_time(dataresponsetime); print_time(datacompletetime); - printf("%lu %lu\n", (unsigned long)write_bytes, (unsigned long)read_bytes); + printf("%lu %lu ", (unsigned long)write_bytes, (unsigned long)read_bytes); + printf("%d\n", didtimeout); } /** Send a resolve request for <b>hostname</b> to the Tor listening on @@ -407,6 +411,8 @@ do_connect(const char *hostname, const char *filename, uint32_t sockshost, uint1 do_http_get(s, filename, hostname, &read_bytes, &write_bytes, &datarequesttime, &dataresponsetime, &datacompletetime); + didtimeout = 0; + // Output status information output_status_information(); @@ -425,6 +431,13 @@ static void termination_handler(int signum) { fprintf(stderr,"Received a timeout. Exiting.\n"); + didtimeout = 1; + + // Get when response is complete + if (gettimeofday(&datacompletetime, NULL)) { + perror("getting datacompletetime for timeout"); + } + output_status_information(); exit(1);

1 0

[torspec/master] mention the uint32_t -> tor_addr_t transition too
by arma＠torproject.org 15 Mar '11

15 Mar '11

commit ab2e389479d5db84f9a7de5f0e2cf279934d19c6 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Mar 15 17:38:28 2011 -0400 mention the uint32_t -> tor_addr_t transition too --- proposals/ideas/xxx-ipv6-plan.txt | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/proposals/ideas/xxx-ipv6-plan.txt b/proposals/ideas/xxx-ipv6-plan.txt index 26a0359..f88c0b0 100644 --- a/proposals/ideas/xxx-ipv6-plan.txt +++ b/proposals/ideas/xxx-ipv6-plan.txt @@ -41,8 +41,15 @@ What needs to change: dual stack of both IPv4 and IPv6 for interconnection seems like a reasonable step towards a fully hybrid v4/v6 Tor network. - Of course, more issues may be discovered as we develop solutions for these - issues, some of which may need to take priority. + One implementation hurdle that will need to get resolved alongside + these changes is to convert uint32_t to tor_addr_t in many more places + in the Tor code, so we can handle addresses being either IPv4 or IPv6. + There are a few cases, e.g. the local router list, where we'll want + to think harder about the resource requirements of keeping tens of + thousands of larger addresses in memory. + + More issues may of course also be discovered as we develop solutions + for these issues, some of which may need to take priority. Designs that we will need to do:

1 0

[torspec/master] Describe optimistic data protocol. (Text from Ian)
by nickm＠torproject.org 15 Mar '11

15 Mar '11

commit ef0bff2ff3c14934a6cd056d8a9d03151741c675 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 17:23:19 2011 -0400 Describe optimistic data protocol. (Text from Ian) --- tor-spec.txt | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index e889431..cb4c70d 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -797,11 +797,25 @@ see tor-design.pdf. their own cached entries after a fixed interval. This prevents certain attacks.] - The OP waits for a RELAY_CONNECTED cell before sending any data. Once a connection has been established, the OP and exit node package stream data in RELAY_DATA cells, and upon receiving such cells, echo their contents to the corresponding TCP stream. - RELAY_DATA cells sent to unrecognized streams are dropped. + + If the exit node does not support optimistic data (i.e. its + version number is before 0.2.3.1-alpha), then the OP MUST wait + for a RELAY_CONNECTED cell before sending any data. If the exit + node supports optimistic data (i.e. its version number is + 0.2.3.1-alpha or later), then the OP MAY send RELAY_DATA cells + immediately after sending the RELAY_BEGIN cell (and before + receiving either a RELAY_CONNECTED or RELAY_END cell). + + RELAY_DATA cells sent to unrecognized streams are dropped. If + the exit node supports optimistic data, then RELAY_DATA cells it + receives on streams which have seen RELAY_BEGIN but have not yet + been replied to with a RELAY_CONNECTED or RELAY_END are queued. + If the stream creation succeeds with a RELAY_CONNECTED, the queue + is processed immediately afterwards; if the stream creation fails + with a RELAY_END, the contents of the queue are deleted. Relay RELAY_DROP cells are long-range dummies; upon receiving such a cell, the OR or OP must drop it.

1 0

[tor/master] Implement server side of Proposal 174 (optimistic data)
by nickm＠torproject.org 15 Mar '11

15 Mar '11

commit bd7721f66ef94d2f3502197bf23a4cf67813eb9f Author: Ian Goldberg <iang(a)cs.uwaterloo.ca> Date: Mon Mar 14 18:05:33 2011 -0400 Implement server side of Proposal 174 (optimistic data) Ian's original message: The current code actually correctly handles queued data at the Exit; if there is queued data in a EXIT_CONN_STATE_CONNECTING stream, that data will be immediately sent when the connection succeeds. If the connection fails, the data will be correctly ignored and freed. The problem with the current server code is that the server currently drops DATA cells on streams in the EXIT_CONN_STATE_CONNECTING state. Also, if you try to queue data in the EXIT_CONN_STATE_RESOLVING state, bad things happen because streams in that state don't yet have conn->write_event set, and so some existing sanity checks (any stream with queued data is at least potentially writable) are no longer sound. The solution is to simply not drop received DATA cells while in the EXIT_CONN_STATE_CONNECTING state. Also do not send SENDME cells in this state, so that the OP cannot send more than one window's worth of data to be queued at the Exit. Finally, patch the sanity checks so that streams in the EXIT_CONN_STATE_RESOLVING state that have buffered data can pass. [...] Here is a simple patch. It seems to work with both regular streams and hidden services, but there may be other corner cases I'm not aware of. (Do streams used for directory fetches, hidden services, etc. take a different code path?) --- src/or/connection.c | 15 +++++++++++++-- src/or/relay.c | 28 +++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 874e724..ff23646 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3259,7 +3259,13 @@ _connection_write_to_buf_impl(const char *string, size_t len, return; } - connection_start_writing(conn); + /* If we receive optimistic data in the EXIT_CONN_STATE_RESOLVING + * state, we don't want to try to write it right away, since + * conn->write_event won't be set yet. Otherwise, write data from + * this conn as the socket is available. */ + if (conn->write_event) { + connection_start_writing(conn); + } if (zlib) { conn->outbuf_flushlen += buf_datalen(conn->outbuf) - old_datalen; } else { @@ -3835,7 +3841,12 @@ assert_connection_ok(connection_t *conn, time_t now) tor_assert(conn->s < 0); if (conn->outbuf_flushlen > 0) { - tor_assert(connection_is_writing(conn) || conn->write_blocked_on_bw || + /* With optimistic data, we may have queued data in + * EXIT_CONN_STATE_RESOLVING while the conn is not yet marked to writing. + * */ + tor_assert((conn->type == CONN_TYPE_EXIT && + conn->state == EXIT_CONN_STATE_RESOLVING) || + connection_is_writing(conn) || conn->write_blocked_on_bw || (CONN_IS_EDGE(conn) && TO_EDGE_CONN(conn)->edge_blocked_on_circ)); } diff --git a/src/or/relay.c b/src/or/relay.c index ec8e9ac..19f8d41 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1031,6 +1031,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, relay_header_t rh; unsigned domain = layer_hint?LD_APP:LD_EXIT; int reason; + int optimistic_data = 0; /* Set to 1 if we receive data on a stream + that's in the EXIT_CONN_STATE_RESOLVING + or EXIT_CONN_STATE_CONNECTING states.*/ tor_assert(cell); tor_assert(circ); @@ -1050,9 +1053,20 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, /* either conn is NULL, in which case we've got a control cell, or else * conn points to the recognized stream. */ - if (conn && !connection_state_is_open(TO_CONN(conn))) - return connection_edge_process_relay_cell_not_open( - &rh, cell, circ, conn, layer_hint); + if (conn && !connection_state_is_open(TO_CONN(conn))) { + if (conn->_base.type == CONN_TYPE_EXIT && + (conn->_base.state == EXIT_CONN_STATE_CONNECTING || + conn->_base.state == EXIT_CONN_STATE_RESOLVING) && + rh.command == RELAY_COMMAND_DATA) { + /* We're going to allow DATA cells to be delivered to an exit + * node in state EXIT_CONN_STATE_CONNECTING or + * EXIT_CONN_STATE_RESOLVING. This speeds up HTTP, for example. */ + optimistic_data = 1; + } else { + return connection_edge_process_relay_cell_not_open( + &rh, cell, circ, conn, layer_hint); + } + } switch (rh.command) { case RELAY_COMMAND_DROP: @@ -1102,7 +1116,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, log_debug(domain,"circ deliver_window now %d.", layer_hint ? layer_hint->deliver_window : circ->deliver_window); - circuit_consider_sending_sendme(circ, layer_hint); + if (!optimistic_data) { + circuit_consider_sending_sendme(circ, layer_hint); + } if (!conn) { log_info(domain,"data cell dropped, unknown stream (streamid %d).", @@ -1119,7 +1135,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, stats_n_data_bytes_received += rh.length; connection_write_to_buf((char*)(cell->payload + RELAY_HEADER_SIZE), rh.length, TO_CONN(conn)); - connection_edge_consider_sending_sendme(conn); + if (!optimistic_data) { + connection_edge_consider_sending_sendme(conn); + } return 0; case RELAY_COMMAND_END: reason = rh.length > 0 ?

1 0

[tor/master] Revise prop174 patch: make the circuit sendme calls unconditional.
by nickm＠torproject.org 15 Mar '11

15 Mar '11

commit fe9de9231acdd50dcaac5c7908ea9d29f2b21b48 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 14 18:08:27 2011 -0400 Revise prop174 patch: make the circuit sendme calls unconditional. The circuit_consider_sending_sendme call should be unconditional, since the circuit windows can move independent of the state of streams. --- src/or/relay.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index 19f8d41..17ce7db 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1116,9 +1116,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, log_debug(domain,"circ deliver_window now %d.", layer_hint ? layer_hint->deliver_window : circ->deliver_window); - if (!optimistic_data) { - circuit_consider_sending_sendme(circ, layer_hint); - } + circuit_consider_sending_sendme(circ, layer_hint); if (!conn) { log_info(domain,"data cell dropped, unknown stream (streamid %d).", @@ -1135,9 +1133,14 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, stats_n_data_bytes_received += rh.length; connection_write_to_buf((char*)(cell->payload + RELAY_HEADER_SIZE), rh.length, TO_CONN(conn)); + if (!optimistic_data) { - connection_edge_consider_sending_sendme(conn); + /* Only send a SENDME if we're not getting optimistic data; otherwise + * a SENDME could arrive before the CONNECTED. + */ + connection_edge_consider_sending_sendme(conn); } + return 0; case RELAY_COMMAND_END: reason = rh.length > 0 ?

1 0

[tor/master] Add changes file for server-side optimistic data patch
by nickm＠torproject.org 15 Mar '11

15 Mar '11

commit 6a97450cbd764998756386c9e84fa7b887400e74 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 14 18:20:56 2011 -0400 Add changes file for server-side optimistic data patch --- changes/prop174_server | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/prop174_server b/changes/prop174_server new file mode 100644 index 0000000..a2fb39f --- /dev/null +++ b/changes/prop174_server @@ -0,0 +1,6 @@ + o Features: + - Servers now accept and queue data on not-yet-connected + streams. Previously, such data wasn't allowed. This forced + clients to wait for a CONNECTED cell before sending their + data, thus adding a round trip to stream setup. (Patch from + Ian Goldberg; implements the server side of Proposal 174.)

1 0