From 0488c88e9d0dba1b7143889732a76fa8b6c37aae Mon Sep 17 00:00:00 2001 From: Bluesaxorcist Date: Mon, 30 Sep 2019 17:19:27 -0500 Subject: Removed unnecessary function --- modes/transparent_udp/transparent_udp.go | 40 ++++++---------------- shapeshifter-dispatcher/shapeshifter-dispatcher.go | 15 ++++---- 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/modes/transparent_udp/transparent_udp.go b/modes/transparent_udp/transparent_udp.go index 8d29453..c324946 100644 --- a/modes/transparent_udp/transparent_udp.go +++ b/modes/transparent_udp/transparent_udp.go @@ -55,8 +55,6 @@ import ( //"github.com/OperatorFoundation/shapeshifter-transports/transports/shadow" ) -var stateDir string - type ConnState struct { Conn net.Conn Waiting bool @@ -137,8 +135,17 @@ func clientHandler(target string, termMon *termmon.TermMonitor, name string, opt fmt.Println("writing...") fmt.Println(length16) fmt.Println(lengthBuf.Bytes()) - state.Conn.Write(lengthBuf.Bytes()) - state.Conn.Write(buf) + _, writErr := state.Conn.Write(lengthBuf.Bytes()) + if writErr != nil { + continue + } else { + _, writeBufErr :=state.Conn.Write(buf) + if writeBufErr != nil { + _ = state.Conn.Close() + _ = conn.Close() + } + + } } } } else { @@ -307,31 +314,6 @@ func ServerSetup(termMon *termmon.TermMonitor, bindaddrString string, ptServerIn return } -func getServerBindaddrs(serverBindaddr string) ([]pt.Bindaddr, error) { - var result []pt.Bindaddr - - for _, spec := range strings.Split(serverBindaddr, ",") { - var bindaddr pt.Bindaddr - - parts := strings.SplitN(spec, "-", 2) - if len(parts) != 2 { - fmt.Println("TOR_PT_SERVER_BINDADDR: doesn't contain \"-\"", spec) - return nil, nil - } - bindaddr.MethodName = parts[0] - addr, err := resolveAddr(parts[1]) - if err != nil { - fmt.Println("TOR_PT_SERVER_BINDADDR: ", spec, err.Error()) - return nil, nil - } - bindaddr.Addr = addr - // bindaddr.Options = optionsMap[bindaddr.MethodName] - result = append(result, bindaddr) - } - - return result, nil -} - // Resolve an address string into a net.TCPAddr. We are a bit more strict than // net.ResolveTCPAddr; we don't allow an empty host or port, and the host part // must be a literal IP address. diff --git a/shapeshifter-dispatcher/shapeshifter-dispatcher.go b/shapeshifter-dispatcher/shapeshifter-dispatcher.go index 8e6de02..f68d18c 100644 --- a/shapeshifter-dispatcher/shapeshifter-dispatcher.go +++ b/shapeshifter-dispatcher/shapeshifter-dispatcher.go @@ -183,7 +183,6 @@ func main() { } else { log.Infof("%s - initializing server transport listeners", execName) if *bindAddr == "" { - fmt.Errorf("%s - transparent mode requires a bindaddr", execName) log.Errorf("%s - transparent mode requires a bindaddr", execName) } else { // launched = transparent_udp.ServerSetup(termMon, *bindAddr, *target) @@ -228,7 +227,7 @@ func main() { } else { log.Infof("%s - initializing server transport listeners", execName) if *bindAddr == "" { - fmt.Errorf("%s - STUN mode requires a bindaddr", execName) + log.Errorf("%s - STUN mode requires a bindaddr", execName) } else { ptServerInfo := getServerInfo(ptversion, bindAddr, options, transportsList, orport, extorport, authcookie) launched, serverListeners = stun_udp.ServerSetup(termMon, *bindAddr, ptServerInfo, *options) @@ -343,14 +342,14 @@ func getServerInfo(ptversion *string, bindaddrList *string, options *string, tra bindaddrs, err = getServerBindaddrs(bindaddrList, options, transportList) if err != nil { - fmt.Errorf("Error parsing bindaddrs %q %q %q", *bindaddrList, *options, *transportList) + log.Errorf("Error parsing bindaddrs %q %q %q", *bindaddrList, *options, *transportList) return ptServerInfo } ptServerInfo = pt.ServerInfo{Bindaddrs: bindaddrs} ptServerInfo.OrAddr, err = pt.ResolveAddr(*orport) if err != nil { - fmt.Errorf("Error resolving OR address %q %q", orport, err) + log.Errorf("Error resolving OR address %q %q", orport, err) return ptServerInfo } @@ -363,13 +362,13 @@ func getServerInfo(ptversion *string, bindaddrList *string, options *string, tra if extorport != nil && *extorport != "" { ptServerInfo.ExtendedOrAddr, err = pt.ResolveAddr(*extorport) if err != nil { - fmt.Errorf("Error resolving Extended OR address %q %q", *extorport, err) + log.Errorf("Error resolving Extended OR address %q %q", *extorport, err) return ptServerInfo } } else { ptServerInfo.ExtendedOrAddr, err = pt.ResolveAddr(pt.Getenv("TOR_PT_EXTENDED_SERVER_PORT")) if err != nil { - fmt.Errorf("Error resolving Extended OR address %q %q", err) + log.Errorf("Error resolving Extended OR address %q %q", err) return ptServerInfo } } @@ -394,7 +393,7 @@ func getServerBindaddrs(bindaddrList *string, options *string, transports *strin if serverTransportOptions != "" { optionsMap, err = pt.ParseServerTransportOptions(serverTransportOptions) if err != nil { - fmt.Errorf("Error parsing options map %q %q", serverTransportOptions, err) + log.Errorf("Error parsing options map %q %q", serverTransportOptions, err) return nil, errors.New(fmt.Sprintf("TOR_PT_SERVER_TRANSPORT_OPTIONS: %q: %s", serverTransportOptions, err.Error())) } } @@ -403,7 +402,7 @@ func getServerBindaddrs(bindaddrList *string, options *string, transports *strin if serverTransportOptions != "" { optionsMap, err = pt.ParsePT2ServerParameters(serverTransportOptions) if err != nil { - fmt.Errorf("Error parsing options map %q %q", serverTransportOptions, err) + log.Errorf("Error parsing options map %q %q", serverTransportOptions, err) return nil, errors.New(fmt.Sprintf("TOR_PT_SERVER_TRANSPORT_OPTIONS: %q: %s", serverTransportOptions, err.Error())) } } -- cgit v1.2.3