diff options
| author | Brandon Wiley <brandon@blanu.net> | 2017-05-10 20:06:03 -0500 |
|---|---|---|
| committer | Brandon Wiley <brandon@blanu.net> | 2017-05-10 20:06:03 -0500 |
| commit | 825c31592311ecf22def6bd64a50b7a350287d21 (patch) | |
| tree | 78eee0e7c13e151dd7286514bb25f22e770e1e52 | |
| parent | db7f18d89ed4495c2c447116d041f5f7ba0154ce (diff) | |
Pass in the state directory and options to the transports, as this is needed by obfs4
| -rw-r--r-- | shapeshifter-dispatcher/shapeshifter-dispatcher.go | 4 |
1 files 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) |