2024-09-28 20:25:50

mohanson · Sep 28, 2024 · d46cdad · d46cdad
1 parent 183f2be
commit d46cdad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/protocol/czar/engine.go b/protocol/czar/engine.go
@@ -84,13 +84,13 @@ func (s *Server) Run() error {
 			mux := NewMuxServer(cli)
 			go func() {
 				defer mux.Close()
-				for cli := range mux.Accept() {
+				for con := range mux.Accept() {
 					idx++
 					ctx := &daze.Context{Cid: idx}
-					log.Printf("conn: %08x accept remote=%s", ctx.Cid, mux.con.RemoteAddr())
+					log.Printf("conn: %08x accept remote=%s", ctx.Cid, cli.RemoteAddr())
 					go func() {
-						defer cli.Close()
-						if err := s.Serve(ctx, cli); err != nil {
+						defer con.Close()
+						if err := s.Serve(ctx, con); err != nil {
 							log.Printf("conn: %08x  error %s", ctx.Cid, err)
 						}
 						log.Printf("conn: %08x closed", ctx.Cid)

diff --git a/protocol/czar/mux.go b/protocol/czar/mux.go
@@ -3,7 +3,6 @@ package czar
 import (
 	"encoding/binary"
 	"io"
-	"net"
 	"sync"
 
 	"github.com/mohanson/daze/lib/doa"
@@ -143,7 +142,7 @@ func NewWither(idx uint8, mux *Mux) *Stream {
 // Mux is used to wrap a reliable ordered connection and to multiplex it into multiple streams.
 type Mux struct {
 	ach chan *Stream
-	con net.Conn
+	con io.ReadWriteCloser
 	idp *Sip
 	pri *priority.Priority
 	rer *Err
@@ -161,7 +160,7 @@ func (m *Mux) Close() error {
 	return m.con.Close()
 }
 
-// Open is used to create a new stream as a net.Conn.
+// Open is used to create a new stream as a io.ReadWriteCloser.
 func (m *Mux) Open() (*Stream, error) {
 	var (
 		err error
@@ -246,7 +245,7 @@ func (m *Mux) Recv() {
 }
 
 // NewMux returns a new Mux.
-func NewMux(conn net.Conn) *Mux {
+func NewMux(conn io.ReadWriteCloser) *Mux {
 	mux := &Mux{
 		ach: make(chan *Stream),
 		con: conn,
@@ -259,7 +258,7 @@ func NewMux(conn net.Conn) *Mux {
 }
 
 // NewMuxServer returns a new MuxServer.
-func NewMuxServer(conn net.Conn) *Mux {
+func NewMuxServer(conn io.ReadWriteCloser) *Mux {
 	mux := NewMux(conn)
 	for i := range 256 {
 		mux.usb[i] = NewWither(uint8(i), mux)
@@ -269,7 +268,7 @@ func NewMuxServer(conn net.Conn) *Mux {
 }
 
 // NewMuxClient returns a new MuxClient.
-func NewMuxClient(conn net.Conn) *Mux {
+func NewMuxClient(conn io.ReadWriteCloser) *Mux {
 	mux := NewMux(conn)
 	go mux.Recv()
 	return mux