瀏覽代碼

fix node removal from egress policy on delete

abhishek9686 3 月之前
父節點
當前提交
604116e53b
共有 2 個文件被更改,包括 3 次插入9 次删除
  1. 3 1
      logic/egress.go
  2. 0 8
      logic/nodes.go

+ 3 - 1
logic/egress.go

@@ -268,7 +268,9 @@ func GetNodeEgressInfo(targetNode *models.Node) {
 }
 }
 
 
 func RemoveNodeFromEgress(node models.Node) {
 func RemoveNodeFromEgress(node models.Node) {
-	egs, _ := (&schema.Egress{}).ListByNetwork(db.WithContext(context.TODO()))
+	egs, _ := (&schema.Egress{
+		Network: node.Network,
+	}).ListByNetwork(db.WithContext(context.TODO()))
 	for _, egI := range egs {
 	for _, egI := range egs {
 		if _, ok := egI.Nodes[node.ID.String()]; ok {
 		if _, ok := egI.Nodes[node.ID.String()]; ok {
 			delete(egI.Nodes, node.ID.String())
 			delete(egI.Nodes, node.ID.String())

+ 0 - 8
logic/nodes.go

@@ -643,14 +643,6 @@ func createNode(node *models.Node) error {
 		return err
 		return err
 	}
 	}
 
 
-	if !node.DNSOn {
-		if servercfg.IsDNSMode() {
-			node.DNSOn = true
-		} else {
-			node.DNSOn = false
-		}
-	}
-
 	SetNodeDefaults(node, true)
 	SetNodeDefaults(node, true)
 
 
 	defaultACLVal := acls.Allowed
 	defaultACLVal := acls.Allowed