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

chnage egress range type to string

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

6
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, ranges6 []net.IPNet) {
func getExtpeerEgressRanges(node models.Node) (ranges, ranges6 []string) {
extPeers, err := GetNetworkExtClients(node.Network)
if err != nil {
return
@ -704,9 +704,9 @@ func getExtpeerEgressRanges(node models.Node) (ranges, ranges6 []net.IPNet) {
_, ipnet, err := net.ParseCIDR(allowedRange)
if err == nil {
if ipnet.IP.To4() != nil {
ranges = append(ranges, *ipnet)
ranges = append(ranges, allowedRange)
} else {
ranges6 = append(ranges6, *ipnet)
ranges6 = append(ranges6, allowedRange)
}
}

16
models/mqtt.go
View file

@ -34,14 +34,14 @@ type FwRule struct {
// IngressInfo - struct for ingress info
type IngressInfo struct {
IngressID string `json:"ingress_id"`
Network net.IPNet `json:"network"`
Network6 net.IPNet `json:"network6"`
StaticNodeIps []net.IP `json:"static_node_ips"`
Rules []FwRule `json:"rules"`
AllowAll bool `json:"allow_all"`
EgressRanges []net.IPNet `json:"egress_ranges"`
EgressRanges6 []net.IPNet `json:"egress_ranges6"`
IngressID string `json:"ingress_id"`
Network net.IPNet `json:"network"`
Network6 net.IPNet `json:"network6"`
StaticNodeIps []net.IP `json:"static_node_ips"`
Rules []FwRule `json:"rules"`
AllowAll bool `json:"allow_all"`
EgressRanges []string `json:"egress_ranges"`
EgressRanges6 []string `json:"egress_ranges6"`
}
// EgressInfo - struct for egress info