November 2021 - tor-commits - lists.torproject.org

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 17 Nov '21

17 Nov '21

commit a8d0c0bd216f11e34eb1aa20aec52ec2963ad465 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 17 13:48:29 2021 +0000 new translations in support-portal --- contents+id.po | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/contents+id.po b/contents+id.po index 3434da6696..fe5dc6f16a 100644 --- a/contents+id.po +++ b/contents+id.po @@ -2466,6 +2466,8 @@ msgid "" "- Unsafe: [Any other browser configured to use Tor as a " "proxy](../../tbb/tbb-9/)" msgstr "" +"- Tidak aman: [Peramban lain yang dikonfigurasi untuk menggunakan Tor " +"sebagai proksi](../../tbb/tbb-9/)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2475,12 +2477,12 @@ msgstr "Pembagian berkas:" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "- Safe: [OnionShare](../../misc/misc-12/)" -msgstr "" +msgstr "- Aman: [OnionShare](../../misc/misc-12/)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "- Unsafe: [BitTorrent over Tor](../../misc/misc-4/)" -msgstr "" +msgstr "- Tidak Aman: [BitTorrent dibandingkan Tor](../../misc/misc-4/)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -11412,7 +11414,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "### Feedback template" -msgstr "" +msgstr "### Format Masukan" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -11457,7 +11459,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "### How to Reach Us" -msgstr "" +msgstr "### Cara Menghubungi Kami" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -11468,7 +11470,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "#### Tor Forum" -msgstr "" +msgstr "#### Forum Tor" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -11503,7 +11505,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "#### GitLab" -msgstr "" +msgstr "#### GitLab" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -11544,7 +11546,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "#### Email" -msgstr "" +msgstr "#### Surel" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -11590,7 +11592,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "#### Blog post comments" -msgstr "" +msgstr "#### Komentar pada posting blog" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -11609,7 +11611,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "#### IRC" -msgstr "" +msgstr "#### IRC" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -11633,7 +11635,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "#### Email Lists" -msgstr "" +msgstr "#### Daftar Surel" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -11677,7 +11679,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "### Report a security issue" -msgstr "" +msgstr "### Laporkan isu keamanan" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -12473,7 +12475,7 @@ msgstr "" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "### Register your nickname" -msgstr "" +msgstr "### Daftarkan nama panggilan mu" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -12531,7 +12533,7 @@ msgstr "" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "### How to verify your nickname" -msgstr "" +msgstr "### Bagaimana memverifikasi nama panggilan mu" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -12794,6 +12796,8 @@ msgid "" "#### 2. Create a new file in `/etc/apt/sources.list.d/` named `tor.list`. " "Add the following entries:" msgstr "" +"#### 2. Buat berkas baru pada `/etc/apt/sources.list.d/` yag dinamakan " +"`tor.list`. Tambahkan entri berikut:" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/tor-deb-repo/contents+en.lrquestion.description)

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 17 Nov '21

17 Nov '21

commit 89381f0374867c465497cd7d8a133f6bc047fd72 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 17 13:18:34 2021 +0000 new translations in support-portal --- contents+id.po | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/contents+id.po b/contents+id.po index 9f9e9f01d5..3434da6696 100644 --- a/contents+id.po +++ b/contents+id.po @@ -1716,7 +1716,7 @@ msgstr "" #: https//support.torproject.org/glossary/script/ #: (content/glossary/script/contents+en.lrword.term) msgid "script" -msgstr "" +msgstr "script" #: https//support.torproject.org/glossary/script/ #: (content/glossary/script/contents+en.lrword.definition) @@ -1726,7 +1726,7 @@ msgstr "" #: https//support.torproject.org/glossary/self-authenticating-address/ #: (content/glossary/self-authenticating-address/contents+en.lrword.term) msgid "self-authenticating address" -msgstr "" +msgstr "alamat otentikasi diri" #: https//support.torproject.org/glossary/self-authenticating-address/ #: (content/glossary/self-authenticating-address/contents+en.lrword.definition) @@ -1743,7 +1743,7 @@ msgstr "" #: https//support.torproject.org/glossary/server/ #: (content/glossary/server/contents+en.lrword.term) msgid "server" -msgstr "" +msgstr "server" #: https//support.torproject.org/glossary/server/ #: (content/glossary/server/contents+en.lrword.definition) @@ -1755,7 +1755,7 @@ msgstr "" #: https//support.torproject.org/glossary/session/ #: (content/glossary/session/contents+en.lrword.term) msgid "session" -msgstr "" +msgstr "sesi" #: https//support.torproject.org/glossary/session/ #: (content/glossary/session/contents+en.lrword.definition) @@ -1815,7 +1815,7 @@ msgstr "" #: https//support.torproject.org/glossary/socks5/ #: (content/glossary/socks5/contents+en.lrword.term) msgid "SOCKS5" -msgstr "" +msgstr "SOCKS5" #: https//support.torproject.org/glossary/socks5/ #: (content/glossary/socks5/contents+en.lrword.definition) @@ -1851,7 +1851,7 @@ msgstr "" #: https//support.torproject.org/glossary/ssl/ #: (content/glossary/ssl/contents+en.lrword.term) msgid "secure sockets layer (SSL)" -msgstr "" +msgstr "secure sockets layer (SSL)" #: https//support.torproject.org/glossary/ssl/ #: (content/glossary/ssl/contents+en.lrword.definition) @@ -1879,7 +1879,7 @@ msgstr "" #: https//support.torproject.org/glossary/sybil-attack/ #: (content/glossary/sybil-attack/contents+en.lrword.term) msgid "Sybil attack" -msgstr "" +msgstr "Serangan sybil" #: https//support.torproject.org/glossary/sybil-attack/ #: (content/glossary/sybil-attack/contents+en.lrword.definition) @@ -1914,7 +1914,7 @@ msgstr "" #: https//support.torproject.org/glossary/the-guardian-project/ #: (content/glossary/the-guardian-project/contents+en.lrword.term) msgid "The Guardian Project" -msgstr "" +msgstr "Proyek The Guardian" #: https//support.torproject.org/glossary/the-guardian-project/ #: (content/glossary/the-guardian-project/contents+en.lrword.definition) @@ -1950,7 +1950,7 @@ msgstr "" #: https//support.torproject.org/glossary/third-party-tracking/ #: (content/glossary/third-party-tracking/contents+en.lrword.term) msgid "third-party tracking" -msgstr "" +msgstr "pelacakan pihak ketiga" #: https//support.torproject.org/glossary/third-party-tracking/ #: (content/glossary/third-party-tracking/contents+en.lrword.definition) @@ -2202,7 +2202,7 @@ msgstr "" #: https//support.torproject.org/glossary/tor2web/ #: (content/glossary/tor2web/contents+en.lrword.term) msgid "Tor2Web" -msgstr "" +msgstr "Tor2Web" #: https//support.torproject.org/glossary/tor2web/ #: (content/glossary/tor2web/contents+en.lrword.definition) @@ -2234,7 +2234,7 @@ msgstr "" #: https//support.torproject.org/glossary/torrc/ #: (content/glossary/torrc/contents+en.lrword.term) msgid "torrc" -msgstr "" +msgstr "torrc" #: https//support.torproject.org/glossary/torrc/ #: (content/glossary/torrc/contents+en.lrword.definition) @@ -2244,7 +2244,7 @@ msgstr "" #: https//support.torproject.org/glossary/torsocks/ #: (content/glossary/torsocks/contents+en.lrword.term) msgid "Torsocks" -msgstr "" +msgstr "Torsocks" #: https//support.torproject.org/glossary/torsocks/ #: (content/glossary/torsocks/contents+en.lrword.definition) @@ -2263,7 +2263,7 @@ msgstr "" #: https//support.torproject.org/glossary/tpi/ #: (content/glossary/tpi/contents+en.lrword.term) msgid "TPI" -msgstr "" +msgstr "TPI" #: https//support.torproject.org/glossary/tpi/ #: (content/glossary/tpi/contents+en.lrword.definition) @@ -2273,7 +2273,7 @@ msgstr "" #: https//support.torproject.org/glossary/tpo/ #: (content/glossary/tpo/contents+en.lrword.term) msgid "tpo" -msgstr "" +msgstr "tpo" #: https//support.torproject.org/glossary/tpo/ #: (content/glossary/tpo/contents+en.lrword.definition) @@ -2286,7 +2286,7 @@ msgstr "" #: https//support.torproject.org/glossary/traffic/ #: (content/glossary/traffic/contents+en.lrword.term) msgid "traffic" -msgstr "" +msgstr "lalu lintas" #: https//support.torproject.org/glossary/traffic/ #: (content/glossary/traffic/contents+en.lrword.definition) @@ -2298,7 +2298,7 @@ msgstr "" #: https//support.torproject.org/glossary/web-browser/ #: (content/glossary/web-browser/contents+en.lrword.term) msgid "web browser" -msgstr "" +msgstr "peramban web" #: https//support.torproject.org/glossary/web-browser/ #: (content/glossary/web-browser/contents+en.lrword.definition) @@ -2318,7 +2318,7 @@ msgstr "" #: https//support.torproject.org/glossary/website-mirror/ #: (content/glossary/website-mirror/contents+en.lrword.term) msgid "website mirror" -msgstr "" +msgstr "situs web mirror" #: https//support.torproject.org/glossary/website-mirror/ #: (content/glossary/website-mirror/contents+en.lrword.definition) @@ -2453,12 +2453,12 @@ msgstr "" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "Web browsing:" -msgstr "" +msgstr "Meramban web:" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "- Safe: [Tor Browser](https://www.torproject.org/download/)" -msgstr "" +msgstr "- Aman: [Tor Browser](https://www.torproject.org/download/)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2470,7 +2470,7 @@ msgstr "" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "File sharing:" -msgstr "" +msgstr "Pembagian berkas:" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description)

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 17 Nov '21

17 Nov '21

commit 91ce89fa036af9657aa43e8f77feb21794958fb0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 17 12:47:55 2021 +0000 new translations in support-portal --- contents+id.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+id.po b/contents+id.po index 74e630e474..9f9e9f01d5 100644 --- a/contents+id.po +++ b/contents+id.po @@ -1569,7 +1569,7 @@ msgstr "" #: https//support.torproject.org/glossary/private-key/ #: (content/glossary/private-key/contents+en.lrword.term) msgid "private key" -msgstr "" +msgstr "kunci pribadi" #: https//support.torproject.org/glossary/private-key/ #: (content/glossary/private-key/contents+en.lrword.definition) @@ -1625,12 +1625,12 @@ msgstr "" #: https//support.torproject.org/glossary/public-key-cryptography/ #: (content/glossary/public-key-cryptography/contents+en.lrword.term) msgid "public key cryptography" -msgstr "" +msgstr "kunci publik kriptografi" #: https//support.torproject.org/glossary/public-key-cryptography/ #: (content/glossary/public-key-cryptography/contents+en.lrword.definition) msgid "A public-key cryptography system uses pairs of mathematical keys." -msgstr "" +msgstr "sistem kunci publik kriptografi menggunakan pasangan kunci matematis" #: https//support.torproject.org/glossary/public-key-cryptography/ #: (content/glossary/public-key-cryptography/contents+en.lrword.definition) @@ -1704,7 +1704,7 @@ msgstr "" #: https//support.torproject.org/glossary/scramblesuit/ #: (content/glossary/scramblesuit/contents+en.lrword.term) msgid "ScrambleSuit" -msgstr "" +msgstr "ScrambleSuit" #: https//support.torproject.org/glossary/scramblesuit/ #: (content/glossary/scramblesuit/contents+en.lrword.definition)

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 17 Nov '21

17 Nov '21

commit b263eac52e7afba13fc4eaa4cb9e3693dd96f332 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 17 12:18:15 2021 +0000 new translations in support-portal --- contents+id.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/contents+id.po b/contents+id.po index f7c2ff833d..74e630e474 100644 --- a/contents+id.po +++ b/contents+id.po @@ -1377,7 +1377,7 @@ msgstr "" #: https//support.torproject.org/glossary/onion-address/ #: (content/glossary/onion-address/contents+en.lrword.term) msgid "onion address" -msgstr "" +msgstr "alamat onion" #: https//support.torproject.org/glossary/onion-address/ #: (content/glossary/onion-address/contents+en.lrword.definition) @@ -1397,7 +1397,7 @@ msgstr "" #: https//support.torproject.org/glossary/onion-browser/ #: (content/glossary/onion-browser/contents+en.lrword.term) msgid "Onion Browser" -msgstr "" +msgstr "Onion Browser" #: https//support.torproject.org/glossary/onion-browser/ #: (content/glossary/onion-browser/contents+en.lrword.definition) @@ -1423,7 +1423,7 @@ msgstr "" #: https//support.torproject.org/glossary/onion-services/ #: (content/glossary/onion-services/contents+en.lrword.term) msgid "onion services" -msgstr "" +msgstr "layanan onion" #: https//support.torproject.org/glossary/onion-services/ #: (content/glossary/onion-services/contents+en.lrword.definition) @@ -1443,7 +1443,7 @@ msgstr "" #: https//support.torproject.org/glossary/onion-site/ #: (content/glossary/onion-site/contents+en.lrword.term) msgid "onion site" -msgstr "" +msgstr "situs onion" #: https//support.torproject.org/glossary/onion-site/ #: (content/glossary/onion-site/contents+en.lrword.definition) @@ -1461,7 +1461,7 @@ msgstr "" #: https//support.torproject.org/glossary/onionoo/ #: (content/glossary/onionoo/contents+en.lrword.term) msgid "Onionoo" -msgstr "" +msgstr "Onionoo" #: https//support.torproject.org/glossary/onionoo/ #: (content/glossary/onionoo/contents+en.lrword.definition) @@ -1482,7 +1482,7 @@ msgstr "" #: https//support.torproject.org/glossary/onionspace/ #: (content/glossary/onionspace/contents+en.lrword.term) msgid "onionspace" -msgstr "" +msgstr "onionspace" #: https//support.torproject.org/glossary/onionspace/ #: (content/glossary/onionspace/contents+en.lrword.definition) @@ -1495,7 +1495,7 @@ msgstr "" #: https//support.torproject.org/glossary/ooni/ #: (content/glossary/ooni/contents+en.lrword.term) msgid "OONI" -msgstr "" +msgstr "OONI" #: https//support.torproject.org/glossary/ooni/ #: (content/glossary/ooni/contents+en.lrword.definition) @@ -1509,7 +1509,7 @@ msgstr "" #: https//support.torproject.org/glossary/operating-system-os-/ #: (content/glossary/operating-system-os-/contents+en.lrword.term) msgid "operating system (OS)" -msgstr "" +msgstr "sistem operasi (OS)" #: https//support.torproject.org/glossary/operating-system-os-/ #: (content/glossary/operating-system-os-/contents+en.lrword.definition) @@ -1539,7 +1539,7 @@ msgstr "" #: https//support.torproject.org/glossary/orfox/ #: (content/glossary/orfox/contents+en.lrword.term) msgid "Orfox" -msgstr "" +msgstr "Orfox" #: https//support.torproject.org/glossary/orfox/ #: (content/glossary/orfox/contents+en.lrword.definition) @@ -1549,7 +1549,7 @@ msgstr "" #: https//support.torproject.org/glossary/pluggable-transports/ #: (content/glossary/pluggable-transports/contents+en.lrword.term) msgid "pluggable transports" -msgstr "" +msgstr "pluggable transport" #: https//support.torproject.org/glossary/pluggable-transports/ #: (content/glossary/pluggable-transports/contents+en.lrword.definition)

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 17 Nov '21

17 Nov '21

commit 7be1804e5bc98a75b703aaa1c243f6f50acc86c7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 17 12:15:14 2021 +0000 new translations in communitytpo-contentspot --- contents+id.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contents+id.po b/contents+id.po index eac85c405b..3e26070ee9 100644 --- a/contents+id.po +++ b/contents+id.po @@ -16,8 +16,9 @@ # erinm, 2021 # ical, 2021 # cuna <cunaxc(a)gmail.com>, 2021 -# 9hs <9hs(a)tuta.io>, 2021 +# hadymaggot <9hs(a)tuta.io>, 2021 # Emma Peel, 2021 +# Dewie Ang, 2021 # msgid "" msgstr "" @@ -25,7 +26,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-11-11 20:06+UTC\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: Dewie Ang, 2021\n" "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -941,7 +942,7 @@ msgstr "Sunting halaman ini" #: https//community.torproject.org/onion-services/setup/install/ #: (content/onion-services/setup/install/contents+en.lrpage.section) msgid "onion services" -msgstr "" +msgstr "layanan onion" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body)

1 0

[snowflake/main] Port V2Ray periodic task standard library to snowflake
by meskio＠torproject.org 16 Nov '21

16 Nov '21

commit 4c8a16617873bcf637d14674f0c0f985303f4d1f Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Thu Nov 4 20:21:59 2021 +0000 Port V2Ray periodic task standard library to snowflake This is a mature implementation of periodic task that run a function at given interval. It allows task to be stopped, and deals with edge case like interval too short gracefully. V2Ray/V2Fly is MIT licensed. --- common/task/periodic.go | 85 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/common/task/periodic.go b/common/task/periodic.go new file mode 100644 index 0000000..6abe41a --- /dev/null +++ b/common/task/periodic.go @@ -0,0 +1,85 @@ +package task + +import ( + "sync" + "time" +) + +// Periodic is a task that runs periodically. +type Periodic struct { + // Interval of the task being run + Interval time.Duration + // Execute is the task function + Execute func() error + + access sync.Mutex + timer *time.Timer + running bool +} + +func (t *Periodic) hasClosed() bool { + t.access.Lock() + defer t.access.Unlock() + + return !t.running +} + +func (t *Periodic) checkedExecute() error { + if t.hasClosed() { + return nil + } + + if err := t.Execute(); err != nil { + t.access.Lock() + t.running = false + t.access.Unlock() + return err + } + + t.access.Lock() + defer t.access.Unlock() + + if !t.running { + return nil + } + + t.timer = time.AfterFunc(t.Interval, func() { + t.checkedExecute() + }) + + return nil +} + +// Start implements common.Runnable. +func (t *Periodic) Start() error { + t.access.Lock() + if t.running { + t.access.Unlock() + return nil + } + t.running = true + t.access.Unlock() + + if err := t.checkedExecute(); err != nil { + t.access.Lock() + t.running = false + t.access.Unlock() + return err + } + + return nil +} + +// Close implements common.Closable. +func (t *Periodic) Close() error { + t.access.Lock() + defer t.access.Unlock() + + t.running = false + if t.timer != nil { + t.timer.Stop() + t.timer = nil + } + + return nil +}

1 0

[snowflake/main] Add NAT Type test periodic task
by meskio＠torproject.org 16 Nov '21

16 Nov '21

commit a6a53ff8ceb3ac48ac1fc1165255df8ebc9c685b Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Thu Nov 4 20:34:32 2021 +0000 Add NAT Type test periodic task --- proxy/lib/snowflake.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index f979ed0..b133c67 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -41,6 +41,7 @@ import ( "time" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" + "git.torproject.org/pluggable-transports/snowflake.git/v2/common/task" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/util" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/websocketco…" "github.com/gorilla/websocket" @@ -546,6 +547,19 @@ func (sf *SnowflakeProxy) Start() error { log.Printf("NAT type: %s", currentNATTypeLoaded) + NatRetestTask := task.Periodic{ + Interval: time.Second * time.Duration(sf.NATTypeMeasurementIntervalSecond), + Execute: func() error { + sf.checkNATType(config, sf.NATProbeURL) + return nil + }, + } + + if sf.NATTypeMeasurementIntervalSecond != 0 { + NatRetestTask.Start() + defer NatRetestTask.Close() + } + ticker := time.NewTicker(pollInterval) defer ticker.Stop()

1 0

[snowflake/main] Support recurring NAT Type measurement
by meskio＠torproject.org 16 Nov '21

16 Nov '21

commit 04bc471a637bcda2d865e5f607c2e588cbe0b044 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Thu Nov 4 19:55:48 2021 +0000 Support recurring NAT Type measurement currentNATType will from now on be guarded by currentNATTypeAccess for any access. NAT Type update rule is flattened into state transfer lookup table to assist reading. --- proxy/lib/snowflake.go | 62 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index e39fcfb..7d237de 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -73,6 +73,10 @@ const readLimit = 100000 //Maximum number of bytes to be read from an HTTP reque var broker *SignalingServer +var currentNATTypeAccess = &sync.RWMutex{} + +// currentNATType describes local network environment. +// Obtain currentNATTypeAccess before access. var currentNATType = NATUnknown const ( @@ -183,7 +187,10 @@ func (s *SignalingServer) pollOffer(sid string, shutdown chan struct{}) *webrtc. return nil default: numClients := int((tokens.count() / 8) * 8) // Round down to 8 - body, err := messages.EncodePollRequest(sid, "standalone", currentNATType, numClients) + currentNATTypeAccess.RLock() + currentNATTypeLoaded := currentNATType + currentNATTypeAccess.RUnlock() + body, err := messages.EncodePollRequest(sid, "standalone", currentNATTypeLoaded, numClients) if err != nil { log.Printf("Error encoding poll message: %s", err.Error()) return nil @@ -530,7 +537,12 @@ func (sf *SnowflakeProxy) Start() error { // use probetest to determine NAT compatability sf.checkNATType(config, sf.NATProbeURL) - log.Printf("NAT type: %s", currentNATType) + + currentNATTypeAccess.RLock() + currentNATTypeLoaded := currentNATType + currentNATTypeAccess.RUnlock() + + log.Printf("NAT type: %s", currentNATTypeLoaded) ticker := time.NewTicker(pollInterval) defer ticker.Stop() @@ -604,12 +616,54 @@ func (sf *SnowflakeProxy) checkNATType(config webrtc.Configuration, probeURL str return } + currentNATTypeAccess.RLock() + currentNATTypeLoaded := currentNATType + currentNATTypeAccess.RUnlock() + + currentNATTypeTestResult := NATUnknown select { case <-dataChan: - currentNATType = NATUnrestricted + currentNATTypeTestResult = NATUnrestricted case <-time.After(dataChannelTimeout): - currentNATType = NATRestricted + currentNATTypeTestResult = NATRestricted } + + currentNATTypeToStore := NATUnknown + switch currentNATTypeLoaded + "->" + currentNATTypeTestResult { + case NATUnknown + "->" + NATUnknown: + currentNATTypeToStore = NATUnknown + + case NATUnknown + "->" + NATUnrestricted: + currentNATTypeToStore = NATUnrestricted + + case NATUnknown + "->" + NATRestricted: + currentNATTypeToStore = NATRestricted + + case NATUnrestricted + "->" + NATUnknown: + currentNATTypeToStore = NATUnrestricted + + case NATUnrestricted + "->" + NATUnrestricted: + currentNATTypeToStore = NATUnrestricted + + case NATUnrestricted + "->" + NATRestricted: + currentNATTypeToStore = NATRestricted + + case NATRestricted + "->" + NATUnknown: + currentNATTypeToStore = NATRestricted + + case NATRestricted + "->" + NATUnrestricted: + currentNATTypeToStore = NATUnrestricted + + case NATRestricted + "->" + NATRestricted: + currentNATTypeToStore = NATRestricted + } + + log.Printf("NAT Type measurement: %v -> %v = %v\n", currentNATTypeLoaded, currentNATTypeTestResult, currentNATTypeToStore) + + currentNATTypeAccess.Lock() + currentNATType = currentNATTypeToStore + currentNATTypeAccess.Unlock() + if err := pc.Close(); err != nil { log.Printf("error calling pc.Close: %v", err) }

1 0

[snowflake/main] Add NAT Type measurement command line flag
by meskio＠torproject.org 16 Nov '21

16 Nov '21

commit ac97ce7136906287a86c6fc2d9cfdc6b7c313166 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Thu Nov 4 20:25:50 2021 +0000 Add NAT Type measurement command line flag It is important to include unit in flag name to prevent user from making mistake. --- proxy/lib/snowflake.go | 4 +++- proxy/main.go | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index 7d237de..f979ed0 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -105,7 +105,9 @@ type SnowflakeProxy struct { RelayURL string // NATProbeURL is the URL of the probe service we use for NAT checks NATProbeURL string - shutdown chan struct{} + // NATTypeMeasurementIntervalSecond is time in second before NAT type is retested + NATTypeMeasurementIntervalSecond uint + shutdown chan struct{} } // Checks whether an IP address is a remote address for the client diff --git a/proxy/main.go b/proxy/main.go index 7dcbcda..a8e56bb 100644 --- a/proxy/main.go +++ b/proxy/main.go @@ -18,6 +18,8 @@ func main() { unsafeLogging := flag.Bool("unsafe-logging", false, "prevent logs from being scrubbed") keepLocalAddresses := flag.Bool("keep-local-addresses", false, "keep local LAN address ICE candidates") relayURL := flag.String("relay", sf.DefaultRelayURL, "websocket relay URL") + NATTypeMeasurementIntervalSecond := flag.Uint("nat-type-measurement-interval-second", 0, + "the time interval in second before NAT type is retested, 0 disables retest") flag.Parse() @@ -27,6 +29,8 @@ func main() { BrokerURL: *rawBrokerURL, KeepLocalAddresses: *keepLocalAddresses, RelayURL: *relayURL, + + NATTypeMeasurementIntervalSecond: *NATTypeMeasurementIntervalSecond, } var logOutput io.Writer = os.Stderr

1 0

[snowflake/main] Extract function getCurrentNATType()
by meskio＠torproject.org 16 Nov '21

16 Nov '21

commit 2547883cf91839c40b937e354408e41fdf34c24e Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Tue Nov 9 19:34:16 2021 +0000 Extract function getCurrentNATType() Adopted the change in according to the recommendation from https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- proxy/lib/snowflake.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index b133c67..4cf25ee 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -80,6 +80,12 @@ var currentNATTypeAccess = &sync.RWMutex{} // Obtain currentNATTypeAccess before access. var currentNATType = NATUnknown +func getCurrentNATType() string { + currentNATTypeAccess.RLock() + defer currentNATTypeAccess.RUnlock() + return currentNATType +} + const ( sessionIDLength = 16 ) @@ -190,9 +196,7 @@ func (s *SignalingServer) pollOffer(sid string, shutdown chan struct{}) *webrtc. return nil default: numClients := int((tokens.count() / 8) * 8) // Round down to 8 - currentNATTypeAccess.RLock() - currentNATTypeLoaded := currentNATType - currentNATTypeAccess.RUnlock() + currentNATTypeLoaded := getCurrentNATType() body, err := messages.EncodePollRequest(sid, "standalone", currentNATTypeLoaded, numClients) if err != nil { log.Printf("Error encoding poll message: %s", err.Error()) @@ -541,9 +545,7 @@ func (sf *SnowflakeProxy) Start() error { // use probetest to determine NAT compatability sf.checkNATType(config, sf.NATProbeURL) - currentNATTypeAccess.RLock() - currentNATTypeLoaded := currentNATType - currentNATTypeAccess.RUnlock() + currentNATTypeLoaded := getCurrentNATType() log.Printf("NAT type: %s", currentNATTypeLoaded) @@ -632,9 +634,7 @@ func (sf *SnowflakeProxy) checkNATType(config webrtc.Configuration, probeURL str return } - currentNATTypeAccess.RLock() - currentNATTypeLoaded := currentNATType - currentNATTypeAccess.RUnlock() + currentNATTypeLoaded := getCurrentNATType() currentNATTypeTestResult := NATUnknown select {

1 0