From a0735e8203ddbaadbafd9c3546d2342929a9acc2 Mon Sep 17 00:00:00 2001
From: abhishek9686 <abhi281342@gmail.com>
Date: Tue, 29 Oct 2024 12:59:24 +0400
Subject: [PATCH] chnage egress range type to string

---
 logic/extpeers.go |  6 +++---
 models/mqtt.go    | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/logic/extpeers.go b/logic/extpeers.go
index fd5e98b2..9ba50409 100644
--- a/logic/extpeers.go
+++ b/logic/extpeers.go
@@ -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)
 				}
 
 			}
diff --git a/models/mqtt.go b/models/mqtt.go
index 395820a9..9c6abd67 100644
--- a/models/mqtt.go
+++ b/models/mqtt.go
@@ -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