config: gomobile bind to avoid ctor overloads

celzero · Nov 9, 2023 · d33ae52 · d33ae52
1 parent 4b3b879
commit d33ae52
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/intra/dns53/upstream.go b/intra/dns53/upstream.go
@@ -9,6 +9,7 @@ package dns53
 import (
 	"errors"
 	"fmt"
+	"net"
 	"net/netip"
 	"strings"
 	"time"
@@ -58,7 +59,8 @@ func NewTransportFromHostname(id, hostname string, ipcsv string, px ipn.Proxies,
 
 // NewTransport returns a DNS transport, ready for use.
 func NewTransport(id, ip, port string, px ipn.Proxies, ctl protect.Controller) (t dnsx.Transport, err error) {
-	do, err := settings.NewDNSOptions(ip, port)
+	ipport := net.JoinHostPort(ip, port)
+	do, err := settings.NewDNSOptions(ipport)
 	if err != nil {
 		return
 	}

diff --git a/intra/settings/config.go b/intra/settings/config.go
@@ -168,9 +168,13 @@ func addrport(ip string, port string) (ipp netip.AddrPort, err error) {
 }
 
 // NewDNSOptions returns a new DNSOpitons object.
-func NewDNSOptions(ip string, port string) (*DNSOptions, error) {
+func NewDNSOptions(ipport string) (*DNSOptions, error) {
 	var ipp netip.AddrPort
 	var err error
+	ip, port, err := net.SplitHostPort(ipport)
+	if err != nil {
+		return nil, err
+	}
 	if ipp, err = addrport(ip, port); err == nil {
 		return &DNSOptions{
 			ipp: ipp.String(),