Kaynağa Gözat

remove chained inet gws

abhishek9686 3 ay önce
ebeveyn
işleme
1faa5196df
4 değiştirilmiş dosya ile 8 ekleme ve 8 silme
  1. 1 1
      controllers/ext_client.go
  2. 3 3
      logic/peers.go
  3. 3 3
      logic/relay.go
  4. 1 1
      pro/logic/acls.go

+ 1 - 1
controllers/ext_client.go

@@ -266,7 +266,7 @@ func getExtClientConf(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var newAllowedIPs string
-	if logic.IsInternetGw(gwnode) || gwnode.EgressDetails.InternetGwID != "" {
+	if logic.IsInternetGw(gwnode) {
 		egressrange := "0.0.0.0/0"
 		if gwnode.Address6.IP != nil && client.Address6 != "" {
 			egressrange += "," + "::/0"

+ 3 - 3
logic/peers.go

@@ -589,9 +589,9 @@ func GetAllowedIPs(node, peer *models.Node, metrics *models.Metrics) []net.IPNet
 	}
 	if node.IsRelayed && node.RelayedBy == peer.ID.String() {
 		allowedips = append(allowedips, GetAllowedIpsForRelayed(node, peer)...)
-		if peer.EgressDetails.InternetGwID != "" {
-			return allowedips
-		}
+		// if peer.EgressDetails.InternetGwID != "" {
+		// 	return allowedips
+		// }
 	}
 
 	// handle ingress gateway peers

+ 3 - 3
logic/relay.go

@@ -215,9 +215,9 @@ func GetAllowedIpsForRelayed(relayed, relay *models.Node) (allowedIPs []net.IPNe
 		logger.Log(0, "RelayedByRelay called with invalid parameters")
 		return
 	}
-	if relay.EgressDetails.InternetGwID != "" {
-		return GetAllowedIpForInetNodeClient(relayed, relay)
-	}
+	// if relay.EgressDetails.InternetGwID != "" {
+	// 	return GetAllowedIpForInetNodeClient(relayed, relay)
+	// }
 	peers, err := GetNetworkNodes(relay.Network)
 	if err != nil {
 		logger.Log(0, "error getting network clients", err.Error())

+ 1 - 1
pro/logic/acls.go

@@ -1530,7 +1530,7 @@ func GetEgressRulesForNode(targetnode models.Node) (rules map[string]models.AclR
 			continue
 		}
 		if _, ok := egI.Nodes[targetnode.ID.String()]; ok {
-			if egI.Range == "*" {
+			if egI.IsInetGw {
 				targetNodeTags[models.TagID("0.0.0.0/0")] = struct{}{}
 				targetNodeTags[models.TagID("::/0")] = struct{}{}
 			} else {