zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-07 01:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix extclient comms to gws

Browse Source
This commit is contained in:
abhishek9686
2025-03-05 23:06:38 +04:00
parent e22519c07e
commit 984db44c78
4 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
logic/nodes.go
View File

@@ -836,12 +836,12 @@ func GetTagMapWithNodesByNetwork(netID models.NetworkID, withStaticNodes bool) (
tagNodesMap = make(map[models.TagID][]models.Node)
nodes, _ := GetNetworkNodes(netID.String())
for _, nodeI := range nodes {
if nodeI.Tags == nil {
continue
}
tagNodesMap[models.TagID(nodeI.ID.String())] = []models.Node{
nodeI,
}
if nodeI.Tags == nil {
continue
}
for nodeTagID := range nodeI.Tags {
tagNodesMap[nodeTagID] = append(tagNodesMap[nodeTagID], nodeI)
}
@@ -860,7 +860,7 @@ func AddTagMapWithStaticNodes(netID models.NetworkID,
return tagNodesMap
}
for _, extclient := range extclients {
if extclient.Tags == nil || extclient.RemoteAccessClientID != "" {
if extclient.RemoteAccessClientID != "" {
continue
}
tagNodesMap[models.TagID(extclient.ClientID)] = []models.Node{
@@ -869,6 +869,10 @@ func AddTagMapWithStaticNodes(netID models.NetworkID,
StaticNode: extclient,
},
}
if extclient.Tags == nil {
continue
}
for tagID := range extclient.Tags {
tagNodesMap[tagID] = append(tagNodesMap[tagID], models.Node{
IsStatic: true,
@@ -891,6 +895,12 @@ func AddTagMapWithStaticNodesWithUsers(netID models.NetworkID,
return tagNodesMap
}
for _, extclient := range extclients {
tagNodesMap[models.TagID(extclient.ClientID)] = []models.Node{
{
IsStatic: true,
StaticNode: extclient,
},
}
if extclient.Tags == nil {
continue
}