From 21de7112bd410d0cc396bbaa8693673eb56d909b Mon Sep 17 00:00:00 2001 From: Brandon Wiley Date: Thu, 8 Dec 2016 17:21:21 -0600 Subject: Fixed some minor errors in function and module names when transitioning from goptlib to shapeshifter-ipc --- 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 1f9c0a0..0a379dd 100644 --- a/shapeshifter-dispatcher/shapeshifter-dispatcher.go +++ b/shapeshifter-dispatcher/shapeshifter-dispatcher.go @@ -350,7 +350,7 @@ func getServerFactories(ptversion *string, bindaddrList *string, options *string } ptServerInfo = pt.ServerInfo{Bindaddrs: bindaddrs} - ptServerInfo.OrAddr, err = resolveAddr(*orport) + ptServerInfo.OrAddr, err = pt.ResolveAddr(*orport) if err != nil { fmt.Println("Error resolving OR address", orport, err) return nil, ptServerInfo @@ -396,7 +396,7 @@ func getServerBindaddrs(bindaddrList *string, options *string, transports *strin if serverTransportOptions != "" { fmt.Println(serverTransportOptions) - optionsMap, err = args.ParseServerTransportOptions(serverTransportOptions) + optionsMap, err = pt.ParseServerTransportOptions(serverTransportOptions) if err != nil { fmt.Println("Error parsing options map") return nil, errors.New(fmt.Sprintf("TOR_PT_SERVER_TRANSPORT_OPTIONS: %q: %s", serverTransportOptions, err.Error())) -- cgit v1.2.3