sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-19 23:11:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

log highest common sync message version

Browse Source 
Signed-off-by: Dmitri Dolguikh <dmitri.external@netbird.io>
This commit is contained in:
Dmitri Dolguikh
2026-07-15 15:57:06 +02:00
parent 572353a932
commit 2ac1d77bf0
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
management/internals/controllers/network_map/controller/controller.go
View File

@@ -236,6 +236,8 @@ func (c *Controller) sendUpdateAccountPeers(ctx context.Context, accountID strin
c.perAccountOrGlobalSupportedSyncMessageVersions(accountID),
grpc.SyncMessageVersionsFromProtoEnums(peer.Meta.Capabilities))
log.WithField("sync_message_version", commonSyncMessageVersions[0]).Debug("common highest sync message version")
if commonSyncMessageVersions[0] == grpc.ComponentNetworkMap {
components := account.GetPeerNetworkMapComponents(
ctx, p.ID, peersCustomZone, accountZones, approvedPeersMap, resourcePolicies, routers, groupIDToUserIDs)
@@ -401,6 +403,8 @@ func (c *Controller) sendUpdateForAffectedPeers(ctx context.Context, accountID s
c.perAccountOrGlobalSupportedSyncMessageVersions(accountID),
grpc.SyncMessageVersionsFromProtoEnums(peer.Meta.Capabilities))
log.WithField("sync_message_version", commonSyncMessageVersions[0]).Debug("common highest sync message version")
if commonSyncMessageVersions[0] == grpc.ComponentNetworkMap {
components := account.GetPeerNetworkMapComponents(
ctx, p.ID, peersCustomZone, accountZones, approvedPeersMap, resourcePolicies, routers, groupIDToUserIDs)
@@ -535,6 +539,8 @@ func (c *Controller) UpdateAccountPeer(ctx context.Context, accountId string, pe
c.perAccountOrGlobalSupportedSyncMessageVersions(accountId),
grpc.SyncMessageVersionsFromProtoEnums(peer.Meta.Capabilities))
log.WithField("sync_message_version", commonSyncMessageVersions[0]).Debug("common highest sync message version")
if commonSyncMessageVersions[0] == grpc.ComponentNetworkMap {
components := account.GetPeerNetworkMapComponents(
ctx, peer.ID, peersCustomZone, accountZones, approvedPeersMap, resourcePolicies, routers, groupIDToUserIDs)

2
management/internals/shared/grpc/server.go
View File

@@ -1025,6 +1025,8 @@ func (s *Server) sendInitialSync(ctx context.Context, peerKey wgtypes.Key, peer
SyncMessageVersionsFromString(s.perAccountOrGlobalSyncMessageVersions(peer.AccountID)),
SyncMessageVersionsFromProtoEnums(peer.Meta.Capabilities))
log.WithField("sync_message_version", commonSyncMessageVersions[0]).Debug("common highest sync message version")
if commonSyncMessageVersions[0] == ComponentNetworkMap {
// Capable peer: discard the legacy NetworkMap that SyncAndMarkPeer
// computed and recompute the raw components instead. This wastes one