- tor-commits - lists.torproject.org

[snowflake/master] Close SocksConn when WebRTC connection is reset
by arlo＠torproject.org 19 Mar '16

19 Mar '16

commit 598e2a3bfb1cd8effab4c1b945035c870be16bff Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Mar 18 21:29:31 2016 -0700 Close SocksConn when WebRTC connection is reset * This will induce the tor client to establish a new SocksConn, which in turn will dial a new WebRTC connection. To be improved upon. * Part of #12 --- client/snowflake.go | 6 ++++++ client/webrtc.go | 37 +++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 652032a..5fe55a9 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -99,6 +99,12 @@ func handler(conn *pt.SocksConn) error { defer remote.Close() webrtcRemote = remote + // Induce another call to handler + go func() { + <-remote.reset + conn.Close() + }() + err = conn.Grant(&net.TCPAddr{IP: net.IPv4zero, Port: 0}) if err != nil { return err diff --git a/client/webrtc.go b/client/webrtc.go index af32ddd..2be31b5 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -101,27 +101,24 @@ func NewWebRTCConnection(config *webrtc.Configuration, // WebRTC re-establishment loop. Expected in own goroutine. func (c *webRTCConn) ConnectLoop() { - for { - log.Println("Establishing WebRTC connection...") - // TODO: When go-webrtc is more stable, it's possible that a new - // PeerConnection won't need to be re-prepared each time. - err := c.preparePeerConnection() - if err != nil { - log.Println("WebRTC: Could not create PeerConnection.") - break - } - err = c.establishDataChannel() - if err != nil { - log.Println("WebRTC: Could not establish DataChannel.") - } else { - go c.exchangeSDP() - <-c.reset - log.Println(" --- snowflake connection reset ---") - } - <-time.After(time.Second * 1) - c.cleanup() + log.Println("Establishing WebRTC connection...") + // TODO: When go-webrtc is more stable, it's possible that a new + // PeerConnection won't need to be re-prepared each time. + err := c.preparePeerConnection() + if err != nil { + log.Println("WebRTC: Could not create PeerConnection.") + return } - log.Println("WebRTC cannot connect.") + err = c.establishDataChannel() + if err != nil { + log.Println("WebRTC: Could not establish DataChannel.") + } else { + go c.exchangeSDP() + <-c.reset + log.Println(" --- snowflake connection reset ---") + } + <-time.After(time.Second * 1) + c.cleanup() } // Create and prepare callbacks on a new WebRTC PeerConnection.

1 0

[snowflake/master] Close connections before unloading
by arlo＠torproject.org 18 Mar '16

18 Mar '16

commit cf1b0a49f13f2550cad1b32ef4e4820b4c26bcf1 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Mar 18 14:22:34 2016 -0700 Close connections before unloading Noticed a long delay after the window closed before the datachannel timed out. 2016/03/18 13:53:16 Traffic Bytes (in|out): 202576 | 8087 2016/03/18 13:58:10 WebRTC: DataChannel.OnClose [remotely] --- proxy/snowflake.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index eff96de..7e26481 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -226,4 +226,8 @@ window.onbeforeunload = -> return CONFIRMATION_MESSAGE null +window.onunload = -> + pair.close() for pair in snowflake.proxyPairs + null + window.onload = init if window

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit feced175c2f77fb0ca811297a2bb156246ead3a0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 21:17:41 2016 +0000 Update translations for tails-openpgp-applet_completed --- ja/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/openpgp-applet.pot b/ja/openpgp-applet.pot index b38d81e..08c38ad 100644 --- a/ja/openpgp-applet.pot +++ b/ja/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2016-03-18 20:46+0000\n" +"PO-Revision-Date: 2016-03-18 20:54+0000\n" "Last-Translator: Tokumei Nanashi\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit f2f61a4faffe7a9774a87fdd3fb0de1fb62e2640 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 21:17:37 2016 +0000 Update translations for tails-openpgp-applet --- ja/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/openpgp-applet.pot b/ja/openpgp-applet.pot index b38d81e..08c38ad 100644 --- a/ja/openpgp-applet.pot +++ b/ja/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2016-03-18 20:46+0000\n" +"PO-Revision-Date: 2016-03-18 20:54+0000\n" "Last-Translator: Tokumei Nanashi\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-messenger-privdtd_completed] Update translations for tor-messenger-privdtd_completed
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit 691a637ead6d4e3d975aa569858b1a9f8b34400c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 21:17:31 2016 +0000 Update translations for tor-messenger-privdtd_completed --- ja/priv.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ja/priv.dtd b/ja/priv.dtd new file mode 100644 index 0000000..fd690b8 --- /dev/null +++ b/ja/priv.dtd @@ -0,0 +1,2 @@ +<!ENTITY privDialog.title "秘密鍵を生成中"> +<!ENTITY privDialog.done "完了"> \ No newline at end of file

1 0

[translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit 958704d722b4ce8c9c48fdd88de172756cad6570 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 21:17:27 2016 +0000 Update translations for tor-messenger-privdtd --- ja/priv.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/priv.dtd b/ja/priv.dtd index 57b860d..fd690b8 100644 --- a/ja/priv.dtd +++ b/ja/priv.dtd @@ -1,2 +1,2 @@ -<!ENTITY privDialog.title "Generating private key"> +<!ENTITY privDialog.title "秘密鍵を生成中"> <!ENTITY privDialog.done "完了"> \ No newline at end of file

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit 4d8191e952092951e542af0d37ab0f0cd4289661 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 21:17:21 2016 +0000 Update translations for tor-messenger-prefsdtd --- ja/prefs.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ja/prefs.dtd b/ja/prefs.dtd index 1441b0e..8526b57 100644 --- a/ja/prefs.dtd +++ b/ja/prefs.dtd @@ -1,13 +1,13 @@ -<!ENTITY prefs.otrPreferences "OTR Preferences"> -<!ENTITY prefs.otrSettings "OTR Settings"> -<!ENTITY prefs.requireEncryption "Require encryption"> -<!ENTITY prefs.otrKeys "My Private Keys"> +<!ENTITY prefs.otrPreferences "OTRの設定"> +<!ENTITY prefs.otrSettings "OTRの設定"> +<!ENTITY prefs.requireEncryption "暗号化を要求する"> +<!ENTITY prefs.otrKeys "自分の秘密鍵"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "フィンガープリント:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "表示"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> -<!ENTITY prefs.generate "Generate"> \ No newline at end of file +<!ENTITY prefs.generate "生成"> \ No newline at end of file

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit 202291fa6cf09daef4779bbcd10d0ed1b80781d8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 21:17:14 2016 +0000 Update translations for tor-messenger-otrproperties --- ja/otr.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/otr.properties b/ja/otr.properties index 11b23be..9ba9f54 100644 --- a/ja/otr.properties +++ b/ja/otr.properties @@ -21,10 +21,10 @@ error.enc=Error occurred encrypting message. error.not_priv=You sent encrypted data to %S, who wasn't expecting it. error.unreadable=You transmitted an unreadable encrypted message. error.malformed=You transmitted a malformed data message. -resent=[resent] +resent=[再送信] tlv.disconnected=%S has ended their private conversation with you; you should do the same. query.msg=%S has requested an Off-the Record private conversation. However, you do not have a plugin to support that. See http://otr.cypherpunks.ca/ for more information. -trust.unused=Unused +trust.unused=未使用 trust.not_private=Not Private trust.unverified=Unverified trust.private=Private

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit ab2bf3bf1f85761e0ee4de863570dd4c34b65dd4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 21:17:09 2016 +0000 Update translations for tor-messenger-ircproperties --- ja/irc.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ja/irc.properties b/ja/irc.properties index 271c970..7c50815 100644 --- a/ja/irc.properties +++ b/ja/irc.properties @@ -25,10 +25,10 @@ joinChat.password=_Password # LOCALIZATION NOTE (options.*): # These are the protocol specific options shown in the account manager and # account wizard windows. -options.server=Server +options.server=サーバー options.port=ポート -options.ssl=Use SSL -options.encoding=Character Set +options.ssl=SSLを使用する +options.encoding=文字セット options.quitMessage=Quit message options.partMessage=Part message options.showServerTab=Show messages from the server @@ -180,7 +180,7 @@ error.unknownMode='%S' is not a valid user mode on this server. # These are the descriptions given in a tooltip with information received # from a whois response. # The human readable ("realname") description of the user. -tooltip.realname=Name +tooltip.realname=名前 tooltip.server=Connected to # The username and hostname that the user connects from (usually based on the # reverse DNS of the user's IP, but often mangled by the server to

1 0

[tor-commits] [translation/tor-messenger-imtooltipproperties_completed] Update translations for tor-messenger-imtooltipproperties_completed
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit db57c5d11919a726b972ee118d1dd492f07caa28 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 21:17:04 2016 +0000 Update translations for tor-messenger-imtooltipproperties_completed --- ja/imtooltip.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ja/imtooltip.properties b/ja/imtooltip.properties new file mode 100644 index 0000000..a83438a --- /dev/null +++ b/ja/imtooltip.properties @@ -0,0 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +buddy.username=ユーザー名 +buddy.account=account +contact.tags=タグ

1 0