重构好了，把tunnel单独拿出来了。

Signed-off-by: dmy@lab <dmy@lab.com>

tcp.go

@@ -1,24 +1,11 @@
 package main
 
 import (
-	"bytes"
-	"crypto/md5"
-	"encoding/hex"
 	"github.com/TransX/log"
-	"github.com/TransX/tscipher"
 	"net"
 	"os"
-	"strconv"
-	"sync/atomic"
-	"time"
 )
 
-var seed int32
-
-func init() {
-	seed = 0
-}
-
 type TransTCP struct {
 }
 
@@ -50,61 +37,6 @@ func (this *TransTCP) createTCPListener(ip, port string) (listen net.Listener, e
 	return
 }
 
-func (this *TransTCP) tunnel(src, dest net.Conn, id string, encrypDirection string) { //单向的，从src发送到dest
-	defer func() {
-		if r := recover(); r != nil {
-			if src != nil {
-				src.Close()
-			}
-			if dest != nil {
-				dest.Close()
-			}
-
-		}
-	}()
-	cache := make([]byte, 1024*2) //128kB
-	for {
-		//构建Carrier
-		revCarrier := &tscipher.Carrier{
-			src,
-			tscipher.NewCipher("XOR"),
-			cache,
-		}
-		log.Debug("Encrypt Direction %s ID %s", encrypDirection, id)
-		if encrypDirection != "receive" {
-			revCarrier.Cipher = nil
-			log.Debug("Read not crypted. Tunnel: %s", id)
-		}
-		nByte, err := tscipher.ReceiveData(revCarrier)
-		if err != nil {
-			log.Panic("Read panic. Tunnel id: %s. Remote Add: %s. Err:%s", id, src.RemoteAddr().String(), err)
-		}
-		log.Info("Reived %d bytes from %s. Tunnel: id %s", nByte, src.RemoteAddr().String(), id)
-		sendCarrier := &tscipher.Carrier{
-			dest,
-			tscipher.NewCipher("XOR"),
-			cache, //TODO:危险，cache的容量容易被不小心修改
-		}
-		if encrypDirection != "send" {
-			sendCarrier.Cipher = nil
-			log.Debug("Write not crypted. Tunnel: %s", id)
-		}
-		n, err := tscipher.SendData(sendCarrier, nByte)
-		log.Info("Write %d bytes from %s to %s. Tunnel: %s", n, dest.LocalAddr(), dest.RemoteAddr().String(), id)
-		if err != nil {
-			log.Panic("Write panic. ID: %s, Err: %s, Remote Add: %s", id, err, dest.RemoteAddr().String())
-		}
-	}
-
-}
-
-func (this *TransTCP) tunnelID() string {
-	nowString := time.Now().String() + strconv.Itoa(int(seed))
-	atomic.AddInt32(&seed, 1) //避免多线程情况下获得的种子相同
-	md5Byte := md5.Sum(bytes.NewBufferString(nowString).Bytes())
-	return hex.EncodeToString(md5Byte[:])
-}
-
 func (this *TransTCP) Start(listenPort, destIP, destPort string, clientOrServer string) {
 	listener, err := this.createTCPListener("0.0.0.0", listenPort)
 	if err != nil {
@@ -123,17 +55,13 @@ func (this *TransTCP) Start(listenPort, destIP, destPort string, clientOrServer
 				}
 				log.Info("Dial %s", destConn.RemoteAddr().String())
 				//tunnel model : [ -->>server ---- client -->> ](this is a tunnel)
-				tunnelIDA := this.tunnelID()
-				tunnelIDB := this.tunnelID()
 				if clientOrServer == "client" {
-					go this.tunnel(listenerConn, destConn, tunnelIDA, "send")
+					go NewTunnel(listenerConn, destConn, "send").run()
-					go this.tunnel(destConn, listenerConn, tunnelIDB, "receive")
+					go NewTunnel(destConn, listenerConn, "receive").run()
-					log.Debug("two tunnel created: %s %s %s %s", tunnelIDA, "send", tunnelIDB, "receive")
 				}
 				if clientOrServer == "server" {
-					go this.tunnel(listenerConn, destConn, tunnelIDA, "receive")
+					go NewTunnel(listenerConn, destConn, "receive").run()
-					go this.tunnel(destConn, listenerConn, tunnelIDB, "send")
+					go NewTunnel(destConn, listenerConn, "send").run()
-					log.Debug("two tunnel created: %s %s %s %s", tunnelIDA, "receive", tunnelIDB, "send")
 				}
 			}()
 

tunnel.go

@@ -0,0 +1,103 @@
+package main
+
+import (
+	"bytes"
+	"crypto/md5"
+	"encoding/hex"
+	"github.com/TransX/log"
+	"github.com/TransX/tscipher"
+	"net"
+	"strconv"
+	"sync/atomic"
+	"time"
+)
+
+var seed int32
+
+func init() {
+	seed = 0
+}
+
+type Tunnel struct {
+	id              string
+	src             net.Conn
+	dest            net.Conn
+	cipherDirection string
+}
+
+func NewTunnel(src, dest net.Conn, cipherDirection string) *Tunnel {
+	return &Tunnel{
+		id:              tunnelID(),
+		src:             src,
+		dest:            dest,
+		cipherDirection: cipherDirection,
+	}
+}
+
+func (this *Tunnel) GetID(id string) string {
+	return this.id
+}
+
+func (this *Tunnel) SetID(id string) { //rarely used
+	this.id = id
+}
+
+//tunnel model : [ -->>server ---- client -->> ](this is a tunnel)
+func (this *Tunnel) run() { //单向的，从src发送到dest
+	src := this.src
+	dest := this.dest
+	cipherDirection := this.cipherDirection
+	id := this.id
+	defer func() {
+		if r := recover(); r != nil {
+			if src != nil {
+				src.Close()
+			}
+			if dest != nil {
+				dest.Close()
+			}
+
+		}
+	}()
+	cache := make([]byte, 1024*2) //128kB
+	for {
+		//构建Carrier
+		revCarrier := &tscipher.Carrier{
+			src,
+			tscipher.NewCipher("XOR"),
+			cache,
+		}
+		log.Debug("Encrypt Direction %s ID %s", cipherDirection, id)
+		if cipherDirection != "receive" {
+			revCarrier.Cipher = nil
+			log.Debug("Read not crypted. Tunnel: %s", id)
+		}
+		nByte, err := tscipher.ReceiveData(revCarrier)
+		if err != nil {
+			log.Panic("Read panic. Tunnel id: %s. Remote Add: %s. Err:%s", id, src.RemoteAddr().String(), err)
+		}
+		log.Info("Reived %d bytes from %s. Tunnel: id %s", nByte, src.RemoteAddr().String(), id)
+		sendCarrier := &tscipher.Carrier{
+			dest,
+			tscipher.NewCipher("XOR"),
+			cache, //TODO:危险，cache的容量容易被不小心修改
+		}
+		if cipherDirection != "send" {
+			sendCarrier.Cipher = nil
+			log.Debug("Write not crypted. Tunnel: %s", id)
+		}
+		n, err := tscipher.SendData(sendCarrier, nByte)
+		log.Info("Write %d bytes from %s to %s. Tunnel: %s", n, dest.LocalAddr(), dest.RemoteAddr().String(), id)
+		if err != nil {
+			log.Panic("Write panic. ID: %s, Err: %s, Remote Add: %s", id, err, dest.RemoteAddr().String())
+		}
+	}
+
+}
+
+func tunnelID() string {
+	nowString := time.Now().String() + strconv.Itoa(int(seed))
+	atomic.AddInt32(&seed, 1) //避免多线程情况下获得的种子相同
+	md5Byte := md5.Sum(bytes.NewBufferString(nowString).Bytes())
+	return hex.EncodeToString(md5Byte[:])
+}