Skip to content

Commit 4a5cd74

Browse files
extract signal config creation
1 parent f88b93e commit 4a5cd74

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

management/server/grpcserver.go

+11-6
Original file line numberDiff line numberDiff line change
@@ -595,14 +595,19 @@ func toNetbirdConfig(config *Config, turnCredentials *Token, relayToken *Token,
595595
}
596596
}
597597

598-
nbConfig := &proto.NetbirdConfig{
599-
Stuns: stuns,
600-
Turns: turns,
601-
Signal: &proto.HostConfig{
598+
var signalCfg *proto.HostConfig
599+
if config.Signal != nil {
600+
signalCfg = &proto.HostConfig{
602601
Uri: config.Signal.URI,
603602
Protocol: ToResponseProto(config.Signal.Proto),
604-
},
605-
Relay: relayCfg,
603+
}
604+
}
605+
606+
nbConfig := &proto.NetbirdConfig{
607+
Stuns: stuns,
608+
Turns: turns,
609+
Signal: signalCfg,
610+
Relay: relayCfg,
606611
}
607612

608613
integrationsConfig.ExtendNetBirdConfig(nbConfig, extraSettings)

management/server/peer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ func (am *DefaultAccountManager) UpdateAccountPeers(ctx context.Context, account
12131213
return
12141214
}
12151215

1216-
update := toSyncResponse(ctx, nil, p, nil, nil, remotePeerNetworkMap, am.GetDNSDomain(), postureChecks, dnsCache, account.Settings.RoutingPeerDNSResolutionEnabled, extraSetting)
1216+
update := toSyncResponse(ctx, &Config{}, p, nil, nil, remotePeerNetworkMap, am.GetDNSDomain(), postureChecks, dnsCache, account.Settings.RoutingPeerDNSResolutionEnabled, extraSetting)
12171217
am.peersUpdateManager.SendUpdate(ctx, p.ID, &UpdateMessage{Update: update, NetworkMap: remotePeerNetworkMap})
12181218
}(peer)
12191219
}
@@ -1282,7 +1282,7 @@ func (am *DefaultAccountManager) UpdateAccountPeer(ctx context.Context, accountI
12821282
return
12831283
}
12841284

1285-
update := toSyncResponse(ctx, nil, peer, nil, nil, remotePeerNetworkMap, am.GetDNSDomain(), postureChecks, dnsCache, account.Settings.RoutingPeerDNSResolutionEnabled, extraSettings)
1285+
update := toSyncResponse(ctx, &Config{}, peer, nil, nil, remotePeerNetworkMap, am.GetDNSDomain(), postureChecks, dnsCache, account.Settings.RoutingPeerDNSResolutionEnabled, extraSettings)
12861286
am.peersUpdateManager.SendUpdate(ctx, peer.ID, &UpdateMessage{Update: update, NetworkMap: remotePeerNetworkMap})
12871287
}
12881288

0 commit comments

Comments
 (0)