Move to networkMap.PeerConfig

Author: mohamed-essam

client/internal/engine.go

@@ -718,8 +718,8 @@ func (e *Engine) handleSync(update *mgmProto.SyncResponse) error {
 	e.syncMsgMux.Lock()
 	defer e.syncMsgMux.Unlock()
 
-	if update.NetworkMap != nil {
-		e.handleAutoUpdateVersion(update.NetworkMap.AutoUpdateVersion)
+	if update.NetworkMap != nil && update.NetworkMap.PeerConfig != nil {
+		e.handleAutoUpdateVersion(update.NetworkMap.PeerConfig.AutoUpdateVersion)
 	}
 	if update.GetNetbirdConfig() != nil {
 		wCfg := update.GetNetbirdConfig()

management/server/grpcserver.go

@@ -710,17 +710,18 @@ func toPeerConfig(peer *nbpeer.Peer, network *types.Network, dnsName string, set
 		Fqdn:                            fqdn,
 		RoutingPeerDnsResolutionEnabled: settings.RoutingPeerDNSResolutionEnabled,
 		LazyConnectionEnabled:           settings.LazyConnectionEnabled,
+		AutoUpdateVersion:               settings.AutoUpdateVersion,
 	}
 }
 
 func toSyncResponse(ctx context.Context, config *nbconfig.Config, peer *nbpeer.Peer, turnCredentials *Token, relayCredentials *Token, networkMap *types.NetworkMap, dnsName string, checks []*posture.Checks, dnsCache *DNSConfigCache, settings *types.Settings, extraSettings *types.ExtraSettings, peerGroups []string) *proto.SyncResponse {
 	response := &proto.SyncResponse{
 		PeerConfig: toPeerConfig(peer, networkMap.Network, dnsName, settings),
 		NetworkMap: &proto.NetworkMap{
-			Serial:            networkMap.Network.CurrentSerial(),
-			Routes:            toProtocolRoutes(networkMap.Routes),
-			DNSConfig:         toProtocolDNSConfig(networkMap.DNSConfig, dnsCache),
-			AutoUpdateVersion: settings.AutoUpdateVersion,
+			Serial:     networkMap.Network.CurrentSerial(),
+			Routes:     toProtocolRoutes(networkMap.Routes),
+			DNSConfig:  toProtocolDNSConfig(networkMap.DNSConfig, dnsCache),
+			PeerConfig: toPeerConfig(peer, networkMap.Network, dnsName, settings),
 		},
 		Checks: toProtocolChecks(ctx, checks),
 	}

management/server/peer.go

@@ -1554,7 +1554,7 @@ func deletePeers(ctx context.Context, am *DefaultAccountManager, transaction sto
 					RemotePeersIsEmpty:   true,
 					FirewallRules:        []*proto.FirewallRule{},
 					FirewallRulesIsEmpty: true,
-					AutoUpdateVersion:    settings.AutoUpdateVersion,
+					PeerConfig:           toPeerConfig(peer, network, dnsDomain, settings),
 				},
 			},
 			NetworkMap: &types.NetworkMap{},

shared/management/proto/management.pb.go

@@ -266,6 +266,9 @@ message PeerConfig {
   bool LazyConnectionEnabled = 6;
 
   int32 mtu = 7;
+
+  // Auto-update config
+  string autoUpdateVersion = 8;
 }
 
 // NetworkMap represents a network state of the peer with the corresponding configuration parameters to establish peer-to-peer connections
@@ -306,9 +309,6 @@ message NetworkMap {
   bool routesFirewallRulesIsEmpty = 11;
 
   repeated ForwardingRule forwardingRules = 12;
-
-  // Auto-update config
-  string autoUpdateVersion = 13;
 }
 
 // RemotePeerConfig represents a configuration of a remote peer.