zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-07 01:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed egress range peer appending

Browse Source
This commit is contained in:
worker-9
2021-08-12 09:01:35 -04:00
parent 9f7d475bac
commit c87e39aa61
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
netclient/server/grpc.go
View File

@@ -211,11 +211,14 @@ func GetPeers(macaddress string, network string, server string, dualstack bool,
if node.IsEgressGateway == "yes" {
hasGateway = true
ranges := node.EgressGatewayRanges
for _, iprange := range ranges {
_, ipnet, err := net.ParseCIDR(iprange)
nodeEndpointArr := strings.Split(node.Endpoint, ":")
if len(nodeEndpointArr) != 2 || ipnet.Contains(net.IP(nodeEndpointArr[0])) {
continue
for _, iprange := range ranges { // go through each cidr for egress gateway
_, ipnet, err := net.ParseCIDR(iprange) // confirming it's valid cidr
if err != nil {
continue // if can't parse CIDR
}
nodeEndpointArr := strings.Split(node.Endpoint, ":") // getting the public ip of node
if ipnet.Contains(net.IP(nodeEndpointArr[0])) { // ensuring egress gateway range does not contain public ip of node
continue // skip adding egress range if overlaps with nodes ip
}
gateways = append(gateways, iprange)
if err != nil {
@@ -262,7 +265,6 @@ func GetPeers(macaddress string, network string, server string, dualstack bool,
}
}
peers = append(peers, peer)
}
if isIngressGateway {
extPeers, err := GetExtPeers(macaddress, network, server, dualstack)