endpoint DNS to config, serve resolve

Author: ntozaks

src/cmd/serve.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 	"sync"
 	"time"
+	"net"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -353,7 +354,11 @@ func (c serveCmdConfig) Run() {
 		Peers: []peer.PeerConfigArgs{
 			{
 				PublicKey: viper.GetString("Relay.Peer.publickey"),
-				Endpoint:  viper.GetString("Relay.Peer.endpoint"),
+				Endpoint:  func() string {
+					endpoint, err := net.ResolveUDPAddr("udp", (viper.GetString("Relay.Peer.endpoint")))
+					check("failed to resolve DNS", err)
+					return endpoint.String()
+				}(),
 				PersistentKeepaliveInterval: func() int {
 					if len(viper.GetString("Relay.Peer.endpoint")) > 0 {
 						return viper.GetInt("Relay.Peer.keepalive")

src/peer/config.go

@@ -378,12 +378,22 @@ func (c *Config) GetPeerPublicKey(i int) string {
 
 func (c *Config) GetPeerEndpoint(i int) string {
 	if len(c.peers) > i {
-		endpoint := c.peers[i].config.Endpoint
-		if endpoint != nil {
-			return endpoint.String()
-		}
+		if len(c.peers[i].endpoint) > 0 {
+			endpoint := c.peers[i].endpoint
+			if endpoint != "" {
+				return endpoint
+			}
+
+			return ""
 
-		return ""
+		} else {
+			endpoint := c.peers[i].config.Endpoint
+			if endpoint != nil {
+				return endpoint.String()
+			}
+
+			return ""
+		}
 	}
 
 	return ""

src/peer/peer_config.go

@@ -8,13 +8,15 @@ import (
 	"net/netip"
 	"strings"
 	"time"
+	"regexp"
 
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 type PeerConfig struct {
 	config     wgtypes.PeerConfig
 	privateKey *wgtypes.Key
+	endpoint   string
 	nickname   string
 }
 
@@ -170,12 +172,19 @@ func (p *PeerConfig) SetPresharedKey(presharedKey string) error {
 }
 
 func (p *PeerConfig) SetEndpoint(addr string) error {
-	endpoint, err := net.ResolveUDPAddr("udp", addr)
-	if err != nil {
-		return err
+	host, _, _ := net.SplitHostPort(addr)
+	ip := regexp.MustCompile(`\d`).MatchString(host)
+	if ip {
+		endpoint, err := net.ResolveUDPAddr("udp", addr)
+		if err != nil {
+			return err
+		}
+		p.config.Endpoint = endpoint
+		return nil
+	} else {
+		endpoint := addr
+		p.endpoint = endpoint
 	}
-
-	p.config.Endpoint = endpoint
 	return nil
 }
 
@@ -275,6 +284,9 @@ func (p *PeerConfig) AsFile() string {
 	if p.config.Endpoint != nil {
 		s.WriteString(fmt.Sprintf("Endpoint = %s\n", p.config.Endpoint.String()))
 	}
+	if p.endpoint != "" {
+		s.WriteString(fmt.Sprintf("Endpoint = %s\n", p.endpoint))
+	}
 	if p.config.PersistentKeepaliveInterval != nil {
 		s.WriteString(fmt.Sprintf("PersistentKeepalive = %d\n", *p.config.PersistentKeepaliveInterval/time.Second))
 	}
@@ -289,6 +301,9 @@ func (p *PeerConfig) AsIPC() string {
 	if p.config.Endpoint != nil {
 		s.WriteString(fmt.Sprintf("endpoint=%s\n", p.config.Endpoint.String()))
 	}
+	if p.endpoint != "" {
+		s.WriteString(fmt.Sprintf("Endpoint = %s\n", p.endpoint))
+	}
 	for _, a := range p.config.AllowedIPs {
 		s.WriteString(fmt.Sprintf("allowed_ip=%s\n", a.String()))
 	}