fix udp

Author: markus621

examples/server-tcp/main.go

@@ -20,10 +20,10 @@ func main() {
 	log.SetLevel(logx.LevelDebug)
 
 	srv := server.New(server.Config{
-		Address: "127.0.0.1:8888",
+		Address: "127.0.0.1:11111",
 		Certs:   nil,
 		Timeout: 15 * time.Second,
-		Network: "tcp",
+		Network: "udp",
 	}, log)
 
 	ctx, cancel := context.WithTimeout(context.TODO(), 120*time.Second)
@@ -42,6 +42,6 @@ type Echo struct {
 
 func (*Echo) Handler(w io.Writer, r io.Reader, addr string) {
 	b, _ := io.ReadAll(r)
-	fmt.Println("[IN]", string(b), "[addr]", addr)
-	w.Write(b)
+	fmt.Println("[------", addr, "------]\n", string(b))
+	// w.Write(b)
 }

internal/copy.go

@@ -0,0 +1,21 @@
+package server
+
+import (
+	"bytes"
+
+	"go.osspkg.com/ioutils/pool"
+)
+
+var bytesPool = pool.New[*Bytes](func() *Bytes {
+	return &Bytes{Slice: make([]byte, 65535)}
+})
+
+type Bytes struct {
+	Slice []byte
+}
+
+func (*Bytes) Reset() {}
+
+var bufferPool = pool.New[*bytes.Buffer](func() *bytes.Buffer {
+	return bytes.NewBuffer(make([]byte, 0, 65535))
+})

server/buffer.go

@@ -135,25 +135,28 @@ func (v *_server) handlingUDP(ctx context.Context, l net.PacketConn) error {
 		default:
 		}
 
-		readBuff := internal.BuffPool.Get()
-		n, addr, err := internal.CopyFrom(readBuff, l)
-		if err != nil || n == 0 {
-			internal.BuffPool.Put(readBuff)
-			return err
+		b := bytesPool.Get()
+		n, addr, err := l.ReadFrom(b.Slice)
+		if err != nil {
+			return internal.NormalCloseError(err)
+		}
+		if n == 0 {
+			bytesPool.Put(b)
+			continue
 		}
 
 		v.wg.Background(func() {
-			defer internal.BuffPool.Put(readBuff)
+			wBuff, rBuff := bufferPool.Get(), bufferPool.Get()
+			rBuff.Write(b.Slice[:n])
 
-			select {
-			case <-ctx.Done():
-				return
-			default:
-			}
+			defer func() {
+				bytesPool.Put(b)
+				bufferPool.Put(wBuff)
+				bufferPool.Put(rBuff)
+			}()
 
-			writeBuff := internal.BuffPool.Get()
-			v.handler.Handler(writeBuff, readBuff, addr.String())
-			if _, err0 := internal.CopyTo(l, writeBuff, addr); err0 != nil {
+			v.handler.Handler(wBuff, rBuff, addr.String())
+			if _, err0 := l.WriteTo(wBuff.Bytes(), addr); err0 != nil {
 				v.log.WithFields(logx.Fields{
 					"err":  err0.Error(),
 					"addr": addr.String(),