fumiama/WireGold
1
0
Fork 0
mirror of https://github.com/fumiama/WireGold.git synced 2026-06-10 19:50:30 +08:00
Code Activity

fix: send all same dst

Browse Source
This commit is contained in:
源文雨
2023-08-04 23:03:27 +08:00
parent a90eea8d4b
commit 833949366f
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gold/link/me.go
View File

@@ -131,14 +131,22 @@ func (m *Me) Close() error {
func (m *Me) Write(packet []byte) (n int, err error) { func (m *Me) Write(packet []byte) (n int, err error) {
remain := m.writer.Len() remain := m.writer.Len()
if remain > 0 { if remain > 0 {
m.writer.Write(packet) if len(packet) > 0 {
m.writer.Write(packet)
}
packet = m.writer.Bytes() packet = m.writer.Bytes()
} }
logrus.Debugln("[me] writer eating", len(packet), "bytes...") logrus.Debugln("[me] writer eating", len(packet), "bytes...")
n = m.sendAllSameDst(packet) complete := false
n, complete = m.sendAllSameDst(packet)
if len(packet) > n { if len(packet) > n {
_, _ = m.writer.Skip(remain + n - len(packet)) _, _ = m.writer.Skip(remain + n - len(packet))
logrus.Debugln("[me] writer remain", m.writer.Len(), "bytes") logrus.Debugln("[me] writer remain", m.writer.Len(), "bytes")
if !complete {
logrus.Debugln("[me] incomplete, call inner writer")
nextn, err := m.Write(nil)
return n + nextn, err
}
} else if n > 0 && remain > 0 { } else if n > 0 && remain > 0 {
m.writer.Reset() m.writer.Reset()
logrus.Debugln("[me] writer becomes empty") logrus.Debugln("[me] writer becomes empty")
@@ -161,13 +169,13 @@ func (p packetID) issame(packet []byte) bool {
return p == waterutil.IPv4Identification(packet) return p == waterutil.IPv4Identification(packet)
} }
func (m *Me) sendAllSameDst(packet []byte) (n int) { func (m *Me) sendAllSameDst(packet []byte) (n int, isremainnotcomplete bool) {
rem := packet rem := packet
if !waterutil.IsIPv4(packet) { if !waterutil.IsIPv4(packet) {
for len(rem) > 20 && waterutil.IsIPv6(rem) { for len(rem) > 20 && waterutil.IsIPv6(rem) {
pktl := int(binary.BigEndian.Uint16(packet[4:6])) + 40 pktl := int(binary.BigEndian.Uint16(packet[4:6])) + 40
if pktl > len(rem) { if pktl > len(rem) {
return return 0, true
} }
n += pktl n += pktl
rem = packet[n:] rem = packet[n:]
@@ -175,7 +183,7 @@ func (m *Me) sendAllSameDst(packet []byte) (n int) {
} }
if len(rem) == 0 || !waterutil.IsIPv4(rem) { if len(rem) == 0 || !waterutil.IsIPv4(rem) {
logrus.Warnln("[me] skip to send", len(packet), "bytes full packet") logrus.Warnln("[me] skip to send", len(packet), "bytes full packet")
return len(packet) return len(packet), false
} }
} }
p := newpacketid(rem) p := newpacketid(rem)
@@ -185,6 +193,7 @@ func (m *Me) sendAllSameDst(packet []byte) (n int) {
totl := waterutil.IPv4TotalLength(ptr) totl := waterutil.IPv4TotalLength(ptr)
if int(totl) > len(ptr) { if int(totl) > len(ptr) {
logrus.Debugln("[me] wrap got invalid totl, break") logrus.Debugln("[me] wrap got invalid totl, break")
isremainnotcomplete = true
break break
} }
i += int(totl) i += int(totl)