CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-05-27 12:52:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmd/cli: only save/restore static DNS

Browse Source 
The save/restore DNS functionality always perform its job, even though
the DNS is not static, aka set by DHCP. That may lead to confusion to
users. Since DHCP settings was changed to static settings, even though
the namesers set are the same.

To fix this, ctrld should save/restore only there's actual static DNS
set. For DHCP, thing should work as-is like we are doing.
This commit is contained in:
Cuong Manh Le
2024-02-09 12:35:43 +07:00
committed by Cuong Manh Le
parent 18e8616834
commit 4d810261a4
6 changed files with 122 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/cli/prog.go
+19 -11
View File
@@ -725,32 +725,40 @@ func requiredMultiNICsConfig() bool {
}
}
// saveCurrentDNS saves the current DNS settings for restoring later.
// saveCurrentStaticDNS saves the current static DNS settings for restoring later.
// Only works on Windows and Mac.
func saveCurrentDNS(iface *net.Interface) {
func saveCurrentStaticDNS(iface *net.Interface) error {
switch runtime.GOOS {
case "windows", "darwin":
default:
return
return nil
}
ns := currentDNS(iface)
file := savedStaticDnsSettingsFilePath(iface)
if err := os.Remove(file); err != nil && !errors.Is(err, os.ErrNotExist) {
mainLog.Load().Warn().Err(err).Msg("could not remove old static DNS settings file")
}
ns := currentStaticDNS(iface)
if len(ns) == 0 {
return
return nil
}
file := savedDnsSettingsFilePath(iface)
mainLog.Load().Debug().Msgf("DNS settings for %s is static, saving ...", iface.Name)
if err := os.WriteFile(file, []byte(strings.Join(ns, ",")), 0600); err != nil {
mainLog.Load().Err(err).Msgf("could not save DNS settings for iface: %s", iface.Name)
return err
}
return nil
}
// savedDnsSettingsFilePath returns the path to saved DNS settings of the given interface.
func savedDnsSettingsFilePath(iface *net.Interface) string {
// savedStaticDnsSettingsFilePath returns the path to saved DNS settings of the given interface.
func savedStaticDnsSettingsFilePath(iface *net.Interface) string {
return absHomeDir(".dns_" + iface.Name)
}
// savedNameservers returns the static DNS nameservers of the given interface.
func savedNameservers(iface *net.Interface) []string {
file := savedDnsSettingsFilePath(iface)
// savedStaticNameservers returns the static DNS nameservers of the given interface.
//
//lint:ignore U1000 use in os_windows.go and os_darwin.go
func savedStaticNameservers(iface *net.Interface) []string {
file := savedStaticDnsSettingsFilePath(iface)
if data, _ := os.ReadFile(file); len(data) > 0 {
return strings.Split(string(data), ",")
}