commit d8411816c457bc2412ffcc211413a56c5fa62dcc
Author: David Fifield <da...@bamsoftware.com>
Date: Fri Jan 20 10:13:39 2017 -0800
Include "tls=no" or "tls=yes" in the bridge descriptor.
Might make this controlled by ServerTransportOptions instead of the
--disable-tls command line option.
---
server/server.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/server/server.go b/server/server.go
index f29490c..b2876fa 100644
--- a/server/server.go
+++ b/server/server.go
@@ -259,16 +259,19 @@ func main() {
switch bindaddr.MethodName {
case ptMethodName:
var ln net.Listener
+ args := pt.Args{}
if disableTLS {
+ args.Add("tls", "no")
ln, err = startListener("tcp", bindaddr.Addr)
} else {
+ args.Add("tls", "yes")
ln, err = startListenerTLS("tcp",
bindaddr.Addr, certFilename, keyFilename)
}
if err != nil {
pt.SmethodError(bindaddr.MethodName,
err.Error())
break
}
- pt.Smethod(bindaddr.MethodName, ln.Addr())
+ pt.SmethodArgs(bindaddr.MethodName, ln.Addr(), args)
listeners = append(listeners, ln)
default:
pt.SmethodError(bindaddr.MethodName, "no such method")
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
