archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-13 20:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update nat-retest-seconds format to time.ParseDuration form

Browse source 
Adopted the change in according to the recommendation from

https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/merge_requests/62#note_2761382
This commit is contained in:
Shelikhoo 2021-11-16 11:16:54 +00:00
parent d4fdb35ee8
commit 9bdb87eaf3
No known key found for this signature in database
GPG key ID: C4D5E79D22B25316
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
proxy/main.go
View file

@ -5,6 +5,7 @@ import (
"io" "io"
"log" "log"
"os" "os"
"time"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog"
sf "git.torproject.org/pluggable-transports/snowflake.git/v2/proxy/lib" 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") unsafeLogging := flag.Bool("unsafe-logging", false, "prevent logs from being scrubbed")
keepLocalAddresses := flag.Bool("keep-local-addresses", false, "keep local LAN address ICE candidates") keepLocalAddresses := flag.Bool("keep-local-addresses", false, "keep local LAN address ICE candidates")
relayURL := flag.String("relay", sf.DefaultRelayURL, "websocket relay URL") relayURL := flag.String("relay", sf.DefaultRelayURL, "websocket relay URL")
NATTypeMeasurementIntervalSecond := flag.Uint("nat-retest-seconds", 86400, NATTypeMeasurementIntervalString := flag.String("nat-retest-seconds", "24h",
"the time interval in second before NAT type is retested, 0 disables retest") "the time interval in second before NAT type is retested, 0s disables retest. Valid time units are \"s\", \"m\", \"h\". ")
flag.Parse() flag.Parse()
@ -29,8 +30,12 @@ func main() {
BrokerURL: *rawBrokerURL, BrokerURL: *rawBrokerURL,
KeepLocalAddresses: *keepLocalAddresses, KeepLocalAddresses: *keepLocalAddresses,
RelayURL: *relayURL, 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 var logOutput io.Writer = os.Stderr