From 47d7ace3a7647ffabc9062ec3ad3c060a732a258 Mon Sep 17 00:00:00 2001
From: Cuong Manh Le <cuong@windscribe.com>
Date: Wed, 5 Feb 2025 13:34:46 +0700
Subject: [PATCH] Simplify dnsFromResolvConf

By using existed package instead of hand written one.

While at it, also simplifying the logger getter, since the ProxyLogger
is guaranted to be non-nil.
---
 nameservers_darwin.go | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/nameservers_darwin.go b/nameservers_darwin.go
index bec6ce4..d536d78 100644
--- a/nameservers_darwin.go
+++ b/nameservers_darwin.go
@@ -7,17 +7,16 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io"
 	"net"
-	"os"
 	"os/exec"
 	"regexp"
 	"slices"
 	"strings"
 	"time"
 
-	"github.com/rs/zerolog"
 	"tailscale.com/net/netmon"
+
+	"github.com/Control-D-Inc/ctrld/internal/resolvconffile"
 )
 
 func dnsFns() []dnsFn {
@@ -26,11 +25,6 @@ func dnsFns() []dnsFn {
 
 // dnsFromResolvConf reads nameservers from /etc/resolv.conf
 func dnsFromResolvConf() []string {
-	logger := zerolog.New(io.Discard)
-	if ProxyLogger.Load() != nil {
-		logger = *ProxyLogger.Load()
-	}
-
 	const (
 		maxRetries    = 10
 		retryInterval = 100 * time.Millisecond
@@ -44,24 +38,12 @@ func dnsFromResolvConf() []string {
 			time.Sleep(retryInterval)
 		}
 
-		file, err := os.Open("/etc/resolv.conf")
-		if err != nil {
-			Log(context.Background(), logger.Error(), "failed to open /etc/resolv.conf (attempt %d/%d)", attempt+1, maxRetries)
-			continue
-		}
-		defer file.Close()
-
+		nss := resolvconffile.NameServers("")
 		var localDNS []string
 		seen := make(map[string]bool)
 
-		scanner := bufio.NewScanner(file)
-		for scanner.Scan() {
-			line := scanner.Text()
-			fields := strings.Fields(line)
-			if len(fields) < 2 || fields[0] != "nameserver" {
-				continue
-			}
-			if ip := net.ParseIP(fields[1]); ip != nil {
+		for _, ns := range nss {
+			if ip := net.ParseIP(ns); ip != nil {
 				// skip loopback IPs
 				for _, v := range slices.Concat(regularIPs, loopbackIPs) {
 					ipStr := v.String()
@@ -76,11 +58,6 @@ func dnsFromResolvConf() []string {
 			}
 		}
 
-		if err := scanner.Err(); err != nil {
-			Log(context.Background(), logger.Error(), "error reading /etc/resolv.conf (attempt %d/%d): %v", attempt+1, maxRetries, err)
-			continue
-		}
-
 		// If we successfully read the file and found nameservers, return them
 		if len(localDNS) > 0 {
 			return localDNS
@@ -91,10 +68,7 @@ func dnsFromResolvConf() []string {
 }
 
 func getDNSFromScutil() []string {
-	logger := zerolog.New(io.Discard)
-	if ProxyLogger.Load() != nil {
-		logger = *ProxyLogger.Load()
-	}
+	logger := *ProxyLogger.Load()
 
 	const (
 		maxRetries    = 10