gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-07 13:44:17 +08:00
Code Issues Projects Releases Packages Wiki Activity

set egress6 ranges

Browse source
This commit is contained in:
abhishek9686 2024-10-29 12:56:11 +04:00
parent dc24e359cb
commit 8e5a3d02c3
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
logic/extpeers.go
View file

@ -688,7 +688,7 @@ func getExtPeerEgressRoute(node models.Node, extPeer models.ExtClient) (egressRo
return
}
func getExtpeerEgressRanges(node models.Node) (ranges []net.IPNet) {
func getExtpeerEgressRanges(node models.Node) (ranges, ranges6 []net.IPNet) {
extPeers, err := GetNetworkExtClients(node.Network)
if err != nil {
return
@ -703,7 +703,12 @@ func getExtpeerEgressRanges(node models.Node) (ranges []net.IPNet) {
for _, allowedRange := range extPeer.ExtraAllowedIPs {
_, ipnet, err := net.ParseCIDR(allowedRange)
if err == nil {
ranges = append(ranges, *ipnet)
if ipnet.IP.To4() != nil {
ranges = append(ranges, *ipnet)
} else {
ranges6 = append(ranges6, *ipnet)
}
}
}
}

2
logic/peers.go
View file

@ -301,9 +301,9 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
Network6: node.NetworkRange6,
AllowAll: defaultDevicePolicy.Enabled && defaultUserPolicy.Default,
StaticNodeIps: GetStaticNodeIps(node),
EgressRanges: getExtpeerEgressRanges(node),
Rules: GetFwRulesOnIngressGateway(node),
}
ingFwUpdate.EgressRanges, ingFwUpdate.EgressRanges6 = getExtpeerEgressRanges(node)
hostPeerUpdate.FwUpdate.IngressInfo[node.ID.String()] = ingFwUpdate
}
hostPeerUpdate.EgressRoutes = append(hostPeerUpdate.EgressRoutes, egressRoutes...)

1
models/mqtt.go
View file

@ -41,6 +41,7 @@ type IngressInfo struct {
Rules []FwRule `json:"rules"`
AllowAll bool `json:"allow_all"`
EgressRanges []net.IPNet `json:"egress_ranges"`
EgressRanges6 []net.IPNet `json:"egress_ranges6"`
}
// EgressInfo - struct for egress info