Browse Source

small bug fixes

0xdcarns 3 years ago
parent
commit
3ca9843328
2 changed files with 7 additions and 1 deletions
  1. 6 0
      controllers/ext_client.go
  2. 1 1
      controllers/network.go

+ 6 - 0
controllers/ext_client.go

@@ -153,6 +153,12 @@ func getExtClientConf(w http.ResponseWriter, r *http.Request) {
 	}
 	gwendpoint := gwnode.Endpoint + ":" + strconv.Itoa(int(gwnode.ListenPort))
 	newAllowedIPs := network.AddressRange
+	if newAllowedIPs != "" {
+		addrString += ","
+	}
+	if network.AddressRange6 != "" {
+		newAllowedIPs += network.AddressRange6
+	}
 	if egressGatewayRanges, err := logic.GetEgressRangesOnNetwork(&client); err == nil {
 		for _, egressGatewayRange := range egressGatewayRanges {
 			newAllowedIPs += "," + egressGatewayRange

+ 1 - 1
controllers/network.go

@@ -308,7 +308,7 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if network.AddressRange == "" && network.AddressRange6 == "" {
-		returnErrorResponse(w, r, formatError(err, "badrequest"))
+		returnErrorResponse(w, r, formatError(fmt.Errorf("IPv4 or IPv6 CIDR required"), "badrequest"))
 		return
 	}