apps/peerguard
1
0
Fork 0
mirror of https://github.com/rkonfj/peerguard.git synced 2024-08-11 11:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

connmux: sync FIN state detect and data write

Browse Source
This commit is contained in:
rkonfj 2024-08-09 21:12:19 +08:00
parent 12595bb6e1
commit 2b49b7b954
No known key found for this signature in database
GPG Key ID: 9595E3A991503741
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
connmux/connmux.go
View File

@ -18,6 +18,8 @@ import (
const (
CMD_DATA = 0
CMD_FIN = 1
HEADER_LEN = 8
)
type SeqGen interface {
@ -103,22 +105,22 @@ func (c *MuxConn) Read(b []byte) (n int, err error) {
}
func (c *MuxConn) Write(p []byte) (int, error) {
select {
case <-c.fin:
return 0, io.ErrClosedPipe
default:
}
b := []byte{0, 0}
b = append(b, binary.BigEndian.AppendUint16(nil, uint16(len(p)))...)
b = append(b, binary.BigEndian.AppendUint32(nil, c.seq)...)
b = append(b, p...)
c.s.w.Lock()
defer c.s.w.Unlock()
select {
case <-c.fin:
return 0, io.ErrClosedPipe
default:
}
n, err := c.s.c.Write(b)
if err != nil {
return max(0, n-8), err
return max(0, n-HEADER_LEN), err
}
return max(0, n-8), nil
return max(0, n-HEADER_LEN), nil
}
func (c *MuxConn) Close() error {
@ -275,7 +277,7 @@ func (l *MuxSession) run() {
// 2 bytes data length
// 4 bytes seq
func (l *MuxSession) nextFrame() error {
header := make([]byte, 8)
header := make([]byte, HEADER_LEN)
_, err := io.ReadFull(l.c, header)
if err != nil {
return fmt.Errorf("read header: %w", err)
@ -309,7 +311,7 @@ func (l *MuxSession) nextFrame() error {
if conn == nil {
conn = &MuxConn{
fin: make(chan struct{}),
finWait: make(chan struct{}, 1),
finWait: make(chan struct{}),
inbound: make(chan []byte, 128),
seq: seq,
s: l,