joker
/
godns
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use net.JoinHostPort instead of string join

This commit is contained in:
kenshinx 2018-02-01 17:43:28 +08:00
parent 43d8d65438
commit 063182e0bd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resolver.go
View File

@ -3,6 +3,7 @@ package main
import ( import (
"bufio" "bufio"
"fmt" "fmt"
"net"
"os" "os"
"strconv" "strconv"
"strings" "strings"
@ -37,7 +38,6 @@ func NewResolver(c ResolvSettings) *Resolver {
if len(c.ServerListFile) > 0 { if len(c.ServerListFile) > 0 {
r.ReadServerListFile(c.ServerListFile) r.ReadServerListFile(c.ServerListFile)
// Debug("%v", r.servers)
} }
if len(c.ResolvFile) > 0 { if len(c.ResolvFile) > 0 {
@ -48,7 +48,7 @@ func NewResolver(c ResolvSettings) *Resolver {
panic(err) panic(err)
} }
for _, server := range clientConfig.Servers { for _, server := range clientConfig.Servers {
nameserver := server + ":" + clientConfig.Port nameserver := net.JoinHostPort(server, clientConfig.Port)
r.servers = append(r.servers, nameserver) r.servers = append(r.servers, nameserver)
} }
} }
@ -104,8 +104,7 @@ func (r *Resolver) ReadServerListFile(file string) {
} }
port = srv_port[1] port = srv_port[1]
} }
r.servers = append(r.servers, ip+":"+port) r.servers = append(r.servers, net.JoinHostPort(ip, port))
} }
} }