fumiama/WireGold
1
0
Fork 0
mirror of https://github.com/fumiama/WireGold.git synced 2026-07-01 08:10:22 +08:00
Code Activity

optimize(head): packet encapsuling

Browse Source
This commit is contained in:
源文雨
2024-07-13 00:22:20 +09:00
parent 8215abb695
commit 6ede65bf28
6 changed files with 136 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gold/link/listen.go
View File

@@ -90,8 +90,7 @@ func (m *Me) listenudp() (conn *net.UDPConn, err error) {
func (m *Me) listenthread(packet *head.Packet, addr *net.UDPAddr, index int, finish func()) {
defer finish()
defer logrus.Debugln("[listen] unlock index", index)
sz := packet.TeaTypeDataSZ & 0x0000ffff
r := int(sz) - len(packet.Data)
r := packet.Len() - len(packet.Data)
if r > 0 {
logrus.Warnln("[listen] @", index, "packet from endpoint", addr, "is smaller than it declared: drop it")
packet.Put()
@@ -112,7 +111,7 @@ func (m *Me) listenthread(packet *head.Packet, addr *net.UDPAddr, index int, fin
case p.IsToMe(packet.Dst):
addt := packet.AdditionalData()
var err error
packet.Data, err = p.Decode(uint8(packet.TeaTypeDataSZ>>27), addt, packet.Data)
packet.Data, err = p.Decode(packet.CipherIndex(), addt, packet.Data)
if err != nil {
logrus.Debugln("[listen] @", index, "drop invalid packet, addt:", addt, "err:", err)
packet.Put()

8
gold/link/recv.go
View File

@@ -3,6 +3,7 @@ package link
import (
"encoding/binary"
"encoding/hex"
"strconv"
"unsafe"
"github.com/fumiama/WireGold/gold/head"
@@ -27,17 +28,18 @@ func (m *Me) wait(data []byte) *head.Packet {
logrus.Debugln("[recv] data bytes", hex.EncodeToString(data[:bound]), endl)
data = m.xordec(data)
logrus.Debugln("[recv] data xored", hex.EncodeToString(data[:bound]), endl)
flags := binary.LittleEndian.Uint16(data[10:12])
if flags&0x8000 != 0 { // not a valid packet
flags := head.Flags(data)
if !flags.IsValid() {
logrus.Debugln("[recv] drop invalid flags packet:", hex.EncodeToString(data[11:12]), hex.EncodeToString(data[10:11]))
return nil
}
crc := binary.LittleEndian.Uint64(data[52:60])
if m.recved.Get(crc) { // 是重放攻击
logrus.Warnln("[recv] ignore duplicated crc packet", strconv.FormatUint(crc, 16))
return nil
}
logrus.Debugln("[recv]", len(data), "bytes data with flag", hex.EncodeToString(data[11:12]), hex.EncodeToString(data[10:11]))
if flags == 0 || flags == 0x4000 {
if flags.IsSingle() || flags.NoFrag() {
h := head.SelectPacket()
_, err := h.Unmarshal(data)
if err != nil {

2
gold/link/send.go
View File

@@ -35,7 +35,7 @@ func (l *Link) WriteAndPut(p *head.Packet, istransfer bool) (n int, err error) {
if len(p.Data) <= delta {
return l.write(p, teatype, sndcnt, uint32(len(p.Data)), 0, istransfer, false)
}
if istransfer && p.Flags&0x4000 == 0x4000 && len(p.Data) > delta {
if istransfer && p.Flags.DontFrag() && len(p.Data) > delta {
return 0, errors.New("drop don't fragmnet big trans packet")
}
data := p.Data