From c68394fa94a89fa9b2988d5706306048945a53b8 Mon Sep 17 00:00:00 2001 From: worker-9 Date: Fri, 6 Aug 2021 15:29:34 -0400 Subject: [PATCH] egress change --- netclient/server/grpc.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/netclient/server/grpc.go b/netclient/server/grpc.go index e634b507..0967e2bb 100644 --- a/netclient/server/grpc.go +++ b/netclient/server/grpc.go @@ -213,15 +213,16 @@ func GetPeers(macaddress string, network string, server string, dualstack bool, hasGateway = true ranges := node.EgressGatewayRanges for _, iprange := range ranges { - gateways = append(gateways, iprange) _, ipnet, err := net.ParseCIDR(iprange) + nodeEndpointArr := strings.Split(node.Endpoint, ":") + if len(nodeEndpointArr) != 2 || ipnet.Contains(net.IP(nodeEndpointArr[0])) { + continue + } + gateways = append(gateways, iprange) if err != nil { log.Println("ERROR ENCOUNTERED SETTING GATEWAY") } else { - nodeEndpointArr := strings.Split(node.Endpoint, ":") - if len(nodeEndpointArr) == 2 && !ipnet.Contains(net.IP(nodeEndpointArr[0])) { - allowedips = append(allowedips, *ipnet) - } + allowedips = append(allowedips, *ipnet) } } }