diff --git a/gold/head/packet.go b/gold/head/packet.go index 2d20256..620e7fa 100644 --- a/gold/head/packet.go +++ b/gold/head/packet.go @@ -43,13 +43,13 @@ func NewPacket(proto uint8, srcPort uint16, dstPort uint16, data []byte) *Packet } } -// UnMashal 将 data 的数据解码到自身 -func (p *Packet) UnMashal(data []byte) error { +// Unmarshal 将 data 的数据解码到自身 +func (p *Packet) Unmarshal(data []byte) error { return json.Unmarshal(data, p) } -// Mashal 将自身数据编码为 []byte -func (p *Packet) Mashal(src string, dst string) ([]byte, error) { +// Marshal 将自身数据编码为 []byte +func (p *Packet) Marshal(src string, dst string) ([]byte, error) { p.DataSZ = uint32(len(p.Data)) p.Src = src p.Dst = dst diff --git a/gold/link/link.go b/gold/link/link.go index 1ec9c78..3577240 100644 --- a/gold/link/link.go +++ b/gold/link/link.go @@ -72,7 +72,7 @@ func (l *Link) Write(p *head.Packet) (n int, err error) { p.FillHash() p.Data = l.Encode(p.Data) 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)) if err == nil { n, err = l.me.myconn.WriteToUDP(d, l.NextHop(l.peerip).endpoint) diff --git a/gold/link/listen.go b/gold/link/listen.go index b460015..a4290f6 100644 --- a/gold/link/listen.go +++ b/gold/link/listen.go @@ -20,7 +20,7 @@ func (m *Me) listen() (conn *net.UDPConn, err error) { if err == nil { lbf = lbf[:n] packet := head.Packet{} - err = packet.UnMashal(lbf) + err = packet.Unmarshal(lbf) if err == nil { r := int(packet.DataSZ) - len(packet.Data) if r > 0 {