CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-09-04 13:36:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmd/cli: only emit error for running interfaces

Browse Source 
While at it, also ensure setDNS/resetDNS return a wrapped error on
Darwin/Windows, so the caller can decide whether to print the error to
users.
This commit is contained in:
Cuong Manh Le
2024-02-19 18:29:22 +07:00
committed by Cuong Manh Le
parent 5145729ab1
commit fdb82f6ec3
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/cli/os_windows.go
+7 -4
View File
@@ -89,8 +89,7 @@ func resetDNS(iface *net.Interface) error {
// Restoring ipv4 DHCP.
output, err := netsh("interface", "ipv4", "set", "dnsserver", strconv.Itoa(iface.Index), "dhcp")
if err != nil {
mainLog.Load().Error().Err(err).Msgf("failed to reset ipv4 DNS: %s", string(output))
return err
return fmt.Errorf("%s: %w", string(output), err)
}
// If there's static DNS saved, restoring it.
if nss := savedStaticNameservers(iface); len(nss) > 0 {
@@ -178,12 +177,16 @@ func currentDNS(iface *net.Interface) []string {
func currentStaticDNS(iface *net.Interface) []string {
luid, err := winipcfg.LUIDFromIndex(uint32(iface.Index))
if err != nil {
mainLog.Load().Error().Err(err).Msg("could not get interface LUID")
if ifaceUp(iface) {
mainLog.Load().Error().Err(err).Msg("could not get interface LUID")
}
return nil
}
guid, err := luid.GUID()
if err != nil {
mainLog.Load().Error().Err(err).Msg("could not get interface GUID")
if ifaceUp(iface) {
mainLog.Load().Error().Err(err).Msg("could not get interface GUID")
}
return nil
}
var ns []string