From 825c31592311ecf22def6bd64a50b7a350287d21 Mon Sep 17 00:00:00 2001 From: Brandon Wiley Date: Wed, 10 May 2017 20:06:03 -0500 Subject: Pass in the state directory and options to the transports, as this is needed by obfs4 --- shapeshifter-dispatcher/shapeshifter-dispatcher.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shapeshifter-dispatcher/shapeshifter-dispatcher.go b/shapeshifter-dispatcher/shapeshifter-dispatcher.go index 74b9027..7fbdcdb 100644 --- a/shapeshifter-dispatcher/shapeshifter-dispatcher.go +++ b/shapeshifter-dispatcher/shapeshifter-dispatcher.go @@ -193,7 +193,7 @@ func main() { fmt.Println("%s - transparent mode requires a bindaddr", execName) } else { ptServerInfo := getServerInfo(ptversion, bindAddr, options, transportsList, orport, extorport, authcookie) - launched, serverListeners = transparent_tcp.ServerSetup(termMon, *bindAddr, ptServerInfo, *options) + launched, serverListeners = transparent_tcp.ServerSetup(termMon, *bindAddr, ptServerInfo, *statePath, *options) fmt.Println("launched", launched, serverListeners) } } @@ -353,7 +353,7 @@ func getServerInfo(ptversion *string, bindaddrList *string, options *string, tra ptServerInfo.AuthCookiePath = pt.Getenv("TOR_PT_AUTH_COOKIE_FILE") } - if extorport != nil { + if extorport != nil && *extorport != "" { ptServerInfo.ExtendedOrAddr, err = pt.ResolveAddr(*extorport) if err != nil { fmt.Println("Error resolving Extended OR address", *extorport, err) -- cgit v1.2.3