添加客户端机器人

gate/kcp/kcp_test.go

@@ -1,135 +0,0 @@
-package kcp
-
-import (
-	"io"
-	"net"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/xtaci/lossyconn"
-)
-
-const repeat = 16
-
-func TestLossyConn1(t *testing.T) {
-	t.Log("testing loss rate 10%, rtt 200ms")
-	t.Log("testing link with nodelay parameters:1 10 2 1")
-	client, err := lossyconn.NewLossyConn(0.1, 100)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	server, err := lossyconn.NewLossyConn(0.1, 100)
-	if err != nil {
-		t.Fatal(err)
-	}
-	testlink(t, client, server, 1, 10, 2, 1)
-}
-
-func TestLossyConn2(t *testing.T) {
-	t.Log("testing loss rate 20%, rtt 200ms")
-	t.Log("testing link with nodelay parameters:1 10 2 1")
-	client, err := lossyconn.NewLossyConn(0.2, 100)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	server, err := lossyconn.NewLossyConn(0.2, 100)
-	if err != nil {
-		t.Fatal(err)
-	}
-	testlink(t, client, server, 1, 10, 2, 1)
-}
-
-func TestLossyConn3(t *testing.T) {
-	t.Log("testing loss rate 30%, rtt 200ms")
-	t.Log("testing link with nodelay parameters:1 10 2 1")
-	client, err := lossyconn.NewLossyConn(0.3, 100)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	server, err := lossyconn.NewLossyConn(0.3, 100)
-	if err != nil {
-		t.Fatal(err)
-	}
-	testlink(t, client, server, 1, 10, 2, 1)
-}
-
-func TestLossyConn4(t *testing.T) {
-	t.Log("testing loss rate 10%, rtt 200ms")
-	t.Log("testing link with nodelay parameters:1 10 2 0")
-	client, err := lossyconn.NewLossyConn(0.1, 100)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	server, err := lossyconn.NewLossyConn(0.1, 100)
-	if err != nil {
-		t.Fatal(err)
-	}
-	testlink(t, client, server, 1, 10, 2, 0)
-}
-
-func testlink(t *testing.T, client *lossyconn.LossyConn, server *lossyconn.LossyConn, nodelay, interval, resend, nc int) {
-	t.Log("testing with nodelay parameters:", nodelay, interval, resend, nc)
-	sess, _ := NewConn2(server.LocalAddr(), client)
-	listener, _ := ServeConn(server)
-	echoServer := func(l *Listener) {
-		for {
-			conn, err := l.AcceptKCP()
-			if err != nil {
-				return
-			}
-			go func() {
-				conn.SetNoDelay(nodelay, interval, resend, nc)
-				buf := make([]byte, 65536)
-				for {
-					n, err := conn.Read(buf)
-					if err != nil {
-						return
-					}
-					conn.Write(buf[:n])
-				}
-			}()
-		}
-	}
-
-	echoTester := func(s *UDPSession, raddr net.Addr) {
-		s.SetNoDelay(nodelay, interval, resend, nc)
-		buf := make([]byte, 64)
-		var rtt time.Duration
-		for i := 0; i < repeat; i++ {
-			start := time.Now()
-			s.Write(buf)
-			io.ReadFull(s, buf)
-			rtt += time.Since(start)
-		}
-
-		t.Log("client:", client)
-		t.Log("server:", server)
-		t.Log("avg rtt:", rtt/repeat)
-		t.Logf("total time: %v for %v round trip:", rtt, repeat)
-	}
-
-	go echoServer(listener)
-	echoTester(sess, server.LocalAddr())
-}
-
-func BenchmarkFlush(b *testing.B) {
-	kcp := NewKCP(1, func(buf []byte, size int) {})
-	kcp.snd_buf = make([]segment, 1024)
-	for k := range kcp.snd_buf {
-		kcp.snd_buf[k].xmit = 1
-		kcp.snd_buf[k].resendts = currentMs() + 10000
-	}
-	b.ResetTimer()
-	b.ReportAllocs()
-	var mu sync.Mutex
-	for i := 0; i < b.N; i++ {
-		mu.Lock()
-		kcp.flush(false)
-		mu.Unlock()
-	}
-}

gate/kcp/sess_test.go

@@ -1,703 +0,0 @@
-package kcp
-
-import (
-	"crypto/sha1"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	_ "net/http/pprof"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"golang.org/x/crypto/pbkdf2"
-)
-
-var baseport = uint32(10000)
-var key = []byte("testkey")
-var pass = pbkdf2.Key(key, []byte("testsalt"), 4096, 32, sha1.New)
-
-func init() {
-	go func() {
-		log.Println(http.ListenAndServe("0.0.0.0:6060", nil))
-	}()
-
-	log.Println("beginning tests, encryption:salsa20, fec:10/3")
-}
-
-func dialEcho(port int) (*UDPSession, error) {
-	// block, _ := NewNoneBlockCrypt(pass)
-	// block, _ := NewSimpleXORBlockCrypt(pass)
-	// block, _ := NewTEABlockCrypt(pass[:16])
-	// block, _ := NewAESBlockCrypt(pass)
-	// block, _ := NewSalsa20BlockCrypt(pass)
-	sess, err := DialWithOptions(fmt.Sprintf("127.0.0.1:%v", port))
-	if err != nil {
-		panic(err)
-	}
-
-	sess.SetStreamMode(true)
-	sess.SetStreamMode(false)
-	sess.SetStreamMode(true)
-	sess.SetWindowSize(1024, 1024)
-	sess.SetReadBuffer(16 * 1024 * 1024)
-	sess.SetWriteBuffer(16 * 1024 * 1024)
-	sess.SetStreamMode(true)
-	sess.SetNoDelay(1, 10, 2, 1)
-	sess.SetMtu(1400)
-	sess.SetMtu(1600)
-	sess.SetMtu(1400)
-	sess.SetACKNoDelay(true)
-	sess.SetACKNoDelay(false)
-	sess.SetDeadline(time.Now().Add(time.Minute))
-	return sess, err
-}
-
-func dialSink(port int) (*UDPSession, error) {
-	sess, err := DialWithOptions(fmt.Sprintf("127.0.0.1:%v", port))
-	if err != nil {
-		panic(err)
-	}
-
-	sess.SetStreamMode(true)
-	sess.SetWindowSize(1024, 1024)
-	sess.SetReadBuffer(16 * 1024 * 1024)
-	sess.SetWriteBuffer(16 * 1024 * 1024)
-	sess.SetStreamMode(true)
-	sess.SetNoDelay(1, 10, 2, 1)
-	sess.SetMtu(1400)
-	sess.SetACKNoDelay(false)
-	sess.SetDeadline(time.Now().Add(time.Minute))
-	return sess, err
-}
-
-func dialTinyBufferEcho(port int) (*UDPSession, error) {
-	// block, _ := NewNoneBlockCrypt(pass)
-	// block, _ := NewSimpleXORBlockCrypt(pass)
-	// block, _ := NewTEABlockCrypt(pass[:16])
-	// block, _ := NewAESBlockCrypt(pass)
-	// block, _ := NewSalsa20BlockCrypt(pass)
-	sess, err := DialWithOptions(fmt.Sprintf("127.0.0.1:%v", port))
-	if err != nil {
-		panic(err)
-	}
-	return sess, err
-}
-
-// ////////////////////////
-func listenEcho(port int) (net.Listener, error) {
-	// block, _ := NewNoneBlockCrypt(pass)
-	// block, _ := NewSimpleXORBlockCrypt(pass)
-	// block, _ := NewTEABlockCrypt(pass[:16])
-	// block, _ := NewAESBlockCrypt(pass)
-	// block, _ := NewSalsa20BlockCrypt(pass)
-	return ListenWithOptions(fmt.Sprintf("127.0.0.1:%v", port))
-}
-func listenTinyBufferEcho(port int) (net.Listener, error) {
-	// block, _ := NewNoneBlockCrypt(pass)
-	// block, _ := NewSimpleXORBlockCrypt(pass)
-	// block, _ := NewTEABlockCrypt(pass[:16])
-	// block, _ := NewAESBlockCrypt(pass)
-	// block, _ := NewSalsa20BlockCrypt(pass)
-	return ListenWithOptions(fmt.Sprintf("127.0.0.1:%v", port))
-}
-
-func listenSink(port int) (net.Listener, error) {
-	return ListenWithOptions(fmt.Sprintf("127.0.0.1:%v", port))
-}
-
-func echoServer(port int) net.Listener {
-	l, err := listenEcho(port)
-	if err != nil {
-		panic(err)
-	}
-
-	go func() {
-		kcplistener := l.(*Listener)
-		kcplistener.SetReadBuffer(4 * 1024 * 1024)
-		kcplistener.SetWriteBuffer(4 * 1024 * 1024)
-		kcplistener.SetDSCP(46)
-		for {
-			s, err := l.Accept()
-			if err != nil {
-				return
-			}
-
-			// coverage test
-			s.(*UDPSession).SetReadBuffer(4 * 1024 * 1024)
-			s.(*UDPSession).SetWriteBuffer(4 * 1024 * 1024)
-			go handleEcho(s.(*UDPSession))
-		}
-	}()
-
-	return l
-}
-
-func sinkServer(port int) net.Listener {
-	l, err := listenSink(port)
-	if err != nil {
-		panic(err)
-	}
-
-	go func() {
-		kcplistener := l.(*Listener)
-		kcplistener.SetReadBuffer(4 * 1024 * 1024)
-		kcplistener.SetWriteBuffer(4 * 1024 * 1024)
-		kcplistener.SetDSCP(46)
-		for {
-			s, err := l.Accept()
-			if err != nil {
-				return
-			}
-
-			go handleSink(s.(*UDPSession))
-		}
-	}()
-
-	return l
-}
-
-func tinyBufferEchoServer(port int) net.Listener {
-	l, err := listenTinyBufferEcho(port)
-	if err != nil {
-		panic(err)
-	}
-
-	go func() {
-		for {
-			s, err := l.Accept()
-			if err != nil {
-				return
-			}
-			go handleTinyBufferEcho(s.(*UDPSession))
-		}
-	}()
-	return l
-}
-
-// /////////////////////////
-
-func handleEcho(conn *UDPSession) {
-	conn.SetStreamMode(true)
-	conn.SetWindowSize(4096, 4096)
-	conn.SetNoDelay(1, 10, 2, 1)
-	conn.SetDSCP(46)
-	conn.SetMtu(1400)
-	conn.SetACKNoDelay(false)
-	conn.SetReadDeadline(time.Now().Add(time.Hour))
-	conn.SetWriteDeadline(time.Now().Add(time.Hour))
-	buf := make([]byte, 65536)
-	for {
-		n, err := conn.Read(buf)
-		if err != nil {
-			return
-		}
-		conn.Write(buf[:n])
-	}
-}
-
-func handleSink(conn *UDPSession) {
-	conn.SetStreamMode(true)
-	conn.SetWindowSize(4096, 4096)
-	conn.SetNoDelay(1, 10, 2, 1)
-	conn.SetDSCP(46)
-	conn.SetMtu(1400)
-	conn.SetACKNoDelay(false)
-	conn.SetReadDeadline(time.Now().Add(time.Hour))
-	conn.SetWriteDeadline(time.Now().Add(time.Hour))
-	buf := make([]byte, 65536)
-	for {
-		_, err := conn.Read(buf)
-		if err != nil {
-			return
-		}
-	}
-}
-
-func handleTinyBufferEcho(conn *UDPSession) {
-	conn.SetStreamMode(true)
-	buf := make([]byte, 2)
-	for {
-		n, err := conn.Read(buf)
-		if err != nil {
-			return
-		}
-		conn.Write(buf[:n])
-	}
-}
-
-// /////////////////////////
-
-func TestTimeout(t *testing.T) {
-	port := int(atomic.AddUint32(&baseport, 1))
-	l := echoServer(port)
-	defer l.Close()
-
-	cli, err := dialEcho(port)
-	if err != nil {
-		panic(err)
-	}
-	buf := make([]byte, 10)
-
-	// timeout
-	cli.SetDeadline(time.Now().Add(time.Second))
-	<-time.After(2 * time.Second)
-	n, err := cli.Read(buf)
-	if n != 0 || err == nil {
-		t.Fail()
-	}
-	cli.Close()
-}
-
-func TestSendRecv(t *testing.T) {
-	port := int(atomic.AddUint32(&baseport, 1))
-	l := echoServer(port)
-	defer l.Close()
-
-	cli, err := dialEcho(port)
-	if err != nil {
-		panic(err)
-	}
-	cli.SetWriteDelay(true)
-	cli.SetDUP(1)
-	const N = 100
-	buf := make([]byte, 10)
-	for i := 0; i < N; i++ {
-		msg := fmt.Sprintf("hello%v", i)
-		cli.Write([]byte(msg))
-		if n, err := cli.Read(buf); err == nil {
-			if string(buf[:n]) != msg {
-				t.Fail()
-			}
-		} else {
-			panic(err)
-		}
-	}
-	cli.Close()
-}
-
-func TestSendVector(t *testing.T) {
-	port := int(atomic.AddUint32(&baseport, 1))
-	l := echoServer(port)
-	defer l.Close()
-
-	cli, err := dialEcho(port)
-	if err != nil {
-		panic(err)
-	}
-	cli.SetWriteDelay(false)
-	const N = 100
-	buf := make([]byte, 20)
-	v := make([][]byte, 2)
-	for i := 0; i < N; i++ {
-		v[0] = []byte(fmt.Sprintf("hello%v", i))
-		v[1] = []byte(fmt.Sprintf("world%v", i))
-		msg := fmt.Sprintf("hello%vworld%v", i, i)
-		cli.WriteBuffers(v)
-		if n, err := cli.Read(buf); err == nil {
-			if string(buf[:n]) != msg {
-				t.Error(string(buf[:n]), msg)
-			}
-		} else {
-			panic(err)
-		}
-	}
-	cli.Close()
-}
-
-func TestTinyBufferReceiver(t *testing.T) {
-	port := int(atomic.AddUint32(&baseport, 1))
-	l := tinyBufferEchoServer(port)
-	defer l.Close()
-
-	cli, err := dialTinyBufferEcho(port)
-	if err != nil {
-		panic(err)
-	}
-	const N = 100
-	snd := byte(0)
-	fillBuffer := func(buf []byte) {
-		for i := 0; i < len(buf); i++ {
-			buf[i] = snd
-			snd++
-		}
-	}
-
-	rcv := byte(0)
-	check := func(buf []byte) bool {
-		for i := 0; i < len(buf); i++ {
-			if buf[i] != rcv {
-				return false
-			}
-			rcv++
-		}
-		return true
-	}
-	sndbuf := make([]byte, 7)
-	rcvbuf := make([]byte, 7)
-	for i := 0; i < N; i++ {
-		fillBuffer(sndbuf)
-		cli.Write(sndbuf)
-		if n, err := io.ReadFull(cli, rcvbuf); err == nil {
-			if !check(rcvbuf[:n]) {
-				t.Fail()
-			}
-		} else {
-			panic(err)
-		}
-	}
-	cli.Close()
-}
-
-func TestClose(t *testing.T) {
-	var n int
-	var err error
-
-	port := int(atomic.AddUint32(&baseport, 1))
-	l := echoServer(port)
-	defer l.Close()
-
-	cli, err := dialEcho(port)
-	if err != nil {
-		panic(err)
-	}
-
-	// double close
-	cli.Close()
-	if cli.Close() == nil {
-		t.Fatal("double close misbehavior")
-	}
-
-	// write after close
-	buf := make([]byte, 10)
-	n, err = cli.Write(buf)
-	if n != 0 || err == nil {
-		t.Fatal("write after close misbehavior")
-	}
-
-	// write, close, read, read
-	cli, err = dialEcho(port)
-	if err != nil {
-		panic(err)
-	}
-	if n, err = cli.Write(buf); err != nil {
-		t.Fatal("write misbehavior")
-	}
-
-	// wait until data arrival
-	time.Sleep(2 * time.Second)
-	// drain
-	cli.Close()
-	n, err = io.ReadFull(cli, buf)
-	if err != nil {
-		t.Fatal("closed conn drain bytes failed", err, n)
-	}
-
-	// after drain, read should return error
-	n, err = cli.Read(buf)
-	if n != 0 || err == nil {
-		t.Fatal("write->close->drain->read misbehavior", err, n)
-	}
-	cli.Close()
-}
-
-func TestParallel1024CLIENT_64BMSG_64CNT(t *testing.T) {
-	port := int(atomic.AddUint32(&baseport, 1))
-	l := echoServer(port)
-	defer l.Close()
-
-	var wg sync.WaitGroup
-	wg.Add(1024)
-	for i := 0; i < 1024; i++ {
-		go parallel_client(&wg, port)
-	}
-	wg.Wait()
-}
-
-func parallel_client(wg *sync.WaitGroup, port int) (err error) {
-	cli, err := dialEcho(port)
-	if err != nil {
-		panic(err)
-	}
-
-	err = echo_tester(cli, 64, 64)
-	cli.Close()
-	wg.Done()
-	return
-}
-
-func BenchmarkEchoSpeed4K(b *testing.B) {
-	speedclient(b, 4096)
-}
-
-func BenchmarkEchoSpeed64K(b *testing.B) {
-	speedclient(b, 65536)
-}
-
-func BenchmarkEchoSpeed512K(b *testing.B) {
-	speedclient(b, 524288)
-}
-
-func BenchmarkEchoSpeed1M(b *testing.B) {
-	speedclient(b, 1048576)
-}
-
-func speedclient(b *testing.B, nbytes int) {
-	port := int(atomic.AddUint32(&baseport, 1))
-	l := echoServer(port)
-	defer l.Close()
-
-	b.ReportAllocs()
-	cli, err := dialEcho(port)
-	if err != nil {
-		panic(err)
-	}
-
-	if err := echo_tester(cli, nbytes, b.N); err != nil {
-		b.Fail()
-	}
-	b.SetBytes(int64(nbytes))
-	cli.Close()
-}
-
-func BenchmarkSinkSpeed4K(b *testing.B) {
-	sinkclient(b, 4096)
-}
-
-func BenchmarkSinkSpeed64K(b *testing.B) {
-	sinkclient(b, 65536)
-}
-
-func BenchmarkSinkSpeed256K(b *testing.B) {
-	sinkclient(b, 524288)
-}
-
-func BenchmarkSinkSpeed1M(b *testing.B) {
-	sinkclient(b, 1048576)
-}
-
-func sinkclient(b *testing.B, nbytes int) {
-	port := int(atomic.AddUint32(&baseport, 1))
-	l := sinkServer(port)
-	defer l.Close()
-
-	b.ReportAllocs()
-	cli, err := dialSink(port)
-	if err != nil {
-		panic(err)
-	}
-
-	sink_tester(cli, nbytes, b.N)
-	b.SetBytes(int64(nbytes))
-	cli.Close()
-}
-
-func echo_tester(cli net.Conn, msglen, msgcount int) error {
-	buf := make([]byte, msglen)
-	for i := 0; i < msgcount; i++ {
-		// send packet
-		if _, err := cli.Write(buf); err != nil {
-			return err
-		}
-
-		// receive packet
-		nrecv := 0
-		for {
-			n, err := cli.Read(buf)
-			if err != nil {
-				return err
-			} else {
-				nrecv += n
-				if nrecv == msglen {
-					break
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func sink_tester(cli *UDPSession, msglen, msgcount int) error {
-	// sender
-	buf := make([]byte, msglen)
-	for i := 0; i < msgcount; i++ {
-		if _, err := cli.Write(buf); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func TestSNMP(t *testing.T) {
-	t.Log(DefaultSnmp.Copy())
-	t.Log(DefaultSnmp.Header())
-	t.Log(DefaultSnmp.ToSlice())
-	DefaultSnmp.Reset()
-	t.Log(DefaultSnmp.ToSlice())
-}
-
-func TestListenerClose(t *testing.T) {
-	port := int(atomic.AddUint32(&baseport, 1))
-	l, err := ListenWithOptions(fmt.Sprintf("127.0.0.1:%v", port))
-	if err != nil {
-		t.Fail()
-	}
-	l.SetReadDeadline(time.Now().Add(time.Second))
-	l.SetWriteDeadline(time.Now().Add(time.Second))
-	l.SetDeadline(time.Now().Add(time.Second))
-	time.Sleep(2 * time.Second)
-	if _, err := l.Accept(); err == nil {
-		t.Fail()
-	}
-
-	l.Close()
-	// fakeaddr, _ := net.ResolveUDPAddr("udp6", "127.0.0.1:1111")
-	fakeConvId := uint64(0)
-	if l.closeSession(fakeConvId) {
-		t.Fail()
-	}
-}
-
-// A wrapper for net.PacketConn that remembers when Close has been called.
-type closedFlagPacketConn struct {
-	net.PacketConn
-	Closed bool
-}
-
-func (c *closedFlagPacketConn) Close() error {
-	c.Closed = true
-	return c.PacketConn.Close()
-}
-
-func newClosedFlagPacketConn(c net.PacketConn) *closedFlagPacketConn {
-	return &closedFlagPacketConn{c, false}
-}
-
-// Listener should close a net.PacketConn that it created.
-// https://github.com/xtaci/kcp-go/issues/165
-func TestListenerOwnedPacketConn(t *testing.T) {
-	// ListenWithOptions creates its own net.PacketConn.
-	l, err := ListenWithOptions("127.0.0.1:0")
-	if err != nil {
-		panic(err)
-	}
-	defer l.Close()
-	// Replace the internal net.PacketConn with one that remembers when it
-	// has been closed.
-	pconn := newClosedFlagPacketConn(l.conn)
-	l.conn = pconn
-
-	if pconn.Closed {
-		t.Fatal("owned PacketConn closed before Listener.Close()")
-	}
-
-	err = l.Close()
-	if err != nil {
-		panic(err)
-	}
-
-	if !pconn.Closed {
-		t.Fatal("owned PacketConn not closed after Listener.Close()")
-	}
-}
-
-// Listener should not close a net.PacketConn that it did not create.
-// https://github.com/xtaci/kcp-go/issues/165
-func TestListenerNonOwnedPacketConn(t *testing.T) {
-	// Create a net.PacketConn not owned by the Listener.
-	c, err := net.ListenPacket("udp", "127.0.0.1:0")
-	if err != nil {
-		panic(err)
-	}
-	defer c.Close()
-	// Make it remember when it has been closed.
-	pconn := newClosedFlagPacketConn(c)
-
-	l, err := ServeConn(pconn)
-	if err != nil {
-		panic(err)
-	}
-	defer l.Close()
-
-	if pconn.Closed {
-		t.Fatal("non-owned PacketConn closed before Listener.Close()")
-	}
-
-	err = l.Close()
-	if err != nil {
-		panic(err)
-	}
-
-	if pconn.Closed {
-		t.Fatal("non-owned PacketConn closed after Listener.Close()")
-	}
-}
-
-// UDPSession should close a net.PacketConn that it created.
-// https://github.com/xtaci/kcp-go/issues/165
-func TestUDPSessionOwnedPacketConn(t *testing.T) {
-	l := sinkServer(0)
-	defer l.Close()
-
-	// DialWithOptions creates its own net.PacketConn.
-	client, err := DialWithOptions(l.Addr().String())
-	if err != nil {
-		panic(err)
-	}
-	defer client.Close()
-	// Replace the internal net.PacketConn with one that remembers when it
-	// has been closed.
-	pconn := newClosedFlagPacketConn(client.conn)
-	client.conn = pconn
-
-	if pconn.Closed {
-		t.Fatal("owned PacketConn closed before UDPSession.Close()")
-	}
-
-	err = client.Close()
-	if err != nil {
-		panic(err)
-	}
-
-	if !pconn.Closed {
-		t.Fatal("owned PacketConn not closed after UDPSession.Close()")
-	}
-}
-
-// UDPSession should not close a net.PacketConn that it did not create.
-// https://github.com/xtaci/kcp-go/issues/165
-func TestUDPSessionNonOwnedPacketConn(t *testing.T) {
-	l := sinkServer(0)
-	defer l.Close()
-
-	// Create a net.PacketConn not owned by the UDPSession.
-	c, err := net.ListenPacket("udp", "127.0.0.1:0")
-	if err != nil {
-		panic(err)
-	}
-	defer c.Close()
-	// Make it remember when it has been closed.
-	pconn := newClosedFlagPacketConn(c)
-
-	client, err := NewConn2(l.Addr(), pconn)
-	if err != nil {
-		panic(err)
-	}
-	defer client.Close()
-
-	if pconn.Closed {
-		t.Fatal("non-owned PacketConn closed before UDPSession.Close()")
-	}
-
-	err = client.Close()
-	if err != nil {
-		panic(err)
-	}
-
-	if pconn.Closed {
-		t.Fatal("non-owned PacketConn closed after UDPSession.Close()")
-	}
-}

gate/net/kcp_connect_manager.go

@@ -317,9 +317,9 @@ func (k *KcpConnectManager) recvHandle(session *Session) {
 		}
 		recvData := recvBuf[:recvLen]
 		kcpMsgList := make([]*KcpMsg, 0)
-		k.decodeBinToPayload(recvData, &dataBuf, convId, &kcpMsgList, session.xorKey)
+		DecodeBinToPayload(recvData, &dataBuf, convId, &kcpMsgList, session.xorKey)
 		for _, v := range kcpMsgList {
-			protoMsgList := k.protoDecode(v)
+			protoMsgList := ProtoDecode(v, k.serverCmdProtoMap, k.clientCmdProtoMap)
 			for _, vv := range protoMsgList {
 				k.recvMsgHandle(vv, session)
 			}
@@ -341,12 +341,12 @@ func (k *KcpConnectManager) sendHandle(session *Session) {
 			k.closeKcpConn(session, kcp.EnetServerKick)
 			break
 		}
-		kcpMsg := k.protoEncode(protoMsg)
+		kcpMsg := ProtoEncode(protoMsg, k.serverCmdProtoMap, k.clientCmdProtoMap)
 		if kcpMsg == nil {
 			logger.Error("decode kcp msg is nil, convId: %v", convId)
 			continue
 		}
-		bin := k.encodePayloadToBin(kcpMsg, session.xorKey)
+		bin := EncodePayloadToBin(kcpMsg, session.xorKey)
 		_ = conn.SetWriteDeadline(time.Now().Add(time.Second * ConnSendTimeout))
 		_, err := conn.Write(bin)
 		if err != nil {

gate/net/kcp_endecode.go

@@ -32,13 +32,13 @@ type KcpMsg struct {
 	ProtoData []byte
 }
 
-func (k *KcpConnectManager) decodeBinToPayload(data []byte, dataBuf *[]byte, convId uint64, kcpMsgList *[]*KcpMsg, xorKey []byte) {
+func DecodeBinToPayload(data []byte, dataBuf *[]byte, convId uint64, kcpMsgList *[]*KcpMsg, xorKey []byte) {
 	// xor解密
 	endec.Xor(data, xorKey)
-	k.decodeLoop(data, dataBuf, convId, kcpMsgList)
+	DecodeLoop(data, dataBuf, convId, kcpMsgList)
 }
 
-func (k *KcpConnectManager) decodeLoop(data []byte, dataBuf *[]byte, convId uint64, kcpMsgList *[]*KcpMsg) {
+func DecodeLoop(data []byte, dataBuf *[]byte, convId uint64, kcpMsgList *[]*KcpMsg) {
 	if len(*dataBuf) != 0 {
 		// 取出之前的缓冲区数据
 		data = append(*dataBuf, data...)
@@ -93,11 +93,11 @@ func (k *KcpConnectManager) decodeLoop(data []byte, dataBuf *[]byte, convId uint
 	*kcpMsgList = append(*kcpMsgList, kcpMsg)
 	// 递归解析
 	if haveMorePacket {
-		k.decodeLoop(data[packetLen:], dataBuf, convId, kcpMsgList)
+		DecodeLoop(data[packetLen:], dataBuf, convId, kcpMsgList)
 	}
 }
 
-func (k *KcpConnectManager) encodePayloadToBin(kcpMsg *KcpMsg, xorKey []byte) (bin []byte) {
+func EncodePayloadToBin(kcpMsg *KcpMsg, xorKey []byte) (bin []byte) {
 	if kcpMsg.HeadData == nil {
 		kcpMsg.HeadData = make([]byte, 0)
 	}

gate/net/proto_endecode.go

@@ -4,6 +4,7 @@ import (
 	"reflect"
 
 	"hk4e/common/config"
+	"hk4e/gate/client_proto"
 	"hk4e/pkg/logger"
 	"hk4e/pkg/object"
 	"hk4e/protocol/cmd"
@@ -24,17 +25,18 @@ type ProtoMessage struct {
 	message pb.Message
 }
 
-func (k *KcpConnectManager) protoDecode(kcpMsg *KcpMsg) (protoMsgList []*ProtoMsg) {
+func ProtoDecode(kcpMsg *KcpMsg,
+	serverCmdProtoMap *cmd.CmdProtoMap, clientCmdProtoMap *client_proto.ClientCmdProtoMap) (protoMsgList []*ProtoMsg) {
 	protoMsgList = make([]*ProtoMsg, 0)
 	if config.CONF.Hk4e.ClientProtoProxyEnable {
 		clientCmdId := kcpMsg.CmdId
 		clientProtoData := kcpMsg.ProtoData
-		cmdName := k.clientCmdProtoMap.GetClientCmdNameByCmdId(clientCmdId)
+		cmdName := clientCmdProtoMap.GetClientCmdNameByCmdId(clientCmdId)
 		if cmdName == "" {
 			logger.Error("get cmdName is nil, clientCmdId: %v", clientCmdId)
 			return protoMsgList
 		}
-		clientProtoObj := k.getClientProtoObjByName(cmdName)
+		clientProtoObj := GetClientProtoObjByName(cmdName, clientCmdProtoMap)
 		if clientProtoObj == nil {
 			logger.Error("get client proto obj is nil, cmdName: %v", cmdName)
 			return protoMsgList
@@ -44,12 +46,12 @@ func (k *KcpConnectManager) protoDecode(kcpMsg *KcpMsg) (protoMsgList []*ProtoMs
 			logger.Error("unmarshal client proto error: %v", err)
 			return protoMsgList
 		}
-		serverCmdId := k.serverCmdProtoMap.GetCmdIdByCmdName(cmdName)
+		serverCmdId := serverCmdProtoMap.GetCmdIdByCmdName(cmdName)
 		if serverCmdId == 0 {
 			logger.Error("get server cmdId is nil, cmdName: %v", cmdName)
 			return protoMsgList
 		}
-		serverProtoObj := k.serverCmdProtoMap.GetProtoObjByCmdId(serverCmdId)
+		serverProtoObj := serverCmdProtoMap.GetProtoObjByCmdId(serverCmdId)
 		if serverProtoObj == nil {
 			logger.Error("get server proto obj is nil, serverCmdId: %v", serverCmdId)
 			return protoMsgList
@@ -87,7 +89,7 @@ func (k *KcpConnectManager) protoDecode(kcpMsg *KcpMsg) (protoMsgList []*ProtoMs
 	}
 	// payload msg
 	protoMessageList := make([]*ProtoMessage, 0)
-	k.protoDecodePayloadLoop(kcpMsg.CmdId, kcpMsg.ProtoData, &protoMessageList)
+	ProtoDecodePayloadLoop(kcpMsg.CmdId, kcpMsg.ProtoData, &protoMessageList, serverCmdProtoMap, clientCmdProtoMap)
 	if len(protoMessageList) == 0 {
 		logger.Error("decode proto object is nil")
 		return protoMsgList
@@ -106,7 +108,8 @@ func (k *KcpConnectManager) protoDecode(kcpMsg *KcpMsg) (protoMsgList []*ProtoMs
 			if msg.PayloadMessage != nil {
 				cmdName = string(msg.PayloadMessage.ProtoReflect().Descriptor().FullName())
 			}
-			logger.Debug("[RECV UNION CMD], cmdId: %v, cmdName: %v, convId: %v, headMsg: %v", msg.CmdId, cmdName, msg.ConvId, msg.HeadMessage)
+			logger.Debug("[RECV UNION CMD], cmdId: %v, cmdName: %v, convId: %v, headMsg: %v",
+				msg.CmdId, cmdName, msg.ConvId, msg.HeadMessage)
 		}
 	} else {
 		protoMsg.PayloadMessage = protoMessageList[0].message
@@ -115,13 +118,15 @@ func (k *KcpConnectManager) protoDecode(kcpMsg *KcpMsg) (protoMsgList []*ProtoMs
 		if protoMsg.PayloadMessage != nil {
 			cmdName = string(protoMsg.PayloadMessage.ProtoReflect().Descriptor().FullName())
 		}
-		logger.Debug("[RECV], cmdId: %v, cmdName: %v, convId: %v, headMsg: %v", protoMsg.CmdId, cmdName, protoMsg.ConvId, protoMsg.HeadMessage)
+		logger.Debug("[RECV], cmdId: %v, cmdName: %v, convId: %v, headMsg: %v",
+			protoMsg.CmdId, cmdName, protoMsg.ConvId, protoMsg.HeadMessage)
 	}
 	return protoMsgList
 }
 
-func (k *KcpConnectManager) protoDecodePayloadLoop(cmdId uint16, protoData []byte, protoMessageList *[]*ProtoMessage) {
-	protoObj := k.decodePayloadToProto(cmdId, protoData)
+func ProtoDecodePayloadLoop(cmdId uint16, protoData []byte, protoMessageList *[]*ProtoMessage,
+	serverCmdProtoMap *cmd.CmdProtoMap, clientCmdProtoMap *client_proto.ClientCmdProtoMap) {
+	protoObj := DecodePayloadToProto(cmdId, protoData, serverCmdProtoMap)
 	if protoObj == nil {
 		logger.Error("decode proto object is nil")
 		return
@@ -137,12 +142,12 @@ func (k *KcpConnectManager) protoDecodePayloadLoop(cmdId uint16, protoData []byt
 			if config.CONF.Hk4e.ClientProtoProxyEnable {
 				clientCmdId := uint16(unionCmd.MessageId)
 				clientProtoData := unionCmd.Body
-				cmdName := k.clientCmdProtoMap.GetClientCmdNameByCmdId(clientCmdId)
+				cmdName := clientCmdProtoMap.GetClientCmdNameByCmdId(clientCmdId)
 				if cmdName == "" {
 					logger.Error("get cmdName is nil, clientCmdId: %v", clientCmdId)
 					continue
 				}
-				clientProtoObj := k.getClientProtoObjByName(cmdName)
+				clientProtoObj := GetClientProtoObjByName(cmdName, clientCmdProtoMap)
 				if clientProtoObj == nil {
 					logger.Error("get client proto obj is nil, cmdName: %v", cmdName)
 					continue
@@ -152,12 +157,12 @@ func (k *KcpConnectManager) protoDecodePayloadLoop(cmdId uint16, protoData []byt
 					logger.Error("unmarshal client proto error: %v", err)
 					continue
 				}
-				serverCmdId := k.serverCmdProtoMap.GetCmdIdByCmdName(cmdName)
+				serverCmdId := serverCmdProtoMap.GetCmdIdByCmdName(cmdName)
 				if serverCmdId == 0 {
 					logger.Error("get server cmdId is nil, cmdName: %v", cmdName)
 					continue
 				}
-				serverProtoObj := k.serverCmdProtoMap.GetProtoObjByCmdId(serverCmdId)
+				serverProtoObj := serverCmdProtoMap.GetProtoObjByCmdId(serverCmdId)
 				if serverProtoObj == nil {
 					logger.Error("get server proto obj is nil, serverCmdId: %v", serverCmdId)
 					continue
@@ -178,7 +183,8 @@ func (k *KcpConnectManager) protoDecodePayloadLoop(cmdId uint16, protoData []byt
 				unionCmd.MessageId = uint32(serverCmdId)
 				unionCmd.Body = serverProtoData
 			}
-			k.protoDecodePayloadLoop(uint16(unionCmd.MessageId), unionCmd.Body, protoMessageList)
+			ProtoDecodePayloadLoop(uint16(unionCmd.MessageId), unionCmd.Body, protoMessageList,
+				serverCmdProtoMap, clientCmdProtoMap)
 		}
 	}
 	*protoMessageList = append(*protoMessageList, &ProtoMessage{
@@ -187,12 +193,14 @@ func (k *KcpConnectManager) protoDecodePayloadLoop(cmdId uint16, protoData []byt
 	})
 }
 
-func (k *KcpConnectManager) protoEncode(protoMsg *ProtoMsg) (kcpMsg *KcpMsg) {
+func ProtoEncode(protoMsg *ProtoMsg,
+	serverCmdProtoMap *cmd.CmdProtoMap, clientCmdProtoMap *client_proto.ClientCmdProtoMap) (kcpMsg *KcpMsg) {
 	cmdName := ""
 	if protoMsg.PayloadMessage != nil {
 		cmdName = string(protoMsg.PayloadMessage.ProtoReflect().Descriptor().FullName())
 	}
-	logger.Debug("[SEND], cmdId: %v, cmdName: %v, convId: %v, headMsg: %v", protoMsg.CmdId, cmdName, protoMsg.ConvId, protoMsg.HeadMessage)
+	logger.Debug("[SEND], cmdId: %v, cmdName: %v, convId: %v, headMsg: %v",
+		protoMsg.CmdId, cmdName, protoMsg.ConvId, protoMsg.HeadMessage)
 	kcpMsg = new(KcpMsg)
 	kcpMsg.ConvId = protoMsg.ConvId
 	kcpMsg.CmdId = protoMsg.CmdId
@@ -209,13 +217,14 @@ func (k *KcpConnectManager) protoEncode(protoMsg *ProtoMsg) (kcpMsg *KcpMsg) {
 	}
 	// payload msg
 	if protoMsg.PayloadMessage != nil {
-		cmdId, protoData := k.encodeProtoToPayload(protoMsg.PayloadMessage)
+		cmdId, protoData := EncodeProtoToPayload(protoMsg.PayloadMessage, serverCmdProtoMap)
 		if cmdId == 0 || protoData == nil {
 			logger.Error("encode proto data is nil")
 			return nil
 		}
 		if cmdId != 65535 && cmdId != protoMsg.CmdId {
-			logger.Error("cmd id is not match with proto obj, src cmd id: %v, found cmd id: %v", protoMsg.CmdId, cmdId)
+			logger.Error("cmd id is not match with proto obj, src cmd id: %v, found cmd id: %v",
+				protoMsg.CmdId, cmdId)
 			return nil
 		}
 		kcpMsg.ProtoData = protoData
@@ -225,7 +234,7 @@ func (k *KcpConnectManager) protoEncode(protoMsg *ProtoMsg) (kcpMsg *KcpMsg) {
 	if config.CONF.Hk4e.ClientProtoProxyEnable {
 		serverCmdId := kcpMsg.CmdId
 		serverProtoData := kcpMsg.ProtoData
-		serverProtoObj := k.serverCmdProtoMap.GetProtoObjByCmdId(serverCmdId)
+		serverProtoObj := serverCmdProtoMap.GetProtoObjByCmdId(serverCmdId)
 		if serverProtoObj == nil {
 			logger.Error("get server proto obj is nil, serverCmdId: %v", serverCmdId)
 			return nil
@@ -235,12 +244,12 @@ func (k *KcpConnectManager) protoEncode(protoMsg *ProtoMsg) (kcpMsg *KcpMsg) {
 			logger.Error("unmarshal server proto error: %v", err)
 			return nil
 		}
-		cmdName := k.serverCmdProtoMap.GetCmdNameByCmdId(serverCmdId)
+		cmdName := serverCmdProtoMap.GetCmdNameByCmdId(serverCmdId)
 		if cmdName == "" {
 			logger.Error("get cmdName is nil, serverCmdId: %v", serverCmdId)
 			return nil
 		}
-		clientProtoObj := k.getClientProtoObjByName(cmdName)
+		clientProtoObj := GetClientProtoObjByName(cmdName, clientCmdProtoMap)
 		if clientProtoObj == nil {
 			logger.Error("get client proto obj is nil, cmdName: %v", cmdName)
 			return nil
@@ -258,7 +267,7 @@ func (k *KcpConnectManager) protoEncode(protoMsg *ProtoMsg) (kcpMsg *KcpMsg) {
 			logger.Error("marshal client proto error: %v", err)
 			return nil
 		}
-		clientCmdId := k.clientCmdProtoMap.GetClientCmdIdByCmdName(cmdName)
+		clientCmdId := clientCmdProtoMap.GetClientCmdIdByCmdName(cmdName)
 		if clientCmdId == 0 {
 			logger.Error("get client cmdId is nil, cmdName: %v", cmdName)
 			return nil
@@ -269,8 +278,8 @@ func (k *KcpConnectManager) protoEncode(protoMsg *ProtoMsg) (kcpMsg *KcpMsg) {
 	return kcpMsg
 }
 
-func (k *KcpConnectManager) decodePayloadToProto(cmdId uint16, protoData []byte) (protoObj pb.Message) {
-	protoObj = k.serverCmdProtoMap.GetProtoObjByCmdId(cmdId)
+func DecodePayloadToProto(cmdId uint16, protoData []byte, serverCmdProtoMap *cmd.CmdProtoMap) (protoObj pb.Message) {
+	protoObj = serverCmdProtoMap.GetProtoObjByCmdId(cmdId)
 	if protoObj == nil {
 		logger.Error("get new proto object is nil")
 		return nil
@@ -283,8 +292,8 @@ func (k *KcpConnectManager) decodePayloadToProto(cmdId uint16, protoData []byte)
 	return protoObj
 }
 
-func (k *KcpConnectManager) encodeProtoToPayload(protoObj pb.Message) (cmdId uint16, protoData []byte) {
-	cmdId = k.serverCmdProtoMap.GetCmdIdByProtoObj(protoObj)
+func EncodeProtoToPayload(protoObj pb.Message, serverCmdProtoMap *cmd.CmdProtoMap) (cmdId uint16, protoData []byte) {
+	cmdId = serverCmdProtoMap.GetCmdIdByProtoObj(protoObj)
 	var err error = nil
 	protoData, err = pb.Marshal(protoObj)
 	if err != nil {
@@ -294,8 +303,8 @@ func (k *KcpConnectManager) encodeProtoToPayload(protoObj pb.Message) (cmdId uin
 	return cmdId, protoData
 }
 
-func (k *KcpConnectManager) getClientProtoObjByName(protoObjName string) pb.Message {
-	fn := k.clientCmdProtoMap.RefValue.MethodByName("GetClientProtoObjByName")
+func GetClientProtoObjByName(protoObjName string, clientCmdProtoMap *client_proto.ClientCmdProtoMap) pb.Message {
+	fn := clientCmdProtoMap.RefValue.MethodByName("GetClientProtoObjByName")
 	ret := fn.Call([]reflect.Value{reflect.ValueOf(protoObjName)})
 	obj := ret[0].Interface()
 	if obj == nil {

gate/net/session.go

@@ -482,10 +482,10 @@ func (k *KcpConnectManager) getPlayerToken(req *proto.GetPlayerTokenReq, session
 	timeRand := random.GetTimeRand()
 	serverSeedUint64 := timeRand.Uint64()
 	session.seed = serverSeedUint64
-	if req.GetKeyId() != 0 {
+	if req.KeyId != 0 {
 		logger.Debug("do hk4e 2.8 rsa logic, uid: %v", uid)
 		session.useMagicSeed = true
-		keyId := strconv.Itoa(int(req.GetKeyId()))
+		keyId := strconv.Itoa(int(req.KeyId))
 		encPubPrivKey, exist := k.encRsaKeyMap[keyId]
 		if !exist {
 			logger.Error("can not found key id: %v, uid: %v", keyId, uid)
@@ -504,7 +504,7 @@ func (k *KcpConnectManager) getPlayerToken(req *proto.GetPlayerTokenReq, session
 			loginFailClose()
 			return nil
 		}
-		clientSeedBase64 := req.GetClientRandKey()
+		clientSeedBase64 := req.ClientRandKey
 		clientSeedEnc, err := base64.StdEncoding.DecodeString(clientSeedBase64)
 		if err != nil {
 			logger.Error("parse client seed base64 error: %v, uid: %v", err, uid)