remove vendor dir

Makefile

@@ -17,9 +17,9 @@ LOG := log/
 ETC := etc/
 USR := usr/
 LOCAL := local/
-VERSION := 0.32.07
+VERSION := 0.32.082
 
-GO111MODULE=on
+GO111MODULE=off
 
 echo:
 	@echo "$(GOPATH)"
@@ -92,7 +92,7 @@ daemon-cli: bin/$(samcatd)-cli
 
 bin/$(samcatd)-cli:
 	mkdir -p bin
-	cd samcatd && go build -a -tags "netgo" \
+	cd samcatd && go build -a -tags "netgo cli" \
 		-ldflags '-w -extldflags "-static"' \
 		-o ../bin/$(samcatd)-cli \
 		./*.go
@@ -240,3 +240,11 @@ tar:
 sed:
 	sed -i 's|func(\*Conf)|func(samtunnel.SAMTunnel)|g' ./config/*.go
 	sed -i 's|func(c \*Conf)|func(c samtunnel.SAMTunnel)|g' ./config/*.go
+
+tasks:
+	golint ./tcp
+	#golint ./udp
+	#golint ./config
+	#golint ./config
+	#golint ./config
+	#golint ./config

config/helpers/tunconf_outproxy.go

@@ -0,0 +1,130 @@
+package i2ptunhelper
+
+import (
+	"github.com/eyedeekay/outproxy"
+	"github.com/eyedeekay/sam-forwarder/config"
+)
+
+// NewOutProxyFromConf generates a SAMforwarder from *i2ptunconf.Conf
+func NewOutProxyFromConf(config *i2ptunconf.Conf) (*outproxy.OutProxy, error) {
+	if config != nil {
+		return outproxy.NewOutProxyFromOptions(
+			outproxy.SetType(config.Type),
+			outproxy.SetSaveFile(config.SaveFile),
+			outproxy.SetFilePath(config.SaveDirectory),
+			outproxy.SetHost(config.TargetHost),
+			outproxy.SetPort(config.TargetPort),
+			outproxy.SetSAMHost(config.SamHost),
+			outproxy.SetSAMPort(config.SamPort),
+			outproxy.SetSigType(config.SigType),
+			outproxy.SetName(config.TunName),
+			outproxy.SetInLength(config.InLength),
+			outproxy.SetOutLength(config.OutLength),
+			outproxy.SetInVariance(config.InVariance),
+			outproxy.SetOutVariance(config.OutVariance),
+			outproxy.SetInQuantity(config.InQuantity),
+			outproxy.SetOutQuantity(config.OutQuantity),
+			outproxy.SetInBackups(config.InBackupQuantity),
+			outproxy.SetOutBackups(config.OutBackupQuantity),
+			outproxy.SetEncrypt(config.EncryptLeaseSet),
+			outproxy.SetLeaseSetKey(config.LeaseSetKey),
+			outproxy.SetLeaseSetPrivateKey(config.LeaseSetPrivateKey),
+			outproxy.SetLeaseSetPrivateSigningKey(config.LeaseSetPrivateSigningKey),
+			outproxy.SetAllowZeroIn(config.InAllowZeroHop),
+			outproxy.SetAllowZeroOut(config.OutAllowZeroHop),
+			outproxy.SetFastRecieve(config.FastRecieve),
+			outproxy.SetCompress(config.UseCompression),
+			outproxy.SetReduceIdle(config.ReduceIdle),
+			outproxy.SetReduceIdleTimeMs(config.ReduceIdleTime),
+			outproxy.SetReduceIdleQuantity(config.ReduceIdleQuantity),
+			outproxy.SetCloseIdle(config.CloseIdle),
+			outproxy.SetCloseIdleTimeMs(config.CloseIdleTime),
+			outproxy.SetAccessListType(config.AccessListType),
+			outproxy.SetAccessList(config.AccessList),
+			outproxy.SetMessageReliability(config.MessageReliability),
+			outproxy.SetKeyFile(config.KeyFilePath),
+			//outproxy.SetTargetForPort443(config.TargetForPort443),
+		)
+	}
+	return nil, nil
+}
+
+// NewOutProxyFromConfig generates a new OutProxy from a config file
+func NewOutProxyFromConfig(iniFile, SamHost, SamPort string, label ...string) (*outproxy.HttpOutProxy, error) {
+	if iniFile != "none" {
+		config, err := i2ptunconf.NewI2PTunConf(iniFile, label...)
+		if err != nil {
+			return nil, err
+		}
+		if SamHost != "" && SamHost != "127.0.0.1" && SamHost != "localhost" {
+			config.SamHost = config.GetSAMHost(SamHost, config.SamHost)
+		}
+		if SamPort != "" && SamPort != "7656" {
+			config.SamPort = config.GetSAMPort(SamPort, config.SamPort)
+		}
+		return NewHttpOutProxyFromConf(config)
+	}
+	return nil, nil
+}
+
+// NewOutProxyFromConf generates a SAMforwarder from *i2ptunconf.Conf
+func NewHttpOutProxyFromConf(config *i2ptunconf.Conf) (*outproxy.HttpOutProxy, error) {
+	if config != nil {
+		return outproxy.NewHttpOutProxydFromOptions(
+			outproxy.SetHttpType(config.Type),
+			outproxy.SetHttpSaveFile(config.SaveFile),
+			outproxy.SetHttpFilePath(config.SaveDirectory),
+			outproxy.SetHttpHost(config.TargetHost),
+			outproxy.SetHttpPort(config.TargetPort),
+			outproxy.SetHttpSAMHost(config.SamHost),
+			outproxy.SetHttpSAMPort(config.SamPort),
+			outproxy.SetHttpSigType(config.SigType),
+			outproxy.SetHttpName(config.TunName),
+			outproxy.SetHttpInLength(config.InLength),
+			outproxy.SetHttpOutLength(config.OutLength),
+			outproxy.SetHttpInVariance(config.InVariance),
+			outproxy.SetHttpOutVariance(config.OutVariance),
+			outproxy.SetHttpInQuantity(config.InQuantity),
+			outproxy.SetHttpOutQuantity(config.OutQuantity),
+			outproxy.SetHttpInBackups(config.InBackupQuantity),
+			outproxy.SetHttpOutBackups(config.OutBackupQuantity),
+			outproxy.SetHttpEncrypt(config.EncryptLeaseSet),
+			outproxy.SetHttpLeaseSetKey(config.LeaseSetKey),
+			outproxy.SetHttpLeaseSetPrivateKey(config.LeaseSetPrivateKey),
+			outproxy.SetHttpLeaseSetPrivateSigningKey(config.LeaseSetPrivateSigningKey),
+			outproxy.SetHttpAllowZeroIn(config.InAllowZeroHop),
+			outproxy.SetHttpAllowZeroOut(config.OutAllowZeroHop),
+			outproxy.SetHttpFastRecieve(config.FastRecieve),
+			outproxy.SetHttpCompress(config.UseCompression),
+			outproxy.SetHttpReduceIdle(config.ReduceIdle),
+			outproxy.SetHttpReduceIdleTimeMs(config.ReduceIdleTime),
+			outproxy.SetHttpReduceIdleQuantity(config.ReduceIdleQuantity),
+			outproxy.SetHttpCloseIdle(config.CloseIdle),
+			outproxy.SetHttpCloseIdleTimeMs(config.CloseIdleTime),
+			outproxy.SetHttpAccessListType(config.AccessListType),
+			outproxy.SetHttpAccessList(config.AccessList),
+			outproxy.SetHttpMessageReliability(config.MessageReliability),
+			outproxy.SetHttpKeyFile(config.KeyFilePath),
+			//outproxy.SetHttpTargetForPort443(config.TargetForPort443),
+		)
+	}
+	return nil, nil
+}
+
+// NewOutProxyFromConfig generates a new OutProxy from a config file
+func NewHttpOutProxyFromConfig(iniFile, SamHost, SamPort string, label ...string) (*outproxy.OutProxy, error) {
+	if iniFile != "none" {
+		config, err := i2ptunconf.NewI2PTunConf(iniFile, label...)
+		if err != nil {
+			return nil, err
+		}
+		if SamHost != "" && SamHost != "127.0.0.1" && SamHost != "localhost" {
+			config.SamHost = config.GetSAMHost(SamHost, config.SamHost)
+		}
+		if SamPort != "" && SamPort != "7656" {
+			config.SamPort = config.GetSAMPort(SamPort, config.SamPort)
+		}
+		return NewOutProxyFromConf(config)
+	}
+	return nil, nil
+}

config/type.go

@@ -44,6 +44,12 @@ func (c *Conf) GetTypes(argc, argu, argh bool, def string, label ...string) stri
 	if def == "vpnserver" {
 		return def
 	}
+	if def == "outproxy" {
+		return def
+	}
+	if def == "outproxyhttp" {
+		return def
+	}
 	if def == "browserclient" {
 		return def
 	}
@@ -92,6 +98,10 @@ func (c *Conf) SetType(label ...string) {
 			c.Type = v
 		case "eephttpd":
 			c.Type = v
+		case "outproxy":
+			c.Type = v
+		case "outproxyhttp":
+			c.Type = v
 		case "vpnserver":
 			c.Type = v
 		case "vpnclient":

etc/samcatd/tunnels.ini

@@ -40,13 +40,13 @@ outbound.length = 3
 destination = i2p-projekt.i2p
 keys = tcpclient
 
-[sam-forwarder-udp-server]
-type = udpserver
-host = 127.0.0.1
-port = 8084
+#[sam-forwarder-udp-server]
+#type = udpserver
+#host = 127.0.0.1
+#port = 8084
 #inbound.length = 6
-outbound.length = 3
-keys = udpserver
+#outbound.length = 3
+#keys = udpserver
 
 #[sam-forwarder-udp-client]
 #type = udpclient
@@ -72,3 +72,12 @@ keys = httpserver
 #inbound.length = 3
 #outbound.length = 3
 #keys = proxy
+
+[sam-forwarder-tcp-socks-outproxy]
+type = client
+host = 127.0.0.1
+port = 8087
+inbound.length = 2
+outbound.length = 3
+destination = 4oymiquy7qobjgx36tejs35zeqt24qpemsnzgtfeswmrw6csxbkq.b32.i2p
+keys = tcpclient

go.mod

@@ -3,21 +3,19 @@ module github.com/eyedeekay/sam-forwarder
 go 1.12
 
 require (
-	crawshaw.io/littleboss v0.0.0-20190317185602-8957d0aedcce // indirect
+	crawshaw.io/littleboss v0.0.0-20190317185602-8957d0aedcce
 	github.com/boreq/friendlyhash v0.0.0-20190522010448-1ca64b3ca69e
-	github.com/d5/tengo v1.24.3 // indirect
+	github.com/cryptix/goSam v0.1.0 // indirect
 	github.com/eyedeekay/eephttpd v0.0.0-20190903000420-52f5a8485a4e
 	github.com/eyedeekay/httptunnel v0.0.0-20190831071439-0ff3d5f798fb
+	github.com/eyedeekay/i2pdig v0.0.0-20180718204453-a67cb46e2e5f // indirect
+	github.com/eyedeekay/outproxy v0.0.0-20190908174238-22bd71d43733
 	github.com/eyedeekay/portcheck v0.0.0-20190218044454-bb8718669680
 	github.com/eyedeekay/sam3 v0.0.0-20190730185140-f8d54526ea25
 	github.com/gtank/cryptopasta v0.0.0-20170601214702-1f550f6f2f69
 	github.com/justinas/nosurf v0.0.0-20190416172904-05988550ea18
+	github.com/spf13/pflag v1.0.3 // indirect
 	github.com/zieckey/goini v0.0.0-20180118150432-0da17d361d26
 	github.com/zserge/lorca v0.1.8
 	github.com/zserge/webview v0.0.0-20190123072648-16c93bcaeaeb
-	gitlab.com/golang-commonmark/html v0.0.0-20180917080848-cfaf75183c4a // indirect
-	gitlab.com/golang-commonmark/linkify v0.0.0-20180917065525-c22b7bdb1179 // indirect
-	gitlab.com/golang-commonmark/markdown v0.0.0-20181102083822-772775880e1f // indirect
-	gitlab.com/golang-commonmark/mdurl v0.0.0-20180912090424-e5bce34c34f2 // indirect
-	gitlab.com/golang-commonmark/puny v0.0.0-20180912090636-2cd490539afe // indirect
 )

handler/pages.go

@@ -43,6 +43,20 @@ func DefaultCSS() string {
     float: left;
     overflow-wrap: break-word;
 }
+.outproxy {
+    width: 63%;
+    min-height: 15%;
+    background-color: #265ea7;
+    float: left;
+    overflow-wrap: break-word;
+}
+.outproxyhttp {
+    width: 63%;
+    min-height: 15%;
+    background-color: #265ea7;
+    float: left;
+    overflow-wrap: break-word;
+}
 .udpclient {
     width: 63%;
     min-height: 15%;

interface/interface-options.go

@@ -41,10 +41,6 @@ func SetAccessList(s []string) func(SAMTunnel) error {
 //SetCompress tells clients to use compression
 func SetCompress(b bool) func(SAMTunnel) error {
 	return func(c SAMTunnel) error {
-		if b {
-			c.Config().UseCompression = b // "true"
-			return nil
-		}
 		c.Config().UseCompression = b // "false"
 		return nil
 	}
@@ -58,7 +54,7 @@ func SetFilePath(s string) func(SAMTunnel) error {
 	}
 }
 
-//SetControlHost sets the host of the service to forward
+//SetControlHost sets the host of the service to present an API on
 func SetControlHost(s string) func(SAMTunnel) error {
 	return func(c SAMTunnel) error {
 		c.Config().ControlHost = s
@@ -66,7 +62,7 @@ func SetControlHost(s string) func(SAMTunnel) error {
 	}
 }
 
-//SetControlPort sets the port of the service to forward
+//SetControlPort sets the port of the service to present an API on
 func SetControlPort(s string) func(SAMTunnel) error {
 	return func(c SAMTunnel) error {
 		port, err := strconv.Atoi(s)
@@ -81,7 +77,8 @@ func SetControlPort(s string) func(SAMTunnel) error {
 	}
 }
 
-//SetKeyFile sets
+//SetKeyFile sets the path to a file containing a private key for decrypting
+//locally-encrypted i2p keys.
 func SetKeyFile(s string) func(SAMTunnel) error {
 	return func(c SAMTunnel) error {
 		c.Config().KeyFilePath = s
@@ -89,7 +86,7 @@ func SetKeyFile(s string) func(SAMTunnel) error {
 	}
 }
 
-//SetSaveFile tells the router to save the tunnel's keys long-term
+//SetDestination tells the
 func SetDestination(b string) func(SAMTunnel) error {
 	return func(c SAMTunnel) error {
 		c.Config().ClientDest = b
@@ -97,7 +94,7 @@ func SetDestination(b string) func(SAMTunnel) error {
 	}
 }
 
-//SetTunnelHost is used for VPN endpoints
+//SetTunnelHost is used for VPN endpoints only.
 func SetTunnelHost(s string) func(SAMTunnel) error {
 	return func(c SAMTunnel) error {
 		c.Config().TunnelHost = s
@@ -136,19 +133,15 @@ func SetPort(s string) func(SAMTunnel) error {
 	}
 }
 
-//SetEncrypt tells the router to use an encrypted leaseset
+//SetEncrypt tells the outproxy.SetHttp to use an encrypted leaseset
 func SetEncrypt(b bool) func(SAMTunnel) error {
 	return func(c SAMTunnel) error {
-		if b {
-			c.Config().EncryptLeaseSet = b //"true"
-			return nil
-		}
 		c.Config().EncryptLeaseSet = b //"false"
 		return nil
 	}
 }
 
-//SetLeaseSetKey sets the host of the Conf's SAM bridge
+//SetLeaseSetKey sets key to use with the encrypted leaseset
 func SetLeaseSetKey(s string) func(SAMTunnel) error {
 	return func(c SAMTunnel) error {
 		c.Config().LeaseSetKey = s
@@ -156,7 +149,7 @@ func SetLeaseSetKey(s string) func(SAMTunnel) error {
 	}
 }
 
-//SetLeaseSetPrivateKey sets the host of the Conf's SAM bridge
+//SetLeaseSetPrivateKey sets the private key to use with the encrypted leaseset
 func SetLeaseSetPrivateKey(s string) func(SAMTunnel) error {
 	return func(c SAMTunnel) error {
 		c.Config().LeaseSetPrivateKey = s
@@ -164,7 +157,7 @@ func SetLeaseSetPrivateKey(s string) func(SAMTunnel) error {
 	}
 }
 
-//SetLeaseSetPrivateSigningKey sets the host of the Conf's SAM bridge
+//SetLeaseSetPrivateSigningKey sets the private signing key to use with the encrypted leaseset
 func SetLeaseSetPrivateSigningKey(s string) func(SAMTunnel) error {
 	return func(c SAMTunnel) error {
 		c.Config().LeaseSetPrivateSigningKey = s
@@ -202,7 +195,7 @@ func SetName(s string) func(SAMTunnel) error {
 	}
 }
 
-//SetSaveFile tells the router to save the tunnel's keys long-term
+//SetSaveFile tells the application to save the tunnel's keys long-term
 func SetSaveFile(b bool) func(SAMTunnel) error {
 	return func(c SAMTunnel) error {
 		c.Config().SaveFile = b
@@ -400,7 +393,7 @@ func SetType(s string) func(SAMTunnel) error {
 	}
 }
 
-//SetUserName sets the host of the Conf's SAM bridge
+//SetUserName sets username for authentication purposes
 func SetUserName(s string) func(SAMTunnel) error {
 	return func(c SAMTunnel) error {
 		c.Config().UserName = s

interface/interface.go

@@ -5,31 +5,51 @@ import (
 	"github.com/eyedeekay/sam3/i2pkeys"
 )
 
+// SAMTunnel is an interface comprehensively representing an I2P tunnel over SAM
+// in Go
 type SAMTunnel interface {
+	// Config returns the appropriate underlying config object all options, or
+	// the common options passed into a compound tunnel.
 	Config() *i2ptunconf.Conf
 	// Tunnel Options
-	GetType() string             // Get the type of the tunnel in use(server, client, http, udp, etc)
-	Print() string               // Print all the tunnel options as a string
-	Props() map[string]string    //Get a full list of tunnel properties as a map for user display/analysis
-	Search(search string) string //Search the Props for a common term
-	Target() string              //The address of the local client or service to forward with a SAM tunnel
-	ID() string                  //The user-chosen tunnel ID
+	// GetType Get the type of the tunnel in use(server, client, http, udp, etc)
+	GetType() string
+	// Print all the tunnel options as a string
+	Print() string
+	// Props Get a full list of tunnel properties as a map for user display/analysis
+	Props() map[string]string
+	//Search the Props for a common term
+	Search(search string) string
+	//Target The address of the local client or service to forward with a SAM tunnel
+	Target() string
+	//ID The user-chosen tunnel name
+	ID() string
 	//Destination() string
 
 	// Key handling
-	Base32() string         // Get the .b32.i2p address of your service
-	Base32Readable() string // Create a more-readable representation of the .b32.i2p address using English words
-	Base64() string         // Get the public base64 address of your I2P service
-	Keys() i2pkeys.I2PKeys  // Get all the parts of the keys to your I2P service
+	// Get the .b32.i2p address of your service
+	Base32() string
+	// Create a more-readable representation of the .b32.i2p address using English words
+	Base32Readable() string
+	// Get the public base64 address of your I2P service
+	Base64() string
+	// Get all the parts of the keys to your I2P service
+	Keys() i2pkeys.I2PKeys
 
 	// Service Management
-	Load() (SAMTunnel, error) // Prepare tunnel keys and tunnel options
-	Serve() error             // Start the tunnel
-	Close() error             // Stop the tunnel and close all connections
-	Cleanup()                 // Stop the tunnel but leave the sockets alone for now
-	Up() bool                 // Return "true" if the tunnel is ready to go up.
+	// Prepare tunnel keys and tunnel options
+	Load() (SAMTunnel, error)
+	// Start the tunnel
+	Serve() error
+	// Stop the tunnel and close all connections
+	Close() error
+	// Stop the tunnel but leave the sockets alone for now
+	Cleanup()
+	// Return "true" if the tunnel is ready to go up.
+	Up() bool
 }
 
+// WebUI is an interface which is used to generate a minimal UI. Open to suggestions.
 type WebUI interface {
 	Title() string
 	URL() string

manager/manager.go

@@ -184,6 +184,20 @@ func NewSAMManagerFromOptions(opts ...func(*SAMManager) error) (*SAMManager, err
 					} else {
 						return nil, e
 					}
+				case "outproxy":
+					if f, e := samtunnelhandler.NewTunnelHandler(i2ptunhelper.NewOutProxyFromConfig(s.config.FilePath, s.SamHost, s.SamPort, label)); e == nil {
+						log.Println("found outproxy under", label)
+						s.handlerMux = s.handlerMux.Append(f)
+					} else {
+						return nil, e
+					}
+				case "outproxyhttp":
+					if f, e := samtunnelhandler.NewTunnelHandler(i2ptunhelper.NewHttpOutProxyFromConfig(s.config.FilePath, s.SamHost, s.SamPort, label)); e == nil {
+						log.Println("found outproxy under", label)
+						s.handlerMux = s.handlerMux.Append(f)
+					} else {
+						return nil, e
+					}
 				/*case "vpnserver":
 					if f, e := samtunnelhandler.NewTunnelHandler(samforwardervpnserver.NewSAMVPNForwarderFromConfig(s.config.FilePath, s.SamHost, s.SamPort, label)); e == nil {
 						log.Println("found vpnserver under", label)
@@ -271,20 +285,34 @@ func NewSAMManagerFromOptions(opts ...func(*SAMManager) error) (*SAMManager, err
 			} else {
 				return nil, e
 			}
-		/*case "vpnserver":
-			if f, e := samtunnelhandler.NewTunnelHandler(samforwardervpnserver.NewSAMVPNForwarderFromConf(s.config)); e == nil {
-				log.Println("found default vpnserver")
+		case "outproxy":
+			if f, e := samtunnelhandler.NewTunnelHandler(i2ptunhelper.NewOutProxyFromConf(s.config)); e == nil {
+				log.Println("found default udpclient")
 				s.handlerMux = s.handlerMux.Append(f)
 			} else {
 				return nil, e
 			}
-		case "vpnclient":
-			if f, e := samtunnelhandler.NewTunnelHandler(samforwardervpn.NewSAMVPNClientForwarderFromConf(s.config)); e == nil {
-				log.Println("found default vpnclient")
+		case "outproxyhttp":
+			if f, e := samtunnelhandler.NewTunnelHandler(i2ptunhelper.NewHttpOutProxyFromConf(s.config)); e == nil {
+				log.Println("found default udpclient")
 				s.handlerMux = s.handlerMux.Append(f)
 			} else {
 				return nil, e
-			}*/
+			}
+			/*case "vpnserver":
+				if f, e := samtunnelhandler.NewTunnelHandler(samforwardervpnserver.NewSAMVPNForwarderFromConf(s.config)); e == nil {
+					log.Println("found default vpnserver")
+					s.handlerMux = s.handlerMux.Append(f)
+				} else {
+					return nil, e
+				}
+			case "vpnclient":
+				if f, e := samtunnelhandler.NewTunnelHandler(samforwardervpn.NewSAMVPNClientForwarderFromConf(s.config)); e == nil {
+					log.Println("found default vpnclient")
+					s.handlerMux = s.handlerMux.Append(f)
+				} else {
+					return nil, e
+				}*/
 		default:
 			if f, e := samtunnelhandler.NewTunnelHandler(i2ptunhelper.NewSAMClientForwarderFromConf(s.config)); e == nil {
 				log.Println("found default client")

manager/nostatic.go

@@ -1,4 +1,5 @@
 // +build nostatic
+// +build !static !cli
 
 package sammanager
 

manager/noui.go

@@ -1,4 +1,5 @@
-// +build !static,!nostatic
+// +build cli
+// +build !nostatic !static
 
 package sammanager
 
@@ -9,12 +10,12 @@ import (
 	"time"
 )
 
-func RunUI() {
+func (s *SAMManager) RunUI() {
 }
 
-func (s *app) Serve() bool {
+func (s *SAMManager) Serve() bool {
 	log.Println("Starting Tunnels()")
-	for _, element := range s.clientMux.Tunnels() {
+	for _, element := range s.handlerMux.Tunnels() {
 		log.Println("Starting service tunnel", element.ID())
 		go element.Serve()
 	}

manager/static.go

@@ -1,4 +1,5 @@
-// +build !nostatic
+// +build static
+// +build !nostatic !cli
 
 package sammanager
 

tcp/forwarder.go

@@ -19,7 +19,7 @@ import (
 	"github.com/eyedeekay/sam-forwarder/i2pkeys"
 	"github.com/eyedeekay/sam-forwarder/interface"
 	"github.com/eyedeekay/sam3"
-	"github.com/eyedeekay/sam3/i2pkeys"
+	i2pkeys "github.com/eyedeekay/sam3/i2pkeys"
 )
 
 //SAMForwarder is a structure which automatically configured the forwarding of

udp/forwarder-client-udp.go

@@ -15,7 +15,7 @@ import (
 	"github.com/eyedeekay/sam-forwarder/i2pkeys"
 	"github.com/eyedeekay/sam-forwarder/interface"
 	"github.com/eyedeekay/sam3"
-	"github.com/eyedeekay/sam3/i2pkeys"
+	i2pkeys "github.com/eyedeekay/sam3/i2pkeys"
 )
 
 //SAMSSUClientForwarder is a structure which automatically configured the forwarding of