Merge 0b83dfc230 into 80a8b9e9e3

internal/network/netif.go

@@ -48,7 +48,7 @@ type NetworkInterfaceOptions struct {
 	DefaultHostname   string
 	OnStateChange     func(state *NetworkInterfaceState)
 	OnInitialCheck    func(state *NetworkInterfaceState)
-	OnDhcpLeaseChange func(lease *udhcpc.Lease, state *NetworkInterfaceState)
+	OnDhcpLeaseChange func(lease *udhcpc.Lease)
 	OnConfigChange    func(config *NetworkConfig)
 	NetworkConfig     *NetworkConfig
 }
@@ -94,7 +94,7 @@ func NewNetworkInterfaceState(opts *NetworkInterfaceOptions) (*NetworkInterfaceS
 			_ = s.updateNtpServersFromLease(lease)
 			_ = s.setHostnameIfNotSame()
 
-			opts.OnDhcpLeaseChange(lease, s)
+			opts.OnDhcpLeaseChange(lease)
 		},
 	})
 

internal/timesync/ntp.go

@@ -9,32 +9,17 @@ import (
 	"github.com/beevik/ntp"
 )
 
-var defaultNTPServerIPs = []string{
+var defaultNTPServers = []string{
-	// These servers are known by static IP and as such don't need DNS lookups
-	// These are from Google and Cloudflare since if they're down, the internet
-	// is broken anyway
-	"162.159.200.1",      // time.cloudflare.com IPv4
-	"162.159.200.123",    // time.cloudflare.com IPv4
-	"2606:4700:f1::1",    // time.cloudflare.com IPv6
-	"2606:4700:f1::123",  // time.cloudflare.com IPv6
-	"216.239.35.0",       // time.google.com IPv4
-	"216.239.35.4",       // time.google.com IPv4
-	"216.239.35.8",       // time.google.com IPv4
-	"216.239.35.12",      // time.google.com IPv4
-	"2001:4860:4806::",   // time.google.com IPv6
-	"2001:4860:4806:4::", // time.google.com IPv6
-	"2001:4860:4806:8::", // time.google.com IPv6
-	"2001:4860:4806:c::", // time.google.com IPv6
-}
-
-var defaultNTPServerHostnames = []string{
-	// should use something from https://github.com/jauderho/public-ntp-servers
 	"time.apple.com",
 	"time.aws.com",
 	"time.windows.com",
 	"time.google.com",
-	"time.cloudflare.com",
+	"162.159.200.123",   // time.cloudflare.com IPv4
-	"pool.ntp.org",
+	"2606:4700:f1::123", // time.cloudflare.com IPv6
+	"0.pool.ntp.org",
+	"1.pool.ntp.org",
+	"2.pool.ntp.org",
+	"3.pool.ntp.org",
 }
 
 func (t *TimeSync) queryNetworkTime(ntpServers []string) (now *time.Time, offset *time.Duration) {

internal/timesync/timesync.go

@@ -158,7 +158,6 @@ func (t *TimeSync) Sync() error {
 	var (
 		now    *time.Time
 		offset *time.Duration
-		log    zerolog.Logger
 	)
 
 	metricTimeSyncCount.Inc()
@@ -167,54 +166,54 @@ func (t *TimeSync) Sync() error {
 
 Orders:
 	for _, mode := range syncMode.Ordering {
-		log = t.l.With().Str("mode", mode).Logger()
 		switch mode {
 		case "ntp_user_provided":
 			if syncMode.Ntp {
-				log.Info().Msg("using NTP custom servers")
+				t.l.Info().Msg("using NTP custom servers")
 				now, offset = t.queryNetworkTime(t.networkConfig.TimeSyncNTPServers)
 				if now != nil {
+					t.l.Info().Str("source", "NTP").Time("now", *now).Msg("time obtained")
 					break Orders
 				}
 			}
 		case "ntp_dhcp":
 			if syncMode.Ntp {
-				log.Info().Msg("using NTP servers from DHCP")
+				t.l.Info().Msg("using NTP servers from DHCP")
 				now, offset = t.queryNetworkTime(t.dhcpNtpAddresses)
 				if now != nil {
+					t.l.Info().Str("source", "NTP DHCP").Time("now", *now).Msg("time obtained")
 					break Orders
 				}
 			}
 		case "ntp":
 			if syncMode.Ntp && syncMode.NtpUseFallback {
-				log.Info().Msg("using NTP fallback IPs")
+				t.l.Info().Msg("using NTP fallback")
-				now, offset = t.queryNetworkTime(defaultNTPServerIPs)
+				now, offset = t.queryNetworkTime(defaultNTPServers)
-				if now == nil {
-					log.Info().Msg("using NTP fallback hostnames")
-					now, offset = t.queryNetworkTime(defaultNTPServerHostnames)
-				}
 				if now != nil {
+					t.l.Info().Str("source", "NTP fallback").Time("now", *now).Msg("time obtained")
 					break Orders
 				}
 			}
 		case "http_user_provided":
 			if syncMode.Http {
-				log.Info().Msg("using HTTP custom URLs")
+				t.l.Info().Msg("using HTTP custom URLs")
 				now = t.queryAllHttpTime(t.networkConfig.TimeSyncHTTPUrls)
 				if now != nil {
+					t.l.Info().Str("source", "HTTP").Time("now", *now).Msg("time obtained")
 					break Orders
 				}
 			}
 		case "http":
 			if syncMode.Http && syncMode.HttpUseFallback {
-				log.Info().Msg("using HTTP fallback")
+				t.l.Info().Msg("using HTTP fallback")
 				now = t.queryAllHttpTime(defaultHTTPUrls)
 				if now != nil {
+					t.l.Info().Str("source", "HTTP fallback").Time("now", *now).Msg("time obtained")
 					break Orders
 				}
 			}
 		default:
-			log.Warn().Msg("unknown time sync mode, skipping")
+			t.l.Warn().Str("mode", mode).Msg("unknown time sync mode, skipping")
 		}
 	}
 
@@ -227,8 +226,6 @@ Orders:
 		now = &newNow
 	}
 
-	log.Info().Time("now", *now).Msg("time obtained")
-
 	err := t.setSystemTime(*now)
 	if err != nil {
 		return fmt.Errorf("failed to set system time: %w", err)

main.go

@@ -96,25 +96,16 @@ func Main() {
 			if !config.AutoUpdateEnabled {
 				return
 			}
-
-			if isTimeSyncNeeded() || !timeSync.IsSyncSuccess() {
-				logger.Debug().Msg("system time is not synced, will retry in 30 seconds")
-				time.Sleep(30 * time.Second)
-				continue
-			}
-
 			if currentSession != nil {
 				logger.Debug().Msg("skipping update since a session is active")
 				time.Sleep(1 * time.Minute)
 				continue
 			}
-
 			includePreRelease := config.IncludePreRelease
 			err = TryUpdate(context.Background(), GetDeviceID(), includePreRelease)
 			if err != nil {
 				logger.Warn().Err(err).Msg("failed to auto update")
 			}
-
 			time.Sleep(1 * time.Hour)
 		}
 	}()

network.go

@@ -15,7 +15,7 @@ var (
 	networkState *network.NetworkInterfaceState
 )
 
-func networkStateChanged(isOnline bool) {
+func networkStateChanged() {
 	// do not block the main thread
 	go waitCtrlAndRequestDisplayUpdate(true)
 
@@ -37,13 +37,6 @@ func networkStateChanged(isOnline bool) {
 			networkState.GetFQDN(),
 		}, true)
 	}
-
-	// if the network is now online, trigger an NTP sync if still needed
-	if isOnline && timeSync != nil && (isTimeSyncNeeded() || !timeSync.IsSyncSuccess()) {
-		if err := timeSync.Sync(); err != nil {
-			logger.Warn().Str("error", err.Error()).Msg("unable to sync time on network state change")
-		}
-	}
 }
 
 func initNetwork() error {
@@ -55,13 +48,13 @@ func initNetwork() error {
 		NetworkConfig:   config.NetworkConfig,
 		Logger:          networkLogger,
 		OnStateChange: func(state *network.NetworkInterfaceState) {
-			networkStateChanged(state.IsOnline())
+			networkStateChanged()
 		},
 		OnInitialCheck: func(state *network.NetworkInterfaceState) {
-			networkStateChanged(state.IsOnline())
+			networkStateChanged()
 		},
-		OnDhcpLeaseChange: func(lease *udhcpc.Lease, state *network.NetworkInterfaceState) {
+		OnDhcpLeaseChange: func(lease *udhcpc.Lease) {
-			networkStateChanged(state.IsOnline())
+			networkStateChanged()
 
 			if currentSession == nil {
 				return
@@ -71,15 +64,7 @@ func initNetwork() error {
 		},
 		OnConfigChange: func(networkConfig *network.NetworkConfig) {
 			config.NetworkConfig = networkConfig
-			networkStateChanged(false)
+			networkStateChanged()
-
-			if mDNS != nil {
-				_ = mDNS.SetListenOptions(networkConfig.GetMDNSMode())
-				_ = mDNS.SetLocalNames([]string{
-					networkState.GetHostname(),
-					networkState.GetFQDN(),
-				}, true)
-			}
 		},
 	})