- tor-commits - lists.torproject.org

[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 03 Dec '11

03 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

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

03 Dec '11

commit eff0429b234bb7bd7abee9713ffc846a85011079 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 2 22:45:03 2011 +0000 Update translations for gettor --- cs/gettor.po | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/cs/gettor.po b/cs/gettor.po index 931ea98..a63a91a 100644 --- a/cs/gettor.po +++ b/cs/gettor.po @@ -5,13 +5,14 @@ # Translators: # <gsanky+transifex(a)gmail.com>, 2011. # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +# <mazelm(a)gmail.com>, 2011. msgid "" 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-11-19 10:28+0000\n" -"Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" +"PO-Revision-Date: 2011-12-02 22:44+0000\n" +"Last-Translator: Mirek2 <mazelm(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "" #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "" +msgstr "Děkujeme za vaší žádost." #: lib/gettor/i18n.py:31 msgid "" @@ -33,6 +34,8 @@ msgid "" "an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" "one of those." msgstr "" +"Naneštěstí Vám neodpovíme na tuto adresu. Měli byste si vytvořit účet na " +"GMAIL.COM, YAHOO.COM či YAHOO.CN a odeslat mail z něj." #: lib/gettor/i18n.py:35 msgid "" @@ -72,18 +75,31 @@ msgid "" " linux-x86_64\n" " source" msgstr "" +"Pošlu Vám Tor balíček, když mi řeknete, jaký chcete.\n" +"Prosím vyberte jeden z následujících jmen balíčků:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" #: lib/gettor/i18n.py:56 msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." msgstr "" +"Prosím odpovězte na tento e-mail a zmiňte jméno jednoho balíčku kdekoliv v " +"e-mailu." #: lib/gettor/i18n.py:59 msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" msgstr "" +"ZÍSKÁVÁM LOKALIZOVANÉ VERZE TORU\n" +"===================================" #: lib/gettor/i18n.py:62 msgid "" @@ -92,6 +108,9 @@ msgid "" "\n" " gettor+fa(a)torproject.org" msgstr "" +"Abyste obdržel(a) verzi Toru přeloženou do Vašeho jazyku, specifikujte jazyk, který chcete, v adrese na kterou mail pošlete:\n" +"\n" +" gettor+fa(a)torproject.org" #: lib/gettor/i18n.py:67 msgid "" @@ -143,6 +162,8 @@ msgid "" "SMALLER SIZED PACKAGES\n" "======================" msgstr "" +"MENŠÍ BALÍČKY\n" +"======================" #: lib/gettor/i18n.py:92 msgid "" @@ -221,6 +242,8 @@ msgid "" "SUPPORT\n" "=======" msgstr "" +"PODPORA\n" +"=======" #: lib/gettor/i18n.py:133 msgid "" @@ -258,6 +281,8 @@ msgid "" "BLOCKED ACCESS / CENSORSHIP\n" "===========================" msgstr "" +"ZABLOKOVANÝ PŘÍSTUP / CENZURA\n" +"===========================" #: lib/gettor/i18n.py:155 msgid "" @@ -343,6 +368,8 @@ msgid "" "UNPACKING THE FILES\n" "===================" msgstr "" +"ROZBALUJI SOUBORY\n" +"===================" #: lib/gettor/i18n.py:196 msgid "" @@ -352,6 +379,13 @@ 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" +"\n" +" http://www.7-zip.org/" #: lib/gettor/i18n.py:202 msgid ""

1 0

[torflow/master] Use FastFirstHopPK to get circ fail rates for Guards.
by mikeperry＠torproject.org 03 Dec '11

03 Dec '11

commit 8684b9588d60a05fed11c83380540c0a8abbf6ca Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Dec 2 14:16:00 2011 -0800 Use FastFirstHopPK to get circ fail rates for Guards. Otherwise we might not detect CPU overload conditions in them. --- NetworkScanners/BwAuthority/data/tor/torrc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/NetworkScanners/BwAuthority/data/tor/torrc b/NetworkScanners/BwAuthority/data/tor/torrc index 0c13322..c64273b 100644 --- a/NetworkScanners/BwAuthority/data/tor/torrc +++ b/NetworkScanners/BwAuthority/data/tor/torrc @@ -12,3 +12,7 @@ __LeaveStreamsUnattached 1 # Bad idea? Too much consensus update activity? FetchDirInfoExtraEarly 1 FetchDirInfoEarly 1 + +# Use CREATE cells for first hop, so we can still measure CPU overload via +# circ failure +FastFirstHopPK 0

1 0

[tor/master] Don't just tell the controller "foo" on id mismatch
by nickm＠torproject.org 03 Dec '11

03 Dec '11

commit 682a85ff7c691f691f9f7745e34e396f15e5d601 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:27:33 2011 -0500 Don't just tell the controller "foo" on id mismatch Fixes bug 4169; bugfix on 0.2.1.1-alpha. --- changes/bug4169 | 6 ++++++ src/or/connection_or.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/changes/bug4169 b/changes/bug4169 new file mode 100644 index 0000000..38c18d3 --- /dev/null +++ b/changes/bug4169 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Report a real bootstrap problem to the controller on router + identity mismatch. Previously we just said "foo", which probably + made a lot of sense at the time. Fixes bug 4169; bugfix on + 0.2.1.1-alpha. + diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 470f6d2..b865e13 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1514,7 +1514,9 @@ connection_or_client_learned_peer_id(or_connection_t *conn, control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED, END_OR_CONN_REASON_OR_IDENTITY); if (!authdir_mode_tests_reachability(options)) - control_event_bootstrap_problem("foo", END_OR_CONN_REASON_OR_IDENTITY); + control_event_bootstrap_problem( + "Unexpected identity in router certificate", + END_OR_CONN_REASON_OR_IDENTITY); as_expected = 0; } if (authdir_mode_tests_reachability(options)) {

1 0

[tor/master] Init conn->addr to "unspec" on cpuworker connections
by nickm＠torproject.org 03 Dec '11

03 Dec '11

commit 5303918091d832d2986b113d60a6ba1ca328af1c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:21:50 2011 -0500 Init conn->addr to "unspec" on cpuworker connections Fixes bug 4532 reported by "troll_un" --- changes/bug4532 | 3 +++ src/or/cpuworker.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug4532 b/changes/bug4532 new file mode 100644 index 0000000..6ce4881 --- /dev/null +++ b/changes/bug4532 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Initialize conn->addr to a vaild state in spawn_cpuworker. Fixes bug + 4532; found by troll_un. diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 9140037..e4460c5 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -347,6 +347,7 @@ spawn_cpuworker(void) /* set up conn so it's got all the data we need to remember */ conn->s = fd; conn->address = tor_strdup("localhost"); + tor_addr_make_unspec(&conn->addr); if (connection_add(conn) < 0) { /* no space, forget it */ log_warn(LD_NET,"connection_add for cpuworker failed. Giving up.");

1 0

[tor/master] Don't call tor_tls_set_logged_address till after checking conn->tls
by nickm＠torproject.org 03 Dec '11

03 Dec '11

commit 6171bdd1056e3511b1842ac8a3e17aa349616075 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:15:52 2011 -0500 Don't call tor_tls_set_logged_address till after checking conn->tls Fixes bug 4531; partial backport of e27a26d5. --- changes/bug4531 | 4 ++++ src/or/connection_or.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug4531 b/changes/bug4531 new file mode 100644 index 0000000..6209f9a --- /dev/null +++ b/changes/bug4531 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Fix null-pointer access that could occur if TLS allocation failed. + Fixes bug 4531; bugfix on 0.2.0.20-rc. Found by "troll_un". + diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 1fffba7..dc8850e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -871,12 +871,12 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving) { conn->_base.state = OR_CONN_STATE_TLS_HANDSHAKING; conn->tls = tor_tls_new(conn->_base.s, receiving); - tor_tls_set_logged_address(conn->tls, // XXX client and relay? - escaped_safe_str(conn->_base.address)); if (!conn->tls) { log_warn(LD_BUG,"tor_tls_new failed. Closing."); return -1; } + tor_tls_set_logged_address(conn->tls, // XXX client and relay? + escaped_safe_str(conn->_base.address)); connection_start_reading(TO_CONN(conn)); log_debug(LD_HANDSHAKE,"starting TLS handshake on fd %d", conn->_base.s); note_crypto_pk_op(receiving ? TLS_HANDSHAKE_S : TLS_HANDSHAKE_C);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 03 Dec '11

03 Dec '11

commit 57ff9913b25ff640f4ae45dc9b60bc28c30f53b8 Merge: d9edee3 6171bdd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:17:52 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/connection_or.c The conflict in src/or/connection_or.c is resolved by taking the version in master, since e27a26d5 already fixed bug 4531 on master. This merge just adds the changes file from 0.2.2. changes/bug4531 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.2] Don't call tor_tls_set_logged_address till after checking conn->tls
by nickm＠torproject.org 03 Dec '11

03 Dec '11

commit 6171bdd1056e3511b1842ac8a3e17aa349616075 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:15:52 2011 -0500 Don't call tor_tls_set_logged_address till after checking conn->tls Fixes bug 4531; partial backport of e27a26d5. --- changes/bug4531 | 4 ++++ src/or/connection_or.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug4531 b/changes/bug4531 new file mode 100644 index 0000000..6209f9a --- /dev/null +++ b/changes/bug4531 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Fix null-pointer access that could occur if TLS allocation failed. + Fixes bug 4531; bugfix on 0.2.0.20-rc. Found by "troll_un". + diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 1fffba7..dc8850e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -871,12 +871,12 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving) { conn->_base.state = OR_CONN_STATE_TLS_HANDSHAKING; conn->tls = tor_tls_new(conn->_base.s, receiving); - tor_tls_set_logged_address(conn->tls, // XXX client and relay? - escaped_safe_str(conn->_base.address)); if (!conn->tls) { log_warn(LD_BUG,"tor_tls_new failed. Closing."); return -1; } + tor_tls_set_logged_address(conn->tls, // XXX client and relay? + escaped_safe_str(conn->_base.address)); connection_start_reading(TO_CONN(conn)); log_debug(LD_HANDSHAKE,"starting TLS handshake on fd %d", conn->_base.s); note_crypto_pk_op(receiving ? TLS_HANDSHAKE_S : TLS_HANDSHAKE_C);

1 0