P2p first version

server/proxy/base.go

@@ -6,7 +6,6 @@ import (
 	"github.com/cnlh/nps/lib/common"
 	"github.com/cnlh/nps/lib/conn"
 	"github.com/cnlh/nps/lib/file"
-	"github.com/cnlh/nps/lib/pool"
 	"net"
 	"net/http"
 	"sync"
@@ -58,27 +57,11 @@ func (s *BaseServer) linkCopy(link *conn.Link, c *conn.Conn, rb []byte, tunnel *
 		flow.Add(len(rb), 0)
 		<-link.StatusCh
 	}
-
-	buf := pool.BufPoolCopy.Get().([]byte)
-	for {
-		if err := s.checkFlow(); err != nil {
-			c.Close()
-			break
-		}
-		if n, err := c.Read(buf); err != nil {
-			tunnel.SendMsg([]byte(common.IO_EOF), link)
-			break
-		} else {
-			if _, err := tunnel.SendMsg(buf[:n], link); err != nil {
-				c.Close()
-				break
-			}
-			flow.Add(n, 0)
-		}
-		<-link.StatusCh
+	if err := s.checkFlow(); err != nil {
+		c.Close()
 	}
+	link.RunRead(tunnel)
 	s.task.Client.AddConn()
-	pool.PutBufPoolCopy(buf)
 }
 
 func (s *BaseServer) writeConnFail(c net.Conn) {
@@ -111,7 +94,7 @@ func (s *BaseServer) DealClient(c *conn.Conn, addr string, rb []byte) error {
 		c.Close()
 		return err
 	} else {
-		link.Run(true)
+		link.RunWrite()
 		s.linkCopy(link, c, rb, tunnel, s.task.Flow)
 	}
 	return nil

server/proxy/http.go

@@ -150,7 +150,7 @@ func (s *httpServer) process(c *conn.Conn, r *http.Request) {
 				logs.Notice(err)
 				break
 			}
-			lk.Run(true)
+			lk.RunWrite()
 			isConn = false
 		} else {
 			r, err = http.ReadRequest(bufio.NewReader(c))

server/proxy/p2p.go

@@ -0,0 +1,104 @@
+package proxy
+
+import (
+	"github.com/cnlh/nps/lib/common"
+	"github.com/cnlh/nps/lib/conn"
+	"github.com/cnlh/nps/vender/github.com/astaxie/beego/logs"
+	"github.com/cnlh/nps/vender/github.com/xtaci/kcp"
+	"strconv"
+	"time"
+)
+
+type P2PServer struct {
+	BaseServer
+	p2pPort int
+	p2p     map[string]*p2p
+}
+
+type p2p struct {
+	provider     *conn.Conn
+	visitor      *conn.Conn
+	visitorAddr  string
+	providerAddr string
+}
+
+func NewP2PServer(p2pPort int) *P2PServer {
+	return &P2PServer{
+		p2pPort: p2pPort,
+		p2p:     make(map[string]*p2p),
+	}
+}
+
+func (s *P2PServer) Start() error {
+	kcpListener, err := kcp.ListenWithOptions(":"+strconv.Itoa(s.p2pPort), nil, 150, 3)
+	if err != nil {
+		logs.Error(err)
+		return err
+	}
+	for {
+		c, err := kcpListener.AcceptKCP()
+		conn.SetUdpSession(c)
+		if err != nil {
+			logs.Warn(err)
+			continue
+		}
+		go s.p2pProcess(conn.NewConn(c))
+	}
+	return nil
+}
+
+func (s *P2PServer) p2pProcess(c *conn.Conn) {
+	logs.Warn("new link", c.Conn.RemoteAddr())
+	//获取密钥
+	var (
+		f   string
+		b   []byte
+		err error
+		v   *p2p
+		ok  bool
+	)
+	if b, err = c.ReadLen(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()
+		v.visitor = c
+		for {
+			time.Sleep(time.Second)
+			if v.provider != nil {
+				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()
+		v.provider = c
+		for {
+			time.Sleep(time.Second)
+			if v.visitor != nil {
+				v.provider.WriteLenContent([]byte(v.visitorAddr))
+				break
+			}
+		}
+	}
+	//假设是连接者、等待对应的被连接者连上后，发送被连接者信息
+	//假设是被连接者，等待对应的连接者脸上后，发送连接者信息
+}

server/proxy/socks5.go

@@ -148,7 +148,7 @@ func (s *Sock5ModeServer) doConnect(c net.Conn, command uint8) {
 		return
 	} else {
 		s.sendReply(c, succeeded)
-		link.Run(true)
+		link.RunWrite()
 		s.linkCopy(link, conn.NewConn(c), nil, tunnel, s.task.Flow)
 	}
 	return

server/proxy/udp.go

@@ -58,7 +58,7 @@ func (s *UdpModeServer) process(addr *net.UDPAddr, data []byte) {
 		s.task.Flow.Add(len(data), 0)
 		tunnel.SendMsg(data, link)
 		pool.PutBufPoolUdp(data)
-		link.Run(true)
+		link.RunWrite()
 	}
 }