sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-28 07:19:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

extract signal config creation

Browse Source
This commit is contained in:
Pascal Fischer
2025-03-17 22:00:41 +01:00
parent f88b93e53f
commit 4a5cd74bfe
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/server/grpcserver.go
+11 -6
View File
@@ -595,14 +595,19 @@ func toNetbirdConfig(config *Config, turnCredentials *Token, relayToken *Token,
} }
} }
nbConfig := &proto.NetbirdConfig{ var signalCfg *proto.HostConfig
Stuns: stuns, if config.Signal != nil {
Turns: turns, signalCfg = &proto.HostConfig{
Signal: &proto.HostConfig{
Uri: config.Signal.URI, Uri: config.Signal.URI,
Protocol: ToResponseProto(config.Signal.Proto), Protocol: ToResponseProto(config.Signal.Proto),
}, }
Relay: relayCfg, }
nbConfig := &proto.NetbirdConfig{
Stuns: stuns,
Turns: turns,
Signal: signalCfg,
Relay: relayCfg,
} }
integrationsConfig.ExtendNetBirdConfig(nbConfig, extraSettings) integrationsConfig.ExtendNetBirdConfig(nbConfig, extraSettings)
management/server/peer.go
+2 -2
View File
@@ -1213,7 +1213,7 @@ func (am *DefaultAccountManager) UpdateAccountPeers(ctx context.Context, account
return return
} }
update := toSyncResponse(ctx, nil, p, nil, nil, remotePeerNetworkMap, am.GetDNSDomain(), postureChecks, dnsCache, account.Settings.RoutingPeerDNSResolutionEnabled, extraSetting) update := toSyncResponse(ctx, &Config{}, p, nil, nil, remotePeerNetworkMap, am.GetDNSDomain(), postureChecks, dnsCache, account.Settings.RoutingPeerDNSResolutionEnabled, extraSetting)
am.peersUpdateManager.SendUpdate(ctx, p.ID, &UpdateMessage{Update: update, NetworkMap: remotePeerNetworkMap}) am.peersUpdateManager.SendUpdate(ctx, p.ID, &UpdateMessage{Update: update, NetworkMap: remotePeerNetworkMap})
}(peer) }(peer)
} }
@@ -1282,7 +1282,7 @@ func (am *DefaultAccountManager) UpdateAccountPeer(ctx context.Context, accountI
return return
} }
update := toSyncResponse(ctx, nil, peer, nil, nil, remotePeerNetworkMap, am.GetDNSDomain(), postureChecks, dnsCache, account.Settings.RoutingPeerDNSResolutionEnabled, extraSettings) update := toSyncResponse(ctx, &Config{}, peer, nil, nil, remotePeerNetworkMap, am.GetDNSDomain(), postureChecks, dnsCache, account.Settings.RoutingPeerDNSResolutionEnabled, extraSettings)
am.peersUpdateManager.SendUpdate(ctx, peer.ID, &UpdateMessage{Update: update, NetworkMap: remotePeerNetworkMap}) am.peersUpdateManager.SendUpdate(ctx, peer.ID, &UpdateMessage{Update: update, NetworkMap: remotePeerNetworkMap})
} }