Browse Source

add ipv6 internet address

Abhishek Kondur 1 year ago
parent
commit
a233714f0d
2 changed files with 7 additions and 7 deletions
  1. 3 3
      controllers/ext_client.go
  2. 4 4
      logic/peers.go

+ 3 - 3
controllers/ext_client.go

@@ -219,10 +219,10 @@ func getExtClientConf(w http.ResponseWriter, r *http.Request) {
 	var newAllowedIPs string
 	if gwnode.IsInternetGateway {
 		egressrange := "0.0.0.0/0"
-		if gwnode.Address.IP == nil {
-			egressrange = "::/0"
+		if gwnode.Address6.IP != nil && client.Address6 != "" {
+			egressrange += "," + "::/0"
 		}
-		newAllowedIPs += "," + egressrange
+		newAllowedIPs = egressrange
 	} else {
 		newAllowedIPs = network.AddressRange
 		if newAllowedIPs != "" && network.AddressRange6 != "" {

+ 4 - 4
logic/peers.go

@@ -233,8 +233,8 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
 			if node.IsInternetGateway {
 				hostPeerUpdate.FwUpdate.IsEgressGw = true
 				egressrange := []string{"0.0.0.0/0"}
-				if node.Address.IP == nil {
-					egressrange = []string{"::/0"}
+				if node.Address6.IP != nil {
+					egressrange = append(egressrange, "::/0")
 				}
 				node.EgressGatewayRequest.Ranges = append(node.EgressGatewayRequest.Ranges, egressrange...)
 				addedInetGwRanges = true
@@ -253,8 +253,8 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
 		if node.IsInternetGateway && !addedInetGwRanges {
 			hostPeerUpdate.FwUpdate.IsEgressGw = true
 			egressrange := []string{"0.0.0.0/0"}
-			if node.Address.IP == nil {
-				egressrange = []string{"::/0"}
+			if node.Address6.IP != nil {
+				egressrange = append(egressrange, "::/0")
 			}
 			hostPeerUpdate.FwUpdate.EgressInfo[node.ID.String()] = models.EgressInfo{
 				EgressID: node.ID.String(),