- tor-commits - lists.torproject.org

[flashproxy/master] Newlines in usage.
by dcf＠torproject.org 23 Sep '12

23 Sep '12

commit 5f57d01f76da5509aee2879a9cc6bb4adc42dc4e Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 15:10:41 2012 -0700 Newlines in usage. --- experiments/facilitator-graph.py | 2 +- facilitator/facilitator | 1 + flashproxy-client | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/experiments/facilitator-graph.py b/experiments/facilitator-graph.py index 41271a7..1356916 100755 --- a/experiments/facilitator-graph.py +++ b/experiments/facilitator-graph.py @@ -16,8 +16,8 @@ POLL_INTERVAL = 10.0 def usage(f = sys.stdout): print >> f, """\ Usage: %s -o OUTPUT [INPUTFILE] - Makes a graph of flash proxy counts from a facilitator log. + -h, --help show this help. -o, --output=OUTPUT output file name (required).\ """ % sys.argv[0] diff --git a/facilitator/facilitator b/facilitator/facilitator index 9d8d3af..64fe952 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -42,6 +42,7 @@ def usage(f = sys.stdout): Usage: %(progname)s -r RELAY <OPTIONS> Flash proxy facilitator: Register client addresses and serve them out again. Listen on 127.0.0.1 and port PORT (by default %(port)d). + -d, --debug don't daemonize, log to stdout. -h, --help show this help. -l, --log FILENAME write log to FILENAME (default \"%(log)s\"). diff --git a/flashproxy-client b/flashproxy-client index 7b80f11..e80c879 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -68,6 +68,7 @@ be sent to the facilitator so that proxies can connect to you. You need to register in some way in order to get any service. The --facilitator option allows controlling which facilitator is used; if omitted, it uses a public default. + --daemon daemonize (Unix only). -f, --facilitator=URL advertise willingness to receive connections to URL. -h, --help show this help.

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 23 Sep '12

23 Sep '12

commit 46fca721d04b03f80eee9aa3477420a3848d59e8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 23 19:45:27 2012 +0000 Update translations for vidalia_help_completed --- cs/netview.po | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cs/netview.po b/cs/netview.po index 83799c1..74ab48b 100644 --- a/cs/netview.po +++ b/cs/netview.po @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-08-27 13:00+0000\n" +"PO-Revision-Date: 2012-09-23 19:43+0000\n" "Last-Translator: digitaldreamer <digitaldreamer(a)email.cz>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cs\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. type: Content of: <html><body><h1> #: en/netview.html:16 @@ -25,7 +25,7 @@ msgstr "Network Viewer" msgid "" "The network viewer lets you see relays in the Tor network and where your " "traffic is going." -msgstr "V Network vieweru uvidíte seznam relayí v síti Tor, a kam směřují vaše data." +msgstr "V Network vieweru uvidíte seznam uzlů v síti Tor, a kam směřují vaše data." #. type: Content of: <html><body> #: en/netview.html:25 @@ -45,7 +45,7 @@ msgid "" "through a series of relays on the network. Your application's traffic is " "then sent as a stream through that circuit. For efficiency, multiple " "streams may share the same circuit." -msgstr "Když chcete anonymně komunikovat skrze Tor (například navštívit webové stránky), Tor vytvoří tunel, neboli okruh šifrovaných spojení skrze řadu relayí na této síti. Data z vaší aplikace jsou pak odeslána jako proud skrze tento okruh. Pro zvýšení efektivity může více proudů sdílet tentýž okruh." +msgstr "Když chcete anonymně komunikovat skrze Tor (například navštívit webové stránky), Tor vytvoří tunel, neboli okruh šifrovaných spojení skrze řadu uzlů na této síti. Data z vaší aplikace jsou pak odeslána jako proud skrze tento okruh. Pro zvýšení efektivity může více proudů sdílet tentýž okruh." #. type: Content of: <html><body> #: en/netview.html:35 @@ -64,7 +64,7 @@ msgid "" "indicating the geographic location of relays in the Tor network. Green lines" " are drawn between relays to indicate the path of circuits that your Tor " "client has created through the Tor network." -msgstr "Mapa sítě se skládá z mapy světa, s červenými tečkami označujímími zeměpisnou polohu relayí sítě Tor. Zelené linky, zobrazující se mezi relayemi, vyznačují trasu okruhů, které váš Tor klient vytvořil v síti Tor." +msgstr "Mapa sítě se skládá z mapy světa, s červenými tečkami označujímími zeměpisnou polohu uzlů sítě Tor. Zelené linky, zobrazující se mezi uzly, vyznačují trasu okruhů, které váš Tor klient vytvořil v síti Tor." #. type: Content of: <html><body> #: en/netview.html:44 @@ -94,7 +94,7 @@ msgid "" "important to note that this request is done through Tor, so your location is" " not revealed to the GeoIP relay. The results of the lookups will be cached " "locally in order to reduce load on Vidalia's GeoIP relays." -msgstr "Uprostřed dialogového okna, pod mapou sítě, najdete seznam vašich současných okruhů, a přenos dat, který právě probíhá skrze tyto okruhy. Když se mapa prvně načte, uvidíte pravděpodobně připojení ke geoip.vidalia-project.net, které probíhá, když Vidalia vyhledává zeměpisné informace pro seznam Tor relayí. Měli byste vědět, že tento požadavek je uskutečnět skrze Tor, takže se relay GeoIP nedozví vaší polohu. Výsledky hledání se ukládají lokálně, aby se snížilo vytížení GeoIP relayí Vidalie." +msgstr "Uprostřed dialogového okna, pod mapou sítě, najdete seznam vašich současných okruhů, a přenos dat, který právě probíhá skrze tyto okruhy. Když se mapa prvně načte, uvidíte pravděpodobně připojení ke geoip.vidalia-project.net, které probíhá, když Vidalia vyhledává zeměpisné informace pro seznam Tor uzlů. Měli byste vědět, že tento požadavek je uskutečnět skrze Tor, takže se relay GeoIP nedozví vaší polohu. Výsledky hledání se ukládají lokálně, aby se snížilo vytížení GeoIP relayí Vidalie." #. type: Content of: <html><body> #: en/netview.html:66 @@ -104,7 +104,7 @@ msgstr "<a name=\"relaylist\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:67 msgid "Relay Status" -msgstr "Status Relaye" +msgstr "Status Uzlu" #. type: Content of: <html><body> #: en/netview.html:69 @@ -112,39 +112,39 @@ msgid "" "On the left side of the network view, you will see a list of relays in the " "Tor network. Next to each relay is an icon indicating that relay's status. " "The following table summarizes the possible relay status icons:" -msgstr "Na levé straně zobrazení sítě najdete seznam relayí v síti Tor. U každého relaye je ikonka indikující jeho status. V následující tabluce jsou uvedeny všechny ikony, které relay může mít." +msgstr "Na levé straně zobrazení sítě najdete seznam uzlů v síti Tor. U každého uzlu je ikonka indikující jeho status. V následující tabluce jsou uvedeny všechny ikony, které může uzel mít." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:78 msgid "The relay is offline or simply not responding." -msgstr "Relay je vypnutý nebo prostě neodpovídá." +msgstr "Uzel je vypnutý nebo prostě neodpovídá." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:84 msgid "" "The relay is hibernating, meaning it is online, but has used up as " "much bandwidth as the operator is willing to allow for a given time period." -msgstr "Relay je zmrazený, což znamená, že je zapnutý, ale vyčerpal už maximální limit přenosu dat, který jeho operátor povolil pro toto časové období." +msgstr "Uzel je zmrazený, což znamená, že je zapnutý, ale vyčerpal už maximální limit přenosu dat, který jeho operátor povolil pro toto časové období." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:92 msgid "The relay is online, but has shown only minimal throughput." -msgstr "Relay je online, ale má jen minimální průchodnost." +msgstr "Uzel je online, ale má jen minimální průchodnost." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:98 msgid "The relay is online and has shown a throughput >= 20 KB/s." -msgstr "Relay je online, a má průchodnost >= 20 KB/s." +msgstr "Uzel je online, a má průchodnost >= 20 KB/s." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:104 msgid "The relay is online and has shown a throughput >= 60 KB/s." -msgstr "Relay je online, a má průchodnost >= 60 KB/s." +msgstr "Uzel je online, a má průchodnost >= 60 KB/s." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:110 msgid "The relay is online and has shown a throughput >= 400 KB/s." -msgstr "Relay je online, a má průchodnost >= 400 KB/s." +msgstr "Uzel je online, a má průchodnost >= 400 KB/s." #. type: Content of: <html><body> #: en/netview.html:116 @@ -162,7 +162,7 @@ msgstr "<a name=\"details\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:123 msgid "Relay Details" -msgstr "Podrobnosti o Relayi" +msgstr "Podrobnosti o Uzlu" #. type: Content of: <html><body> #: en/netview.html:125 @@ -172,7 +172,7 @@ msgid "" "href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream" " in the list of your current circuits and streams, this panel will show you " "details about each relay through which your traffic is currently being sent." -msgstr "Panel podrobností o relayi na pravé straně obrazovky zobrazuje podrobné informace o relayi nebo relayích označených v <a href=\"#relaylist\">seznamu relayí</a>. Pokud jste označili okruh nebo proud v seznamu vašich současných okruhů a proudů, bude tento panel zobrazovat podrobnosti o každém z relayí, skrze které právě data prochází." +msgstr "Panel podrobností o uzlu na pravé straně obrazovky zobrazuje podrobné informace o uzlu nebo relayích označených v <a href=\"#relaylist\">seznamu relayí</a>. Pokud jste označili okruh nebo proud v seznamu vašich současných okruhů a proudů, bude tento panel zobrazovat podrobnosti o každém z uzlů, skrze které právě data prochází." #. type: Content of: <html><body> #: en/netview.html:132 @@ -189,7 +189,7 @@ msgstr "Umístění" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:139 msgid "The geographic location of this Tor relay." -msgstr "Zeměpisné umístění Tor relaye." +msgstr "Zeměpisné umístění Tor uzlu." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:142 @@ -199,7 +199,7 @@ msgstr "IP Adresa" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:143 msgid "IP address at which this Tor relay can be reached." -msgstr "IP adresa, na které je možné tento Tor relay kontaktovat." +msgstr "IP adresa, na které je možné tento Tor uzel kontaktovat." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:146 @@ -211,7 +211,7 @@ msgstr "Platforma" msgid "" "Operating system information and Tor version on which this relay is " "currently running." -msgstr "Informace o operačním systému a verzi Toru, na které tento relay nyní běží." +msgstr "Informace o operačním systému a verzi Toru, na které tento uzel nyní běží." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:153 @@ -223,7 +223,7 @@ msgstr "Rychlost" msgid "" "Estimated maximum amount of bandwidth that the directory relays have seen " "this relay handle recently." -msgstr "Odhad maximálního průtoku dat, který řídící relaye v poslední době na tomto relayi zaznamenali." +msgstr "Odhad maximálního průtoku dat, který řídící uzly v poslední době na tomto relayi zaznamenali." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:160 @@ -245,4 +245,4 @@ msgstr "Poslední změna" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:168 msgid "Date this relay's information was last updated." -msgstr "Datum, kdy byly informace o tomto relayi naposledy updatovány." +msgstr "Datum, kdy byly informace o tomto uzlu naposledy updatovány."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 23 Sep '12

23 Sep '12

commit 7e557cb83ee6186d151e2a6aa19a81cab5e2c363 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 23 19:45:21 2012 +0000 Update translations for vidalia_help --- cs/netview.po | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cs/netview.po b/cs/netview.po index 83799c1..74ab48b 100644 --- a/cs/netview.po +++ b/cs/netview.po @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-08-27 13:00+0000\n" +"PO-Revision-Date: 2012-09-23 19:43+0000\n" "Last-Translator: digitaldreamer <digitaldreamer(a)email.cz>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cs\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. type: Content of: <html><body><h1> #: en/netview.html:16 @@ -25,7 +25,7 @@ msgstr "Network Viewer" msgid "" "The network viewer lets you see relays in the Tor network and where your " "traffic is going." -msgstr "V Network vieweru uvidíte seznam relayí v síti Tor, a kam směřují vaše data." +msgstr "V Network vieweru uvidíte seznam uzlů v síti Tor, a kam směřují vaše data." #. type: Content of: <html><body> #: en/netview.html:25 @@ -45,7 +45,7 @@ msgid "" "through a series of relays on the network. Your application's traffic is " "then sent as a stream through that circuit. For efficiency, multiple " "streams may share the same circuit." -msgstr "Když chcete anonymně komunikovat skrze Tor (například navštívit webové stránky), Tor vytvoří tunel, neboli okruh šifrovaných spojení skrze řadu relayí na této síti. Data z vaší aplikace jsou pak odeslána jako proud skrze tento okruh. Pro zvýšení efektivity může více proudů sdílet tentýž okruh." +msgstr "Když chcete anonymně komunikovat skrze Tor (například navštívit webové stránky), Tor vytvoří tunel, neboli okruh šifrovaných spojení skrze řadu uzlů na této síti. Data z vaší aplikace jsou pak odeslána jako proud skrze tento okruh. Pro zvýšení efektivity může více proudů sdílet tentýž okruh." #. type: Content of: <html><body> #: en/netview.html:35 @@ -64,7 +64,7 @@ msgid "" "indicating the geographic location of relays in the Tor network. Green lines" " are drawn between relays to indicate the path of circuits that your Tor " "client has created through the Tor network." -msgstr "Mapa sítě se skládá z mapy světa, s červenými tečkami označujímími zeměpisnou polohu relayí sítě Tor. Zelené linky, zobrazující se mezi relayemi, vyznačují trasu okruhů, které váš Tor klient vytvořil v síti Tor." +msgstr "Mapa sítě se skládá z mapy světa, s červenými tečkami označujímími zeměpisnou polohu uzlů sítě Tor. Zelené linky, zobrazující se mezi uzly, vyznačují trasu okruhů, které váš Tor klient vytvořil v síti Tor." #. type: Content of: <html><body> #: en/netview.html:44 @@ -94,7 +94,7 @@ msgid "" "important to note that this request is done through Tor, so your location is" " not revealed to the GeoIP relay. The results of the lookups will be cached " "locally in order to reduce load on Vidalia's GeoIP relays." -msgstr "Uprostřed dialogového okna, pod mapou sítě, najdete seznam vašich současných okruhů, a přenos dat, který právě probíhá skrze tyto okruhy. Když se mapa prvně načte, uvidíte pravděpodobně připojení ke geoip.vidalia-project.net, které probíhá, když Vidalia vyhledává zeměpisné informace pro seznam Tor relayí. Měli byste vědět, že tento požadavek je uskutečnět skrze Tor, takže se relay GeoIP nedozví vaší polohu. Výsledky hledání se ukládají lokálně, aby se snížilo vytížení GeoIP relayí Vidalie." +msgstr "Uprostřed dialogového okna, pod mapou sítě, najdete seznam vašich současných okruhů, a přenos dat, který právě probíhá skrze tyto okruhy. Když se mapa prvně načte, uvidíte pravděpodobně připojení ke geoip.vidalia-project.net, které probíhá, když Vidalia vyhledává zeměpisné informace pro seznam Tor uzlů. Měli byste vědět, že tento požadavek je uskutečnět skrze Tor, takže se relay GeoIP nedozví vaší polohu. Výsledky hledání se ukládají lokálně, aby se snížilo vytížení GeoIP relayí Vidalie." #. type: Content of: <html><body> #: en/netview.html:66 @@ -104,7 +104,7 @@ msgstr "<a name=\"relaylist\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:67 msgid "Relay Status" -msgstr "Status Relaye" +msgstr "Status Uzlu" #. type: Content of: <html><body> #: en/netview.html:69 @@ -112,39 +112,39 @@ msgid "" "On the left side of the network view, you will see a list of relays in the " "Tor network. Next to each relay is an icon indicating that relay's status. " "The following table summarizes the possible relay status icons:" -msgstr "Na levé straně zobrazení sítě najdete seznam relayí v síti Tor. U každého relaye je ikonka indikující jeho status. V následující tabluce jsou uvedeny všechny ikony, které relay může mít." +msgstr "Na levé straně zobrazení sítě najdete seznam uzlů v síti Tor. U každého uzlu je ikonka indikující jeho status. V následující tabluce jsou uvedeny všechny ikony, které může uzel mít." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:78 msgid "The relay is offline or simply not responding." -msgstr "Relay je vypnutý nebo prostě neodpovídá." +msgstr "Uzel je vypnutý nebo prostě neodpovídá." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:84 msgid "" "The relay is hibernating, meaning it is online, but has used up as " "much bandwidth as the operator is willing to allow for a given time period." -msgstr "Relay je zmrazený, což znamená, že je zapnutý, ale vyčerpal už maximální limit přenosu dat, který jeho operátor povolil pro toto časové období." +msgstr "Uzel je zmrazený, což znamená, že je zapnutý, ale vyčerpal už maximální limit přenosu dat, který jeho operátor povolil pro toto časové období." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:92 msgid "The relay is online, but has shown only minimal throughput." -msgstr "Relay je online, ale má jen minimální průchodnost." +msgstr "Uzel je online, ale má jen minimální průchodnost." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:98 msgid "The relay is online and has shown a throughput >= 20 KB/s." -msgstr "Relay je online, a má průchodnost >= 20 KB/s." +msgstr "Uzel je online, a má průchodnost >= 20 KB/s." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:104 msgid "The relay is online and has shown a throughput >= 60 KB/s." -msgstr "Relay je online, a má průchodnost >= 60 KB/s." +msgstr "Uzel je online, a má průchodnost >= 60 KB/s." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:110 msgid "The relay is online and has shown a throughput >= 400 KB/s." -msgstr "Relay je online, a má průchodnost >= 400 KB/s." +msgstr "Uzel je online, a má průchodnost >= 400 KB/s." #. type: Content of: <html><body> #: en/netview.html:116 @@ -162,7 +162,7 @@ msgstr "<a name=\"details\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:123 msgid "Relay Details" -msgstr "Podrobnosti o Relayi" +msgstr "Podrobnosti o Uzlu" #. type: Content of: <html><body> #: en/netview.html:125 @@ -172,7 +172,7 @@ msgid "" "href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream" " in the list of your current circuits and streams, this panel will show you " "details about each relay through which your traffic is currently being sent." -msgstr "Panel podrobností o relayi na pravé straně obrazovky zobrazuje podrobné informace o relayi nebo relayích označených v <a href=\"#relaylist\">seznamu relayí</a>. Pokud jste označili okruh nebo proud v seznamu vašich současných okruhů a proudů, bude tento panel zobrazovat podrobnosti o každém z relayí, skrze které právě data prochází." +msgstr "Panel podrobností o uzlu na pravé straně obrazovky zobrazuje podrobné informace o uzlu nebo relayích označených v <a href=\"#relaylist\">seznamu relayí</a>. Pokud jste označili okruh nebo proud v seznamu vašich současných okruhů a proudů, bude tento panel zobrazovat podrobnosti o každém z uzlů, skrze které právě data prochází." #. type: Content of: <html><body> #: en/netview.html:132 @@ -189,7 +189,7 @@ msgstr "Umístění" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:139 msgid "The geographic location of this Tor relay." -msgstr "Zeměpisné umístění Tor relaye." +msgstr "Zeměpisné umístění Tor uzlu." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:142 @@ -199,7 +199,7 @@ msgstr "IP Adresa" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:143 msgid "IP address at which this Tor relay can be reached." -msgstr "IP adresa, na které je možné tento Tor relay kontaktovat." +msgstr "IP adresa, na které je možné tento Tor uzel kontaktovat." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:146 @@ -211,7 +211,7 @@ msgstr "Platforma" msgid "" "Operating system information and Tor version on which this relay is " "currently running." -msgstr "Informace o operačním systému a verzi Toru, na které tento relay nyní běží." +msgstr "Informace o operačním systému a verzi Toru, na které tento uzel nyní běží." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:153 @@ -223,7 +223,7 @@ msgstr "Rychlost" msgid "" "Estimated maximum amount of bandwidth that the directory relays have seen " "this relay handle recently." -msgstr "Odhad maximálního průtoku dat, který řídící relaye v poslední době na tomto relayi zaznamenali." +msgstr "Odhad maximálního průtoku dat, který řídící uzly v poslední době na tomto relayi zaznamenali." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:160 @@ -245,4 +245,4 @@ msgstr "Poslední změna" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:168 msgid "Date this relay's information was last updated." -msgstr "Datum, kdy byly informace o tomto relayi naposledy updatovány." +msgstr "Datum, kdy byly informace o tomto uzlu naposledy updatovány."

1 0

[pyonionoo/master] Remove addresses, flags table; Add get_router_tuple
by karsten＠torproject.org 23 Sep '12

23 Sep '12

commit 1ec3848f1385ee18598b3d07ab3c25871e83d8db Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 23 09:38:35 2012 +0530 Remove addresses, flags table; Add get_router_tuple Use summary table to handle all the data. Add a search, flags, and addresses column to the summary table. get_router_tuple(fields) returns the values corresponding to the fields --- pyonionoo/database.py | 78 +++++++++++++++---------------------------------- pyonionoo/parser.py | 38 ++++++++++++++++++++---- 2 files changed, 56 insertions(+), 60 deletions(-) diff --git a/pyonionoo/database.py b/pyonionoo/database.py index be70578..18eb4bc 100644 --- a/pyonionoo/database.py +++ b/pyonionoo/database.py @@ -45,30 +45,21 @@ TOTAL_ROWS = 0 # will be made into an alias for rowid. summary_tbl_name = 'summary' summary_schema = """ -id INTEGER PRIMARY KEY, -type CHARACTER, -nickname STRING, -fingerprint STRING, -running BOOLEAN, -time_published STRING, -OR_port STRING, -dir_port STRING, -consensus_weight INTEGER, -country_code STRING, -hostname STRING, -time_lookup STRING -""" - -addresses_tbl_name = 'addresses' -addresses_schema = """ -id_of_row INTEGER, -address STRING -""" - -flags_tbl_name = 'flags' -flags_schema = """ -id_of_row INTEGER, -flag STRING +id INTEGER PRIMARY KEY, +type CHARACTER, +nickname STRING, +fingerprint STRING, +running BOOLEAN, +time_published STRING, +or_port STRING, +dir_port STRING, +consensus_weight INTEGER, +country_code STRING, +hostname STRING, +time_lookup STRING, +flags STRING, +addresses STRING, +search STRING """ def _create_table(conn, tbl_name, schema): @@ -113,8 +104,6 @@ def bootstrap_database(metrics_out, summary_file): # Create the tables. _create_table(conn, summary_tbl_name, summary_schema) - _create_table(conn, flags_tbl_name, flags_schema) - _create_table(conn, addresses_tbl_name, addresses_schema) conn.commit() @@ -122,13 +111,16 @@ def bootstrap_database(metrics_out, summary_file): def update_databases(summary_file=None): """ - Updates all three databases information. + Updates the database. This operation operates as a single transaction. Therefore, the database can be read by other requests while it is being performed, and those reads will correspond to the "un-updated" database. Once this function completes, all future reads will be from the "updated" database. + + @type summary_file: string + @param summary_file: full path to the summary file """ global DB_CREATION_TIME, TABLE_ROWS @@ -145,8 +137,6 @@ def update_databases(summary_file=None): logging.info("Deleting data from databases") CURSOR = conn.cursor() CURSOR.execute('DELETE FROM %s' % summary_tbl_name) - CURSOR.execute('DELETE FROM %s' % flags_tbl_name) - CURSOR.execute('DELETE FROM %s' %addresses_tbl_name) TABLE_ROWS = 0 # Create the summary database. We could accumulate all the router tuples @@ -158,11 +148,9 @@ def update_databases(summary_file=None): # field in the flags/addresses table. Here we can avoid all those # selects, because the rowid attribute of the cursor is set to that # id field right after we execute the (individual) insert statements. - summary_fields = ('type', 'nickname', 'fingerprint', 'running', - 'time_published', 'OR_port', 'dir_port', 'consensus_weight', - 'country_code', 'hostname', 'time_lookup') - addresses_fields = ('id_of_row', 'address') - flags_fields = ('id_of_row', 'flag') + summary_fields = ('type', 'nickname', 'fingerprint', 'running', 'time_published', + 'or_port', 'dir_port', 'consensus_weight', 'country_code', + 'hostname', 'time_lookup', 'flags', 'addresses', 'search') insert_stmt = 'insert into %s (%s) values (%s)' @@ -170,14 +158,6 @@ def update_databases(summary_file=None): summary_insert_stmt = (insert_stmt % (summary_tbl_name, ','.join(summary_fields), ','.join(['?']*len(summary_fields)))) - # create insertion statement for addresses table - addresses_insert_stmt = (insert_stmt % (addresses_tbl_name, ','.join(addresses_fields), - ','.join(['?']*len(addresses_fields)))) - - # create insertion statement for flags table - flags_insert_stmt = (insert_stmt % (flags_tbl_name, ','.join(flags_fields), - ','.join(['?']*len(flags_fields)))) - if not summary_file: # raise Exception? return @@ -187,10 +167,7 @@ def update_databases(summary_file=None): router = Router() router.parse(line) - router_tuple = (router.type, router.nickname, router.fingerprint, - router.running, router.time_published, router.orport, - router.dirport, router.consensus_weight, router.country_code, - router.hostname, router.time_of_lookup) + router_tuple = router.get_router_tuple(summary_fields) # TODO: Determine whether sqlite3 optimizes by remembering # this insert command and not parsing it every time it sees @@ -201,13 +178,6 @@ def update_databases(summary_file=None): id_num = CURSOR.lastrowid TABLE_ROWS += 1 - address_values = (id_num, router.address) - CURSOR.execute(addresses_insert_stmt, address_values) - - for flag in router.flags: - flag_values = (id_num, flag) - CURSOR.execute(flags_insert_stmt, flag_values) - conn.commit() logging.info("Table updated") DB_CREATION_TIME = time.time() @@ -227,7 +197,7 @@ def query_summary_tbl(running_filter=None, type_filter=None, hex_fingerprint_fil order_asc=True, offset_value=None, limit_value=None, fields=('fingerprint',)): conn = get_database_conn() - + cursor = conn.cursor() # Build up a WHERE clause based on the request parameters. We only # consider the case in which the client specifies 'search' or # some subset (possibly empty) of {'running', 'type', 'lookup', 'country'}. diff --git a/pyonionoo/parser.py b/pyonionoo/parser.py index 5105782..b917a92 100644 --- a/pyonionoo/parser.py +++ b/pyonionoo/parser.py @@ -10,14 +10,14 @@ class Router: self.exit_addresses = None self.or_addresses = None self.time_published = None - self.orport = None - self.dirport = None + self.or_port = None + self.dir_port = None self.flags = None self.running = False self.consensus_weight = None self.country_code = None self.hostname = None - self.time_of_lookup = None + self.time_lookup = None self.type = None def parse(self, raw_content): @@ -46,8 +46,8 @@ class Router: self.time_published = self._parse_timestamp(values[4] + ' ' + values[5]) - self.orport = int(values[6]) - self.dirport = int(values[7]) + self.or_port = int(values[6]) + self.dir_port = int(values[7]) self.flags = values[8].split(',') for flag in self.flags: if flag == "Running": @@ -55,7 +55,7 @@ class Router: self.consensus_weight = int(values[9]) self.country_code = values[10] if values[11] != "null" : self.hostname = values[11] - self.time_of_lookup = int(values[12]) + self.time_lookup = int(values[12]) def _parse_timestamp(self, content): """ @@ -67,3 +67,29 @@ class Router: return timestamp except ValueError: raise ValueError("Timestamp wasn't parseable: %s" % line) + + def get_router_tuple(self, fields): + """ + Returns a tuple of values. + + @param type: list/tuple + @param fields: attributes of Router for which the values must be returned + + @rtype: tuple + @return: list of values corresponding to the fields + """ + + router_list = [] + for field in fields: + if field == "search": + value = ' %s %s %s' % (self.fingerprint, self.nickname, + self.address) + elif field == "flags": + value = ' '.join(self.flags) + # add leading space + value = ' %s' % value + else: + value = getattr(self, field) + router_list.append(value) + + return tuple(router_list)

1 0

[pyonionoo/master] Implement search filter
by karsten＠torproject.org 23 Sep '12

23 Sep '12

commit 3fce02cc02caa2e91d5d10133f596a14b3245292 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 23 15:12:18 2012 +0530 Implement search filter --- pyonionoo/database.py | 35 +++++++++++------------------------ pyonionoo/handlers/arguments.py | 2 +- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/pyonionoo/database.py b/pyonionoo/database.py index 18eb4bc..128ccae 100644 --- a/pyonionoo/database.py +++ b/pyonionoo/database.py @@ -203,29 +203,16 @@ def query_summary_tbl(running_filter=None, type_filter=None, hex_fingerprint_fil # some subset (possibly empty) of {'running', 'type', 'lookup', 'country'}. clauses = [] if search_filter: - # We have to do some heuristics here, because the search filters - # do not come with anything to identify which field they correspond - # to. E.g., the request search=ffa means any relay with nickname - # starting with 'ffa' or fingerprint starting with 'ffa' or '$ffa'. - - # Actually, this is a moderately painful parameter to implement. - # Testing for an IP address probably means using regular expressions. - # SQLite doesn't support them without a user-defined function. - # Matching against a Python RE is easy to do, but then we have - # to have a where clause that matches against the beginning of a - # field value, and SQLite doesn't appear to support such a search - # (unless, of course, you want to write a user-defined match() - # function). - pass - else: - if running_filter: - clauses.append("running = %s" % int(running_filter)) - if type_filter: - clauses.append("type = '%s'" % type_filter) - if hex_fingerprint_filter: - clauses.append("fingerprint = '%s'" % hex_fingerprint_filter) - if country_filter: - clauses.append("country_code = '%s'" % country_filter) + for filter in search_filter: + clauses.append("search like '%%%s%%'" % filter) + if running_filter: + clauses.append("running = %s" % int(running_filter)) + if type_filter: + clauses.append("type = '%s'" % type_filter) + if hex_fingerprint_filter: + clauses.append("fingerprint = '%s'" % hex_fingerprint_filter) + if country_filter: + clauses.append("country_code = '%s'" % country_filter) where_clause = ('WHERE %s' % ' and '.join(clauses)) if clauses else '' # Construct the ORDER, LIMIT, and OFFSET clauses. @@ -259,7 +246,7 @@ def get_summary_routers(running_filter=None, type_filter=None, hex_fingerprint_f @return: tuple of form (relays, bridges, relays_time, bridges_time), where * relays/bridges is a list of Router objects * relays_time/bridges_time is a datetime object with the most - recent timestamp of the relay descriptors in relays. + recent timestamp of the relay/bridges descriptors in relays. """ # Timestamps of most recent relay/bridge in the returned set. diff --git a/pyonionoo/handlers/arguments.py b/pyonionoo/handlers/arguments.py index e853faf..4c18b84 100644 --- a/pyonionoo/handlers/arguments.py +++ b/pyonionoo/handlers/arguments.py @@ -74,7 +74,7 @@ def parse(arguments): # the search parameter, which is then given to us as a single # (space-separated) string. if key == "search": - search_filter = values.split() + search_filter = values[0].split() # TODO: Handle list of ordering fields. if key == "order":

1 0

[onionoo/master] Don't require country code to be lower-case.
by karsten＠torproject.org 23 Sep '12

23 Sep '12

commit cbcf7f0cd925f0fefde4519f986ecd6a19a89c36 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Sep 23 15:02:05 2012 -0400 Don't require country code to be lower-case. --- web/index.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/index.html b/web/index.html index 1a597f4..ff63cf0 100755 --- a/web/index.html +++ b/web/index.html @@ -607,7 +607,7 @@ fingerprints in the URL. Lookups are case-insensitive. </td></tr> <tr><td>country</td><td>Return only relays which are located in the -given country as identified by a two-letter lower-case country code. +given country as identified by a two-letter country code. </td></tr> </table> Relay and/or bridge documents in the response can be ordered and

1 0

[onionoo/master] Note that the lookup parameter is case-insensitive.
by karsten＠torproject.org 23 Sep '12

23 Sep '12

commit efd2ee889b22b57565ca5efc35c09c3d3a9703e5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Sep 23 14:57:55 2012 -0400 Note that the lookup parameter is case-insensitive. --- web/index.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/index.html b/web/index.html index 70e019f..1a597f4 100755 --- a/web/index.html +++ b/web/index.html @@ -604,6 +604,7 @@ matching the hashed fingerprint. Fingerprints should always be hashed using SHA-1, regardless of looking up a relay or a bridge, in order to not accidentally leak non-hashed bridge fingerprints in the URL. +Lookups are case-insensitive. </td></tr> <tr><td>country</td><td>Return only relays which are located in the given country as identified by a two-letter lower-case country code.

1 0

[onionoo/master] Clarify what (relays|bridges)_published should contain.
by karsten＠torproject.org 23 Sep '12

23 Sep '12

commit 4646460f23f992c257a37714c4ec775ac48d07e9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Sep 23 14:25:23 2012 -0400 Clarify what (relays|bridges)_published should contain. Also specify bridges[_published] in weights documents. --- web/index.html | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/web/index.html b/web/index.html index 2ed5075..bedfa8c 100755 --- a/web/index.html +++ b/web/index.html @@ -44,7 +44,7 @@ with hashed fingerprints and running information. Summary documents contain the following fields: <ul> <li>"relays_published": UTC timestamp (YYYY-MM-DD hh:mm:ss) when -the last contained relay network status consensus started being valid. +the last known relay network status consensus started being valid. Indicates how recent the relay summaries in this document are. Required field.</li> <li>"relays": Array of objects representing relay summaries. @@ -68,7 +68,7 @@ Required field.</li> </ul> </li> <li>"bridges_published": UTC timestamp (YYYY-MM-DD hh:mm:ss) when -the last contained bridge network status was published. +the last known bridge network status was published. Indicates how recent the bridge summaries in this document are. Required field.</li> <li>"bridges": Array of objects representing bridge summaries. @@ -97,7 +97,7 @@ directories and the server descriptors published by relays and bridges. Detail documents contain the following fields: <ul> <li>"relays_published": UTC timestamp (YYYY-MM-DD hh:mm:ss) when -the last contained relay network status consensus started being valid. +the last known relay network status consensus started being valid. Indicates how recent the relay details in this document are. Required field.</li> <li>"relays": Array of objects representing relay details. @@ -278,7 +278,7 @@ bandwidth weights.</li> </ul> </li> <li>"bridges_published": UTC timestamp (YYYY-MM-DD hh:mm:ss) when -the last contained bridge network status was published. +the last known bridge network status was published. Indicates how recent the bridge details in this document are. Required field.</li> <li>"bridges": Array of objects representing bridge summaries. @@ -342,7 +342,7 @@ been running in the past week. Bandwidth documents contain the following fields: <ul> <li>"relays_published": UTC timestamp (YYYY-MM-DD hh:mm:ss) when -the last contained relay network status consensus started being valid. +the last known relay network status consensus started being valid. Indicates how recent the relay bandwidth documents in this document are. Required field.</li> <li>"relays": Array of objects representing relay bandwidth @@ -402,7 +402,7 @@ The specification of bandwidth history objects is similar to those in the </ul> </li> <li>"bridges_published": UTC timestamp (YYYY-MM-DD hh:mm:ss) when -the last contained bridge network status was published. +the last known bridge network status was published. Indicates how recent the bridge bandwidth documents in this document are. Required field.</li> <li>"bridges": Array of objects representing bridge bandwidth @@ -436,7 +436,7 @@ all relays that have been running in the past week. Weights documents contain the following fields: <ul> <li>"relays_published": UTC timestamp (YYYY-MM-DD hh:mm:ss) when -the last contained relay network status consensus started being valid. +the last known relay network status consensus started being valid. Indicates how recent the relay weights documents in this document are. Required field.</li> <li>"relays": Array of objects representing relay weights @@ -528,6 +528,14 @@ The specification of this history object is similar to that in the advertised_bandwidth_fraction field above.</li> </ul> </li> +<li>"bridges_published": UTC timestamp (YYYY-MM-DD hh:mm:ss) when +the last known bridge network status was published. +Only included for compatibility reasons with the other document types. +Required field.</li> +<li>"bridges": Empty array of objects that would represent bridge +weights documents. +Only included for compatibility reasons with the other document types. +Required field.</li> </ul> <a name="methods"></a>

1 0

[onionoo/master] Stop highlighting old news.
by karsten＠torproject.org 23 Sep '12

23 Sep '12

commit 5908eb3dc8bfae23edf65c4a9d0d95af9fa31c4a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Sep 23 14:27:23 2012 -0400 Stop highlighting old news. --- web/index.html | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/web/index.html b/web/index.html index bedfa8c..70e019f 100755 --- a/web/index.html +++ b/web/index.html @@ -186,22 +186,19 @@ was successful yet.</li> <li>"last_restarted": UTC timestamp (YYYY-MM-DD hh:mm:ss) when the relay was last (re-)started. Optional field.</li> -<li>"bandwidth_rate": Average bandwidth +<li>"bandwidth_rate": Average bandwidth in bytes per second that this relay is willing to sustain over long periods. -Required field. -Added field on August 1, 2012.</li> -<li>"bandwidth_burst": Bandwidth in bytes +Required field.</li> +<li>"bandwidth_burst": Bandwidth in bytes per second that this relay is willing to sustain in very short intervals. -Required field. -Added field on August 1, 2012.</li> -<li>"observed_bandwidth": Bandwidth +Required field.</li> +<li>"observed_bandwidth": Bandwidth estimate in bytes per second of the capacity this relay can handle. The relay remembers the maximum bandwidth sustained output over any ten second period in the past day, and another sustained input. The "observed_bandwidth" value is the lesser of these two numbers. -Required field. -Added field on August 1, 2012.</li> +Required field.</li> <li>"advertised_bandwidth": Bandwidth in bytes per second that this relay is willing and capable to provide. Optional field. @@ -211,14 +208,13 @@ found.</li> Optional field. Missing if router descriptor containing this information cannot be found.</li> -<li>"exit_policy_summary": Summary +<li>"exit_policy_summary": Summary version of the relay's exit policy containing a dictionary with either an "accept" or a "reject" element. If there is an "accept" ("reject") element, the relay accepts (rejects) all TCP ports or port ranges in the given list for most IP addresses and rejects (accepts) all other ports. -Optional field. -Added field on August 1, 2012.</li> +Optional field.</li> <li>"contact": Contact address of the relay operator. Omitted if empty or if descriptor containing this information cannot be found.</li>

1 0

[flashproxy/master] Listen on both IPv4 and IPv6 by default in flashproxy-client.
by dcf＠torproject.org 23 Sep '12

23 Sep '12

commit 54c3d895d51562adc3e5b54f44daf8a070fba439 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 11:19:23 2012 -0700 Listen on both IPv4 and IPv6 by default in flashproxy-client. If no host is given for the local address, listen on 127.0.0.1 and ::1. If no host is given for the remote address, listen on 0.0.0.0 and ::. This adds the ability to listen on more than one local or remote socket, though this is not exposed in the command-line interface except in this special case. --- README | 2 +- flashproxy-client | 85 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/README b/README index f5654cf..af19893 100644 --- a/README +++ b/README @@ -19,7 +19,7 @@ transport plugin" below to try out the system even behind NAT. 9000. If you have to use a different port (to get through a firewall, for example), give it on the command lines like this (here using port 8888): - $ flashproxy-client --register 127.0.0.1:9001 :8888 + $ flashproxy-client --register :9001 :8888 2. Run Tor using the included torrc file. $ tor -f torrc diff --git a/flashproxy-client b/flashproxy-client index 16c95ec..cf0c0b7 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -29,16 +29,15 @@ try: except ImportError: numpy = None -DEFAULT_REMOTE_ADDRESS = None -DEFAULT_REMOTE_PORT = 9000 -DEFAULT_LOCAL_ADDRESS = "127.0.0.1" DEFAULT_LOCAL_PORT = 9001 +DEFAULT_REMOTE_PORT = 9000 LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" class options(object): - local_addr = None - remote_addr = None + local_addrs = [] + remote_addrs = [] + register_addr = None facilitator_url = None log_filename = None @@ -57,7 +56,8 @@ def usage(f = sys.stdout): Usage: %(progname)s --register [LOCAL][:PORT] [REMOTE][:PORT] Wait for connections on a local and a remote port. When any pair of connections exists, data is ferried between them until one side is closed. By default -LOCAL is "%(local)s" and REMOTE is "%(remote)s". +LOCAL is localhost addresses on port %(local_port)d and REMOTE is all addresses +on port %(remote_port)d. The local connection acts as a SOCKS4a proxy, but the host and port in the SOCKS request are ignored and the local connection is always linked to a remote @@ -76,8 +76,8 @@ facilitator is used; if omitted, it uses a public default. --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], - "local": format_addr((DEFAULT_LOCAL_ADDRESS, DEFAULT_LOCAL_PORT)), - "remote": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), + "local_port": DEFAULT_LOCAL_PORT, + "remote_port": DEFAULT_REMOTE_PORT, } def safe_str(s): @@ -433,10 +433,16 @@ class WebSocketBinaryEncoder(object): def listen_socket(addr): """Return a nonblocking socket listening on the given address.""" - addr = (addr[0] or "0.0.0.0", addr[1]) addrinfo = socket.getaddrinfo(addr[0], addr[1], 0, socket.SOCK_STREAM, socket.IPPROTO_TCP)[0] s = socket.socket(addrinfo[0], addrinfo[1], addrinfo[2]) s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + if addrinfo[0] == socket.AF_INET6 and socket.has_ipv6: + # Set the IPV6_V6ONLY socket option, otherwise some operating systems + # will listen on an IPv4 address as well as IPv6 by default. For + # example, "::" will listen on both "::" and "0.0.0.0", and "::1" will + # listen on both "::1" and "127.0.0.1". See + # https://trac.torproject.org/projects/tor/ticket/4760. + s.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 1) s.bind(addr) s.listen(10) s.setblocking(0) @@ -639,7 +645,7 @@ def register(): # Maybe the script was read from stdin; in any case don't guess at the directory. return command = [os.path.join(script_dir, "flashproxy-reg-http")] - spec = format_addr(options.remote_addr) + spec = format_addr(options.register_addr) if options.facilitator_url is None: log(u"Registering \"%s\"." % spec) else: @@ -792,14 +798,14 @@ class LocalSocket(object): def main(): while True: - rset = [remote_s, local_s] + websocket_pending + socks_pending + locals + remotes + rset = remote_listen + local_listen + websocket_pending + socks_pending + locals + remotes rset, _, _ = select.select(rset, [], [], WEBSOCKET_REQUEST_TIMEOUT) for fd in rset: - if fd == remote_s: + if fd in remote_listen: remote_c, addr = fd.accept() log(u"Remote connection from %s." % safe_format_sockaddr(addr)) websocket_pending.append(TimeoutSocket(remote_c)) - elif fd == local_s: + elif fd in local_listen: local_c, addr = fd.accept() log(u"Local connection from %s." % safe_format_sockaddr(addr)) socks_pending.append(local_c) @@ -879,30 +885,51 @@ if __name__ == "__main__": elif o == "--unsafe-logging": options.safe_logging = False + if options.log_filename: + options.log_file = open(options.log_filename, "a") + # Send error tracebacks to the log. + sys.stderr = options.log_file + else: + options.log_file = sys.stdout + if len(args) == 0: - options.local_addr = (DEFAULT_LOCAL_ADDRESS, DEFAULT_LOCAL_PORT) - options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) + local_addr = (None, DEFAULT_LOCAL_PORT) + remote_addr = (None, DEFAULT_REMOTE_PORT) elif len(args) == 1: - options.local_addr = parse_addr_spec(args[0], DEFAULT_LOCAL_ADDRESS, DEFAULT_LOCAL_PORT) - options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) + local_addr = parse_addr_spec(args[0], defport=DEFAULT_LOCAL_PORT) + remote_addr = (None, DEFAULT_REMOTE_PORT) elif len(args) == 2: - options.local_addr = parse_addr_spec(args[0], DEFAULT_LOCAL_ADDRESS, DEFAULT_LOCAL_PORT) - options.remote_addr = parse_addr_spec(args[1], DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) + local_addr = parse_addr_spec(args[0], defport=DEFAULT_LOCAL_PORT) + remote_addr = parse_addr_spec(args[1], defport=DEFAULT_REMOTE_PORT) else: usage(sys.stderr) sys.exit(1) - if options.log_filename: - options.log_file = open(options.log_filename, "a") - # Send error tracebacks to the log. - sys.stderr = options.log_file + # Listen on both IPv4 and IPv6 if no host is given. + if local_addr[0]: + options.local_addrs.append(local_addr) else: - options.log_file = sys.stdout - - # Local socket, accepting SOCKS requests from localhost - local_s = listen_socket(options.local_addr) - # Remote socket, accepting remote WebSocket connections from proxies. - remote_s = listen_socket(options.remote_addr) + options.local_addrs.append(("127.0.0.1", local_addr[1])) + if socket.has_ipv6: + options.local_addrs.append(("::1", local_addr[1])) + if remote_addr[0]: + options.remote_addrs.append(remote_addr) + else: + options.remote_addrs.append(("0.0.0.0", remote_addr[1])) + if socket.has_ipv6: + options.remote_addrs.append(("::", remote_addr[1])) + options.register_addr = remote_addr + + # Local sockets, accepting SOCKS requests from localhost + local_listen = [] + for addr in options.local_addrs: + local_listen.append(listen_socket(addr)) + log(u"Listening local on %s." % format_addr(addr)) + # Remote sockets, accepting remote WebSocket connections from proxies. + remote_listen = [] + for addr in options.remote_addrs: + remote_listen.append(listen_socket(addr)) + log(u"Listening remote on %s." % format_addr(addr)) # New remote sockets waiting to finish their WebSocket negotiation. websocket_pending = []

1 0