all: imp code, docs

annguyen0 · Apr 2, 2024 · 63c14cf · 63c14cf
1 parent 185ccdd
commit 63c14cf
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/internal/dnsforward/access.go b/internal/dnsforward/access.go
@@ -30,7 +30,7 @@ type accessManager struct {
 	// TODO(s.chzhen):  Use [aghnet.IgnoreEngine].
 	blockedHostsEng *urlfilter.DNSEngine
 
-	// TODO(a.garipov): Create a type for a set of IP networks.
+	// TODO(a.garipov): Create a type for an efficient tree set of IP networks.
 	allowedNets []netip.Prefix
 	blockedNets []netip.Prefix
 }

diff --git a/internal/dnsforward/config.go b/internal/dnsforward/config.go
@@ -481,8 +481,6 @@ func (conf *ServerConfig) collectDNSAddrs() (
 	addrs *container.MapSet[netip.AddrPort],
 	unspecPorts *container.MapSet[uint16],
 ) {
-	// TODO(e.burkov):  Perhaps, we shouldn't allocate as much memory, since the
-	// TCP and UDP listening addresses are currently the same.
 	addrs = container.NewMapSet[netip.AddrPort]()
 	unspecPorts = container.NewMapSet[uint16]()
 
@@ -520,15 +518,15 @@ func (emptyAddrPortSet) Has(_ netip.AddrPort) (ok bool) { return false }
 type combinedAddrPortSet struct {
 	// TODO(e.burkov):  Use container.SliceSet when available.
 	ports *container.MapSet[uint16]
-	addrs []netip.Addr
+	addrs *container.MapSet[netip.Addr]
 }
 
 // type check
 var _ addrPortSet = (*combinedAddrPortSet)(nil)
 
 // Has implements the [addrPortSet] interface for [*combinedAddrPortSet].
 func (m *combinedAddrPortSet) Has(addrPort netip.AddrPort) (ok bool) {
-	return m.ports.Has(addrPort.Port()) && slices.Contains(m.addrs, addrPort.Addr())
+	return m.ports.Has(addrPort.Port()) && m.addrs.Has(addrPort.Addr())
 }
 
 // filterOut filters out all the upstreams that match um.  It returns all the
@@ -586,7 +584,7 @@ func (conf *ServerConfig) ourAddrsSet() (m addrPortSet, err error) {
 
 		return &combinedAddrPortSet{
 			ports: unspecPorts,
-			addrs: ifaceAddrs,
+			addrs: container.NewMapSet(ifaceAddrs...),
 		}, nil
 	}
 }

diff --git a/internal/ipset/ipset_linux.go b/internal/ipset/ipset_linux.go
@@ -199,7 +199,8 @@ type manager struct {
 // ipInIpsetEntry is the type for entries in [manager.addIPs].
 type ipInIpsetEntry struct {
 	ipsetName string
-	ipArr     [net.IPv6len]byte
+	// TODO(schzen):  Use netip.Addr.
+	ipArr [net.IPv6len]byte
 }
 
 // dialNetfilter establishes connections to Linux's netfilter module.

diff --git a/internal/tools/go.mod b/internal/tools/go.mod
@@ -26,7 +26,7 @@ require (
 	github.com/kyoh86/nolint v0.0.1 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
-	golang.org/x/exp/typeparams v0.0.0-20240222234643-814bf88cf225 // indirect
+	golang.org/x/exp/typeparams v0.0.0-20240325151524-a685a6edb6d8 // indirect
 	golang.org/x/mod v0.16.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect

diff --git a/internal/tools/go.sum b/internal/tools/go.sum
@@ -63,8 +63,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/exp/typeparams v0.0.0-20240222234643-814bf88cf225 h1:BzKNaIRXh1bD+1557OcFIHlpYBiVbK4zEyn8zBHi1SE=
-golang.org/x/exp/typeparams v0.0.0-20240222234643-814bf88cf225/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
+golang.org/x/exp/typeparams v0.0.0-20240325151524-a685a6edb6d8 h1:ShhqwXlNzuDeQzaa6htzo1S333ACXZzJZgZLpKAza8E=
+golang.org/x/exp/typeparams v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=