cmd/ctrld: make staticcheck happy

cmd/ctrld/main.go

@@ -27,8 +27,6 @@ var (
 	cfg               ctrld.Config
 	verbose           int
 
-	bootstrapDNS = "76.76.2.0"
-
 	rootLogger = zerolog.New(io.Discard)
 	mainLog    = rootLogger
 

cmd/ctrld/network_manager_others.go

@@ -3,10 +3,12 @@
 package main
 
 func setupNetworkManager() error {
+	reloadNetworkManager()
 	return nil
 }
 
 func restoreNetworkManager() error {
+	reloadNetworkManager()
 	return nil
 }
 

config.go

@@ -209,9 +209,11 @@ func (uc *UpstreamConfig) SetupBootstrapIP() error {
 		switch ar := a.(type) {
 		case *dns.A:
 			uc.BootstrapIP = ar.A.String()
+			//lint:ignore S1023 false alarm?
 			break
 		case *dns.AAAA:
 			uc.BootstrapIP = ar.AAAA.String()
+			//lint:ignore S1023 false alarm?
 			break
 		}
 	}

internal/controld/config.go

@@ -60,11 +60,11 @@ func FetchResolverConfig(uid string) (*ResolverConfig, error) {
 	transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
 		// We experiment hanging in TLS handshake when connecting to ControlD API
 		// with ipv6. So prefer ipv4 if available.
-		network = "tcp6"
+		proto := "tcp6"
 		if ctrldnet.SupportsIPv4() {
-			network = "tcp4"
+			proto = "tcp4"
 		}
-		return ctrldnet.Dialer.DialContext(ctx, network, addr)
+		return ctrldnet.Dialer.DialContext(ctx, proto, addr)
 	}
 	client := http.Client{
 		Timeout:   10 * time.Second,

internal/dns/resolved.go

@@ -100,9 +100,8 @@ type resolvedManager struct {
 	logf  logger.Logf
 	ifidx int
 
-	configCR   chan changeRequest // tracks OSConfigs changes and error responses
-	revertCh   chan struct{}
-	newManager func(conn *dbus.Conn) dbus.BusObject
+	configCR chan changeRequest // tracks OSConfigs changes and error responses
+	revertCh chan struct{}
 }
 
 var _ OSConfigurator = (*resolvedManager)(nil)