zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 09:22:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

small bug fixes

Browse Source
This commit is contained in:
0xdcarns
2022-04-21 10:56:10 -04:00
parent 3298a074bb
commit 3ca9843328
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/ext_client.go
View File

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

2
controllers/network.go
View File

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