Explorar el Código

chnage egress range type to string

abhishek9686 hace 10 meses
padre
commit
a0735e8203
Se han modificado 2 ficheros con 11 adiciones y 11 borrados
  1. 3 3
      logic/extpeers.go
  2. 8 8
      models/mqtt.go

+ 3 - 3
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)
 				}
 
 			}

+ 8 - 8
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