From 059eb57d350bf92efa72eed5d4fb0c863bdb1d5d Mon Sep 17 00:00:00 2001
From: idk <problemsolver@openmailbox.org>
Date: Mon, 3 Dec 2018 16:54:58 -0500
Subject: [PATCH] more integration of vpn

---
 README.md.asc     | 16 ++++++++--------
 config/tunconf.go |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.md.asc b/README.md.asc
index 137fce1..e5519a6 100644
--- a/README.md.asc
+++ b/README.md.asc
@@ -102,12 +102,12 @@ Donate
   BTC:159M8MEUwhTzE9RXmcZxtigKaEjgfwRbHt
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlwFpTYACgkQ11wDs5te
-FOFJ9QgAniEFvWHW+BnU6EeH0VG8rQgnkSuO72E0rX3wlU2dwxHJFqPS0bVbPlwC
-nTzZMKDp2ZHWfq7PUfDFemyUjt7rVLdSFt//a7rY8u+8cJrenDxwZLdi8UUTmeBe
-/KvyUaPTSALWJ1EmNPaqq9ODtRR7q2VbQc5AmDU1k6jQOdfcUNO3smgT/HEqDzRZ
-JYRvtIq3OPOqnZZWqnFs+2F96SYda8XIrX8sBG3GeNDAj8aKCudrtCsZhrZleY/e
-qf+xpV+WvRUx6Z6ew0JPoifLMmdcTgBvxoPaeWteB+Gt3TsNDKU0OQ3NwyXUx76D
-wvMrb4bYH7o3lf4cj/4k9pFLS5aEwg==
-=AU0g
+iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlwFpjIACgkQ11wDs5te
+FOHJ6Qf9FQ5Sv9TeH5VukcceOLkekMMklLwyrjy1yzXObRgDKgGT4LFBa2eD1cNn
+GWPsOl3RKyE9+d8bty+916VxjqaYmx1V2Pwte/NN1FT8Y/0JJBOS6htPaPBu1vQQ
+rXhroXJSHpaFBfpBtDY8cf9kbGZYyvOryWTR0gZxrBJADay/IKwm/zrr3/A+Ky2Q
+inyR+MPKUnaoc3miMuJ4d0obINcpxsAG4ndcvxyM0pqYbmCXfAPPMr2qo1m1NT5Z
+kARBjQivyqjlhJgajKCwZ3Rm2f1anQpTy9Y0SiU+JLBFQ/rKAwlnsE83i+QZ3Dd8
+1xEZsHDR8a8G8fCJmgDWGzm/jRgk+g==
+=4VT+
 -----END PGP SIGNATURE-----
diff --git a/config/tunconf.go b/config/tunconf.go
index 94807b2..e9b427d 100644
--- a/config/tunconf.go
+++ b/config/tunconf.go
@@ -11,6 +11,7 @@ import (
 
 import (
 	"github.com/eyedeekay/sam-forwarder"
+    "github.com/eyedeekay/sam-forwarder/csvpn"
 	"github.com/eyedeekay/sam-forwarder/udp"
 	"github.com/zieckey/goini"
 )
@@ -490,7 +491,7 @@ func NewSAMVPNClientForwarderFromConfig(iniFile, SamHost, SamPort string, label
 		if SamPort != "" && SamPort != "7656" {
 			config.SamPort = config.GetSAMPort(SamPort, config.SamPort)
 		}
-		return NewSAMClientServerVPN(config)
+		return samforwardervpn.NewSAMClientServerVPN(config)
 	}
 	return nil, nil
 }
@@ -508,7 +509,7 @@ func NewSAMVPNForwarderFromConfig(iniFile, SamHost, SamPort string, label ...str
 		if SamPort != "" && SamPort != "7656" {
 			config.SamPort = config.GetSAMPort(SamPort, config.SamPort)
 		}
-		return NewSAMClientVPN(config)
+		return samforwardervpn.NewSAMClientVPN(config)
 	}
 	return nil, nil
 }