ipset: imp naming

internal/ipset/ipset.go

@@ -29,5 +29,5 @@ func NewManager(ipsetConf []string) (mgr Manager, err error) {
 		return nil, nil
 	}
 
-	return newMngr(ipsetConf)
+	return newManager(ipsetConf)
 }

internal/ipset/ipset_linux.go

@@ -31,9 +31,9 @@ import (
 //  6. Run "sudo ipset list example_set".  The Members field should contain the
 //     resolved IP addresses.
 
-// newMngr returns a new Linux ipset manager.
-func newMngr(ipsetConf []string) (set Manager, err error) {
-	return newMngrWithDialer(ipsetConf, defaultDial)
+// newManager returns a new Linux ipset manager.
+func newManager(ipsetConf []string) (set Manager, err error) {
+	return newManagerWithDialer(ipsetConf, defaultDial)
 }
 
 // defaultDial is the default netfilter dialing function.
@@ -74,8 +74,8 @@ type ipInIpsetEntry struct {
 	ipArr     [net.IPv6len]byte
 }
 
-// mngr is the Linux Netfilter ipset manager.
-type mngr struct {
+// manager is the Linux Netfilter ipset manager.
+type manager struct {
 	nameToIpset    map[string]props
 	domainToIpsets map[string][]props
 
@@ -96,7 +96,7 @@ type mngr struct {
 }
 
 // dialNetfilter establishes connections to Linux's netfilter module.
-func (m *mngr) dialNetfilter(conf *netlink.Config) (err error) {
+func (m *manager) dialNetfilter(conf *netlink.Config) (err error) {
 	// The kernel API does not actually require two sockets but package
 	// github.com/digineo/go-ipset does.
 	//
@@ -145,7 +145,7 @@ func parseIpsetConfig(confStr string) (hosts, ipsetNames []string, err error) {
 }
 
 // ipsetProps returns the properties of an ipset with the given name.
-func (m *mngr) ipsetProps(name string) (set props, err error) {
+func (m *manager) ipsetProps(name string) (set props, err error) {
 	// The family doesn't seem to matter when we use a header query, so
 	// query only the IPv4 one.
 	//
@@ -172,7 +172,7 @@ func (m *mngr) ipsetProps(name string) (set props, err error) {
 }
 
 // ipsets returns currently known ipsets.
-func (m *mngr) ipsets(names []string) (sets []props, err error) {
+func (m *manager) ipsets(names []string) (sets []props, err error) {
 	for _, name := range names {
 		set, ok := m.nameToIpset[name]
 		if ok {
@@ -193,12 +193,12 @@ func (m *mngr) ipsets(names []string) (sets []props, err error) {
 	return sets, nil
 }
 
-// newMngrWithDialer returns a new Linux ipset manager using the provided
+// newManagerWithDialer returns a new Linux ipset manager using the provided
 // dialer.
-func newMngrWithDialer(ipsetConf []string, dial dialer) (mn Manager, err error) {
+func newManagerWithDialer(ipsetConf []string, dial dialer) (mgr Manager, err error) {
 	defer func() { err = errors.Annotate(err, "ipset: %w") }()
 
-	m := &mngr{
+	m := &manager{
 		mu: &sync.Mutex{},
 
 		nameToIpset:    make(map[string]props),
@@ -249,7 +249,7 @@ func newMngrWithDialer(ipsetConf []string, dial dialer) (mn Manager, err error)
 
 // lookupHost find the ipsets for the host, taking subdomain wildcards into
 // account.
-func (m *mngr) lookupHost(host string) (sets []props) {
+func (m *manager) lookupHost(host string) (sets []props) {
 	// Search for matching ipset hosts starting with most specific domain.
 	// We could use a trie here but the simple, inefficient solution isn't
 	// that expensive: ~10 ns for TLD + SLD vs. ~140 ns for 10 subdomains on
@@ -274,7 +274,7 @@ func (m *mngr) lookupHost(host string) (sets []props) {
 
 // addIPs adds the IP addresses for the host to the ipset.  set must be same
 // family as set's family.
-func (m *mngr) addIPs(host string, set props, ips []net.IP) (n int, err error) {
+func (m *manager) addIPs(host string, set props, ips []net.IP) (n int, err error) {
 	if len(ips) == 0 {
 		return 0, nil
 	}
@@ -325,7 +325,7 @@ func (m *mngr) addIPs(host string, set props, ips []net.IP) (n int, err error) {
 }
 
 // addToSets adds the IP addresses to the corresponding ipset.
-func (m *mngr) addToSets(
+func (m *manager) addToSets(
 	host string,
 	ip4s []net.IP,
 	ip6s []net.IP,
@@ -356,8 +356,8 @@ func (m *mngr) addToSets(
 	return n, nil
 }
 
-// Add implements the [Manager] interface for *mngr
-func (m *mngr) Add(host string, ip4s, ip6s []net.IP) (n int, err error) {
+// Add implements the [Manager] interface for *manager.
+func (m *manager) Add(host string, ip4s, ip6s []net.IP) (n int, err error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
@@ -371,8 +371,8 @@ func (m *mngr) Add(host string, ip4s, ip6s []net.IP) (n int, err error) {
 	return m.addToSets(host, ip4s, ip6s, sets)
 }
 
-// Close implements the [Manager] interface for *mngr.
-func (m *mngr) Close() (err error) {
+// Close implements the [Manager] interface for *manager.
+func (m *manager) Close() (err error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 

internal/ipset/ipset_linux_internal_test.go

@@ -54,7 +54,7 @@ func (c *fakeConn) Header(name string) (p *ipset.HeaderPolicy, err error) {
 	return nil, errors.Error("test: ipset not found")
 }
 
-func TestMngr_Add(t *testing.T) {
+func TestManager_Add(t *testing.T) {
 	ipsetConf := []string{
 		"example.com,example.net/ipv4set",
 		"example.org,example.biz/ipv6set",
@@ -79,7 +79,7 @@ func TestMngr_Add(t *testing.T) {
 		}, nil
 	}
 
-	m, err := newMngrWithDialer(ipsetConf, fakeDial)
+	m, err := newManagerWithDialer(ipsetConf, fakeDial)
 	require.NoError(t, err)
 
 	ip4 := net.IP{1, 2, 3, 4}
@@ -116,7 +116,7 @@ func TestMngr_Add(t *testing.T) {
 
 var ipsetPropsSink []props
 
-func BenchmarkMngr_LookupHost(b *testing.B) {
+func BenchmarkManager_LookupHost(b *testing.B) {
 	propsLong := []props{{
 		name:   "example.com",
 		family: netfilter.ProtoIPv4,
@@ -127,7 +127,7 @@ func BenchmarkMngr_LookupHost(b *testing.B) {
 		family: netfilter.ProtoIPv4,
 	}}
 
-	m := &mngr{
+	m := &manager{
 		domainToIpsets: map[string][]props{
 			"":            propsLong,
 			"example.net": propsShort,

internal/ipset/ipset_others.go

@@ -6,6 +6,6 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
 )
 
-func newMngr(_ []string) (mgr Manager, err error) {
+func newManager(_ []string) (mgr Manager, err error) {
 	return nil, aghos.Unsupported("ipset")
 }