Code refactor. Utils moved to main vpn package

Lukasz Zajaczkowski · Lukasz Zajaczkowski · commit 93831278548c · 2017-01-13T08:31:31.000+01:00
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/vpn/utils/config.go b/vpn/utils/config.go
diff --git a/vpn/utils/loging.go b/vpn/utils/loging.go

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"os"`
`24`	`24`	`"runtime"`
`25`	`25`
`26`		`- . "github.com/zreigz/ws-vpn/utils"`
	`26`	`+ . "github.com/zreigz/ws-vpn/vpn/utils"`
`27`	`27`	`client "github.com/zreigz/ws-vpn/vpn"`
`28`	`28`	`server "github.com/zreigz/ws-vpn/vpn"`
`29`	`29`	`)`