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

feat(head): packet SetBody recv Bytes

Browse Source
This commit is contained in:
源文雨
2025-02-26 00:09:50 +09:00
parent f0a853e449
commit 689dfbc174
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gold/head/packet.go
View File

@@ -270,10 +270,10 @@ func (p *Packet) BodyLen() int {
return p.b - p.a return p.b - p.a
} }
func (p *Packet) SetBody(b []byte) { func (p *Packet) SetBody(b pbuf.Bytes) {
p.a = 0 p.a = 0
p.b = len(b) p.b = b.Len()
p.data = pbuf.ParseBytes(b...) p.data = b
} }
func (p *Packet) CropBody(a, b int) { func (p *Packet) CropBody(a, b int) {

66
gold/link/listen.go
View File

@@ -137,24 +137,22 @@ func (m *Me) waitordispatch(index int, addr p2p.EndPoint, buf pbuf.Bytes, hasntf
} }
func (m *Me) dispatch(packet *orbyte.Item[head.Packet], addr p2p.EndPoint, index int) { func (m *Me) dispatch(packet *orbyte.Item[head.Packet], addr p2p.EndPoint, index int) {
defer runtime.KeepAlive(packet)
if config.ShowDebugLog { if config.ShowDebugLog {
defer logrus.Debugln("[listen] dispatched, unlock index", index) defer logrus.Debugln("[listen] dispatched, unlock index", index)
logrus.Debugln("[listen] start dispatching index", index) logrus.Debugln("[listen] start dispatching index", index)
} }
pp := packet.Pointer() pp := packet.Pointer
r := pp.Len() - pp.BodyLen() r := pp().Len() - pp().BodyLen()
if r > 0 { if r > 0 {
logrus.Warnln("[listen] @", index, "packet from endpoint", addr, "len", pp.BodyLen(), "is smaller than it declared len", pp.Len(), ", drop it") logrus.Warnln("[listen] @", index, "packet from endpoint", addr, "len", pp().BodyLen(), "is smaller than it declared len", pp().Len(), ", drop it")
return return
} }
p, ok := m.IsInPeer(pp.Src.String()) p, ok := m.IsInPeer(pp().Src.String())
if config.ShowDebugLog { if config.ShowDebugLog {
logrus.Debugln("[listen] @", index, "recv from endpoint", addr, "src", pp.Src, "dst", pp.Dst) logrus.Debugln("[listen] @", index, "recv from endpoint", addr, "src", pp().Src, "dst", pp().Dst)
} }
if !ok { if !ok {
logrus.Warnln("[listen] @", index, "packet from", pp.Src, "to", pp.Dst, "is refused") logrus.Warnln("[listen] @", index, "packet from", pp().Src, "to", pp().Dst, "is refused")
return return
} }
if helper.IsNilInterface(p.endpoint) || !p.endpoint.Euqal(addr) { if helper.IsNilInterface(p.endpoint) || !p.endpoint.Euqal(addr) {
@@ -169,17 +167,17 @@ func (m *Me) dispatch(packet *orbyte.Item[head.Packet], addr p2p.EndPoint, index
now := time.Now() now := time.Now()
atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(&p.lastalive)), unsafe.Pointer(&now)) atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(&p.lastalive)), unsafe.Pointer(&now))
switch { switch {
case p.IsToMe(pp.Dst): case p.IsToMe(pp().Dst):
if !p.Accept(pp.Src) { if !p.Accept(pp().Src) {
logrus.Warnln("[listen] @", index, "refused packet from", pp.Src.String()+":"+strconv.Itoa(int(pp.SrcPort))) logrus.Warnln("[listen] @", index, "refused packet from", pp().Src.String()+":"+strconv.Itoa(int(pp().SrcPort)))
return return
} }
addt := pp.AdditionalData() addt := pp().AdditionalData()
var err error var err error
data, err := p.decode(pp.CipherIndex(), addt, pp.UnsafeBody()) data, err := p.decode(pp().CipherIndex(), addt, pp().TransBody().Bytes())
if err != nil { if err != nil {
if config.ShowDebugLog { if config.ShowDebugLog {
logrus.Debugln("[listen] @", index, "drop invalid packet key idx:", pp.CipherIndex(), "addt:", addt, "err:", err) logrus.Debugln("[listen] @", index, "drop invalid packet key idx:", pp().CipherIndex(), "addt:", addt, "err:", err)
} }
return return
} }
@@ -196,19 +194,19 @@ func (m *Me) dispatch(packet *orbyte.Item[head.Packet], addr p2p.EndPoint, index
} }
data = dat data = dat
} }
pp.SetBody(data.Trans().Bytes()) pp().SetBody(data)
if !pp.IsVaildHash() { if !pp().IsVaildHash() {
if config.ShowDebugLog { if config.ShowDebugLog {
logrus.Debugln("[listen] @", index, "drop invalid hash packet") logrus.Debugln("[listen] @", index, "drop invalid hash packet")
} }
return return
} }
switch pp.Proto { switch pp().Proto {
case head.ProtoHello: case head.ProtoHello:
switch { switch {
case len(pp.UnsafeBody()) == 0: case len(pp().UnsafeBody()) == 0:
logrus.Warnln("[listen] @", index, "recv old hello packet, do nothing") logrus.Warnln("[listen] @", index, "recv old hello packet, do nothing")
case pp.UnsafeBody()[0] == byte(head.HelloPing): case pp().UnsafeBody()[0] == byte(head.HelloPing):
n, err := p.WritePacket(head.NewPacketPartial( n, err := p.WritePacket(head.NewPacketPartial(
head.ProtoHello, m.SrcPort(), p.peerip, m.DstPort(), pbuf.ParseBytes(byte(head.HelloPong))), false) head.ProtoHello, m.SrcPort(), p.peerip, m.DstPort(), pbuf.ParseBytes(byte(head.HelloPong))), false)
if err == nil { if err == nil {
@@ -220,11 +218,13 @@ func (m *Me) dispatch(packet *orbyte.Item[head.Packet], addr p2p.EndPoint, index
logrus.Infoln("[listen] @", index, "recv hello ack packet, do nothing") logrus.Infoln("[listen] @", index, "recv hello ack packet, do nothing")
} }
case head.ProtoNotify: case head.ProtoNotify:
logrus.Infoln("[listen] @", index, "recv notify from", pp.Src) logrus.Infoln("[listen] @", index, "recv notify from", pp().Src)
p.onNotify(pp.UnsafeBody()) p.onNotify(pp().UnsafeBody())
runtime.KeepAlive(packet)
case head.ProtoQuery: case head.ProtoQuery:
logrus.Infoln("[listen] @", index, "recv query from", pp.Src) logrus.Infoln("[listen] @", index, "recv query from", pp().Src)
p.onQuery(pp.UnsafeBody()) p.onQuery(pp().UnsafeBody())
runtime.KeepAlive(packet)
case head.ProtoData: case head.ProtoData:
if p.pipe != nil { if p.pipe != nil {
p.pipe <- packet.Copy() p.pipe <- packet.Copy()
@@ -232,23 +232,23 @@ func (m *Me) dispatch(packet *orbyte.Item[head.Packet], addr p2p.EndPoint, index
logrus.Debugln("[listen] @", index, "deliver to pipe of", p.peerip) logrus.Debugln("[listen] @", index, "deliver to pipe of", p.peerip)
} }
} else { } else {
_, err := m.nic.Write(pp.UnsafeBody()) _, err := m.nic.Write(pp().UnsafeBody())
if err != nil { if err != nil {
logrus.Errorln("[listen] @", index, "deliver", pp.BodyLen(), "bytes data to nic err:", err) logrus.Errorln("[listen] @", index, "deliver", pp().BodyLen(), "bytes data to nic err:", err)
} else if config.ShowDebugLog { } else if config.ShowDebugLog {
logrus.Debugln("[listen] @", index, "deliver", pp.BodyLen(), "bytes data to nic") logrus.Debugln("[listen] @", index, "deliver", pp().BodyLen(), "bytes data to nic")
} }
} }
default: default:
logrus.Warnln("[listen] @", index, "recv unknown proto:", pp.Proto) logrus.Warnln("[listen] @", index, "recv unknown proto:", pp().Proto)
} }
case p.Accept(pp.Dst): case p.Accept(pp().Dst):
if !p.allowtrans { if !p.allowtrans {
logrus.Warnln("[listen] @", index, "refused to trans packet to", pp.Dst.String()+":"+strconv.Itoa(int(pp.DstPort))) logrus.Warnln("[listen] @", index, "refused to trans packet to", pp().Dst.String()+":"+strconv.Itoa(int(pp().DstPort)))
return return
} }
// 转发 // 转发
lnk := m.router.NextHop(pp.Dst.String()) lnk := m.router.NextHop(pp().Dst.String())
if lnk == nil { if lnk == nil {
logrus.Warnln("[listen] @", index, "transfer drop packet: nil nexthop") logrus.Warnln("[listen] @", index, "transfer drop packet: nil nexthop")
return return
@@ -256,12 +256,12 @@ func (m *Me) dispatch(packet *orbyte.Item[head.Packet], addr p2p.EndPoint, index
n, err := lnk.WritePacket(packet, true) n, err := lnk.WritePacket(packet, true)
if err == nil { if err == nil {
if config.ShowDebugLog { if config.ShowDebugLog {
logrus.Debugln("[listen] @", index, "trans", n, "bytes packet to", pp.Dst.String()+":"+strconv.Itoa(int(pp.DstPort))) logrus.Debugln("[listen] @", index, "trans", n, "bytes packet to", pp().Dst.String()+":"+strconv.Itoa(int(pp().DstPort)))
} }
} else { } else {
logrus.Errorln("[listen] @", index, "trans packet to", pp.Dst.String()+":"+strconv.Itoa(int(pp.DstPort)), "err:", err) logrus.Errorln("[listen] @", index, "trans packet to", pp().Dst.String()+":"+strconv.Itoa(int(pp().DstPort)), "err:", err)
} }
default: default:
logrus.Warnln("[listen] @", index, "packet dst", pp.Dst.String()+":"+strconv.Itoa(int(pp.DstPort)), "is not in peers") logrus.Warnln("[listen] @", index, "packet dst", pp().Dst.String()+":"+strconv.Itoa(int(pp().DstPort)), "is not in peers")
} }
} }

2
gold/link/send.go
View File

@@ -103,7 +103,7 @@ func (l *Link) encrypt(p *head.Packet, sndcnt uint16, teatype uint8) {
logrus.Debugln("[send] data len after zstd:", len(data)) logrus.Debugln("[send] data len after zstd:", len(data))
} }
} }
p.SetBody(l.encode(teatype, sndcnt&0x07ff, data).Trans().Bytes()) p.SetBody(l.encode(teatype, sndcnt&0x07ff, data).Trans())
if config.ShowDebugLog { if config.ShowDebugLog {
logrus.Debugln("[send] data len after xchacha20:", p.BodyLen(), "addt:", sndcnt) logrus.Debugln("[send] data len after xchacha20:", p.BodyLen(), "addt:", sndcnt)
} }