Merge branch 'develop' into pr/58

# Conflicts:
#	controller/server.go
#	geo_ip.go
#	http.go
#	transport_channel.go

Author: sipt

ciphers/ciphers.go

@@ -1,16 +1,16 @@
 package ciphers
 
 import (
-	"github.com/sipt/shuttle"
-	"github.com/sipt/shuttle/ciphers/ssstream"
 	"fmt"
 	"github.com/sipt/shuttle/ciphers/ssaead"
+	"github.com/sipt/shuttle/ciphers/ssstream"
+	connect "github.com/sipt/shuttle/conn"
 )
 
-type ConnDecorate func(password string, conn shuttle.IConn) (shuttle.IConn, error)
+type ConnDecorate func(password string, conn connect.IConn) (connect.IConn, error)
 
 //加密装饰
-func CipherDecorate(password, method string, conn shuttle.IConn) (shuttle.IConn, error) {
+func CipherDecorate(password, method string, conn connect.IConn) (connect.IConn, error) {
 	d := ssstream.GetStreamCiphers(method)
 	if d != nil {
 		return d(password, conn)

ciphers/ssaead/cipher_conn.go

@@ -3,15 +3,15 @@ package ssaead
 import (
 	"crypto/cipher"
 	"crypto/sha1"
+	connect "github.com/sipt/shuttle/conn"
 	"io"
 
-	"golang.org/x/crypto/hkdf"
-	"github.com/sipt/shuttle"
 	"bytes"
 	"crypto/md5"
 	"crypto/rand"
-	"github.com/sipt/shuttle/pool"
 	"github.com/sipt/shuttle/log"
+	"github.com/sipt/shuttle/pool"
+	"golang.org/x/crypto/hkdf"
 )
 
 var aeadCiphers = make(map[string]IAEADCipher)
@@ -21,12 +21,12 @@ func registerAEADCiphers(method string, c IAEADCipher) {
 	log.Logger.Infof("[SS Ciphers] register cipher [%s]", method)
 }
 
-func GetAEADCiphers(method string) func(string, shuttle.IConn) (shuttle.IConn, error) {
+func GetAEADCiphers(method string) func(string, connect.IConn) (connect.IConn, error) {
 	c, ok := aeadCiphers[method]
 	if !ok {
 		return nil
 	}
-	return func(password string, conn shuttle.IConn) (shuttle.IConn, error) {
+	return func(password string, conn connect.IConn) (connect.IConn, error) {
 		salt := make([]byte, c.SaltSize())
 		if _, err := io.ReadFull(rand.Reader, salt); err != nil {
 			return nil, err
@@ -57,7 +57,7 @@ type IAEADCipher interface {
 }
 
 type aeadConn struct {
-	shuttle.IConn
+	connect.IConn
 	IAEADCipher
 	key        []byte
 	rNonce     []byte

ciphers/ssstream/cipher_conn.go

@@ -1,13 +1,13 @@
 package ssstream
 
 import (
-	"github.com/sipt/shuttle"
-	"github.com/sipt/shuttle/pool"
 	"crypto/cipher"
-	"io"
-	"crypto/rand"
 	"crypto/md5"
+	"crypto/rand"
+	connect "github.com/sipt/shuttle/conn"
 	"github.com/sipt/shuttle/log"
+	"github.com/sipt/shuttle/pool"
+	"io"
 )
 
 var streamCiphers = make(map[string]IStreamCipher)
@@ -17,12 +17,12 @@ func registerStreamCiphers(method string, c IStreamCipher) {
 	log.Logger.Infof("[SS Ciphers] register cipher [%s]", method)
 }
 
-func GetStreamCiphers(method string) func(string, shuttle.IConn) (shuttle.IConn, error) {
+func GetStreamCiphers(method string) func(string, connect.IConn) (connect.IConn, error) {
 	c, ok := streamCiphers[method]
 	if !ok {
 		return nil
 	}
-	return func(password string, conn shuttle.IConn) (shuttle.IConn, error) {
+	return func(password string, conn connect.IConn) (connect.IConn, error) {
 		iv := make([]byte, c.IVLen())
 		if _, err := io.ReadFull(rand.Reader, iv); err != nil {
 			return nil, err
@@ -47,7 +47,7 @@ type IStreamCipher interface {
 }
 
 type streamConn struct {
-	shuttle.IConn
+	connect.IConn
 	IStreamCipher
 	key       []byte
 	Encrypter cipher.Stream