From b7e0b497cfd41d604f5dddbc98425ab72da51717 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 24 Apr 2021 17:49:06 +0200
Subject: [PATCH] Print the server IP address instead of a full DNS stamp

Also allow the sdns scheme in api/index.html
---
 cmd/doggo/api/index.html  | 2 +-
 pkg/resolvers/dnscrypt.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/doggo/api/index.html b/cmd/doggo/api/index.html
index a0e6ed3..650ca17 100644
--- a/cmd/doggo/api/index.html
+++ b/cmd/doggo/api/index.html
@@ -49,7 +49,7 @@
             <div class="field">
                 <label for="address">Nameserver address</label>
                 <input id="address" name="address" type="text" placeholder="tcp://your-ip"
-                    required pattern="(tcp|udp|tls|https):\/\/(.*)" />
+                    required pattern="(tcp|udp|tls|https|sdns):\/\/(.*)" />
                 <p class="help">
                     To use different protocols like DOH, DOT etc. refer to the instructions
                     <a href="https://github.com/mr-karan/doggo#transport-options">here</a>.
diff --git a/pkg/resolvers/dnscrypt.go b/pkg/resolvers/dnscrypt.go
index c0eb282..bf8713e 100644
--- a/pkg/resolvers/dnscrypt.go
+++ b/pkg/resolvers/dnscrypt.go
@@ -36,7 +36,7 @@ func NewDNSCryptResolver(server string, dnscryptOpts DNSCryptResolverOpts, resol
 	return &DNSCryptResolver{
 		client:          client,
 		serverInfo:      serverInfo,
-		server:          server,
+		server:          serverInfo.ServerAddress,
 		resolverOptions: resolverOpts,
 	}, nil
 }
@@ -52,7 +52,7 @@ func (r *DNSCryptResolver) Lookup(question dns.Question) (Response, error) {
 		r.resolverOptions.Logger.WithFields(logrus.Fields{
 			"domain":     msg.Question[0].Name,
 			"ndots":      r.resolverOptions.Ndots,
-			"nameserver": r.serverInfo.ProviderName,
+			"nameserver": r.server,
 		}).Debug("Attempting to resolve")
 		in, rtt, err := r.client.Exchange(&msg, r.serverInfo)
 		if err != nil {