Просмотр исходного кода

fix inet gw acting as inet client

abhishek9686 3 месяцев назад
Родитель
Сommit
36056ce1ae
4 измененных файлов с 18 добавлено и 8 удалено
  1. 2 0
      controllers/tags.go
  2. 8 8
      logic/egress.go
  3. 5 0
      logic/nodes.go
  4. 3 0
      logic/tags.go

+ 2 - 0
controllers/tags.go

@@ -46,12 +46,14 @@ func getTags(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		return
 	}
+	fmt.Println("hereee 1")
 	tags, err := logic.ListTagsWithNodes(models.NetworkID(netID))
 	if err != nil {
 		logger.Log(0, r.Header.Get("user"), "failed to get all network tag entries: ", err.Error())
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
+	fmt.Println("hereee N")
 	logic.SortTagEntrys(tags[:])
 	logic.ReturnSuccessResponseWithJson(w, r, tags, "fetched all tags in the network "+netID)
 }

+ 8 - 8
logic/egress.go

@@ -202,10 +202,10 @@ func DoesNodeHaveAccessToEgress(node *models.Node, e *schema.Egress) bool {
 }
 
 func AddEgressInfoToPeerByAccess(node, targetNode *models.Node) {
-	if targetNode.Mutex != nil {
-		targetNode.Mutex.Lock()
-		defer targetNode.Mutex.Unlock()
-	}
+	// if targetNode.Mutex != nil {
+	// 	targetNode.Mutex.Lock()
+	// 	defer targetNode.Mutex.Unlock()
+	// }
 	eli, _ := (&schema.Egress{Network: targetNode.Network}).ListByNetwork(db.WithContext(context.TODO()))
 	req := models.EgressGatewayRequest{
 		NodeID: targetNode.ID.String(),
@@ -263,10 +263,10 @@ func AddEgressInfoToPeerByAccess(node, targetNode *models.Node) {
 }
 
 func GetNodeEgressInfo(targetNode *models.Node) {
-	if targetNode.Mutex != nil {
-		targetNode.Mutex.Lock()
-		defer targetNode.Mutex.Unlock()
-	}
+	// if targetNode.Mutex != nil {
+	// 	targetNode.Mutex.Lock()
+	// 	defer targetNode.Mutex.Unlock()
+	// }
 	eli, _ := (&schema.Egress{Network: targetNode.Network}).ListByNetwork(db.WithContext(context.TODO()))
 	req := models.EgressGatewayRequest{
 		NodeID: targetNode.ID.String(),

+ 5 - 0
logic/nodes.go

@@ -856,7 +856,9 @@ func GetTagMapWithNodes() (tagNodesMap map[models.TagID][]models.Node) {
 func GetTagMapWithNodesByNetwork(netID models.NetworkID, withStaticNodes bool) (tagNodesMap map[models.TagID][]models.Node) {
 	tagNodesMap = make(map[models.TagID][]models.Node)
 	nodes, _ := GetNetworkNodes(netID.String())
+	fmt.Println("hereee 2.1")
 	for _, nodeI := range nodes {
+		fmt.Println("checking node ", nodeI.ID.String())
 		tagNodesMap[models.TagID(nodeI.ID.String())] = []models.Node{
 			nodeI,
 		}
@@ -875,11 +877,14 @@ func GetTagMapWithNodesByNetwork(netID models.NetworkID, withStaticNodes bool) (
 		if nodeI.Mutex != nil {
 			nodeI.Mutex.Unlock()
 		}
+		fmt.Println("checked node ", nodeI.ID.String())
 	}
+	fmt.Println("hereee 2.2")
 	tagNodesMap["*"] = nodes
 	if !withStaticNodes {
 		return
 	}
+	fmt.Println("hereee 2.3")
 	return AddTagMapWithStaticNodes(netID, tagNodesMap)
 }
 

+ 3 - 0
logic/tags.go

@@ -93,7 +93,9 @@ func ListTagsWithNodes(netID models.NetworkID) ([]models.TagListResp, error) {
 	if err != nil {
 		return []models.TagListResp{}, err
 	}
+	fmt.Println("hereee 2")
 	tagsNodeMap := GetTagMapWithNodesByNetwork(netID, true)
+	fmt.Println("hereee 3")
 	resp := []models.TagListResp{}
 	for _, tagI := range tags {
 		tagRespI := models.TagListResp{
@@ -103,6 +105,7 @@ func ListTagsWithNodes(netID models.NetworkID) ([]models.TagListResp, error) {
 		}
 		resp = append(resp, tagRespI)
 	}
+	fmt.Println("hereee 4")
 	return resp, nil
 }
 func DeleteAllNetworkTags(networkID models.NetworkID) {