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

fixing mac interface parsing

Browse Source
This commit is contained in:
afeiszli
2021-09-22 14:31:31 -04:00
parent 80eb6a8cee
commit c826b782ed
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netclient/server/grpc.go
View File

@@ -211,12 +211,12 @@ func GetPeers(macaddress string, network string, server string, dualstack bool,
for _, iprange := range ranges { // go through each cidr for egress gateway
_, ipnet, err := net.ParseCIDR(iprange) // confirming it's valid cidr
if err != nil {
ncutils.PrintLog("could not parse gateway IP range. Not adding "+iprange,1)
ncutils.PrintLog("could not parse gateway IP range. Not adding "+iprange, 1)
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
ncutils.PrintLog("egress IP range of "+iprange+" overlaps with "+node.Endpoint+", omitting",1)
nodeEndpointArr := strings.Split(nodecfg.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
ncutils.PrintLog("egress IP range of "+iprange+" overlaps with "+nodecfg.Endpoint+", omitting", 1)
continue // skip adding egress range if overlaps with node's ip
}
gateways = append(gateways, iprange)