From 842be5eaddf49b26ee0c9bfebf4274bb533dd06f Mon Sep 17 00:00:00 2001
From: idk <problemsolver@openmailbox.org>
Date: Tue, 25 Dec 2018 01:55:24 -0500
Subject: [PATCH] get ready for saving the keys

---
 main.go                  | 5 ++---
 socks/manager.go         | 4 ++--
 socks/manager_options.go | 6 ++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/main.go b/main.go
index 1720172..b75684b 100644
--- a/main.go
+++ b/main.go
@@ -8,9 +8,8 @@ import (
 )
 
 import (
-	"github.com/eyedeekay/sam-forwarder/config"
-	//"github.com/eyedeekay/samcatd-web"
 	"github.com/eyedeekay/eeproxy/socks"
+	"github.com/eyedeekay/sam-forwarder/config"
 )
 
 type flagOpts []string
@@ -138,7 +137,7 @@ func main() {
 
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt)
-	if tunsocks, tunerr := tunmanager.NewManager(config.SamHost, config.SamPort, config.Print(), config.SaveDirectory); tunerr == nil {
+	if tunsocks, tunerr := tunmanager.NewManager(config.SamHost, config.SamPort, config.SaveDirectory, config.Print()); tunerr == nil {
 		go func() {
 			for sig := range c {
 				if sig == os.Interrupt {
diff --git a/socks/manager.go b/socks/manager.go
index 86a69fa..5f1efa6 100644
--- a/socks/manager.go
+++ b/socks/manager.go
@@ -53,12 +53,12 @@ func (m Manager) Dial(ctx context.Context, network, addr string) (net.Conn, erro
 	return m.DialI2P(ctx, addr)
 }
 
-func NewManager(samhost, samport, samopts, datadir string) (*Manager, error) {
+func NewManager(samhost, samport, datadir string, samopts []string) (*Manager, error) {
 	return NewManagerFromOptions(
 		SetHost(samhost),
 		SetPort(samport),
-		SetSAMOpts(samopts),
 		SetDataDir(datadir),
+		SetSAMOpts(samopts),
 	)
 }
 
diff --git a/socks/manager_options.go b/socks/manager_options.go
index cddecd2..2d6fe4f 100644
--- a/socks/manager_options.go
+++ b/socks/manager_options.go
@@ -40,9 +40,11 @@ func SetPort(v string) func(*Manager) error {
 }
 
 //SetSAMOpts sets the SAM options
-func SetSAMOpts(s string) func(*Manager) error {
+func SetSAMOpts(s []string) func(*Manager) error {
 	return func(c *Manager) error {
-		c.samopts = s
+		for _, i := range s {
+			c.samopts += i + " "
+		}
 		return nil
 	}
 }