Refactor flag setting in Info struct to use CopyFlagsFrom method

This commit is contained in:
Hakan Sariman
2025-09-29 15:38:35 +07:00
parent 4b2cd97d5f
commit f241bfa339
2 changed files with 16 additions and 12 deletions

View File

@@ -96,6 +96,21 @@ func (i *Info) SetFlags(
i.LazyConnectionEnabled = lazyConnectionEnabled
}
func (i *Info) CopyFlagsFrom(other *Info) {
i.SetFlags(
other.RosenpassEnabled,
other.RosenpassPermissive,
&other.ServerSSHAllowed,
other.DisableClientRoutes,
other.DisableServerRoutes,
other.DisableDNS,
other.DisableFirewall,
other.BlockLANAccess,
other.BlockInbound,
other.LazyConnectionEnabled,
)
}
// extractUserAgent extracts Netbird's agent (client) name and version from the outgoing context
func extractUserAgent(ctx context.Context) string {
md, hasMeta := metadata.FromOutgoingContext(ctx)

View File

@@ -229,18 +229,7 @@ func (c *GrpcClient) connectToStream(ctx context.Context, serverPubKey wgtypes.K
// Always compute latest system info to ensure up-to-date PeerSystemMeta on first and subsequent syncs
recomputed := system.GetInfo(c.ctx)
if sysInfo != nil {
recomputed.SetFlags(
sysInfo.RosenpassEnabled,
sysInfo.RosenpassPermissive,
&sysInfo.ServerSSHAllowed,
sysInfo.DisableClientRoutes,
sysInfo.DisableServerRoutes,
sysInfo.DisableDNS,
sysInfo.DisableFirewall,
sysInfo.BlockLANAccess,
sysInfo.BlockInbound,
sysInfo.LazyConnectionEnabled,
)
recomputed.CopyFlagsFrom(sysInfo)
// carry over posture files if any were computed
if len(sysInfo.Files) > 0 {
recomputed.Files = sysInfo.Files