- tor-commits - lists.torproject.org

[tor/master] Add comment about bug4651 fix
by nickm＠torproject.org 05 Dec '11

05 Dec '11

commit 15d99fe4eb0e969322f401bc5d5b497d5cfc9f71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 5 11:29:43 2011 -0500 Add comment about bug4651 fix --- src/or/circuituse.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 0bc416d..bdff75c 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1017,6 +1017,14 @@ circuit_has_opened(origin_circuit_t *circ) switch (TO_CIRCUIT(circ)->purpose) { case CIRCUIT_PURPOSE_C_ESTABLISH_REND: rend_client_rendcirc_has_opened(circ); + /* XXXX We'd like to set something like "can_try_clearing_isolation" + * here, so that we can change the isolation of this circuit (and maybe + * its purpose too) if it turns out that we no longer have any streams + * that want to use it. But connection_ap_attach_pending() doesn't + * actually attach streams to a C_ESTABLISH_REND circuit-- streams + * don't get attached until the circuit is in C_REND_JOINED... so + * we can't clear isolation now. + */ connection_ap_attach_pending(); break; case CIRCUIT_PURPOSE_C_INTRODUCING:

1 0

[metrics-web/master] Consider all bwauth* consensus params to be valid.
by karsten＠torproject.org 05 Dec '11

05 Dec '11

commit 6aec8a94f60c70da9d187952093cc5024fa1e7f7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 5 14:48:25 2011 +0100 Consider all bwauth* consensus params to be valid. Once the set of bwauth-related consensus parameters has stabilized we should put in just the valid parameters. But updating the set every two weeks doesn't help anyone. --- src/org/torproject/chc/Checker.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/chc/Checker.java b/src/org/torproject/chc/Checker.java index c7a2d00..02c70b7 100644 --- a/src/org/torproject/chc/Checker.java +++ b/src/org/torproject/chc/Checker.java @@ -179,9 +179,8 @@ public class Checker { ("circwindow,CircuitPriorityHalflifeMsec,refuseunknownexits," + "cbtdisabled,cbtnummodes,cbtrecentcount,cbtmaxtimeouts," + "cbtmincircs,cbtquantile,cbtclosequantile,cbttestfreq," - + "cbtmintimeout,cbtinitialtimeout,perconnbwburst,perconnbwrate," - + "bwauthpid,bwauthbestratio,bwauthcircs,bwauthkp,bwauthtd," - + "bwauthti,bwauthtidecay,bwauthdescbw").split(","))); + + "cbtmintimeout,cbtinitialtimeout,perconnbwburst,perconnbwrate"). + split(","))); SortedSet<String> conflicts = new TreeSet<String>(); for (Status vote : this.downloadedVotes) { Map<String, String> voteConsensusParams = @@ -194,7 +193,8 @@ public class Checker { e.getKey()) || !downloadedConsensus.getConsensusParams().get(e.getKey()). equals(e.getValue()) || - !validParameters.contains(e.getKey())) { + (!validParameters.contains(e.getKey()) && + !e.getKey().startsWith("bwauth"))) { StringBuilder message = new StringBuilder(); message.append(vote.getNickname()); for (Map.Entry<String, String> p :

1 0

r25243: {website} fix grammar in faq entry (website/trunk/docs/en)
by Roger Dingledine 05 Dec '11

05 Dec '11

Author: arma Date: 2011-12-05 00:59:37 +0000 (Mon, 05 Dec 2011) New Revision: 25243 Modified: website/trunk/docs/en/faq.wml Log: fix grammar in faq entry Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-12-02 18:48:55 UTC (rev 25242) +++ website/trunk/docs/en/faq.wml 2011-12-05 00:59:37 UTC (rev 25243) @@ -1090,12 +1090,13 @@ <h3><a class="anchor" href="#DoesntWork">I installed Tor but it's not working.</a></h3> <p> -Once you've got the Tor bundle up and running, the first questions to ask is if -your Tor is able to establish a circuit? +Once you've got the Tor bundle up and running, the first question to +ask is whether your Tor client is able to establish a circuit. </p> <p>If Tor can establish a circuit, the onion icon in -Vidalia will turn green. You can also check in the Vidalia +Vidalia will turn green (and if you're running Tor Browser Bundle, it will +automatically launch a browser for you). You can also check in the Vidalia Control Panel to make sure it says "Connected to the Tor network!" under Status. For those not using Vidalia, check your <a href="#Logs">Tor logs</a> for @@ -1113,7 +1114,8 @@ <li>Check your system clock. If it's more than a few hours off, Tor will refuse to build circuits. For Microsoft Windows users, synchronize your clock under the clock -> Internet time tab. In addition, correct the -day and date under the 'Date & Time' Tab.</li> +day and date under the 'Date & Time' Tab. Also make sure your time +zone is correct.</li> <li>Is your Internet connection <a href="#FirewallPorts">firewalled by port</a>, or do you normally need to use a <a href="<wikifaq>#MyInternetconnectionrequiresanHTTPorSOCKSproxy.">proxy</a>?

1 0

[torflow/master] Clean up the spec a tad.
by mikeperry＠torproject.org 04 Dec '11

04 Dec '11

commit 2d4b7ba817e6c398f5b0137d893d96957ac2adf7 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Dec 3 18:13:37 2011 -0800 Clean up the spec a tad. --- NetworkScanners/BwAuthority/README.spec.txt | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.spec.txt b/NetworkScanners/BwAuthority/README.spec.txt index 5eb0661..a1b732e 100644 --- a/NetworkScanners/BwAuthority/README.spec.txt +++ b/NetworkScanners/BwAuthority/README.spec.txt @@ -371,10 +371,6 @@ The bandwidth authorities measure F_node: the filtered stream capacity through a given node (filtering is described in Section 1.6). - In PID control, we add in this extra failure rate as a damper, to prevent - the PID control system from driving nodes to CPU overload. Once nodes - begin failing circuits, we want to stop devoting more capacity. - The PID Setpoint, or target for each node is F_avg: the average F_node value observed across the entire network. @@ -412,9 +408,9 @@ hours. Since the bandwidth authorities also take on the order of hours to measure a slice of nodes, we do nothing special here. - For Guard nodes however, clients have minimum rotation rate of 4-6 + For Guard nodes however, clients try to keep their Guards for 4-6 weeks. However, on the assumption that they rotate more frequently - than this, we set our Guard feedback interval to 2 weeks. + than this in practice, we set our Guard feedback interval to 2 weeks. Guard measurements are also used without feedback whenever new measurements are available, to compensate for changes in Guard flag @@ -428,7 +424,7 @@ determining when to report a measurement. The integral component, pid_error_sum is subjected to a decay factor - of 20% per interval, to prevent unbounded growth in cases without + per each interval, to prevent unbounded growth in cases without convergence. The differential component is a simple delta, calculating by @@ -521,6 +517,11 @@ of the circ_error and the original pid_error as the new pid_error. + We use this to prevent the PID control system from driving nodes + to CPU overload. Once nodes begin failing circuits, we want to stop + devoting additional capacity to them (and decrease it proportional + to their failure rate relative to the rest of the network). + "bwauthbestratio=0" If absent, the larger of stream bandwidth vs filtered bandwidth is used to compute F_node.

1 0

[torflow/master] Allow us to cap feedback via consensus param.
by mikeperry＠torproject.org 04 Dec '11

04 Dec '11

commit 0300422f1f9a1c9ab6df2344a343898ee545082f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Dec 3 16:53:44 2011 -0800 Allow us to cap feedback via consensus param. Also demote a couple logs, and add a couple more. --- NetworkScanners/BwAuthority/README.spec.txt | 7 +++++++ NetworkScanners/BwAuthority/aggregate.py | 22 ++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.spec.txt b/NetworkScanners/BwAuthority/README.spec.txt index e46994c..5eb0661 100644 --- a/NetworkScanners/BwAuthority/README.spec.txt +++ b/NetworkScanners/BwAuthority/README.spec.txt @@ -577,3 +577,10 @@ for the values of T_i that are relevant to us. If T_i is 0 or absent, K_i_decay is set to 0. + + "bwauthpidmax=N" + Caps pid_error_sum feedback to N/10000.0. Can be used to prevent + runaway feedback loops for fast nodes. + + If absent, the default is 500.0, which translates to a 501X + multiplier of descriptor bandwidth. diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index ca26b2d..7af68aa 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -242,6 +242,7 @@ class ConsensusJunk: self.use_desc_bw = True self.use_mercy = False + self.pid_max = 500.0 self.K_p = K_p self.T_i = T_i self.T_d = T_d @@ -283,6 +284,9 @@ class ConsensusJunk: elif p.startswith("bwauthtidecay="): self.T_i_decay = (int(p.split("=")[1])/10000.0) plog("INFO", "Got T_i_decay=%f from consensus." % self.T_i_decay) + elif p.startswith("bwauthpidmax="): + self.pid_max = (int(p.split("=")[1])/10000.0) + plog("INFO", "Got pid_max=%f from consensus." % self.pid_max) except: plog("NOTICE", "Bw auth PID control disabled due to parse error.") traceback.print_exc() @@ -596,8 +600,22 @@ def main(argv): # If node was demoted in the past and we plan to demote it again, # let's just not and say we did. if n.desc_bw > n.ns_bw and n.pid_error < 0: + plog("INFO", "Showing mercy for node "+n.nick+"="+n.idhex) n.use_bw = n.desc_bw if n.pid_error_sum < 0 and n.pid_error < 0: + plog("INFO", "Showing mercy for node "+n.nick+"="+n.idhex+", pid_error_sum="+str(n.pid_error_sum)) + n.pid_error_sum = 0 + + # Similarly, don't accumulate too much amplification for + # fast nodes + if cs_junk.use_desc_bw: + if n.pid_error_sum > cs_junk.pid_max and n.pid_error > 0: + plog("INFO", "Capping feedback for node "+n.nick+"="+n.idhex+", pid_error_sum="+str(n.pid_error_sum)) + n.pid_error_sum = cs_junk.pid_max + else: + if float(n.ns_bw)/n.desc_bw > cs_junk.pid_max and n.pid_error > 0: + plog("INFO", "Capping feedback for node "+n.nick+"="+n.idhex) + n.pid_error = 0 n.pid_error_sum = 0 if n.idhex in prev_votes.vote_map: @@ -669,7 +687,7 @@ def main(argv): n.new_bw = n.use_bw + cs_junk.K_p*n.use_bw*n.pid_error n.pid_error_sum = n.pid_error n.pid_bw = n.new_bw - plog("INFO", "No prev vote for node "+n.nick+": Consensus feedback") + plog("DEBUG", "No prev vote for node "+n.nick+": Consensus feedback") else: # No PID feedback # Choose the larger between sbw and fbw if n.sbw_ratio > n.fbw_ratio: @@ -694,7 +712,7 @@ def main(argv): plog("INFO", "Skipping voting for guard "+n.nick) n.ignore = True elif "Authority" in prev_consensus[n.idhex].flags: - plog("INFO", "Skipping voting for authority "+n.nick) + plog("DEBUG", "Skipping voting for authority "+n.nick) n.ignore = True # Go through the list and cap them to NODE_CAP

1 0

[torflow/master] Make the pid target bw actually converge.
by mikeperry＠torproject.org 03 Dec '11

03 Dec '11

commit 063ea9bca63343996a8e3e3f6d3c2142bad8681e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Dec 2 17:04:04 2011 -0800 Make the pid target bw actually converge. This seems to only take a few seconds to do.. Expensive, but probably not prohibitively so? --- NetworkScanners/BwAuthority/README.spec.txt | 2 +- NetworkScanners/BwAuthority/aggregate.py | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.spec.txt b/NetworkScanners/BwAuthority/README.spec.txt index bc94eee..e46994c 100644 --- a/NetworkScanners/BwAuthority/README.spec.txt +++ b/NetworkScanners/BwAuthority/README.spec.txt @@ -545,7 +545,7 @@ "bwauthpidtgt=1" If present, the PID setpoint bandwidth F_avg will be re-computed by averaging the F_node values for only those nodes whose - descriptor bandwidth exceeds the F_avg computed from Section 3.1. + descriptor bandwidth exceeds the F_avg. Note that this parameter causes bwauthbestratio to have no effect. diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 1dc39ca..ca26b2d 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -482,9 +482,14 @@ def main(argv): true_circ_avg[cl] = sum(map(lambda n: (1.0-n.circ_fail_rate), c_nodes))/float(len(c_nodes)) - f_nodes = filter(lambda n: n.desc_bw >= true_filt_avg[cl], c_nodes) + # FIXME: This may be expensive + pid_tgt_avg[cl] = true_filt_avg[cl] + prev_pid_avg = 2*pid_tgt_avg[cl] - pid_tgt_avg[cl] = sum(map(lambda n: n.filt_bw, f_nodes))/float(len(f_nodes)) + while prev_pid_avg > pid_tgt_avg[cl]: + f_nodes = filter(lambda n: n.desc_bw >= pid_tgt_avg[cl], c_nodes) + prev_pid_avg = pid_tgt_avg[cl] + pid_tgt_avg[cl] = sum(map(lambda n: n.filt_bw, f_nodes))/float(len(f_nodes)) plog("INFO", "Network true_filt_avg["+cl+"]: "+str(true_filt_avg[cl])) plog("INFO", "Network pid_tgt_avg["+cl+"]: "+str(pid_tgt_avg[cl])) @@ -494,9 +499,15 @@ def main(argv): strm_avg = sum(map(lambda n: n.strm_bw, nodes.itervalues()))/float(len(nodes)) circ_avg = sum(map(lambda n: (1.0-n.circ_fail_rate), nodes.itervalues()))/float(len(nodes)) - f_nodes = filter(lambda n: n.desc_bw >= strm_avg, nodes.itervalues) - pid_avg = sum(map(lambda n: n.filt_bw, f_nodes))/float(len(f_nodes)) + # FIXME: This may be expensive + pid_avg = filt_avg + prev_pid_avg = 2*pid_avg + + while prev_pid_avg > pid_avg: + f_nodes = filter(lambda n: n.desc_bw >= pid_avg, c_nodes) + prev_pid_avg = pid_avg + pid_avg = sum(map(lambda n: n.filt_bw, f_nodes))/float(len(f_nodes)) for cl in ["Guard+Exit", "Guard", "Exit", "Middle"]: true_filt_avg[cl] = filt_avg

1 0

[torflow/master] Be more merciful.
by mikeperry＠torproject.org 03 Dec '11

03 Dec '11

commit 0e2cb272706083f68ce4b7a8244403580ce37f1b Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Dec 2 16:35:09 2011 -0800 Be more merciful. We can just check to see if we've previously punished the node by inspecting the previous values directly. Forgot about that. --- NetworkScanners/BwAuthority/README.spec.txt | 3 --- NetworkScanners/BwAuthority/aggregate.py | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.spec.txt b/NetworkScanners/BwAuthority/README.spec.txt index 64827cb..bc94eee 100644 --- a/NetworkScanners/BwAuthority/README.spec.txt +++ b/NetworkScanners/BwAuthority/README.spec.txt @@ -555,9 +555,6 @@ nodes with already negative pid_error. This prevents us from punishing relays down to 0 bandwidth. - Note that this parameter has no effect unless you omit bwauthnsbw=1 - and also set a bwauthti value of non-zero. - "bwauthkp=N" Sets K_p to N/10000.0. If absent, K_p=1.0. diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index b3692e8..1dc39ca 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -582,8 +582,10 @@ def main(argv): # Don't punish gimpy nodes too hard if cs_junk.use_mercy: if not cs_junk.use_desc_bw: - plog("WARN", - "Can't be merciful w/ NS feedback! Set bwauthnsbw=0 and bwauthti!=0") + # If node was demoted in the past and we plan to demote it again, + # let's just not and say we did. + if n.desc_bw > n.ns_bw and n.pid_error < 0: + n.use_bw = n.desc_bw if n.pid_error_sum < 0 and n.pid_error < 0: n.pid_error_sum = 0

1 0

[torflow/master] Add a consensus param to raise the PID setpoint.
by mikeperry＠torproject.org 03 Dec '11

03 Dec '11

commit 65b9670fc3db3708c4f069ce27dd06a788926415 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Dec 2 15:58:58 2011 -0800 Add a consensus param to raise the PID setpoint. Intuitively, it seems to make sense to exclude nodes with no chance of reaching the setpoint from consideration. --- NetworkScanners/BwAuthority/README.spec.txt | 8 ++++++ NetworkScanners/BwAuthority/aggregate.py | 32 ++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.spec.txt b/NetworkScanners/BwAuthority/README.spec.txt index ddaa7cc..175a9fb 100644 --- a/NetworkScanners/BwAuthority/README.spec.txt +++ b/NetworkScanners/BwAuthority/README.spec.txt @@ -542,6 +542,14 @@ of Guard, Middle, Exit, and Guard+Exit nodes, and uses these flag-specific averages to compute pid_error. + "bwauthpidtgt=1" + If present, the PID setpoint bandwidth F_avg will be re-computed + by averaging the F_node values for only those nodes whose + descriptor bandwidth exceeds the F_avg computed from Section 3.1. + + Note that this parameter causes bwauthbestratio to have no + effect. + "bwauthkp=N" Sets K_p to N/10000.0. If absent, K_p=1.0. diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 884b065..615a157 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -234,6 +234,7 @@ class ConsensusJunk: cs_bytes = c.sendAndRecv("GETINFO dir/status-vote/current/consensus\r\n")[0][2] self.bwauth_pid_control = True self.group_by_class = False + self.use_pid_tgt = False self.use_circ_fails = False self.use_best_ratio = True self.use_desc_bw = True @@ -261,6 +262,9 @@ class ConsensusJunk: elif p == "bwauthbyclass=1": self.group_by_class = True plog("INFO", "Grouping nodes by flag-class") + elif p == "bwauthpidtgt=1": + self.use_pid_tgt = True + plog("INFO", "Using filtered PID target") elif p.startswith("bwauthkp="): self.K_p = int(p.split("=")[1])/10000.0 plog("INFO", "Got K_p=%f from consensus." % self.K_p) @@ -454,6 +458,7 @@ def main(argv): nodes[idhex].flags = prev_consensus[idhex].flags true_filt_avg = {} + pid_tgt_avg = {} true_strm_avg = {} true_circ_avg = {} @@ -470,18 +475,31 @@ def main(argv): true_strm_avg[cl] = sum(map(lambda n: n.strm_bw, c_nodes))/float(len(c_nodes)) true_circ_avg[cl] = sum(map(lambda n: (1.0-n.circ_fail_rate), c_nodes))/float(len(c_nodes)) + + f_nodes = filter(lambda n: n.desc_bw >= true_filt_avg[cl], c_nodes) + + pid_tgt_avg[cl] = sum(map(lambda n: n.filt_bw, f_nodes))/float(len(f_nodes)) + plog("INFO", "Network true_filt_avg["+cl+"]: "+str(true_filt_avg[cl])) + plog("INFO", "Network pid_tgt_avg["+cl+"]: "+str(pid_tgt_avg[cl])) plog("INFO", "Network true_circ_avg["+cl+"]: "+str(true_circ_avg[cl])) else: filt_avg = sum(map(lambda n: n.filt_bw, nodes.itervalues()))/float(len(nodes)) strm_avg = sum(map(lambda n: n.strm_bw, nodes.itervalues()))/float(len(nodes)) circ_avg = sum(map(lambda n: (1.0-n.circ_fail_rate), nodes.itervalues()))/float(len(nodes)) + f_nodes = filter(lambda n: n.desc_bw >= strm_avg, nodes.itervalues) + + pid_avg = sum(map(lambda n: n.filt_bw, f_nodes))/float(len(f_nodes)) + for cl in ["Guard+Exit", "Guard", "Exit", "Middle"]: true_filt_avg[cl] = filt_avg true_strm_avg[cl] = strm_avg true_circ_avg[cl] = circ_avg + pid_tgt_avg[cl] = pid_avg + plog("INFO", "Network true_filt_avg: "+str(true_filt_avg["Middle"])) + plog("INFO", "Network pid_tgt_avg: "+str(pid_tgt_avg["Middle"])) plog("INFO", "Network true_circ_avg: "+str(true_circ_avg["Middle"])) else: plog("INFO", "PID control disabled") @@ -535,12 +553,16 @@ def main(argv): else: n.use_bw = n.ns_bw - if cs_junk.use_best_ratio and n.sbw_ratio > n.fbw_ratio: - n.pid_error = (n.strm_bw - true_strm_avg[n.node_class()]) \ - / true_strm_avg[n.node_class()] + if cs_junk.use_pid_tgt: + n.pid_error = (n.filt_bw - pid_tgt_avg[n.node_class()]) \ + / pid_tgt_avg[n.node_class()] else: - n.pid_error = (n.filt_bw - true_filt_avg[n.node_class()]) \ - / true_filt_avg[n.node_class()] + if cs_junk.use_best_ratio and n.sbw_ratio > n.fbw_ratio: + n.pid_error = (n.strm_bw - true_strm_avg[n.node_class()]) \ + / true_strm_avg[n.node_class()] + else: + n.pid_error = (n.filt_bw - true_filt_avg[n.node_class()]) \ + / true_filt_avg[n.node_class()] # Penalize nodes for circ failure rate if cs_junk.use_circ_fails:

1 0

[torflow/master] Implement mercy, subject to consensus parameter.
by mikeperry＠torproject.org 03 Dec '11

03 Dec '11

commit 0e0564672f92ef8332b0707e7ad5ddfa0e25dd68 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Dec 2 16:17:16 2011 -0800 Implement mercy, subject to consensus parameter. If the param is set, we don't accumulate negative pid_error_sum for nodes with negative pid_error. Prevents us from punishing these nodes to 0 bw. The param only makes sense for descriptor-based feedback. --- NetworkScanners/BwAuthority/README.spec.txt | 8 ++++++++ NetworkScanners/BwAuthority/aggregate.py | 22 ++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.spec.txt b/NetworkScanners/BwAuthority/README.spec.txt index 175a9fb..64827cb 100644 --- a/NetworkScanners/BwAuthority/README.spec.txt +++ b/NetworkScanners/BwAuthority/README.spec.txt @@ -550,6 +550,14 @@ Note that this parameter causes bwauthbestratio to have no effect. + "bwauthmercy=1" + If present, we do not accumulate a negative pid_error_sum for + nodes with already negative pid_error. This prevents us from + punishing relays down to 0 bandwidth. + + Note that this parameter has no effect unless you omit bwauthnsbw=1 + and also set a bwauthti value of non-zero. + "bwauthkp=N" Sets K_p to N/10000.0. If absent, K_p=1.0. diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 615a157..b3692e8 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -123,14 +123,16 @@ class Node: + kd*self.use_bw*self.pid_delta self.prev_error = prev_vote.pid_error - # We decay the interval each round to keep it bounded. - # This decay is non-standard. We do it to avoid overflow - self.pid_error_sum = prev_vote.pid_error_sum*kidecay + self.pid_error self.pid_bw = self.use_bw \ + kp*self.use_bw*self.pid_error \ + ki*self.use_bw*self.integral_error() \ + kd*self.use_bw*self.d_error_dt() + + # We decay the interval each round to keep it bounded. + # This decay is non-standard. We do it to avoid overflow + self.pid_error_sum = prev_vote.pid_error_sum*kidecay + self.pid_error + return self.pid_bw def node_class(self): @@ -238,6 +240,7 @@ class ConsensusJunk: self.use_circ_fails = False self.use_best_ratio = True self.use_desc_bw = True + self.use_mercy = False self.K_p = K_p self.T_i = T_i @@ -252,7 +255,7 @@ class ConsensusJunk: self.bwauth_pid_control = False elif p == "bwauthnsbw=1": self.use_desc_bw = False - plog("INFO", "Using descriptor bandwidth") + plog("INFO", "Using NS bandwidth directly for feedback") elif p == "bwauthcircs=1": self.use_circ_fails = True plog("INFO", "Counting circuit failures") @@ -265,6 +268,9 @@ class ConsensusJunk: elif p == "bwauthpidtgt=1": self.use_pid_tgt = True plog("INFO", "Using filtered PID target") + elif p == "bwauthmercy=1": + self.use_mercy = True + plog("INFO", "Showing mercy on gimpy nodes") elif p.startswith("bwauthkp="): self.K_p = int(p.split("=")[1])/10000.0 plog("INFO", "Got K_p=%f from consensus." % self.K_p) @@ -573,6 +579,14 @@ def main(argv): if circ_error < 0: n.pid_error = min(circ_error,n.pid_error) + # Don't punish gimpy nodes too hard + if cs_junk.use_mercy: + if not cs_junk.use_desc_bw: + plog("WARN", + "Can't be merciful w/ NS feedback! Set bwauthnsbw=0 and bwauthti!=0") + if n.pid_error_sum < 0 and n.pid_error < 0: + n.pid_error_sum = 0 + if n.idhex in prev_votes.vote_map: # If there is a new sample, let's use it for all but guards if n.measured_at > prev_votes.vote_map[n.idhex].measured_at:

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 02 Dec '11

02 Dec '11

commit 0cdfe8c9af70ecb8e35bfdd3eb6cfd9cea6323ec Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 2 23:15:03 2011 +0000 Update translations for gettor --- cs/gettor.po | 47 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 14 deletions(-) diff --git a/cs/gettor.po b/cs/gettor.po index a63a91a..2b603c4 100644 --- a/cs/gettor.po +++ b/cs/gettor.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2011-12-02 22:44+0000\n" +"PO-Revision-Date: 2011-12-02 23:01+0000\n" "Last-Translator: Mirek2 <mazelm(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "" +msgstr "Ahoj, toto je \"GetTor\" robot." #: lib/gettor/i18n.py:29 msgid "Thank you for your request." @@ -379,11 +379,7 @@ msgid "" "\n" " http://www.7-zip.org/" msgstr "" -"Nejjednodušší způsob, jak rozbalit soubory, které jste obdržel(a)\n" -"\n" -"The easiest way to unpack the files you received is to install 7-Zip,\n" -"a free file compression/uncompression tool. If it isn't installed on\n" -"your computer yet, you can download it here:\n" +"Nejjednodušší způsob, jak rozbalit soubory, které jste obdržel(a), je instalací 7-Zip, bezplatného komprimačního programu. Pokud ho ještě nemáte na počítači nainstalovaný, můžete ho stáhnout zde:\n" "\n" " http://www.7-zip.org/" @@ -392,6 +388,8 @@ msgid "" "When 7-Zip is installed, you can open the .z archive you received from\n" "us by double-clicking on it." msgstr "" +"Poté, co se nainstaluje 7-Zip, můžete otevřít .z archiv, který jste " +"obdrželi, dvojtým klikem." #: lib/gettor/i18n.py:205 msgid "" @@ -400,12 +398,18 @@ msgid "" "\"windows.zip\". You should then be able to extract the archive with common \n" "file archiver programs that probably are already installed on your computer." msgstr "" +"Alternativní způsob extrahování .z souborů je jejich přejmenování na .zip. " +"Např. když jste obdrželi soubor s názvem \"windows.z\", přejmenujte ho na " +"\"windows.zip\". Poté byste měli moct extrahovat archiv pomocí archivačních " +"programů, které pravděpodobně už na počítači máte nainstalované." #: lib/gettor/i18n.py:210 msgid "" "Please reply to this mail, and tell me a single package name anywhere\n" "in your reply. Here's a short explanation of what these packages are:" msgstr "" +"Prosím odpovězte na tento e-mail a zmiňte jméno jednoho balíčku kdekoliv ve " +"Vaší odpovědi. Zde je krátké vysvětlení toho, co tyto balíčky jsou zač:" #: lib/gettor/i18n.py:213 msgid "" @@ -414,6 +418,9 @@ msgid "" "running some version of Windows, like Windows XP, Windows Vista or \n" "Windows 7, this is the package you should get." msgstr "" +"windows:\n" +"Balíček Tor Browser Bundle pro operační systémy Windows. Pokud používáte nějakou verzi Windows, např. Windows XP, Windows Vistu či \n" +"Windows 7, pak se vám bude hodit tento balíček." #: lib/gettor/i18n.py:218 msgid "" @@ -434,6 +441,8 @@ msgid "" "linux-i386:\n" "The Tor Browser Bundle package for Linux, 32bit versions." msgstr "" +"linux-i386:\n" +"Balíček Tor Browser Bundle pro Linux, 32-bitové verze." #: lib/gettor/i18n.py:229 msgid "" @@ -446,26 +455,32 @@ msgid "" "linux-x86_64:\n" "The Tor Browser Bundle package for Linux, 64bit versions." msgstr "" +"linux-x86_64:\n" +"Balíček Tor Browser Bundle pro Linux, 64-bitové verze." #: lib/gettor/i18n.py:235 msgid "" "source:\n" "The Tor source code, for experts. Most users do not want this package." msgstr "" +"source:\n" +"Zdrojový kód toru, pro experty. Většina uživatelů nechce tento balíček." #: lib/gettor/i18n.py:238 msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" msgstr "" +"ČASTO KLADENÉ OTÁZKY\n" +"==========================" #: lib/gettor/i18n.py:241 msgid "What is Tor?" -msgstr "" +msgstr "Co je Tor?" #: lib/gettor/i18n.py:243 msgid "The name \"Tor\" can refer to several different components." -msgstr "" +msgstr "Název \"Tor\" se může vztahovat k několika jiným součástem." #: lib/gettor/i18n.py:245 msgid "" @@ -482,7 +497,7 @@ msgstr "" #: lib/gettor/i18n.py:255 msgid "What is the Tor Browser Bundle?" -msgstr "" +msgstr "Co je Tor Browser Bundle?" #: lib/gettor/i18n.py:257 msgid "" @@ -493,7 +508,7 @@ msgstr "" #: lib/gettor/i18n.py:261 msgid "What package should I request?" -msgstr "" +msgstr "Jaký balíček bych měl(a) požadovat?" #: lib/gettor/i18n.py:263 msgid "" @@ -502,18 +517,22 @@ msgid "" "is a short explanation of all packages to request and what operating \n" "systems there are suitable for:" msgstr "" +"To záleží na operačním systému, který používáte. Například pokud váš " +"operační systém je Microsoft Windows, měl(a) byste požadovat \"windows\". " +"Zde je krátké vysvětlení všech balíčků, které můžete požadovat a ke kterým " +"operačním systémům patří." #: lib/gettor/i18n.py:268 msgid "How do I extract the file(s) you sent me?" -msgstr "" +msgstr "Jak extrahuji soubory, které jste mi poslali?" #: lib/gettor/i18n.py:270 msgid "QUESTION:" -msgstr "" +msgstr "OTÁZKA:" #: lib/gettor/i18n.py:272 msgid "ANSWER:" -msgstr "" +msgstr "ODPOVĚĎ:" #: lib/gettor/i18n.py:274 #, python-format

1 0