fumiama/WireGold
1
0
Fork 0
mirror of https://github.com/fumiama/WireGold.git synced 2026-06-12 21:00:27 +08:00
Code Activity

fix offset

Browse Source
This commit is contained in:
fumiama
2021-12-31 20:14:19 +08:00
parent f7cf029d00
commit 41b085be20
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gold/head/packet.go
View File

@@ -97,7 +97,6 @@ func (p *Packet) Marshal(src net.IP, datasz uint32, offset uint16, dontfrag, has
if src != nil { if src != nil {
p.DataSZ = datasz p.DataSZ = datasz
p.Src = src p.Src = src
offset >>= 3
if dontfrag { if dontfrag {
offset |= 0x4000 offset |= 0x4000
} }

4
gold/link/link.go
View File

@@ -93,7 +93,7 @@ func (l *Link) Write(p *head.Packet, istransfer bool) (n int, err error) {
logrus.Infoln("[link] split frag", i, ":", i+int(l.me.mtu), ", remain:", int(totl)-i-int(l.me.mtu)) logrus.Infoln("[link] split frag", i, ":", i+int(l.me.mtu), ", remain:", int(totl)-i-int(l.me.mtu))
packet := *p packet := *p
packet.Data = data[:int(l.me.mtu)] packet.Data = data[:int(l.me.mtu)]
cnt, err := l.write(&packet, totl, uint16(i), istransfer, true) cnt, err := l.write(&packet, totl, uint16(uint(i)>>3), istransfer, true)
n += cnt n += cnt
if err != nil { if err != nil {
return n, err return n, err
@@ -101,7 +101,7 @@ func (l *Link) Write(p *head.Packet, istransfer bool) (n int, err error) {
data = data[int(l.me.mtu):] data = data[int(l.me.mtu):]
} }
p.Data = data p.Data = data
cnt, err := l.write(p, totl, uint16(i), istransfer, false) cnt, err := l.write(p, totl, uint16(uint(i)>>3), istransfer, false)
n += cnt n += cnt
if err != nil { if err != nil {
return n, err return n, err

1
gold/link/recv.go
View File

@@ -39,6 +39,7 @@ func (m *Me) initrecvpool() {
func (m *Me) wait(data []byte) *head.Packet { func (m *Me) wait(data []byte) *head.Packet {
flags := binary.LittleEndian.Uint16(data[10:12]) flags := binary.LittleEndian.Uint16(data[10:12])
logrus.Infoln("[recv]", len(data), "bytes data with flag", hex.EncodeToString(data[10:12]))
if flags == 0 || flags == 0x4000 { if flags == 0 || flags == 0x4000 {
h := &head.Packet{} h := &head.Packet{}
_, err := h.Unmarshal(data) _, err := h.Unmarshal(data)