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

Include "tls=no" or "tls=yes" in the bridge descriptor.

Browse source 
Might make this controlled by ServerTransportOptions instead of the
--disable-tls command line option.
This commit is contained in:
David Fifield 2017-01-20 10:13:39 -08:00
parent aa204af6b1
commit d8411816c4
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/server.go
View file

@ -259,16 +259,19 @@ func main() {
switch bindaddr.MethodName { switch bindaddr.MethodName {
case ptMethodName: case ptMethodName:
var ln net.Listener var ln net.Listener
args := pt.Args{}
if disableTLS { if disableTLS {
args.Add("tls", "no")
ln, err = startListener("tcp", bindaddr.Addr) ln, err = startListener("tcp", bindaddr.Addr)
} else { } else {
args.Add("tls", "yes")
ln, err = startListenerTLS("tcp", bindaddr.Addr, certFilename, keyFilename) ln, err = startListenerTLS("tcp", bindaddr.Addr, certFilename, keyFilename)
} }
if err != nil { if err != nil {
pt.SmethodError(bindaddr.MethodName, err.Error()) pt.SmethodError(bindaddr.MethodName, err.Error())
break break
} }
pt.Smethod(bindaddr.MethodName, ln.Addr()) pt.SmethodArgs(bindaddr.MethodName, ln.Addr(), args)
listeners = append(listeners, ln) listeners = append(listeners, ln)
default: default:
pt.SmethodError(bindaddr.MethodName, "no such method") pt.SmethodError(bindaddr.MethodName, "no such method")