yggdrasil-network/yggstack
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggstack.git synced 2025-11-04 00:15:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

use proper stdlib functions for splitting host and port

Browse source 
replace use of strings.Cut() with net.SplitHostPort() as it does not handle every case we need it to.
e.g. "[1234::1%lan0]"
This commit is contained in:
Jeff Becker 2023-11-27 10:14:28 -05:00
parent 6e427fefec
commit fc585b07b0
No known key found for this signature in database
GPG key ID: 3CDD4CDBFD4747B3
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/types/resolver.go
View file

@ -29,11 +29,13 @@ func NewNameResolver(stack *netstack.YggdrasilNetstack, nameserver string) *Name
if nameserver == "" { if nameserver == "" {
return nil, fmt.Errorf("no nameserver configured") return nil, fmt.Errorf("no nameserver configured")
} }
address, port, found := strings.Cut(nameserver, ":") host, port, err := net.SplitHostPort(nameserver)
if !found { if err != nil {
port = "53" // default to dns service when no port given.
port = "dns"
host = nameserver
} }
address = net.JoinHostPort(nameserver, port) address = net.JoinHostPort(host, port)
return stack.DialContext(ctx, network, address) return stack.DialContext(ctx, network, address)
} }
} }