endpoint dns to JSON

Author: ntozaks

src/peer/config.go

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

src/peer/peer_config.go

@@ -16,13 +16,15 @@ type PeerConfig struct {
 	config     wgtypes.PeerConfig
 	privateKey *wgtypes.Key
 	endpoint   string
+	endpointDNS string
 	nickname   string
 }
 
 type peerConfigJSON struct {
 	Config     wgtypes.PeerConfig
 	PrivateKey *wgtypes.Key
 	Nickname   string
+	EndpointDNS string
 }
 
 type PeerConfigArgs struct {
@@ -119,6 +121,7 @@ func (p *PeerConfig) MarshalJSON() ([]byte, error) {
 		p.config,
 		p.privateKey,
 		p.nickname,
+		p.endpointDNS
 	})
 }
 
@@ -133,6 +136,7 @@ func (p *PeerConfig) UnmarshalJSON(b []byte) error {
 	p.config = tmp.Config
 	p.privateKey = tmp.PrivateKey
 	p.nickname = tmp.Nickname
+	p.endpointDNS = tmp.EndpointDNS
 
 	return nil
 }