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

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 08 Mar '12

08 Mar '12

commit 3b1127fae50d05df15b146fa3f5c3c68120cd5d7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 8 11:45:09 2012 +0000 Update translations for vidalia --- eu/vidalia_eu.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 631456f..83370de 100755 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-08 11:07+0000\n" +"PO-Revision-Date: 2012-03-08 11:38+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3586,7 +3586,7 @@ msgstr "Mapeatze portu errelea eguneratzen" msgctxt "UPNPTestDialog" msgid "Test completed successfully!" -msgstr "Froga arrakastaz bukatu da!" +msgstr "Froga arrakastaz burutu da!" msgctxt "UPNPTestDialog" msgid "Testing UPnP Support" @@ -3606,7 +3606,7 @@ msgctxt "UpdateProcess" msgid "" "Vidalia was unable to check for available software updates because Tor's " "update process exited unexpectedly." -msgstr "Vidaliak ezin izan du eskuragarri egon daitzekeen software eguneraketak begiratu Toren eguneraketa prozesua ustekabean irten delako." +msgstr "Vidaliak ezin izan du eskuragarri egon daitezkeen software eguneraketak begiratu Toren eguneraketa prozesua ustekabean irten delako." msgctxt "UpdateProgressDialog" msgid "Checking for available updates..." @@ -3734,11 +3734,11 @@ msgstr "Vidaliak datu fitxategientzako erabiltzen duen direktorioa ezartzen du." msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's pidfile." -msgstr "Vidaliaren pidfitxaren izena eta kokalekua ezartzen ditu." +msgstr "Vidaliaren pidfitxategiaren izena eta kokalekua ezartzen ditu." msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's logfile." -msgstr "Vidaliaren erregistro-fitxaren izena eta kokalekua ezartzen ditu." +msgstr "Vidaliaren erregistro-fitxategiaren izena eta kokalekua ezartzen ditu." msgctxt "Vidalia" msgid "Sets the verbosity of Vidalia's logging."

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 08 Mar '12

08 Mar '12

commit 96605c9539b5458b4a1a3d73ed532f9afc6f6908 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 8 11:15:14 2012 +0000 Update translations for vidalia_completed --- eu/vidalia_eu.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 889f737..631456f 100644 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-07 18:39+0000\n" +"PO-Revision-Date: 2012-03-08 11:07+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2539,7 +2539,7 @@ msgctxt "NetworkPage" msgid "" "You must specify one or more ports to which your firewall allows you to " "connect." -msgstr "Zure Firewallak baimenduko duen portu bat edo gehiago zehaztu behar duzu." +msgstr "Zure Firewallak konektatzea baimentzen dizun portu bat edo gehiago zehaztu behar duzu." msgctxt "NetworkPage" msgid "'%1' is not a valid port number." @@ -2879,7 +2879,7 @@ msgstr "Harremanetarako:" msgctxt "ServerPage" msgid "Name of your relay" -msgstr "IZena eman zure erreleari" +msgstr "Izena eman zure erreleari" msgctxt "ServerPage" msgid "Port on which users and other relays can communicate with your relay" @@ -3402,7 +3402,7 @@ msgid "" "happen if you are behind a router or firewall that requires you to set up " "port forwarding. If %1:%2 is not your correct IP address and directory port," " please check your relay's configuration." -msgstr "Zure errele direktorioa ez dago beste Tor bezeroentzako iritsgarri. Hau portu jarraipena konfiguratzea behar duen router edo firewall baten atzean bazaude gerta daiteke. %1:%2 zure benetazko IP helbidea eta zerbitzari portua ez badira, mesedez egiaztatu zure errelearen konfigurazioa." +msgstr "Zure errele direktorioa ez dago beste Tor bezeroentzako iritsgarri. Hau portu jarraipena konfiguratzea behar duen router edo firewall baten atzean bazaude gerta daiteke. %1:%2 zure benetazko IP helbidea eta direktorio portua ez badira, mesedez egiaztatu zure errelearen konfigurazioa." msgctxt "StatusEventWidget" msgid "Relay Descriptor Rejected"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 08 Mar '12

08 Mar '12

commit adb7940b1cdd266277e19682ccbfc0579c0b1747 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 8 11:15:10 2012 +0000 Update translations for vidalia --- eu/vidalia_eu.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 889f737..631456f 100755 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-07 18:39+0000\n" +"PO-Revision-Date: 2012-03-08 11:07+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2539,7 +2539,7 @@ msgctxt "NetworkPage" msgid "" "You must specify one or more ports to which your firewall allows you to " "connect." -msgstr "Zure Firewallak baimenduko duen portu bat edo gehiago zehaztu behar duzu." +msgstr "Zure Firewallak konektatzea baimentzen dizun portu bat edo gehiago zehaztu behar duzu." msgctxt "NetworkPage" msgid "'%1' is not a valid port number." @@ -2879,7 +2879,7 @@ msgstr "Harremanetarako:" msgctxt "ServerPage" msgid "Name of your relay" -msgstr "IZena eman zure erreleari" +msgstr "Izena eman zure erreleari" msgctxt "ServerPage" msgid "Port on which users and other relays can communicate with your relay" @@ -3402,7 +3402,7 @@ msgid "" "happen if you are behind a router or firewall that requires you to set up " "port forwarding. If %1:%2 is not your correct IP address and directory port," " please check your relay's configuration." -msgstr "Zure errele direktorioa ez dago beste Tor bezeroentzako iritsgarri. Hau portu jarraipena konfiguratzea behar duen router edo firewall baten atzean bazaude gerta daiteke. %1:%2 zure benetazko IP helbidea eta zerbitzari portua ez badira, mesedez egiaztatu zure errelearen konfigurazioa." +msgstr "Zure errele direktorioa ez dago beste Tor bezeroentzako iritsgarri. Hau portu jarraipena konfiguratzea behar duen router edo firewall baten atzean bazaude gerta daiteke. %1:%2 zure benetazko IP helbidea eta direktorio portua ez badira, mesedez egiaztatu zure errelearen konfigurazioa." msgctxt "StatusEventWidget" msgid "Relay Descriptor Rejected"

1 0

[metrics-db/master] Prepare for 'opt' strings being omitted in bridge descriptors.
by karsten＠torproject.org 08 Mar '12

08 Mar '12

commit 9d6c353dd664f83f01697d8ebd005b12303269da Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 8 10:17:40 2012 +0100 Prepare for 'opt' strings being omitted in bridge descriptors. See #5124 for plans to get rid of 'opt' strings in descriptors. Looks like the bridge descriptor sanitizer was the only code relying on them to be there. This is fixed now. --- .../ernie/db/SanitizedBridgesWriter.java | 33 ++++++++++++++------ 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index d70f0ce..7710b82 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -749,7 +749,8 @@ public class SanitizedBridgesWriter { /* Parse the fingerprint to determine the hashed bridge * identity. */ - } else if (line.startsWith("opt fingerprint ")) { + } else if (line.startsWith("opt fingerprint ") || + line.startsWith("fingerprint ")) { String fingerprint = line.substring(line.startsWith("opt ") ? "opt fingerprint".length() : "fingerprint".length()). replaceAll(" ", "").toLowerCase(); @@ -779,7 +780,8 @@ public class SanitizedBridgesWriter { * IP addresses in this execution. */ return; } - scrubbed.append("opt fingerprint"); + scrubbed.append((line.startsWith("opt ") ? "opt " : "") + + "fingerprint"); for (int i = 0; i < hashedBridgeIdentity.length() / 4; i++) scrubbed.append(" " + hashedBridgeIdentity.substring(4 * i, 4 * (i + 1)).toUpperCase()); @@ -808,8 +810,10 @@ public class SanitizedBridgesWriter { /* Replace extra-info digest with the one we know from our * descriptor mapping (which might be all 0's if we didn't parse * the extra-info descriptor before). */ - } else if (line.startsWith("opt extra-info-digest ")) { - scrubbed.append("opt extra-info-digest " + } else if (line.startsWith("opt extra-info-digest ") || + line.startsWith("extra-info-digest ")) { + scrubbed.append((line.startsWith("opt ") ? "opt " : "") + + "extra-info-digest " + mapping.extraInfoDescriptorIdentifier.toUpperCase() + "\n"); @@ -829,12 +833,17 @@ public class SanitizedBridgesWriter { } else if (line.startsWith("accept ") || line.startsWith("platform ") || line.startsWith("opt protocols ") + || line.startsWith("protocols ") || line.startsWith("uptime ") || line.startsWith("bandwidth ") || line.startsWith("opt hibernating ") + || line.startsWith("hibernating ") || line.equals("opt hidden-service-dir") + || line.equals("hidden-service-dir") || line.equals("opt caches-extra-info") - || line.equals("opt allow-single-hop-exits")) { + || line.equals("caches-extra-info") + || line.equals("opt allow-single-hop-exits") + || line.equals("allow-single-hop-exits")) { scrubbed.append(line + "\n"); /* Replace node fingerprints in the family line with their hashes @@ -1202,12 +1211,16 @@ public class SanitizedBridgesWriter { } sb.append(line2 + "\n"); this.descriptorPublicationTimes.add(published); - } else if (line2.startsWith("opt fingerprint ")) { - hashedBridgeIdentity = line2.substring("opt fingerprint". - length()).replaceAll(" ", "").toLowerCase(); + } else if (line2.startsWith("opt fingerprint ") || + line2.startsWith("fingerprint ")) { + hashedBridgeIdentity = line2.substring( + line2.indexOf("fingerprint") + "fingerprint".length()). + replaceAll(" ", "").toLowerCase(); sb.append(line2 + "\n"); - } else if (line2.startsWith("opt extra-info-digest ")) { - sb.append("opt extra-info-digest " + } else if (line2.startsWith("opt extra-info-digest ") || + line2.startsWith("extra-info-digest")) { + sb.append((line2.startsWith("opt ") ? "opt " : "") + + "extra-info-digest " + mapping.extraInfoDescriptorIdentifier.toUpperCase() + "\n"); } else {

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 08 Mar '12

08 Mar '12

commit 7306bf672312e79a3333ef9cf78354541b401c57 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 8 09:15:10 2012 +0000 Update translations for vidalia --- tr/vidalia_tr.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index 87a5315..c1ea52c 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -1,5 +1,6 @@ # Translators: # Translators: +# Caglar Ulkuderner <caglar(a)ulkuderner.net>, 2012. # Deniz <>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" @@ -7,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-02-14 09:46+0000\n" -"Last-Translator: Deniz <>\n" +"PO-Revision-Date: 2012-03-08 08:49+0000\n" +"Last-Translator: Caglar Ulkuderner <caglar(a)ulkuderner.net>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -152,7 +153,7 @@ msgstr "Konum:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" -msgstr "" +msgstr "Unix alanadı soketi kullan (Kontrol Soketi)" msgctxt "AdvancedPage" msgid "Edit current torrc"

1 0

[metrics-db/master] Keep conn-bi-direct lines in sanitized bridge descriptors.
by karsten＠torproject.org 08 Mar '12

08 Mar '12

commit 14aa8276ce96d4e1cc6cf100ae91c8813066f147 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 8 06:57:14 2012 +0100 Keep conn-bi-direct lines in sanitized bridge descriptors. In theory, bridges shouldn't be configured to collect these statistics. But in practice, it doesn't hurt to keep the data in sanitized descriptors. --- .../ernie/db/SanitizedBridgesWriter.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index 0180052..d70f0ce 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -996,7 +996,8 @@ public class SanitizedBridgesWriter { || line.startsWith("read-history ") || line.startsWith("geoip-start-time ") || line.startsWith("geoip-client-origins ") - || line.startsWith("geoip-db-digest ")) { + || line.startsWith("geoip-db-digest ") + || line.startsWith("conn-bi-direct ")) { scrubbed.append(line + "\n"); /* When we reach the signature, we're done. Write the sanitized

1 0

r25512: {website} replace check with obfsproxy. (in website/trunk: en images)
by Andrew Lewman 08 Mar '12

08 Mar '12

Author: phobos Date: 2012-03-08 05:04:09 +0000 (Thu, 08 Mar 2012) New Revision: 25512 Added: website/trunk/images/icon-Obfsproxy.jpg Modified: website/trunk/en/index.wml Log: replace check with obfsproxy. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2012-03-07 15:42:21 UTC (rev 25511) +++ website/trunk/en/index.wml 2012-03-08 05:04:09 UTC (rev 25512) @@ -113,13 +113,16 @@ <p>Site providing an overview of the Tor network.</p> </div> </td> +  <td> <div class="project"> - <a href="https://check.torproject.org/"><img - src="$(IMGROOT)/icon-TorCheck.jpg" alt="Tor Check Icon"></a> - <h3><a href="https://check.torproject.org/">Check</a></h3> - <p>Check determines if you are successfully browsing - with Tor.</p> + <a href="<page projects/obfsproxy>"><img + src="$(IMGROOT)/icon-Obfsproxy.jpg" alt="Obfsproxy Icon"></a> + <h3><a href="<page projects/obfsproxy>">Obfsproxy</a></h3> + <p>Obfsproxy is a tool that attempts to circumvent censorship.</p> </div> </td> </tr> Added: website/trunk/images/icon-Obfsproxy.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/icon-Obfsproxy.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg

1 0

[ooni-probe/master] Add a useful Test template
by art＠torproject.org 08 Mar '12

08 Mar '12

commit 2d2991f65c1c539e1235ec4ef9f2c0ec4b1d02f3 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Mar 6 21:16:45 2012 -0800 Add a useful Test template * Remove useless test example --- tests/exampletest.py | 6 ---- tests/template.py | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/tests/exampletest.py b/tests/exampletest.py deleted file mode 100644 index ff3a89d..0000000 --- a/tests/exampletest.py +++ /dev/null @@ -1,6 +0,0 @@ -# This is an example test that just defines the -# two strings that are used to ouput a descrption -# in the cli interface -__plugoo__ = "this is an example test" -__desc__ = "This is the description of the example test" - diff --git a/tests/template.py b/tests/template.py new file mode 100644 index 0000000..42952bf --- /dev/null +++ b/tests/template.py @@ -0,0 +1,63 @@ +""" + Test Template + ************* + + This is a Test template, to be used when writing your + own OONI probe Tests. +""" +from plugoo.assets import Asset +from plugoo.tests import Test + +__plugoo__ = "Test Template" +__desc__ = "This a test template to be used to build your own tests" + +class TestTemplateAsset(Asset): + """ + This is the asset that should be used by the Test. It will + contain all the code responsible for parsing the asset file + and should be passed on instantiation to the test. + """ + def __init__(self, file=None): + self = asset.__init__(self, file) + + +class TestTemplate(Test): + """ + The main Test class + """ + + def experiment(self, *a, **kw): + """ + Fill this up with the tasks that should be performed + on the "dirty" network and should be compared with the + control. + """ + pass + + def control(self): + """ + Fill this up with the control related code. + """ + pass + +def run(ooni): + """ + This is the function that will be called by OONI + and it is responsible for instantiating and passing + the arguments to the Test class. + """ + config = ooni.config + + # This the assets array to be passed to the run function of + # the test + assets = [TestTemplateAsset(os.path.join(config.main.assetdir, \ + "someasset.txt"))] + + # Instantiate the Test + thetest = TestTemplate(ooni) + ooni.logger.info("starting TestTemplate...") + # Run the test with argument assets + thetest.run(assets) + ooni.logger.info("finished.") + +

1 0

[ooni-probe/master] Code cleanup and error handling
by art＠torproject.org 08 Mar '12

08 Mar '12

commit 465786b5d693d66ecb206f81e69342610478e413 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Mar 6 21:48:00 2012 -0800 Code cleanup and error handling --- plugoo/assets.py | 9 ++++++--- plugoo/reports.py | 10 +++++++--- plugoo/tests.py | 20 +++++++------------- tests/template.py | 8 +++++--- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/plugoo/assets.py b/plugoo/assets.py index 5f93d1b..bb2cb78 100644 --- a/plugoo/assets.py +++ b/plugoo/assets.py @@ -1,5 +1,6 @@ class Asset: - """This is an ooni-probe asset. It is a python + """ + This is an ooni-probe asset. It is a python iterator object, allowing it to be efficiently looped. To create your own custom asset your should subclass this and override the next_asset method and the len method for @@ -16,7 +17,8 @@ class Asset: return self def len(self): - """Returns the length of the asset + """ + Returns the length of the asset """ for i, l in enumerate(self.fh): pass @@ -25,7 +27,8 @@ class Asset: return i + 1 def next_asset(self): - """Return the next asset. + """ + Return the next asset. """ # XXX this is really written with my feet. # clean me up please... diff --git a/plugoo/reports.py b/plugoo/reports.py index 5a9fb8b..90de498 100644 --- a/plugoo/reports.py +++ b/plugoo/reports.py @@ -87,7 +87,8 @@ class Report: def tcp_report(self, data): - """This connect to the specified tcp server + """ + This connect to the specified tcp server and writes the data passed as argument. """ host, port = self.tcp.split(":") @@ -105,7 +106,9 @@ class Report: def scp_report(self, data, rfile=None, mode='a+'): - """Push data to the remote ssh server. + """ + Push data to the remote ssh server. + :rfile the remote filename to write :data the raw data content that should be written :mode in what mode the file should be created @@ -160,7 +163,8 @@ class Report: def send_report(self, data, type): - """This sends the report using the + """ + This sends the report using the specified type. """ #print "Reporting %s to %s" % (data, type) diff --git a/plugoo/tests.py b/plugoo/tests.py index 24986b2..0e87874 100644 --- a/plugoo/tests.py +++ b/plugoo/tests.py @@ -26,17 +26,19 @@ class Test: pass def experiment(self, *a, **b): - """Override this method to write your own + """ + Override this method to write your own Plugoo. """ pass def load_assets(self, assets): - """Takes as input an array of Asset objects and + """ + Takes as input an array of Asset objects and outputs an iterator for the loaded assets. + example: assets = [hostlist, portlist, requestlist] - """ asset_count = len(assets) bigsize = 0 @@ -63,16 +65,6 @@ class Test: else: yield (x) - def srun(self, assets=None, buffer=10, timeout=2): - self.logger.info("Starting %s", self.name) - if assets: - self.logger.debug("Running through tests") - for i, data in enumerate(self.load_assets(assets)): - args = {'data': data} - ret = self.experiment(**args) - print ret - self.report(ret) - def run(self, assets=None, buffer=10, timeout=100000): self.logger.info("Starting %s", self.name) jobs = [] @@ -101,5 +93,7 @@ class Test: self.report(job.value) job.kill() jobs = [] + else: + self.logger.error("No Assets! Dying!") diff --git a/tests/template.py b/tests/template.py index 42952bf..f5f9d93 100644 --- a/tests/template.py +++ b/tests/template.py @@ -5,6 +5,8 @@ This is a Test template, to be used when writing your own OONI probe Tests. """ +import os + from plugoo.assets import Asset from plugoo.tests import Test @@ -18,7 +20,7 @@ class TestTemplateAsset(Asset): and should be passed on instantiation to the test. """ def __init__(self, file=None): - self = asset.__init__(self, file) + self = Asset.__init__(self, file) class TestTemplate(Test): @@ -32,13 +34,13 @@ class TestTemplate(Test): on the "dirty" network and should be compared with the control. """ - pass + return False def control(self): """ Fill this up with the control related code. """ - pass + return True def run(ooni): """

1 0

[ooni-probe/master] Add samples nodes configuration file
by art＠torproject.org 08 Mar '12

08 Mar '12

commit 9c39e48369dde382124438a45ce38e16014d7a03 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Mar 6 21:58:07 2012 -0800 Add samples nodes configuration file --- nodes.conf | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/nodes.conf b/nodes.conf new file mode 100644 index 0000000..4d14be1 --- /dev/null +++ b/nodes.conf @@ -0,0 +1,53 @@ +[control] +# Specify in the list of network nodes to +# be used as control nodes +[[node1]] +address = socks4a://user:password@192.0.2.1 + +[[node2]] +address = socks5://user:password@192.0.2.2 + +[[node3]] +address = ssh://user:password@192.0.2.3 + + +[experiment] +# Specify the list of experiment nodes to +# be used for running tests. +[[countryA]] +address = socks4a://user:password@192.0.2.1 +family = china + +[[countryA1]] +address = socks5://user:password@192.0.2.2 +family = china + +[[countryA2]] +address = ssh://user:password@192.0.2.3 +family = italy + +[operators] +# Specify the list of operator nodes. These are +# the ones capable of accepting bundles of units +# of work and scheduling work to experiment nodes. +[[Local box]] +address = localhost +capacity = 0.2 + +[[Planetlab node]] +address = ssh://user:password@192.0.2.3 +rsakey = ~/.ssh/id_rsa +other = +# Specify an float between 0 and 1 to how much +# work this operator node should support. +capacity = 0.4 + +[[M-Lab server]] +address = ssh://user:password@192.0.2.3 +capacity = 0.5 + + + + + +

1 0