Added new command line flags and refactored ClientSetup to use them

4 files changed, 48 insertions, 127 deletions

diff --git a/modes/pt_socks5/pt_socks5.go b/modes/pt_socks5/pt_socks5.go
index e7a4cec..38b0e2c 100644
--- a/modes/pt_socks5/pt_socks5.go
+++ b/modes/pt_socks5/pt_socks5.go
@@ -41,7 +41,6 @@ import (
 
 	"git.torproject.org/pluggable-transports/goptlib.git"
 	"github.com/OperatorFoundation/shapeshifter-dispatcher/common/log"
-	"github.com/OperatorFoundation/shapeshifter-dispatcher/common/pt_extras"
 	"github.com/OperatorFoundation/shapeshifter-dispatcher/common/socks5"
 	"github.com/OperatorFoundation/shapeshifter-dispatcher/common/termmon"
 	"github.com/OperatorFoundation/shapeshifter-dispatcher/transports"
@@ -49,41 +48,14 @@ import (
 )
 
 const (
-	obfs4proxyVersion = "0.0.7-dev"
-	obfs4proxyLogFile = "obfs4proxy.log"
-	socksAddr         = "127.0.0.1:0"
+	socksAddr = "127.0.0.1:0"
 )
 
 var stateDir string
 
-func ClientSetup(termMon *termmon.TermMonitor) (launched bool, listeners []net.Listener) {
-	ptClientInfo, err := pt.ClientSetup(transports.Transports())
-	if err != nil {
-		golog.Fatal(err)
-	}
-
-	ptClientProxy, err := pt_extras.PtGetProxy()
-	fmt.Println("ptclientproxy", ptClientProxy)
-	if err != nil {
-		golog.Fatal(err)
-	} else if ptClientProxy != nil {
-		pt_extras.PtProxyDone()
-	}
-
+func ClientSetup(termMon *termmon.TermMonitor, ptClientProxy *url.URL, factories map[string]base.ClientFactory) (launched bool, listeners []net.Listener) {
 	// Launch each of the client listeners.
-	for _, name := range ptClientInfo.MethodNames {
-		t := transports.Get(name)
-		if t == nil {
-			pt.CmethodError(name, "no such transport is supported")
-			continue
-		}
-
-		f, err := t.ClientFactory(stateDir)
-		if err != nil {
-			pt.CmethodError(name, "failed to get ClientFactory")
-			continue
-		}
-
+	for name, f := range factories {
 		ln, err := net.Listen("tcp", socksAddr)
 		if err != nil {
 			pt.CmethodError(name, err.Error())
diff --git a/modes/stun_udp/stun_udp.go b/modes/stun_udp/stun_udp.go
index bf3045d..d636881 100644
--- a/modes/stun_udp/stun_udp.go
+++ b/modes/stun_udp/stun_udp.go
@@ -30,8 +30,8 @@
 package stun_udp
 
 import (
-	"io"
 	"fmt"
+	"io"
 	golog "log"
 	"net"
 	"net/url"
@@ -52,15 +52,13 @@ import (
 )
 
 const (
-	obfs4proxyVersion = "0.0.7-dev"
-	obfs4proxyLogFile = "obfs4proxy.log"
-	socksAddr         = "127.0.0.1:1234"
+	socksAddr = "127.0.0.1:1234"
 )
 
 var stateDir string
 
 type ConnState struct {
-	Conn *net.Conn
+	Conn    *net.Conn
 	Waiting bool
 }
 
@@ -70,24 +68,9 @@ func NewConnState() ConnState {
 
 type ConnTracker map[string]ConnState
 
-func ClientSetup(termMon *termmon.TermMonitor, target string) bool {
-	methodNames := [...]string{"obfs2"}
-	var ptClientProxy *url.URL = nil
-
+func ClientSetup(termMon *termmon.TermMonitor, target string, ptClientProxy *url.URL, factories map[string]base.ClientFactory) bool {
 	// Launch each of the client listeners.
-	for _, name := range methodNames {
-		t := transports.Get(name)
-		if t == nil {
-			log.Errorf("no such transport is supported: %s", name)
-			continue
-		}
-
-		f, err := t.ClientFactory(stateDir)
-		if err != nil {
-			log.Errorf("failed to get ClientFactory: %s", name)
-			continue
-		}
-
+	for name, f := range factories {
 		udpAddr, err := net.ResolveUDPAddr("udp", socksAddr)
 		if err != nil {
 			fmt.Println("Error resolving address", socksAddr)
@@ -115,24 +98,24 @@ func clientHandler(target string, termMon *termmon.TermMonitor, f base.ClientFac
 
 	fmt.Println("@@@ handling...")
 
-  tracker := make(ConnTracker)
+	tracker := make(ConnTracker)
 
 	name := f.Transport().Name()
 
 	fmt.Println("Transport is", name)
 
-  buf := make([]byte, 1024)
+	buf := make([]byte, 1024)
 
-  // Receive UDP packets and forward them over transport connections forever
+	// Receive UDP packets and forward them over transport connections forever
 	for {
 		n, addr, err := conn.ReadFromUDP(buf)
-		fmt.Println("Received ",string(buf[0:n]), " from ",addr)
+		fmt.Println("Received ", string(buf[0:n]), " from ", addr)
 
 		if err != nil {
-      fmt.Println("Error: ",err)
+			fmt.Println("Error: ", err)
 		}
 
-    fmt.Println(tracker)
+		fmt.Println(tracker)
 
 		if state, ok := tracker[addr.String()]; ok {
 			// There is an open transport connection, or a connection attempt is in progress.
@@ -148,11 +131,11 @@ func clientHandler(target string, termMon *termmon.TermMonitor, f base.ClientFac
 				fmt.Println("writing...")
 				(*state.Conn).Write(buf)
 			}
-    } else {
+		} else {
 			// There is not an open transport connection and a connection attempt is not in progress.
 			// Open a transport connection.
 
-      fmt.Println("Opening connection to ", target)
+			fmt.Println("Opening connection to ", target)
 
 			openConnection(&tracker, addr.String(), target, termMon, f, proxyURI)
 
@@ -166,7 +149,7 @@ func openConnection(tracker *ConnTracker, addr string, target string, termMon *t
 	fmt.Println("Making dialer...")
 
 	newConn := NewConnState()
-	(*tracker)[addr]=newConn
+	(*tracker)[addr] = newConn
 
 	go dialConn(tracker, addr, target, f, proxyURI)
 }
@@ -209,7 +192,7 @@ func dialConn(tracker *ConnTracker, addr string, target string, f base.ClientFac
 
 	fmt.Println("Success")
 
-	(*tracker)[addr]=ConnState{&remote, false}
+	(*tracker)[addr] = ConnState{&remote, false}
 }
 
 func ServerSetup(termMon *termmon.TermMonitor, bindaddrString string, target string) bool {
@@ -347,7 +330,7 @@ func serverHandler(termMon *termmon.TermMonitor, f base.ServerFactory, conn net.
 		return
 	}
 
-	serverAddr, err := net.ResolveUDPAddr("udp",target)
+	serverAddr, err := net.ResolveUDPAddr("udp", target)
 	if err != nil {
 		golog.Fatal(err)
 	}
@@ -362,7 +345,7 @@ func serverHandler(termMon *termmon.TermMonitor, f base.ServerFactory, conn net.
 		golog.Fatal(err)
 	}
 
-  fmt.Println("pumping")
+	fmt.Println("pumping")
 
 	defer dest.Close()
 
@@ -371,7 +354,7 @@ func serverHandler(termMon *termmon.TermMonitor, f base.ServerFactory, conn net.
 	for {
 		fmt.Println("reading...")
 		// Read the incoming connection into the buffer.
-	  _, err := io.ReadFull(remote, headerBuffer)
+		_, err := io.ReadFull(remote, headerBuffer)
 		if err != nil {
 			fmt.Println("read error")
 			break
@@ -394,8 +377,8 @@ func serverHandler(termMon *termmon.TermMonitor, f base.ServerFactory, conn net.
 			break
 		}
 
-    writeBuffer := append(headerBuffer, readBuffer...)
+		writeBuffer := append(headerBuffer, readBuffer...)
 
 		dest.Write(writeBuffer)
-  }
+	}
 }
diff --git a/modes/transparent_tcp/transparent_tcp.go b/modes/transparent_tcp/transparent_tcp.go
index 30e04fc..119e797 100644
--- a/modes/transparent_tcp/transparent_tcp.go
+++ b/modes/transparent_tcp/transparent_tcp.go
@@ -49,31 +49,14 @@ import (
 )
 
 const (
-	obfs4proxyVersion = "0.0.7-dev"
-	obfs4proxyLogFile = "obfs4proxy.log"
-	socksAddr         = "127.0.0.1:1234"
+	socksAddr = "127.0.0.1:1234"
 )
 
 var stateDir string
 
-func ClientSetup(termMon *termmon.TermMonitor, target string) (launched bool, listeners []net.Listener) {
-	methodNames := [...]string{"obfs2"}
-	var ptClientProxy *url.URL = nil
-
+func ClientSetup(termMon *termmon.TermMonitor, target string, ptClientProxy *url.URL, factories map[string]base.ClientFactory) (launched bool, listeners []net.Listener) {
 	// Launch each of the client listeners.
-	for _, name := range methodNames {
-		t := transports.Get(name)
-		if t == nil {
-			log.Errorf("no such transport is supported: %s", name)
-			continue
-		}
-
-		f, err := t.ClientFactory(stateDir)
-		if err != nil {
-			log.Errorf("failed to get ClientFactory: %s", name)
-			continue
-		}
-
+	for name, f := range factories {
 		fmt.Println("Listening ", socksAddr)
 		ln, err := net.Listen("tcp", socksAddr)
 		if err != nil {
diff --git a/modes/transparent_udp/transparent_udp.go b/modes/transparent_udp/transparent_udp.go
index d7ee938..f9c2efc 100644
--- a/modes/transparent_udp/transparent_udp.go
+++ b/modes/transparent_udp/transparent_udp.go
@@ -30,15 +30,15 @@
 package transparent_udp
 
 import (
-	"io"
+	"bytes"
+	"encoding/binary"
 	"fmt"
+	"io"
 	golog "log"
 	"net"
 	"net/url"
 	"strconv"
 	"strings"
-	"bytes"
-	"encoding/binary"
 
 	"golang.org/x/net/proxy"
 
@@ -50,15 +50,13 @@ import (
 )
 
 const (
-	obfs4proxyVersion = "0.0.7-dev"
-	obfs4proxyLogFile = "obfs4proxy.log"
-	socksAddr         = "127.0.0.1:1234"
+	socksAddr = "127.0.0.1:1234"
 )
 
 var stateDir string
 
 type ConnState struct {
-	Conn *net.Conn
+	Conn    *net.Conn
 	Waiting bool
 }
 
@@ -68,24 +66,9 @@ func NewConnState() ConnState {
 
 type ConnTracker map[string]ConnState
 
-func ClientSetup(termMon *termmon.TermMonitor, target string) bool {
-	methodNames := [...]string{"obfs2"}
-	var ptClientProxy *url.URL = nil
-
+func ClientSetup(termMon *termmon.TermMonitor, target string, ptClientProxy *url.URL, factories map[string]base.ClientFactory) bool {
 	// Launch each of the client listeners.
-	for _, name := range methodNames {
-		t := transports.Get(name)
-		if t == nil {
-			log.Errorf("no such transport is supported: %s", name)
-			continue
-		}
-
-		f, err := t.ClientFactory(stateDir)
-		if err != nil {
-			log.Errorf("failed to get ClientFactory: %s", name)
-			continue
-		}
-
+	for name, f := range factories {
 		udpAddr, err := net.ResolveUDPAddr("udp", socksAddr)
 		if err != nil {
 			fmt.Println("Error resolving address", socksAddr)
@@ -107,7 +90,7 @@ func ClientSetup(termMon *termmon.TermMonitor, target string) bool {
 }
 
 func clientHandler(target string, termMon *termmon.TermMonitor, f base.ClientFactory, conn *net.UDPConn, proxyURI *url.URL) {
-  var length16 uint16
+	var length16 uint16
 
 	defer conn.Close()
 	termMon.OnHandlerStart()
@@ -115,24 +98,24 @@ func clientHandler(target string, termMon *termmon.TermMonitor, f base.ClientFac
 
 	fmt.Println("@@@ handling...")
 
-  tracker := make(ConnTracker)
+	tracker := make(ConnTracker)
 
 	name := f.Transport().Name()
 
 	fmt.Println("Transport is", name)
 
-  buf := make([]byte, 1024)
+	buf := make([]byte, 1024)
 
-  // Receive UDP packets and forward them over transport connections forever
+	// Receive UDP packets and forward them over transport connections forever
 	for {
 		n, addr, err := conn.ReadFromUDP(buf)
-		fmt.Println("Received ",string(buf[0:n]), " from ",addr)
+		fmt.Println("Received ", string(buf[0:n]), " from ", addr)
 
 		if err != nil {
-      fmt.Println("Error: ",err)
+			fmt.Println("Error: ", err)
 		}
 
-    fmt.Println(tracker)
+		fmt.Println(tracker)
 
 		if state, ok := tracker[addr.String()]; ok {
 			// There is an open transport connection, or a connection attempt is in progress.
@@ -158,11 +141,11 @@ func clientHandler(target string, termMon *termmon.TermMonitor, f base.ClientFac
 					(*state.Conn).Write(buf)
 				}
 			}
-    } else {
+		} else {
 			// There is not an open transport connection and a connection attempt is not in progress.
 			// Open a transport connection.
 
-      fmt.Println("Opening connection to ", target)
+			fmt.Println("Opening connection to ", target)
 
 			openConnection(&tracker, addr.String(), target, termMon, f, proxyURI)
 
@@ -176,7 +159,7 @@ func openConnection(tracker *ConnTracker, addr string, target string, termMon *t
 	fmt.Println("Making dialer...")
 
 	newConn := NewConnState()
-	(*tracker)[addr]=newConn
+	(*tracker)[addr] = newConn
 
 	go dialConn(tracker, addr, target, f, proxyURI)
 }
@@ -219,7 +202,7 @@ func dialConn(tracker *ConnTracker, addr string, target string, f base.ClientFac
 
 	fmt.Println("Success")
 
-	(*tracker)[addr]=ConnState{&remote, false}
+	(*tracker)[addr] = ConnState{&remote, false}
 }
 
 func ServerSetup(termMon *termmon.TermMonitor, bindaddrString string, target string) bool {
@@ -357,7 +340,7 @@ func serverHandler(termMon *termmon.TermMonitor, f base.ServerFactory, conn net.
 		return
 	}
 
-	serverAddr, err := net.ResolveUDPAddr("udp",target)
+	serverAddr, err := net.ResolveUDPAddr("udp", target)
 	if err != nil {
 		golog.Fatal(err)
 	}
@@ -372,7 +355,7 @@ func serverHandler(termMon *termmon.TermMonitor, f base.ServerFactory, conn net.
 		golog.Fatal(err)
 	}
 
-  fmt.Println("pumping")
+	fmt.Println("pumping")
 
 	defer dest.Close()
 
@@ -381,7 +364,7 @@ func serverHandler(termMon *termmon.TermMonitor, f base.ServerFactory, conn net.
 	for {
 		fmt.Println("reading...")
 		// Read the incoming connection into the buffer.
-	  readLen, err := io.ReadFull(remote, lengthBuffer)
+		readLen, err := io.ReadFull(remote, lengthBuffer)
 		if err != nil {
 			fmt.Println("read error")
 			break
@@ -405,5 +388,5 @@ func serverHandler(termMon *termmon.TermMonitor, f base.ServerFactory, conn net.
 		}
 
 		dest.Write(readBuffer)
-  }
+	}
 }