fix(link): noroute skip

fumiama · fumiama · commit 4a8e8486739d · 2024-07-13T02:19:33.000+09:00
diff --git a/gold/link/peer.go b/gold/link/peer.go
@@ -92,15 +92,17 @@ func (m *Me) AddPeer(cfg *PeerConfig) (l *Link) {
 				}
 			}
 			_, cidr, err := net.ParseCIDR(ipnet)
-			if err == nil {
-				l.allowedips = append(l.allowedips, cidr)
-				l.me.router.SetItem(cidr, l)
-				l.me.connmapmu.Lock()
-				l.me.connections[cfg.PeerIP] = l
-				l.me.connmapmu.Unlock()
-			} else {
+			if err != nil {
 				panic(err)
 			}
+			l.allowedips = append(l.allowedips, cidr)
+			if noroute {
+				continue
+			}
+			l.me.router.SetItem(cidr, l)
+			l.me.connmapmu.Lock()
+			l.me.connections[cfg.PeerIP] = l
+			l.me.connmapmu.Unlock()
 		}
 	}
 	logrus.Infoln("[peer] add peer:", cfg.PeerIP, "allow:", cfg.AllowedIPs)

Original file line number	Diff line number	Diff line change
`@@ -92,15 +92,17 @@ func (m Me) AddPeer(cfg PeerConfig) (l *Link) {`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`_, cidr, err := net.ParseCIDR(ipnet)`
`95`		`- if err == nil {`
`96`		`- l.allowedips = append(l.allowedips, cidr)`
`97`		`- l.me.router.SetItem(cidr, l)`
`98`		`- l.me.connmapmu.Lock()`
`99`		`- l.me.connections[cfg.PeerIP] = l`
`100`		`- l.me.connmapmu.Unlock()`
`101`		`- } else {`
	`95`	`+ if err != nil {`
`102`	`96`	`panic(err)`
`103`	`97`	`}`
	`98`	`+ l.allowedips = append(l.allowedips, cidr)`
	`99`	`+ if noroute {`
	`100`	`+ continue`
	`101`	`+ }`
	`102`	`+ l.me.router.SetItem(cidr, l)`
	`103`	`+ l.me.connmapmu.Lock()`
	`104`	`+ l.me.connections[cfg.PeerIP] = l`
	`105`	`+ l.me.connmapmu.Unlock()`
`104`	`106`	`}`
`105`	`107`	`}`
`106`	`108`	`logrus.Infoln("[peer] add peer:", cfg.PeerIP, "allow:", cfg.AllowedIPs)`