From 561392dc0d38d93442240bb67492aa52ef2770a4 Mon Sep 17 00:00:00 2001 From: fumiama Date: Thu, 30 Dec 2021 15:36:27 +0800 Subject: [PATCH] fix allowed ips error --- gold/link/link.go | 5 ++++- gold/link/peer.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gold/link/link.go b/gold/link/link.go index 2a3870d..cc148a0 100644 --- a/gold/link/link.go +++ b/gold/link/link.go @@ -77,13 +77,16 @@ func (l *Link) Write(p *head.Packet) (n int, err error) { p.Data = l.Encode(p.Data) d := p.Marshal(l.me.me) if d == nil { - return 0, errors.New("ttl exceeded") + return 0, errors.New("[link] ttl exceeded") } logrus.Debugln("[link] write", len(d), "bytes data") if err == nil { peerlink := l.me.router.NextHop(l.peerip.String() + "/32") if peerlink != nil { peerep := peerlink.endpoint + if peerep == nil { + return 0, errors.New("[link] nil endpoint of " + l.peerip.String()) + } logrus.Infoln("[link] write data from ep", l.me.myconn.LocalAddr(), "to", peerep) n, err = l.me.myconn.WriteToUDP(d, peerep) } else { diff --git a/gold/link/peer.go b/gold/link/peer.go index 53f595a..c1854a5 100644 --- a/gold/link/peer.go +++ b/gold/link/peer.go @@ -43,7 +43,7 @@ func (m *Me) AddPeer(peerip string, pubicKey *[32]byte, endPoint string, allowed l.endpoint = e } if allowedIPs != nil { - l.allowedips = make([]*net.IPNet, len(allowedIPs)) + l.allowedips = make([]*net.IPNet, 0, len(allowedIPs)) for _, ipnet := range allowedIPs { _, cidr, err := net.ParseCIDR(ipnet) if err == nil {