mirror of
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
synced 2025-10-13 20:11:19 -04:00
Rename logToStateDir/keepLocalAddresses to kebab case
https://en.wikipedia.org/wiki/Letter_case#Special_case_styles
This commit is contained in:
parent
f58c865d82
commit
5fa7578655
2 changed files with 12 additions and 5 deletions
|
@ -89,11 +89,16 @@ func main() {
|
||||||
brokerURL := flag.String("url", "", "URL of signaling broker")
|
brokerURL := flag.String("url", "", "URL of signaling broker")
|
||||||
frontDomain := flag.String("front", "", "front domain")
|
frontDomain := flag.String("front", "", "front domain")
|
||||||
logFilename := flag.String("log", "", "name of log file")
|
logFilename := flag.String("log", "", "name of log file")
|
||||||
logToStateDir := flag.Bool("logToStateDir", false, "resolve the log file relative to tor's pt state dir")
|
logToStateDir := flag.Bool("log-to-state-dir", false, "resolve the log file relative to tor's pt state dir")
|
||||||
keepLocalAddresses := flag.Bool("keepLocalAddresses", false, "keep local LAN address ICE candidates")
|
keepLocalAddresses := flag.Bool("keep-local-addresses", false, "keep local LAN address ICE candidates")
|
||||||
unsafeLogging := flag.Bool("unsafe-logging", false, "prevent logs from being scrubbed")
|
unsafeLogging := flag.Bool("unsafe-logging", false, "prevent logs from being scrubbed")
|
||||||
max := flag.Int("max", DefaultSnowflakeCapacity,
|
max := flag.Int("max", DefaultSnowflakeCapacity,
|
||||||
"capacity for number of multiplexed WebRTC peers")
|
"capacity for number of multiplexed WebRTC peers")
|
||||||
|
|
||||||
|
// Deprecated
|
||||||
|
oldLogToStateDir := flag.Bool("logToStateDir", false, "use -log-to-state-dir instead")
|
||||||
|
oldKeepLocalAddresses := flag.Bool("keepLocalAddresses", false, "use -keep-local-addresses instead")
|
||||||
|
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
log.SetFlags(log.LstdFlags | log.LUTC)
|
log.SetFlags(log.LstdFlags | log.LUTC)
|
||||||
|
@ -105,7 +110,7 @@ func main() {
|
||||||
// https://bugs.torproject.org/25600#comment:14
|
// https://bugs.torproject.org/25600#comment:14
|
||||||
var logOutput = ioutil.Discard
|
var logOutput = ioutil.Discard
|
||||||
if *logFilename != "" {
|
if *logFilename != "" {
|
||||||
if *logToStateDir {
|
if *logToStateDir || *oldLogToStateDir {
|
||||||
stateDir, err := pt.MakeStateDir()
|
stateDir, err := pt.MakeStateDir()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
|
@ -139,7 +144,9 @@ func main() {
|
||||||
snowflakes := sf.NewPeers(*max)
|
snowflakes := sf.NewPeers(*max)
|
||||||
|
|
||||||
// Use potentially domain-fronting broker to rendezvous.
|
// Use potentially domain-fronting broker to rendezvous.
|
||||||
broker, err := sf.NewBrokerChannel(*brokerURL, *frontDomain, sf.CreateBrokerTransport(), *keepLocalAddresses)
|
broker, err := sf.NewBrokerChannel(
|
||||||
|
*brokerURL, *frontDomain, sf.CreateBrokerTransport(),
|
||||||
|
*keepLocalAddresses || *oldKeepLocalAddresses)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("parsing broker URL: %v", err)
|
log.Fatalf("parsing broker URL: %v", err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,6 @@ DataDirectory datadir
|
||||||
|
|
||||||
ClientTransportPlugin snowflake exec ./client \
|
ClientTransportPlugin snowflake exec ./client \
|
||||||
-url http://localhost:8080/ \
|
-url http://localhost:8080/ \
|
||||||
-keepLocalAddresses
|
-keep-local-addresses
|
||||||
|
|
||||||
Bridge snowflake 0.0.3.0:1
|
Bridge snowflake 0.0.3.0:1
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue