Merge pull request #229 from gravitl/develop

Develop
This commit is contained in:
dcarns 2021-08-13 08:07:16 -04:00 committed by GitHub
commit 7c469b039f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -208,6 +208,16 @@ func GetPeers(macaddress string, network string, server string, dualstack bool,
}
var allowedips []net.IPNet
allowedips = append(allowedips, peeraddr)
// handle manually set peers
for _, allowedIp := range node.AllowedIPs {
if _, ipnet, err := net.ParseCIDR(allowedIp); err == nil {
nodeEndpointArr := strings.Split(node.Endpoint, ":")
if !ipnet.Contains(net.IP(nodeEndpointArr[0])) { // don't need to add an allowed ip that already exists..
allowedips = append(allowedips, *ipnet)
}
}
}
// handle egress gateway peers
if node.IsEgressGateway == "yes" {
hasGateway = true
ranges := node.EgressGatewayRanges