all: mk aghnet package, rename sysutil package

heyxkhoa · Mar 16, 2021 · b033657 · b033657
1 parent e6a8fe4
commit b033657
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 33 deletions.
diff --git a/internal/sysutil/net.go → internal/aghnet/net.go b/internal/sysutil/net.go → internal/aghnet/net.go
@@ -1,4 +1,5 @@
-package sysutil
+// Package aghnet contains some utilities for networking.
+package aghnet
 
 import (
 	"net"

diff --git a/internal/sysutil/net_darwin.go → internal/aghnet/net_darwin.go b/internal/sysutil/net_darwin.go → internal/aghnet/net_darwin.go
@@ -1,6 +1,6 @@
 // +build darwin
 
-package sysutil
+package aghnet
 
 import (
 	"errors"

diff --git a/internal/sysutil/net_linux.go → internal/aghnet/net_linux.go b/internal/sysutil/net_linux.go → internal/aghnet/net_linux.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package sysutil
+package aghnet
 
 import (
 	"bufio"

diff --git a/internal/sysutil/net_linux_test.go → internal/aghnet/net_linux_test.go b/internal/sysutil/net_linux_test.go → internal/aghnet/net_linux_test.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package sysutil
+package aghnet
 
 import (
 	"bytes"

diff --git a/internal/sysutil/net_others.go → internal/aghnet/net_others.go b/internal/sysutil/net_others.go → internal/aghnet/net_others.go
@@ -1,6 +1,6 @@
 // +build !linux,!darwin
 
-package sysutil
+package aghnet
 
 import (
 	"fmt"

diff --git a/internal/sysutil/os.go → internal/aghos/os.go b/internal/sysutil/os.go → internal/aghos/os.go
@@ -1,5 +1,5 @@
-// Package sysutil contains utilities for functions requiring system calls.
-package sysutil
+// Package aghos contains utilities for functions requiring system calls.
+package aghos
 
 import "syscall"
 

diff --git a/internal/sysutil/os_freebsd.go → internal/aghos/os_freebsd.go b/internal/sysutil/os_freebsd.go → internal/aghos/os_freebsd.go
@@ -1,6 +1,6 @@
 // +build freebsd
 
-package sysutil
+package aghos
 
 import (
 	"os"

diff --git a/internal/sysutil/os_linux.go → internal/aghos/os_linux.go b/internal/sysutil/os_linux.go → internal/aghos/os_linux.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package sysutil
+package aghos
 
 import (
 	"os"

diff --git a/internal/sysutil/os_unix.go → internal/aghos/os_unix.go b/internal/sysutil/os_unix.go → internal/aghos/os_unix.go
@@ -1,6 +1,6 @@
 // +build aix darwin dragonfly netbsd openbsd solaris
 
-package sysutil
+package aghos
 
 import (
 	"os"

diff --git a/internal/sysutil/os_windows.go → internal/aghos/os_windows.go b/internal/sysutil/os_windows.go → internal/aghos/os_windows.go
@@ -1,6 +1,6 @@
 // +build windows
 
-package sysutil
+package aghos
 
 import (
 	"fmt"

diff --git a/internal/sysutil/syslog.go → internal/aghos/syslog.go b/internal/sysutil/syslog.go → internal/aghos/syslog.go
@@ -1,4 +1,4 @@
-package sysutil
+package aghos
 
 // ConfigureSyslog reroutes standard logger output to syslog.
 func ConfigureSyslog(serviceName string) error {

diff --git a/internal/sysutil/syslog_others.go → internal/aghos/syslog_others.go b/internal/sysutil/syslog_others.go → internal/aghos/syslog_others.go
@@ -1,6 +1,6 @@
 // +build !windows,!plan9
 
-package sysutil
+package aghos
 
 import (
 	"log/syslog"

diff --git a/internal/sysutil/syslog_windows.go → internal/aghos/syslog_windows.go b/internal/sysutil/syslog_windows.go → internal/aghos/syslog_windows.go
@@ -1,6 +1,6 @@
 // +build windows plan9
 
-package sysutil
+package aghos
 
 import (
 	"strings"

diff --git a/internal/sysutil/sysutil_test.go → internal/aghos/sysutil_test.go b/internal/sysutil/sysutil_test.go → internal/aghos/sysutil_test.go
@@ -1,4 +1,4 @@
-package sysutil
+package aghos
 
 import (
 	"testing"

diff --git a/internal/dhcpd/http.go b/internal/dhcpd/http.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
+	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
 	"github.com/AdguardTeam/AdGuardHome/internal/util"
 	"github.com/AdguardTeam/golibs/log"
 )
@@ -93,7 +93,7 @@ func (s *Server) handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
 
 func (s *Server) enableDHCP(ifaceName string) (code int, err error) {
 	var hasStaticIP bool
-	hasStaticIP, err = sysutil.IfaceHasStaticIP(ifaceName)
+	hasStaticIP, err = aghnet.IfaceHasStaticIP(ifaceName)
 	if err != nil {
 		if errors.Is(err, os.ErrPermission) {
 			// ErrPermission may happen here on Linux systems where
@@ -110,7 +110,7 @@ func (s *Server) enableDHCP(ifaceName string) (code int, err error) {
 			log.Info("error while checking static ip: %s; "+
 				"assuming machine has static ip and going on", err)
 			hasStaticIP = true
-		} else if errors.Is(err, sysutil.ErrNoStaticIPInfo) {
+		} else if errors.Is(err, aghnet.ErrNoStaticIPInfo) {
 			// Couldn't obtain a definitive answer.  Assume static
 			// IP an go on.
 			log.Info("can't check for static ip; " +
@@ -124,7 +124,7 @@ func (s *Server) enableDHCP(ifaceName string) (code int, err error) {
 	}
 
 	if !hasStaticIP {
-		err = sysutil.IfaceSetStaticIP(ifaceName)
+		err = aghnet.IfaceSetStaticIP(ifaceName)
 		if err != nil {
 			err = fmt.Errorf("setting static ip: %w", err)
 
@@ -317,7 +317,7 @@ func (s *Server) handleDHCPInterfaces(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 		if len(jsonIface.Addrs4)+len(jsonIface.Addrs6) != 0 {
-			jsonIface.GatewayIP = sysutil.GatewayIP(iface.Name)
+			jsonIface.GatewayIP = aghnet.GatewayIP(iface.Name)
 			response[iface.Name] = jsonIface
 		}
 	}
@@ -397,7 +397,7 @@ func (s *Server) handleDHCPFindActiveServer(w http.ResponseWriter, r *http.Reque
 
 	found4, err4 := CheckIfOtherDHCPServersPresentV4(interfaceName)
 
-	isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
+	isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName)
 	if err != nil {
 		result.V4.StaticIP.Static = "error"
 		result.V4.StaticIP.Error = err.Error()

diff --git a/internal/home/controlinstall.go b/internal/home/controlinstall.go
@@ -15,10 +15,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
 	"github.com/AdguardTeam/AdGuardHome/internal/util"
 
-	"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
-
 	"github.com/AdguardTeam/golibs/log"
 )
 
@@ -155,7 +154,7 @@ func handleStaticIP(ip net.IP, set bool) staticIPJSON {
 
 	if set {
 		// Try to set static IP for the specified interface
-		err := sysutil.IfaceSetStaticIP(interfaceName)
+		err := aghnet.IfaceSetStaticIP(interfaceName)
 		if err != nil {
 			resp.Static = "error"
 			resp.Error = err.Error()
@@ -165,7 +164,7 @@ func handleStaticIP(ip net.IP, set bool) staticIPJSON {
 
 	// Fallthrough here even if we set static IP
 	// Check if we have a static IP and return the details
-	isStaticIP, err := sysutil.IfaceHasStaticIP(interfaceName)
+	isStaticIP, err := aghnet.IfaceHasStaticIP(interfaceName)
 	if err != nil {
 		resp.Static = "error"
 		resp.Error = err.Error()

diff --git a/internal/home/controlupdate.go b/internal/home/controlupdate.go
@@ -12,7 +12,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
+	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
 	"github.com/AdguardTeam/AdGuardHome/internal/updater"
 	"github.com/AdguardTeam/golibs/log"
 )
@@ -141,7 +141,7 @@ func (vr *versionResponse) confirmAutoUpdate() {
 				tlsConf.PortDNSOverQUIC < 1024)) ||
 				config.BindPort < 1024 ||
 				config.DNS.Port < 1024) {
-			canUpdate, _ = sysutil.CanBindPrivilegedPorts()
+			canUpdate, _ = aghos.CanBindPrivilegedPorts()
 		}
 		vr.CanAutoUpdate = &canUpdate
 	}

diff --git a/internal/home/home.go b/internal/home/home.go
@@ -22,12 +22,12 @@ import (
 	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/agherr"
+	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
 	"github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
 	"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
 	"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
 	"github.com/AdguardTeam/AdGuardHome/internal/querylog"
 	"github.com/AdguardTeam/AdGuardHome/internal/stats"
-	"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
 	"github.com/AdguardTeam/AdGuardHome/internal/updater"
 	"github.com/AdguardTeam/AdGuardHome/internal/util"
 	"github.com/AdguardTeam/AdGuardHome/internal/version"
@@ -204,7 +204,7 @@ func setupConfig(args options) {
 
 	if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") &&
 		config.RlimitNoFile != 0 {
-		sysutil.SetRlimit(config.RlimitNoFile)
+		aghos.SetRlimit(config.RlimitNoFile)
 	}
 
 	// override bind host/port from the console
@@ -361,7 +361,7 @@ func checkPermissions() {
 	if runtime.GOOS == "windows" {
 		// On Windows we need to have admin rights to run properly
 
-		admin, _ := sysutil.HaveAdminRights()
+		admin, _ := aghos.HaveAdminRights()
 		if admin {
 			return
 		}
@@ -481,7 +481,7 @@ func configureLogger(args options) {
 
 	if ls.LogFile == configSyslog {
 		// Use syslog where it is possible and eventlog on Windows
-		err := sysutil.ConfigureSyslog(serviceName)
+		err := aghos.ConfigureSyslog(serviceName)
 		if err != nil {
 			log.Fatalf("cannot initialize syslog: %s", err)
 		}

diff --git a/internal/home/service.go b/internal/home/service.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/AdguardTeam/AdGuardHome/internal/sysutil"
+	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
 	"github.com/AdguardTeam/AdGuardHome/internal/util"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/kardianos/service"
@@ -121,7 +121,7 @@ func sendSigReload() {
 		log.Error("Can't read PID file %s: %s", pidfile, err)
 		return
 	}
-	err = sysutil.SendProcessSignal(pid, syscall.SIGHUP)
+	err = aghos.SendProcessSignal(pid, syscall.SIGHUP)
 	if err != nil {
 		log.Error("Can't send signal to PID %d: %s", pid, err)
 		return