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

2025-10-18 19:23:53 +00:00 · 2019-03-01 17:23:14 +08:00
parent 534d428c6d
commit f526c56784
82 changed files with 15199 additions and 4561 deletions
--- a/server/proxy/base.go
+++ b/server/proxy/base.go
@@ -48,22 +48,6 @@ func (s *BaseServer) FlowAddHost(host *file.Host, in, out int64) {
 	host.Flow.InletFlow += in
 }

-func (s *BaseServer) linkCopy(link *conn.Link, c *conn.Conn, rb []byte, tunnel *conn.Conn, flow *file.Flow) {
-	if rb != nil {
-		if _, err := tunnel.SendMsg(rb, link); err != nil {
-			c.Close()
-			return
-		}
-		flow.Add(len(rb), 0)
-		<-link.StatusCh
-	}
-	if err := s.checkFlow(); err != nil {
-		c.Close()
-	}
-	link.RunRead(tunnel)
-	s.task.Client.AddConn()
-}
-
 func (s *BaseServer) writeConnFail(c net.Conn) {
 	c.Write([]byte(common.ConnectionFailBytes))
 	c.Write(s.errorContent)
@@ -87,15 +71,16 @@ func (s *BaseServer) checkFlow() error {
 }

 //与客户端建立通道
-func (s *BaseServer) DealClient(c *conn.Conn, addr string, rb []byte) error {
-	link := conn.NewLink(s.task.Client.GetId(), common.CONN_TCP, addr, s.task.Client.Cnf.CompressEncode, s.task.Client.Cnf.CompressDecode, s.task.Client.Cnf.Crypt, c, s.task.Flow, nil, s.task.Client.Rate, nil)
+func (s *BaseServer) DealClient(c *conn.Conn, addr string, rb []byte, tp string) error {
+	link := conn.NewLink(tp, addr, s.task.Client.Cnf.Crypt, s.task.Client.Cnf.Compress, c.Conn.RemoteAddr().String())

-	if tunnel, err := s.bridge.SendLinkInfo(s.task.Client.Id, link, c.Conn.RemoteAddr().String()); err != nil {
+	if target, err := s.bridge.SendLinkInfo(s.task.Client.Id, link, c.Conn.RemoteAddr().String()); err != nil {
 		c.Close()
 		return err
 	} else {
-		link.RunWrite()
-		s.linkCopy(link, c, rb, tunnel, s.task.Flow)
+		conn.CopyWaitGroup(target, c, link.Crypt, link.Compress, s.task.Client.Rate, s.task.Client.Flow)
 	}
+	
+	s.task.Client.AddConn()
 	return nil
 }
--- a/server/proxy/http.go
+++ b/server/proxy/http.go
@@ -9,6 +9,7 @@ import (
 	"github.com/cnlh/nps/lib/file"
 	"github.com/cnlh/nps/vender/github.com/astaxie/beego"
 	"github.com/cnlh/nps/vender/github.com/astaxie/beego/logs"
+	"net"
 	"net/http"
 	"net/http/httputil"
 	"os"
@@ -116,17 +117,16 @@ func (s *httpServer) process(c *conn.Conn, r *http.Request) {
 	//多客户端域名代理
 	var (
 		isConn   = true
-		lk       *conn.Link
 		host     *file.Host
-		tunnel   *conn.Conn
+		target   net.Conn
 		lastHost *file.Host
 		err      error
 	)
 	if host, err = file.GetCsvDb().GetInfoByHost(r.Host, r); err != nil {
 		logs.Notice("the url %s %s can't be parsed!", r.Host, r.RequestURI)
 		goto end
-	} else if !host.Client.GetConn() {
-		logs.Notice("Connections exceed the current client %d limit", host.Client.Id)
+	} else if !host.Client.GetConn() { //conn num limit
+		logs.Notice("Connections exceed the current client %d limit %d ,now connection num %d", host.Client.Id, host.Client.MaxConn, host.Client.NowConn)
 		c.Close()
 		return
 	} else {
@@ -138,20 +138,26 @@ func (s *httpServer) process(c *conn.Conn, r *http.Request) {
 		if isConn {
 			//流量限制
 			if host.Client.Flow.FlowLimit > 0 && (host.Client.Flow.FlowLimit<<20) < (host.Client.Flow.ExportFlow+host.Client.Flow.InletFlow) {
+				logs.Warn("Traffic exceeded client id %s", host.Client.Id)
 				break
 			}
-			host.Client.Cnf.CompressDecode, host.Client.Cnf.CompressEncode = common.GetCompressType(host.Client.Cnf.Compress)
 			//权限控制
 			if err = s.auth(r, c, host.Client.Cnf.U, host.Client.Cnf.P); err != nil {
+				logs.Warn("auth error", err, r.RemoteAddr)
 				break
 			}
-			lk = conn.NewLink(host.Client.GetId(), common.CONN_TCP, host.GetRandomTarget(), host.Client.Cnf.CompressEncode, host.Client.Cnf.CompressDecode, host.Client.Cnf.Crypt, c, host.Flow, nil, host.Client.Rate, nil)
-			if tunnel, err = s.bridge.SendLinkInfo(host.Client.Id, lk, c.Conn.RemoteAddr().String()); err != nil {
-				logs.Notice(err)
+			lk := conn.NewLink(common.CONN_TCP, host.Target, host.Client.Cnf.Crypt, host.Client.Cnf.Compress, r.RemoteAddr)
+			if target, err = s.bridge.SendLinkInfo(host.Client.Id, lk, c.Conn.RemoteAddr().String()); err != nil {
+				logs.Notice("connect to target %s error %s", lk.Host, err)
 				break
 			}
-			lk.RunWrite()
 			isConn = false
+			go func() {
+				w, _ := common.CopyBuffer(c, conn.GetConn(target, lk.Crypt, lk.Compress, host.Client.Rate))
+				host.Flow.Add(0, w)
+				c.Close()
+				target.Close()
+			}()
 		} else {
 			r, err = http.ReadRequest(bufio.NewReader(c))
 			if err != nil {
@@ -174,20 +180,18 @@ func (s *httpServer) process(c *conn.Conn, r *http.Request) {
 		if err != nil {
 			break
 		}
-		host.Flow.Add(len(b), 0)
-		if _, err := tunnel.SendMsg(b, lk); err != nil {
-			c.Close()
-			break
-		}
-		<-lk.StatusCh
+		host.Flow.Add(int64(len(b)), 0)
+		//write
+		target.Write(b)
 	}
 end:
 	if isConn {
 		s.writeConnFail(c.Conn)
-	} else {
-		tunnel.SendMsg([]byte(common.IO_EOF), lk)
 	}
 	c.Close()
+	if target != nil {
+		target.Close()
+	}
 	if host != nil {
 		host.Client.AddConn()
 	}
--- a/server/proxy/p2p.go
+++ b/server/proxy/p2p.go
@@ -48,7 +48,6 @@ func (s *P2PServer) Start() error {
 }

 func (s *P2PServer) p2pProcess(c *conn.Conn) {
-	logs.Warn("new link", c.Conn.RemoteAddr())
 	//获取密钥
 	var (
 		f   string
@@ -57,19 +56,17 @@ func (s *P2PServer) p2pProcess(c *conn.Conn) {
 		v   *p2p
 		ok  bool
 	)
-	if b, err = c.ReadLen(32); err != nil {
+	if b, err = c.GetShortContent(32); err != nil {
 		return
 	}
 	//获取角色
 	if f, err = c.ReadFlag(); err != nil {
 		return
 	}
-	logs.Warn("收到", string(b), f)
 	if v, ok = s.p2p[string(b)]; !ok {
 		v = new(p2p)
 		s.p2p[string(b)] = v
 	}
-	logs.Warn(f, c.Conn.RemoteAddr().String())
 	//存储
 	if f == common.WORK_P2P_VISITOR {
 		v.visitorAddr = c.Conn.RemoteAddr().String()
@@ -80,13 +77,10 @@ func (s *P2PServer) p2pProcess(c *conn.Conn) {
 				break
 			}
 		}
-		logs.Warn("等待确认")
 		if _, err := v.provider.ReadFlag(); err == nil {
 			v.visitor.WriteLenContent([]byte(v.providerAddr))
-			logs.Warn("收到确认")
 			delete(s.p2p, string(b))
 		} else {
-			logs.Warn("收到确认失败", err)
 		}
 	} else {
 		v.providerAddr = c.Conn.RemoteAddr().String()
@@ -99,6 +93,4 @@ func (s *P2PServer) p2pProcess(c *conn.Conn) {
 			}
 		}
 	}
-	//假设是连接者、等待对应的被连接者连上后，发送被连接者信息
-	//假设是被连接者，等待对应的连接者脸上后，发送连接者信息
 }
--- a/server/proxy/socks5.go
+++ b/server/proxy/socks5.go
@@ -141,16 +141,18 @@ func (s *Sock5ModeServer) doConnect(c net.Conn, command uint8) {
 	} else {
 		ltype = common.CONN_TCP
 	}
-	link := conn.NewLink(s.task.Client.GetId(), ltype, addr, s.task.Client.Cnf.CompressEncode, s.task.Client.Cnf.CompressDecode, s.task.Client.Cnf.Crypt, conn.NewConn(c), s.task.Flow, nil, s.task.Client.Rate, nil)
+	//s.DealClient(conn.NewConn(c), addr, nil, ltype)
+	link := conn.NewLink(ltype, addr, s.task.Client.Cnf.Crypt, s.task.Client.Cnf.Compress, c.RemoteAddr().String())

-	if tunnel, err := s.bridge.SendLinkInfo(s.task.Client.Id, link, c.RemoteAddr().String()); err != nil {
+	if target, err := s.bridge.SendLinkInfo(s.task.Client.Id, link, c.RemoteAddr().String()); err != nil {
 		c.Close()
 		return
 	} else {
 		s.sendReply(c, succeeded)
-		link.RunWrite()
-		s.linkCopy(link, conn.NewConn(c), nil, tunnel, s.task.Flow)
+		conn.CopyWaitGroup(target, c, link.Crypt, link.Compress, s.task.Client.Rate, s.task.Client.Flow)
 	}
+
+	s.task.Client.AddConn()
 	return
 }

@@ -272,6 +274,10 @@ func (s *Sock5ModeServer) Start() error {
 			}
 			logs.Warn("accept error: ", err)
 		}
+		if err := s.checkFlow(); err != nil {
+			logs.Warn("client id %d  task id %d  error  %s", s.task.Client.Id, s.task.Id, err.Error())
+			conn.Close()
+		}
 		if s.task.Client.GetConn() {
 			logs.Trace("New socks5 connection,client %d,remote address %s", s.task.Client.Id, conn.RemoteAddr())
 			go s.handleConn(conn)
--- a/server/proxy/tcp.go
+++ b/server/proxy/tcp.go
@@ -45,6 +45,10 @@ func (s *TunnelModeServer) Start() error {
 			logs.Info(err)
 			continue
 		}
+		if err := s.checkFlow(); err != nil {
+			logs.Warn("client id %d  task id %d  error  %s", s.task.Client.Id, s.task.Id, err.Error())
+			c.Close()
+		}
 		if s.task.Client.GetConn() {
 			logs.Trace("New tcp connection,client %d,remote address %s", s.task.Client.Id, c.RemoteAddr())
 			go s.process(conn.NewConn(c), s)
@@ -69,6 +73,10 @@ type WebServer struct {
 //开始
 func (s *WebServer) Start() error {
 	p, _ := beego.AppConfig.Int("httpport")
+	if p == 0 {
+		stop := make(chan struct{})
+		<-stop
+	}
 	if !common.TestTcpPort(p) {
 		logs.Error("Web management port %d is occupied", p)
 		os.Exit(0)
@@ -96,7 +104,7 @@ type process func(c *conn.Conn, s *TunnelModeServer) error

 //tcp隧道模式
 func ProcessTunnel(c *conn.Conn, s *TunnelModeServer) error {
-	return s.DealClient(c, s.task.Target, nil)
+	return s.DealClient(c, s.task.Target, nil, common.CONN_TCP)
 }

 //http代理模式
@@ -114,5 +122,5 @@ func ProcessHttp(c *conn.Conn, s *TunnelModeServer) error {
 	if err := s.auth(r, c, s.task.Client.Cnf.U, s.task.Client.Cnf.P); err != nil {
 		return err
 	}
-	return s.DealClient(c, addr, rb)
+	return s.DealClient(c, addr, rb, common.CONN_TCP)
 }
--- a/server/proxy/udp.go
+++ b/server/proxy/udp.go
@@ -14,13 +14,11 @@ import (
 type UdpModeServer struct {
 	BaseServer
 	listener *net.UDPConn
-	udpMap   map[string]*conn.Conn
 }

 func NewUdpModeServer(bridge *bridge.Bridge, task *file.Tunnel) *UdpModeServer {
 	s := new(UdpModeServer)
 	s.bridge = bridge
-	s.udpMap = make(map[string]*conn.Conn)
 	s.task = task
 	return s
 }
@@ -41,24 +39,31 @@ func (s *UdpModeServer) Start() error {
 			}
 			continue
 		}
-		logs.Trace("New ydo connection,client %d,remote address %s", s.task.Client.Id, addr)
+		logs.Trace("New udp connection,client %d,remote address %s", s.task.Client.Id, addr)
 		go s.process(addr, buf[:n])
 	}
 	return nil
 }

 func (s *UdpModeServer) process(addr *net.UDPAddr, data []byte) {
-	link := conn.NewLink(s.task.Client.GetId(), common.CONN_UDP, s.task.Target, s.task.Client.Cnf.CompressEncode, s.task.Client.Cnf.CompressDecode, s.task.Client.Cnf.Crypt, nil, s.task.Flow, s.listener, s.task.Client.Rate, addr)
+	link := conn.NewLink(common.CONN_UDP, s.task.Target, s.task.Client.Cnf.Crypt, s.task.Client.Cnf.Compress, addr.String())
 	if err := s.checkFlow(); err != nil {
 		return
 	}
-	if tunnel, err := s.bridge.SendLinkInfo(s.task.Client.Id, link, addr.String()); err != nil {
+	if target, err := s.bridge.SendLinkInfo(s.task.Client.Id, link, addr.String()); err != nil {
 		return
 	} else {
-		s.task.Flow.Add(len(data), 0)
-		tunnel.SendMsg(data, link)
-		pool.PutBufPoolUdp(data)
-		link.RunWrite()
+		s.task.Flow.Add(int64(len(data)), 0)
+		buf := pool.BufPoolUdp.Get().([]byte)
+		defer pool.BufPoolUdp.Put(buf)
+		target.Write(data)
+		if n, err := target.Read(buf); err != nil {
+			logs.Warn(err)
+			return
+		} else {
+			s.listener.WriteTo(buf[:n], addr)
+			s.task.Flow.Add(0, int64(n))
+		}
 	}
 }