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

Remove the --port option from WebSocket server.

Browse source 
Recommend ServerTransportListenAddr in torrc instead.
This commit is contained in:
David Fifield 2017-01-18 19:33:07 -08:00
parent 2a9126a158
commit 3e78251715
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/server.go
View file

@ -4,7 +4,8 @@
// //
// Usage in torrc: // Usage in torrc:
// ExtORPort auto // ExtORPort auto
// ServerTransportPlugin snowflake exec server --port 9902 // ServerTransportListenAddr snowflake 0.0.0.0:9902
// ServerTransportPlugin snowflake exec server
package main package main
import ( import (
@ -250,14 +251,12 @@ func main() {
var disableTLS bool var disableTLS bool
var certFilename, keyFilename string var certFilename, keyFilename string
var logFilename string var logFilename string
var port int
flag.Usage = usage flag.Usage = usage
flag.BoolVar(&disableTLS, "disable-tls", false, "don't use HTTPS") flag.BoolVar(&disableTLS, "disable-tls", false, "don't use HTTPS")
flag.StringVar(&certFilename, "cert", "", "TLS certificate file (required without --disable-tls)") flag.StringVar(&certFilename, "cert", "", "TLS certificate file (required without --disable-tls)")
flag.StringVar(&keyFilename, "key", "", "TLS private key file (required without --disable-tls)") flag.StringVar(&keyFilename, "key", "", "TLS private key file (required without --disable-tls)")
flag.StringVar(&logFilename, "log", "", "log file to write to") flag.StringVar(&logFilename, "log", "", "log file to write to")
flag.IntVar(&port, "port", 0, "port to listen on if unspecified by Tor")
flag.Parse() flag.Parse()
if logFilename != "" { if logFilename != "" {
@ -290,13 +289,6 @@ func main() {
listeners := make([]net.Listener, 0) listeners := make([]net.Listener, 0)
for _, bindaddr := range ptInfo.Bindaddrs { for _, bindaddr := range ptInfo.Bindaddrs {
// Override tor's requested port (which is 0 if this transport
// has not been run before) with the one requested by the --port
// option.
if port != 0 {
bindaddr.Addr.Port = port
}
switch bindaddr.MethodName { switch bindaddr.MethodName {
case ptMethodName: case ptMethodName:
var ln net.Listener var ln net.Listener

3
server/torrc
View file

@ -5,4 +5,5 @@ SocksPort 0
ExitPolicy reject *:* ExitPolicy reject *:*
DataDirectory datadir DataDirectory datadir
ServerTransportPlugin snowflake exec ./server --disable-tls --log snowflake.log --port 9902 ServerTransportListenAddr snowflake 0.0.0.0:9902
ServerTransportPlugin snowflake exec ./server --disable-tls --log snowflake.log