merge v0.2.4

Author: M09Ic

.gitignore

@@ -18,4 +18,3 @@
 .idea/
 /bin
 /dist
-

protocol/tunnel/options.go

@@ -136,8 +136,11 @@ func WithProxyClient(proxyAddr []string) TunnelOption {
 				if err != nil {
 					return nil, err
 				}
-
-				conn, err := proxy.Dial("tcp", dst)
+				u, err := core.NewURL(dst)
+				if err != nil {
+					return nil, err
+				}
+				conn, err := proxy.Dial(u.Scheme, u.Host)
 				if err != nil {
 					return nil, err
 				}

x/kcp/readloop.go

@@ -54,6 +54,9 @@ func (l *Listener) defaultMonitor() {
 	buf := make([]byte, mtuLimit)
 	for {
 		if n, from, err := l.conn.ReadFrom(buf); err == nil {
+			if n == 0 {
+				return
+			}
 			l.packetInput(buf[:n], from)
 		} else {
 			l.notifyReadError(errors.WithStack(err))

x/kcp/simplex.go

@@ -48,6 +48,9 @@ func newSimplexBuffer(addr *SimplexAddr) *simplexBuffer {
 
 // 从buffer中读取所有数据并序列化
 func (b *simplexBuffer) marshal() []byte {
+	if len(b.ctrlChan) == 0 && b.writeBuf.Size() == 0 {
+		return nil
+	}
 	var ctrlBufs [][]byte
 	var ctrlTotalLen int
 	for {
@@ -293,6 +296,7 @@ func (c *SimplexServer) polling() {
 		default:
 			p, addr, err := c.Receive()
 			if err != nil || len(p) == 0 {
+				time.Sleep(time.Duration(DefaultSimplexMinInternal/2) * time.Millisecond)
 				continue
 			}
 			buf := c.GetBuffer(addr)