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

typo

Browse Source
This commit is contained in:
fumiama
2021-12-28 14:30:15 +08:00
parent 0efd89f7ef
commit a9abad93d3
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gold/head/packet.go
View File

@@ -43,13 +43,13 @@ func NewPacket(proto uint8, srcPort uint16, dstPort uint16, data []byte) *Packet
} }
} }
// UnMashal 将 data 的数据解码到自身 // Unmarshal 将 data 的数据解码到自身
func (p *Packet) UnMashal(data []byte) error { func (p *Packet) Unmarshal(data []byte) error {
return json.Unmarshal(data, p) return json.Unmarshal(data, p)
} }
// Mashal 将自身数据编码为 []byte // Marshal 将自身数据编码为 []byte
func (p *Packet) Mashal(src string, dst string) ([]byte, error) { func (p *Packet) Marshal(src string, dst string) ([]byte, error) {
p.DataSZ = uint32(len(p.Data)) p.DataSZ = uint32(len(p.Data))
p.Src = src p.Src = src
p.Dst = dst p.Dst = dst

2
gold/link/link.go
View File

@@ -72,7 +72,7 @@ func (l *Link) Write(p *head.Packet) (n int, err error) {
p.FillHash() p.FillHash()
p.Data = l.Encode(p.Data) p.Data = l.Encode(p.Data)
var d []byte var d []byte
d, err = p.Mashal(l.me.me.String(), l.peerip.String()) d, err = p.Marshal(l.me.me.String(), l.peerip.String())
logrus.Debugln("[link] write data", string(d)) logrus.Debugln("[link] write data", string(d))
if err == nil { if err == nil {
n, err = l.me.myconn.WriteToUDP(d, l.NextHop(l.peerip).endpoint) n, err = l.me.myconn.WriteToUDP(d, l.NextHop(l.peerip).endpoint)

2
gold/link/listen.go
View File

@@ -20,7 +20,7 @@ func (m *Me) listen() (conn *net.UDPConn, err error) {
if err == nil { if err == nil {
lbf = lbf[:n] lbf = lbf[:n]
packet := head.Packet{} packet := head.Packet{}
err = packet.UnMashal(lbf) err = packet.Unmarshal(lbf)
if err == nil { if err == nil {
r := int(packet.DataSZ) - len(packet.Data) r := int(packet.DataSZ) - len(packet.Data)
if r > 0 { if r > 0 {