miracle091/dnscrypt-proxy
miracle091
/
dnscrypt-proxy
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git
1
0
Fork 0
Code Issues Releases Wiki Activity

make expression be more self-explanatory

This commit is contained in:
YX Hao 2024-02-27 21:57:18 +08:00
parent ac5087315c
commit 8d43ce9b56
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dnscrypt-proxy/coldstart.go
View File

@ -123,7 +123,8 @@ func addColdStartListener(
captivePortalHandler *CaptivePortalHandler, captivePortalHandler *CaptivePortalHandler,
) error { ) error {
network := "udp" network := "udp"
if isDigit(listenAddrStr[0]) { isIPv4 := isDigit(listenAddrStr[0])
if isIPv4 {
network = "udp4" network = "udp4"
} }
listenUDPAddr, err := net.ResolveUDPAddr(network, listenAddrStr) listenUDPAddr, err := net.ResolveUDPAddr(network, listenAddrStr)

15
dnscrypt-proxy/proxy.go
View File

@ -120,7 +120,8 @@ func (proxy *Proxy) registerLocalDoHListener(listener *net.TCPListener) {
func (proxy *Proxy) addDNSListener(listenAddrStr string) { func (proxy *Proxy) addDNSListener(listenAddrStr string) {
udp := "udp" udp := "udp"
tcp := "tcp" tcp := "tcp"
if isDigit(listenAddrStr[0]) { isIPv4 := isDigit(listenAddrStr[0])
if isIPv4 {
udp = "udp4" udp = "udp4"
tcp = "tcp4" tcp = "tcp4"
} }
@ -193,7 +194,8 @@ func (proxy *Proxy) addDNSListener(listenAddrStr string) {
func (proxy *Proxy) addLocalDoHListener(listenAddrStr string) { func (proxy *Proxy) addLocalDoHListener(listenAddrStr string) {
network := "tcp" network := "tcp"
if isDigit(listenAddrStr[0]) { isIPv4 := isDigit(listenAddrStr[0])
if isIPv4 {
network = "tcp4" network = "tcp4"
} }
listenTCPAddr, err := net.ResolveTCPAddr(network, listenAddrStr) listenTCPAddr, err := net.ResolveTCPAddr(network, listenAddrStr)
@ -454,7 +456,8 @@ func (proxy *Proxy) udpListenerFromAddr(listenAddr *net.UDPAddr) error {
} }
listenAddrStr := listenAddr.String() listenAddrStr := listenAddr.String()
network := "udp" network := "udp"
if isDigit(listenAddrStr[0]) { isIPv4 := isDigit(listenAddrStr[0])
if isIPv4 {
network = "udp4" network = "udp4"
} }
clientPc, err := listenConfig.ListenPacket(context.Background(), network, listenAddrStr) clientPc, err := listenConfig.ListenPacket(context.Background(), network, listenAddrStr)
@ -473,7 +476,8 @@ func (proxy *Proxy) tcpListenerFromAddr(listenAddr *net.TCPAddr) error {
} }
listenAddrStr := listenAddr.String() listenAddrStr := listenAddr.String()
network := "tcp" network := "tcp"
if isDigit(listenAddrStr[0]) { isIPv4 := isDigit(listenAddrStr[0])
if isIPv4 {
network = "tcp4" network = "tcp4"
} }
acceptPc, err := listenConfig.Listen(context.Background(), network, listenAddrStr) acceptPc, err := listenConfig.Listen(context.Background(), network, listenAddrStr)
@ -492,7 +496,8 @@ func (proxy *Proxy) localDoHListenerFromAddr(listenAddr *net.TCPAddr) error {
} }
listenAddrStr := listenAddr.String() listenAddrStr := listenAddr.String()
network := "tcp" network := "tcp"
if isDigit(listenAddrStr[0]) { isIPv4 := isDigit(listenAddrStr[0])
if isIPv4 {
network = "tcp4" network = "tcp4"
} }
acceptPc, err := listenConfig.Listen(context.Background(), network, listenAddrStr) acceptPc, err := listenConfig.Listen(context.Background(), network, listenAddrStr)