Merge branch 'master' into AGDNS-3863-gopacket-dhcp-vol.34

Author: EugeneOne1

internal/aghnet/dhcp_windows.go

@@ -12,7 +12,7 @@ import (
 func checkOtherDHCP(
 	_ context.Context,
 	_ *slog.Logger,
-	ifaceName string,
+	_ string,
 ) (ok4, ok6 bool, err4, err6 error) {
 	return false,
 		false,

internal/aghnet/hostscontainer_test.go

@@ -64,10 +64,10 @@ func TestNewHostsContainer(t *testing.T) {
 				return nil
 			}
 
-			var eventsCalledCounter uint32
+			var eventsCalledCounter atomic.Uint32
 			eventsCh := make(chan struct{})
 			onEvents := func() (e <-chan struct{}) {
-				assert.Equal(t, uint32(1), atomic.AddUint32(&eventsCalledCounter, 1))
+				assert.Equal(t, uint32(1), eventsCalledCounter.Add(1))
 
 				return eventsCh
 			}
@@ -95,7 +95,7 @@ func TestNewHostsContainer(t *testing.T) {
 			assert.NotNil(t, <-hc.Upd())
 
 			eventsCh <- struct{}{}
-			assert.Equal(t, uint32(1), atomic.LoadUint32(&eventsCalledCounter))
+			assert.Equal(t, uint32(1), eventsCalledCounter.Load())
 		})
 	}
 

internal/aghnet/interfaces_linux.go

@@ -11,7 +11,7 @@ import (
 
 // listenPacketReusable announces on the local network address additionally
 // configuring the socket to have a reusable binding.
-func listenPacketReusable(ifaceName, network, address string) (c net.PacketConn, err error) {
+func listenPacketReusable(ifaceName, _, address string) (c net.PacketConn, err error) {
 	var port uint16
 	_, port, err = netutil.SplitHostPort(address)
 	if err != nil {

internal/dnsforward/dnsforward_internal_test.go

@@ -837,7 +837,7 @@ func TestBlockedRequest(t *testing.T) {
 func TestServerCustomClientUpstream(t *testing.T) {
 	const defaultCacheSize = 1024 * 1024
 
-	var upsCalledCounter uint32
+	var upsCalledCounter atomic.Uint32
 
 	forwardConf := ServerConfig{
 		UDPListenAddrs: []*net.UDPAddr{{}},
@@ -862,7 +862,7 @@ func TestServerCustomClientUpstream(t *testing.T) {
 	)
 
 	ups := aghtest.NewUpstreamMock(func(req *dns.Msg) (resp *dns.Msg, err error) {
-		atomic.AddUint32(&upsCalledCounter, 1)
+		upsCalledCounter.Add(1)
 
 		return cmp.Or(
 			aghtest.MatchedResponse(req, dns.TypeA, "host", "192.168.0.1"),
@@ -902,11 +902,11 @@ func TestServerCustomClientUpstream(t *testing.T) {
 
 	assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
 	assert.Equal(t, net.IP{192, 168, 0, 1}, reply.Answer[0].(*dns.A).A)
-	assert.Equal(t, uint32(1), atomic.LoadUint32(&upsCalledCounter))
+	assert.Equal(t, uint32(1), upsCalledCounter.Load())
 
 	_, err = dns.Exchange(req, addr)
 	require.NoError(t, err)
-	assert.Equal(t, uint32(1), atomic.LoadUint32(&upsCalledCounter))
+	assert.Equal(t, uint32(1), upsCalledCounter.Load())
 }
 
 // testCNAMEs is a map of names and CNAMEs necessary for the TestUpstream work.
@@ -1576,10 +1576,10 @@ func TestPTRResponseFromHosts(t *testing.T) {
 		OnHostByIP: func(ip netip.Addr) (host string) { return "" },
 	}
 
-	var eventsCalledCounter uint32
+	var eventsCalledCounter atomic.Uint32
 	watcher := aghtest.NewFSWatcher()
 	watcher.OnEvents = func() (e <-chan aghos.Event) {
-		assert.Equal(t, uint32(1), atomic.AddUint32(&eventsCalledCounter, 1))
+		assert.Equal(t, uint32(1), eventsCalledCounter.Add(1))
 
 		return nil
 	}
@@ -1593,7 +1593,7 @@ func TestPTRResponseFromHosts(t *testing.T) {
 	hc, err := aghnet.NewHostsContainer(ctx, testLogger, testFS, watcher, hostsFilename)
 	require.NoError(t, err)
 	t.Cleanup(func() {
-		assert.Equal(t, uint32(1), atomic.LoadUint32(&eventsCalledCounter))
+		assert.Equal(t, uint32(1), eventsCalledCounter.Load())
 	})
 
 	flt, err := filtering.New(&filtering.Config{

internal/filtering/filtering.go

@@ -169,7 +169,9 @@ type Config struct {
 	//
 	// It is of type uint32 to be accessed by atomic.
 	//
-	// TODO(e.burkov):  Use atomic.Bool in Go 1.19.
+	// TODO(e.burkov):  Use *atomic.Bool once this entire package is refactored.
+	// Do not use it until then, since *newConf = *oldConf will copy an atomic
+	// bool by value, which is prohibited.
 	enabled uint32
 
 	// FiltersUpdateIntervalHours is the time period to update filters

internal/querylog/qlogfile.go

@@ -70,19 +70,20 @@ func newQLogFile(path string) (qf *qLogFile, err error) {
 // validateQLogLineIdx returns error if the line index is not valid to continue
 // search.
 func (q *qLogFile) validateQLogLineIdx(lineIdx, lastProbeLineIdx, ts, fSize int64) (err error) {
-	if lineIdx == lastProbeLineIdx {
+	switch lineIdx {
+	case lastProbeLineIdx:
 		if lineIdx == 0 {
 			return errTSTooEarly
 		}
 
 		// If we're testing the same line twice then most likely the scope is
 		// too narrow and we won't find anything anymore in any other file.
 		return fmt.Errorf("looking up timestamp %d in %q: %w", ts, q.file.Name(), errTSNotFound)
-	} else if lineIdx == fSize {
+	case fSize:
 		return errTSTooLate
+	default:
+		return nil
 	}
-
-	return nil
 }
 
 // seekTS performs binary search in the query log file looking for a record

internal/stats/stats_internal_test.go

@@ -45,10 +45,9 @@ func newTestStatsCtx(tb testing.TB, c Config) (s *StatsCtx) {
 }
 
 func TestStats_races(t *testing.T) {
-	var r uint32
-	idGen := func() (id uint32) { return atomic.LoadUint32(&r) }
+	var currentRound atomic.Uint32
 	s := newTestStatsCtx(t, Config{
-		UnitID:  idGen,
+		UnitID:  currentRound.Load,
 		Enabled: true,
 	})
 
@@ -81,14 +80,14 @@ func TestStats_races(t *testing.T) {
 	}
 
 	const (
-		roundsNum = 3
+		roundsNum uint32 = 3
 
 		writersNum = 10
 		readersNum = 5
 	)
 
 	for round := range roundsNum {
-		atomic.StoreUint32(&r, uint32(round))
+		currentRound.Store(round)
 
 		startWG, finWG := &sync.WaitGroup{}, &sync.WaitGroup{}
 		waitCh := make(chan unit)