Code refactor. Utils moved to main vpn package

zreigz · Jan 13, 2017 · 9383127 · 9383127
1 parent c39d1c6
commit 9383127
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"runtime"
 
-	. "github.com/zreigz/ws-vpn/utils"
+	. "github.com/zreigz/ws-vpn/vpn/utils"
 	client "github.com/zreigz/ws-vpn/vpn"
 	server "github.com/zreigz/ws-vpn/vpn"
 )

diff --git a/vpn/client.go b/vpn/client.go
@@ -22,7 +22,7 @@ import (
 	"github.com/songgao/water"
 	"net"
 
-	. "github.com/zreigz/ws-vpn/utils"
+	. "github.com/zreigz/ws-vpn/vpn/utils"
 	"net/url"
 	"os"
 	"os/signal"

diff --git a/vpn/init.go b/vpn/init.go
@@ -17,7 +17,7 @@
  */
 package vpn
 
-import loging "github.com/zreigz/ws-vpn/utils"
+import loging "github.com/zreigz/ws-vpn/vpn/utils"
 
 var logger = loging.GetLogger()
 
@@ -33,6 +33,4 @@ const (
 	STATE_CONNECT = 1
 
 	STATE_CONNECTED = 2
-
-	STATE_DISCONNECT = 3
 )
diff --git a/vpn/server.go b/vpn/server.go
@@ -22,7 +22,7 @@ import (
 	"net"
 
 	"github.com/songgao/water"
-	. "github.com/zreigz/ws-vpn/utils"
+	. "github.com/zreigz/ws-vpn/vpn/utils"
 
 	"fmt"
 	"net/http"

diff --git a/utils/config.go → vpn/utils/config.go b/utils/config.go → vpn/utils/config.go
diff --git a/utils/loging.go → vpn/utils/loging.go b/utils/loging.go → vpn/utils/loging.go