diff options
| author | Dr. Brandon Wiley <brandon@operatorfoundation.org> | 2018-01-15 13:34:34 -0600 |
|---|---|---|
| committer | Dr. Brandon Wiley <brandon@operatorfoundation.org> | 2018-01-15 13:34:34 -0600 |
| commit | 86971126f37d01f3e3fcea00887a552a86c1a382 (patch) | |
| tree | f0ccde3869816952312e7fede803a41896303ffb /modes | |
| parent | d93413e8a79df10fa1d6713756595e265403d1c6 (diff) | |
Allow for the client proxy listening address to be specified on the command line2.0.1
Diffstat (limited to 'modes')
| -rw-r--r-- | modes/pt_socks5/pt_socks5.go | 6 | ||||
| -rw-r--r-- | modes/stun_udp/stun_udp.go | 6 | ||||
| -rw-r--r-- | modes/transparent_tcp/transparent_tcp.go | 6 | ||||
| -rw-r--r-- | modes/transparent_udp/transparent_udp.go | 6 |
4 files changed, 4 insertions, 20 deletions
diff --git a/modes/pt_socks5/pt_socks5.go b/modes/pt_socks5/pt_socks5.go index 9243f31..0a82971 100644 --- a/modes/pt_socks5/pt_socks5.go +++ b/modes/pt_socks5/pt_socks5.go @@ -46,13 +46,9 @@ import ( "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4" ) -const ( - socksAddr = "127.0.0.1:0" -) - var stateDir string -func ClientSetup(termMon *termmon.TermMonitor, target string, ptClientProxy *url.URL, names []string, options string) (launched bool, listeners []net.Listener) { +func ClientSetup(termMon *termmon.TermMonitor, socksAddr string, target string, ptClientProxy *url.URL, names []string, options string) (launched bool, listeners []net.Listener) { // Launch each of the client listeners. for _, name := range names { ln, err := net.Listen("tcp", socksAddr) diff --git a/modes/stun_udp/stun_udp.go b/modes/stun_udp/stun_udp.go index 81ef6d8..535e9b9 100644 --- a/modes/stun_udp/stun_udp.go +++ b/modes/stun_udp/stun_udp.go @@ -51,10 +51,6 @@ import ( "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4" ) -const ( - socksAddr = "127.0.0.1:1234" -) - var stateDir string type ConnState struct { @@ -68,7 +64,7 @@ func NewConnState() ConnState { type ConnTracker map[string]ConnState -func ClientSetup(termMon *termmon.TermMonitor, target string, ptClientProxy *url.URL, names []string, options string) bool { +func ClientSetup(termMon *termmon.TermMonitor, socksAddr string, target string, ptClientProxy *url.URL, names []string, options string) bool { // Launch each of the client listeners. for _, name := range names { udpAddr, err := net.ResolveUDPAddr("udp", socksAddr) diff --git a/modes/transparent_tcp/transparent_tcp.go b/modes/transparent_tcp/transparent_tcp.go index 17cd5d4..0e06869 100644 --- a/modes/transparent_tcp/transparent_tcp.go +++ b/modes/transparent_tcp/transparent_tcp.go @@ -48,13 +48,9 @@ import ( "github.com/OperatorFoundation/shapeshifter-transports/transports/shadow" ) -const ( - socksAddr = "127.0.0.1:1234" -) - var stateDir string -func ClientSetup(termMon *termmon.TermMonitor, target string, ptClientProxy *url.URL, names []string, options string) (launched bool, listeners []net.Listener) { +func ClientSetup(termMon *termmon.TermMonitor, socksAddr string, target string, ptClientProxy *url.URL, names []string, options string) (launched bool, listeners []net.Listener) { // Launch each of the client listeners. for _, name := range names { ln, err := net.Listen("tcp", socksAddr) diff --git a/modes/transparent_udp/transparent_udp.go b/modes/transparent_udp/transparent_udp.go index 63591a7..4be013a 100644 --- a/modes/transparent_udp/transparent_udp.go +++ b/modes/transparent_udp/transparent_udp.go @@ -49,10 +49,6 @@ import ( "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4" ) -const ( - socksAddr = "127.0.0.1:1234" -) - var stateDir string type ConnState struct { @@ -66,7 +62,7 @@ func NewConnState() ConnState { type ConnTracker map[string]ConnState -func ClientSetup(termMon *termmon.TermMonitor, target string, ptClientProxy *url.URL, names []string, options string) bool { +func ClientSetup(termMon *termmon.TermMonitor, socksAddr string, target string, ptClientProxy *url.URL, names []string, options string) bool { // Launch each of the client listeners. for _, name := range names { udpAddr, err := net.ResolveUDPAddr("udp", socksAddr) |