From 8d43ce9b56dc50849c0d820521e7933bf74a97a7 Mon Sep 17 00:00:00 2001
From: YX Hao <lifenjoiner@163.com>
Date: Tue, 27 Feb 2024 21:57:18 +0800
Subject: [PATCH] make expression be more self-explanatory

---
 dnscrypt-proxy/coldstart.go |  3 ++-
 dnscrypt-proxy/proxy.go     | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dnscrypt-proxy/coldstart.go b/dnscrypt-proxy/coldstart.go
index 9850d460..98482dc8 100644
--- a/dnscrypt-proxy/coldstart.go
+++ b/dnscrypt-proxy/coldstart.go
@@ -123,7 +123,8 @@ func addColdStartListener(
 	captivePortalHandler *CaptivePortalHandler,
 ) error {
 	network := "udp"
-	if isDigit(listenAddrStr[0]) {
+	isIPv4 := isDigit(listenAddrStr[0])
+	if isIPv4 {
 		network = "udp4"
 	}
 	listenUDPAddr, err := net.ResolveUDPAddr(network, listenAddrStr)
diff --git a/dnscrypt-proxy/proxy.go b/dnscrypt-proxy/proxy.go
index e558fc5d..f6cd0af0 100644
--- a/dnscrypt-proxy/proxy.go
+++ b/dnscrypt-proxy/proxy.go
@@ -120,7 +120,8 @@ func (proxy *Proxy) registerLocalDoHListener(listener *net.TCPListener) {
 func (proxy *Proxy) addDNSListener(listenAddrStr string) {
 	udp := "udp"
 	tcp := "tcp"
-	if isDigit(listenAddrStr[0]) {
+	isIPv4 := isDigit(listenAddrStr[0])
+	if isIPv4 {
 		udp = "udp4"
 		tcp = "tcp4"
 	}
@@ -193,7 +194,8 @@ func (proxy *Proxy) addDNSListener(listenAddrStr string) {
 
 func (proxy *Proxy) addLocalDoHListener(listenAddrStr string) {
 	network := "tcp"
-	if isDigit(listenAddrStr[0]) {
+	isIPv4 := isDigit(listenAddrStr[0])
+	if isIPv4 {
 		network = "tcp4"
 	}
 	listenTCPAddr, err := net.ResolveTCPAddr(network, listenAddrStr)
@@ -454,7 +456,8 @@ func (proxy *Proxy) udpListenerFromAddr(listenAddr *net.UDPAddr) error {
 	}
 	listenAddrStr := listenAddr.String()
 	network := "udp"
-	if isDigit(listenAddrStr[0]) {
+	isIPv4 := isDigit(listenAddrStr[0])
+	if isIPv4 {
 		network = "udp4"
 	}
 	clientPc, err := listenConfig.ListenPacket(context.Background(), network, listenAddrStr)
@@ -473,7 +476,8 @@ func (proxy *Proxy) tcpListenerFromAddr(listenAddr *net.TCPAddr) error {
 	}
 	listenAddrStr := listenAddr.String()
 	network := "tcp"
-	if isDigit(listenAddrStr[0]) {
+	isIPv4 := isDigit(listenAddrStr[0])
+	if isIPv4 {
 		network = "tcp4"
 	}
 	acceptPc, err := listenConfig.Listen(context.Background(), network, listenAddrStr)
@@ -492,7 +496,8 @@ func (proxy *Proxy) localDoHListenerFromAddr(listenAddr *net.TCPAddr) error {
 	}
 	listenAddrStr := listenAddr.String()
 	network := "tcp"
-	if isDigit(listenAddrStr[0]) {
+	isIPv4 := isDigit(listenAddrStr[0])
+	if isIPv4 {
 		network = "tcp4"
 	}
 	acceptPc, err := listenConfig.Listen(context.Background(), network, listenAddrStr)