https 、客户端与服务端连接优化

utils/util.go

@@ -2,7 +2,6 @@ package utils
 
 import (
 	"encoding/base64"
-	"io"
 	"io/ioutil"
 	"log"
 	"net"
@@ -11,8 +10,6 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"sync"
-	"time"
 )
 
 const (
@@ -26,9 +23,8 @@ const (
 	RES_SIGN          = "sign"
 	RES_MSG           = "msg0"
 	RES_CLOSE         = "clse"
+	NEW_CONN          = "conn" //新连接标志
 	CONN_SUCCESS      = "sucs"
-	CONN_ERROR        = "fail"
-	TEST_FLAG         = "tst"
 	CONN_TCP          = "tcp"
 	CONN_UDP          = "udp"
 	UnauthorizedBytes = `HTTP/1.1 401 Unauthorized
@@ -42,32 +38,6 @@ WWW-Authenticate: Basic realm="easyProxy"
 `
 )
 
-//copy
-func Relay(in, out net.Conn, compressType int, crypt, mux bool, rate *Rate) (n int64, err error) {
-	switch compressType {
-	case COMPRESS_SNAPY_ENCODE:
-		n, err = copyBuffer(NewSnappyConn(in, crypt, rate), out)
-		out.Close()
-		NewSnappyConn(in, crypt, rate).Write([]byte(IO_EOF))
-	case COMPRESS_SNAPY_DECODE:
-		n, err = copyBuffer(in, NewSnappyConn(out, crypt, rate))
-		in.Close()
-		if !mux {
-			out.Close()
-		}
-	case COMPRESS_NONE_ENCODE:
-		n, err = copyBuffer(NewCryptConn(in, crypt, rate), out)
-		out.Close()
-		NewCryptConn(in, crypt, rate).Write([]byte(IO_EOF))
-	case COMPRESS_NONE_DECODE:
-		n, err = copyBuffer(in, NewCryptConn(out, crypt, rate))
-		in.Close()
-		if !mux {
-			out.Close()
-		}
-	}
-	return
-}
 
 //判断压缩方式
 func GetCompressType(compress string) (int, int) {
@@ -152,71 +122,11 @@ func GetIntNoErrByStr(str string) int {
 	return i
 }
 
-// io.copy的优化版，读取buffer长度原为32*1024，与snappy不同，导致读取出的内容存在差异，不利于解密
-//内存优化 用到pool，快速回收
-func copyBuffer(dst io.Writer, src io.Reader) (written int64, err error) {
-	for {
-		//放在里面是为了加快回收和重利用
-		buf := bufPoolCopy.Get().([]byte)
-		nr, er := src.Read(buf)
-		if nr > 0 {
-			nw, ew := dst.Write(buf[0:nr])
-			bufPoolCopy.Put(buf)
-			if nw > 0 {
-				written += int64(nw)
-			}
-			if ew != nil {
-				err = ew
-				break
-			}
-			if nr != nw {
-				err = io.ErrShortWrite
-				break
-			}
-		} else {
-			bufPoolCopy.Put(buf)
-		}
-		if er != nil {
-			if er != io.EOF {
-				err = er
-			}
-			break
-		}
-	}
-	return written, err
-}
-
-//连接重置 清空缓存区
-func FlushConn(c net.Conn) {
-	c.SetReadDeadline(time.Now().Add(time.Second * 3))
-	buf := bufPool.Get().([]byte)
-	defer bufPool.Put(buf)
-	for {
-		if _, err := c.Read(buf); err != nil {
-			break
-		}
-	}
-	c.SetReadDeadline(time.Time{})
-}
-
 //简单的一个校验值
 func Getverifyval(vkey string) string {
 	return Md5(vkey)
 }
 
-//wait replay group
-//conn1 网桥 conn2
-func ReplayWaitGroup(conn1 net.Conn, conn2 net.Conn, compressEncode, compressDecode int, crypt, mux bool, rate *Rate) (out int64, in int64) {
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		in, _ = Relay(conn1, conn2, compressEncode, crypt, mux, rate)
-		wg.Done()
-	}()
-	out, _ = Relay(conn2, conn1, compressDecode, crypt, mux, rate)
-	wg.Wait()
-	return
-}
 
 func ChangeHostAndHeader(r *http.Request, host string, header string, addr string) {
 	if host != "" {
@@ -236,8 +146,8 @@ func ChangeHostAndHeader(r *http.Request, host string, header string, addr strin
 	r.Header.Set("X-Real-IP", addr)
 }
 
-func ReadAllFromFile(filePth string) ([]byte, error) {
-	f, err := os.Open(filePth)
+func ReadAllFromFile(filePath string) ([]byte, error) {
+	f, err := os.Open(filePath)
 	if err != nil {
 		return nil, err
 	}