redo web UI |web close| client log |system info |p2p |max、ump optimization

lib/conn/link.go

@@ -1,13 +1,5 @@
 package conn
 
-import (
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/file"
-	"github.com/cnlh/nps/lib/pool"
-	"github.com/cnlh/nps/lib/rate"
-	"net"
-)
-
 type Secret struct {
 	Password string
 	Conn     *Conn
@@ -21,93 +13,19 @@ func NewSecret(p string, conn *Conn) *Secret {
 }
 
 type Link struct {
-	Id            int    //id
-	ConnType      string //连接类型
-	Host          string //目标
-	En            int    //加密
-	De            int    //解密
-	Crypt         bool   //加密
-	Conn          *Conn
-	Flow          *file.Flow
-	UdpListener   *net.UDPConn
-	Rate          *rate.Rate
-	UdpRemoteAddr *net.UDPAddr
-	MsgCh         chan []byte
-	MsgConn       *Conn
-	StatusCh      chan bool
-	FinishUse     bool
+	ConnType   string //连接类型
+	Host       string //目标
+	Crypt      bool   //加密
+	Compress   bool
+	RemoteAddr string
 }
 
-func NewLink(id int, connType string, host string, en, de int, crypt bool, c *Conn, flow *file.Flow, udpListener *net.UDPConn, rate *rate.Rate, UdpRemoteAddr *net.UDPAddr) *Link {
+func NewLink(connType string, host string, crypt bool, compress bool, remoteAddr string) *Link {
 	return &Link{
-		Id:            id,
-		ConnType:      connType,
-		Host:          host,
-		En:            en,
-		De:            de,
-		Crypt:         crypt,
-		Conn:          c,
-		Flow:          flow,
-		UdpListener:   udpListener,
-		Rate:          rate,
-		UdpRemoteAddr: UdpRemoteAddr,
-		MsgCh:         make(chan []byte),
-		StatusCh:      make(chan bool),
+		RemoteAddr: remoteAddr,
+		ConnType:   connType,
+		Host:       host,
+		Crypt:      crypt,
+		Compress:   compress,
 	}
 }
-
-func (s *Link) RunWrite() {
-	go func() {
-		for {
-			select {
-			case content := <-s.MsgCh:
-				if len(content) == len(common.IO_EOF) && string(content) == common.IO_EOF {
-					s.FinishUse = true
-					if s.Conn != nil {
-						s.Conn.Close()
-					}
-					return
-				} else {
-					if s.Conn == nil {
-						return
-					}
-					if s.UdpListener != nil && s.UdpRemoteAddr != nil {
-						s.UdpListener.WriteToUDP(content, s.UdpRemoteAddr)
-					} else {
-						s.Conn.Write(content)
-					}
-					if s.Flow != nil {
-						s.Flow.Add(0, len(content))
-					}
-					if s.ConnType == common.CONN_UDP {
-						return
-					}
-					s.MsgConn.WriteWriteSuccess(s.Id)
-				}
-				pool.PutBufPoolCopy(content)
-			}
-		}
-	}()
-}
-func (s *Link) RunRead(msgConn *Conn) {
-	buf := pool.BufPoolCopy.Get().([]byte)
-	for {
-		if n, err := s.Conn.Read(buf); err != nil {
-			msgConn.SendMsg([]byte(common.IO_EOF), s)
-			break
-		} else {
-			if _, err := msgConn.SendMsg(buf[:n], s); err != nil {
-				msgConn.Close()
-				break
-			}
-			if s.ConnType == common.CONN_UDP {
-				break
-			}
-			if s.Flow != nil {
-				s.Flow.Add(n, 0)
-			}
-		}
-		<-s.StatusCh
-	}
-	pool.PutBufPoolCopy(buf)
-}