main: fix import

AdguardTeam · Nov 7, 2023 · aeda179 · aeda179
1 parent fa37464
commit aeda179
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/internal/osutil/osutil.go b/internal/osutil/osutil.go
@@ -1,3 +1,5 @@
+// Package osutil contains utilities for functions requiring system calls and
+// other OS-specific APIs, except for network-related ones.
 package osutil
 
 import "io/fs"

diff --git a/internal/osutil/os_unix.go → internal/osutil/osutil_unix.go b/internal/osutil/os_unix.go → internal/osutil/osutil_unix.go
diff --git a/internal/osutil/os_windows.go → internal/osutil/osutil_windows.go b/internal/osutil/os_windows.go → internal/osutil/osutil_windows.go
diff --git a/main.go b/main.go
@@ -16,13 +16,14 @@ import (
 	"time"
 
 	"github.com/AdguardTeam/dnsproxy/internal/bootstrap"
-	"github.com/AdguardTeam/dnsproxy/internal/netutil"
+	proxynetutil "github.com/AdguardTeam/dnsproxy/internal/netutil"
 	"github.com/AdguardTeam/dnsproxy/internal/osutil"
 	"github.com/AdguardTeam/dnsproxy/internal/version"
 	"github.com/AdguardTeam/dnsproxy/proxy"
 	"github.com/AdguardTeam/dnsproxy/upstream"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/mathutil"
+	"github.com/AdguardTeam/golibs/netutil"
 	"github.com/AdguardTeam/golibs/timeutil"
 	"github.com/ameshkov/dnscrypt/v2"
 	goFlags "github.com/jessevdk/go-flags"
@@ -514,7 +515,7 @@ func initBogusNXDomain(config *proxy.Config, options *Options) {
 	}
 
 	for i, s := range options.BogusNXDomain {
-		p, err := netutil.ParseSubnet(s)
+		p, err := proxynetutil.ParseSubnet(s)
 		if err != nil {
 			log.Error("parsing bogus nxdomain subnet at index %d: %s", i, err)
 		} else {