- tor-commits - lists.torproject.org

[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

[snowflake/main] Refactor state transfer logic to simplify it
by meskio＠torproject.org 16 Nov '21

16 Nov '21

commit 59af9927a5383587eb20893a48b51e312bdbe896 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Fri Nov 12 10:28:01 2021 +0000 Refactor state transfer logic to simplify it Adopted the change in according to the recommendation from https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- proxy/lib/snowflake.go | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index 4cf25ee..df6a256 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -646,32 +646,14 @@ func (sf *SnowflakeProxy) checkNATType(config webrtc.Configuration, probeURL str 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 + default: + currentNATTypeToStore = currentNATTypeTestResult } log.Printf("NAT Type measurement: %v -> %v = %v\n", currentNATTypeLoaded, currentNATTypeTestResult, currentNATTypeToStore)

1 0

[snowflake/main] Rename flag to nat-retest-seconds and retest daily by default
by meskio＠torproject.org 16 Nov '21

16 Nov '21

commit 1b79962ca81e6d1db0c790b2d2d5e54a806148f4 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Fri Nov 12 10:43:05 2021 +0000 Rename flag to nat-retest-seconds and retest daily by default Adopted the change in according to the recommendation from https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- proxy/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/main.go b/proxy/main.go index a8e56bb..baac52b 100644 --- a/proxy/main.go +++ b/proxy/main.go @@ -18,7 +18,7 @@ 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, + NATTypeMeasurementIntervalSecond := flag.Uint("nat-retest-seconds", 86400, "the time interval in second before NAT type is retested, 0 disables retest") flag.Parse()

1 0

[snowflake/main] Add in source indicator of file origin
by meskio＠torproject.org 16 Nov '21

16 Nov '21

commit d4fdb35ee8d1f7e43dbca2503355d191da8d00f0 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Fri Nov 12 10:56:57 2021 +0000 Add in source indicator of file origin Adopted the change in according to the recommendation from https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- common/task/periodic.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/task/periodic.go b/common/task/periodic.go index 6abe41a..1ab34b3 100644 --- a/common/task/periodic.go +++ b/common/task/periodic.go @@ -1,3 +1,5 @@ +// Package task +// Reused from https://github.com/v2fly/v2ray-core/blob/784775f68922f07d40c9eead63015b2026… package task import (

1 0

[snowflake/main] Update nat-retest-seconds format to time.ParseDuration form
by meskio＠torproject.org 16 Nov '21

16 Nov '21

commit 9bdb87eaf355e4dacdf5e1b59b8e37e010b166ba Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Tue Nov 16 11:16:54 2021 +0000 Update nat-retest-seconds format to time.ParseDuration form Adopted the change in according to the recommendation from https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- proxy/main.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/proxy/main.go b/proxy/main.go index baac52b..b0f6971 100644 --- a/proxy/main.go +++ b/proxy/main.go @@ -5,6 +5,7 @@ import ( "io" "log" "os" + "time" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" sf "git.torproject.org/pluggable-transports/snowflake.git/v2/proxy/lib" @@ -18,8 +19,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-retest-seconds", 86400, - "the time interval in second before NAT type is retested, 0 disables retest") + NATTypeMeasurementIntervalString := flag.String("nat-retest-seconds", "24h", + "the time interval in second before NAT type is retested, 0s disables retest. Valid time units are \"s\", \"m\", \"h\". ") flag.Parse() @@ -29,8 +30,12 @@ func main() { BrokerURL: *rawBrokerURL, KeepLocalAddresses: *keepLocalAddresses, RelayURL: *relayURL, + } - NATTypeMeasurementIntervalSecond: *NATTypeMeasurementIntervalSecond, + if NATTypeMeasurementIntervalTime, err := time.ParseDuration(*NATTypeMeasurementIntervalString); err == nil { + proxy.NATTypeMeasurementIntervalSecond = uint(NATTypeMeasurementIntervalTime.Seconds()) + } else { + log.Fatalf("unable to parse nat-retest-seconds: %v", err) } var logOutput io.Writer = os.Stderr

1 0

[snowflake/main] Update nat-retest-interval flag name to reflect the change
by meskio＠torproject.org 16 Nov '21

16 Nov '21

commit efdb850d2ed7105959a53614b9e881bbee42fd28 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Tue Nov 16 11:22:44 2021 +0000 Update nat-retest-interval flag name to reflect the change Adopted the change in according to the recommendation from https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- proxy/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/main.go b/proxy/main.go index b0f6971..399493b 100644 --- a/proxy/main.go +++ b/proxy/main.go @@ -19,7 +19,7 @@ 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") - NATTypeMeasurementIntervalString := flag.String("nat-retest-seconds", "24h", + NATTypeMeasurementIntervalString := flag.String("nat-retest-interval", "24h", "the time interval in second before NAT type is retested, 0s disables retest. Valid time units are \"s\", \"m\", \"h\". ") flag.Parse()

1 0

[snowflake/main] Represent NATTypeMeasurementInterval in time.Duration
by meskio＠torproject.org 16 Nov '21

16 Nov '21

commit 0c62d806a4352c054f80bb0f604eb7de7f1430e0 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Tue Nov 16 19:25:27 2021 +0000 Represent NATTypeMeasurementInterval in time.Duration Adopted the change in according to the recommendation from https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- proxy/lib/snowflake.go | 10 +++++----- proxy/main.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index df6a256..a9ac399 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -112,9 +112,9 @@ type SnowflakeProxy struct { RelayURL string // NATProbeURL is the URL of the probe service we use for NAT checks NATProbeURL string - // NATTypeMeasurementIntervalSecond is time in second before NAT type is retested - NATTypeMeasurementIntervalSecond uint - shutdown chan struct{} + // NATTypeMeasurementInterval is time before NAT type is retested + NATTypeMeasurementInterval time.Duration + shutdown chan struct{} } // Checks whether an IP address is a remote address for the client @@ -550,14 +550,14 @@ func (sf *SnowflakeProxy) Start() error { log.Printf("NAT type: %s", currentNATTypeLoaded) NatRetestTask := task.Periodic{ - Interval: time.Second * time.Duration(sf.NATTypeMeasurementIntervalSecond), + Interval: sf.NATTypeMeasurementInterval, Execute: func() error { sf.checkNATType(config, sf.NATProbeURL) return nil }, } - if sf.NATTypeMeasurementIntervalSecond != 0 { + if sf.NATTypeMeasurementInterval != 0 { NatRetestTask.Start() defer NatRetestTask.Close() } diff --git a/proxy/main.go b/proxy/main.go index de33d42..b85dde0 100644 --- a/proxy/main.go +++ b/proxy/main.go @@ -31,7 +31,7 @@ func main() { KeepLocalAddresses: *keepLocalAddresses, RelayURL: *relayURL, - NATTypeMeasurementIntervalSecond: uint(NATTypeMeasurementInterval.Seconds()), + NATTypeMeasurementInterval: *NATTypeMeasurementInterval, } var logOutput io.Writer = os.Stderr

1 0

[snowflake/main] Update nat-retest-interval type to duration
by meskio＠torproject.org 16 Nov '21

16 Nov '21

commit c49f72eb0c630fcdb03aea179f7b4b00d204ddfb Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Tue Nov 16 15:58:57 2021 +0000 Update nat-retest-interval type to duration Adopted the change in according to the recommendation from https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- proxy/main.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/proxy/main.go b/proxy/main.go index 399493b..de33d42 100644 --- a/proxy/main.go +++ b/proxy/main.go @@ -19,7 +19,7 @@ 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") - NATTypeMeasurementIntervalString := flag.String("nat-retest-interval", "24h", + NATTypeMeasurementInterval := flag.Duration("nat-retest-interval", time.Hour*24, "the time interval in second before NAT type is retested, 0s disables retest. Valid time units are \"s\", \"m\", \"h\". ") flag.Parse() @@ -30,12 +30,8 @@ func main() { BrokerURL: *rawBrokerURL, KeepLocalAddresses: *keepLocalAddresses, RelayURL: *relayURL, - } - if NATTypeMeasurementIntervalTime, err := time.ParseDuration(*NATTypeMeasurementIntervalString); err == nil { - proxy.NATTypeMeasurementIntervalSecond = uint(NATTypeMeasurementIntervalTime.Seconds()) - } else { - log.Fatalf("unable to parse nat-retest-seconds: %v", err) + NATTypeMeasurementIntervalSecond: uint(NATTypeMeasurementInterval.Seconds()), } var logOutput io.Writer = os.Stderr

1 0

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

16 Nov '21

commit cf7a955fabdccd54c83eab60fe8e24d76630b0fb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 16 11:17:54 2021 +0000 new translations in support-portal --- contents+id.po | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/contents+id.po b/contents+id.po index c0b0af2016..f7c2ff833d 100644 --- a/contents+id.po +++ b/contents+id.po @@ -12,8 +12,9 @@ # raz <razmawardhana(a)gmail.com>, 2021 # Khairul Agasta <khairuldroids(a)gmail.com>, 2021 # ical, 2021 -# 9hs <9hs(a)tuta.io>, 2021 +# hadymaggot <9hs(a)tuta.io>, 2021 # Emma Peel, 2021 +# Dewie Ang, 2021 # msgid "" msgstr "" @@ -21,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-30 12:55+CET\n" "PO-Revision-Date: 2018-10-02 22:41+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" @@ -644,6 +645,8 @@ msgid "" "Fore more information see this [blogpost about domain " "fronting](https://blog.torproject.org/domain-fronting-critical-open-web)." msgstr "" +"Untuk informasi lebih lanjut lihat [blogspot tentang domain " +"fronting](https://blog.torproject.org/domain-fronting-critical-open-web)." #: https//support.torproject.org/glossary/domain-fronting/ #: (content/glossary/domain-fronting/contents+en.lrword.spelling) @@ -1169,6 +1172,9 @@ msgid "" "you are browsing a major web site instead of using [Tor](../tor-tor-network-" "core-tor)." msgstr "" +"[pluggable transports](../pluggable-transports) membuatnya terlihat seperti " +"Anda sedang menjelajahi laman situs web ternama alih-alih menggunakan [Tor" +"](../tor-tor-network-core-tor)." #: https//support.torproject.org/glossary/meek/ #: (content/glossary/meek/contents+en.lrword.definition) @@ -2078,7 +2084,7 @@ msgstr "" #: https//support.torproject.org/glossary/tor-log/ #: (content/glossary/tor-log/contents+en.lrword.term) msgid "Tor log" -msgstr "" +msgstr "Catatan Tor" #: https//support.torproject.org/glossary/tor-log/ #: (content/glossary/tor-log/contents+en.lrword.definition) @@ -2086,6 +2092,9 @@ msgid "" "\"Tor log\" is an automatically-generated list of [Tor](../tor-tor-network-" "core-tor)’s activity that can help diagnose problems." msgstr "" +"\"Catatan Tor\" adalah daftar aktivitas [Tor](../tor-tor-network-core-tor) " +"yang dihasilkan secara otomatis yang dapat membantu mendiagnosis " +"permasalahan. " #: https//support.torproject.org/glossary/tor-log/ #: (content/glossary/tor-log/contents+en.lrword.definition)

1 0