From ff1c19cac5bdc15d1d773a50ad86aa2d3ab7bca2 Mon Sep 17 00:00:00 2001
From: Eugene Bujak <hmage@hmage.net>
Date: Wed, 5 Dec 2018 21:33:32 +0300
Subject: [PATCH] dnsforward -- support tcp:// schema

---
 dnsforward/upstream.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/dnsforward/upstream.go b/dnsforward/upstream.go
index 1ca27242..5d672f5a 100644
--- a/dnsforward/upstream.go
+++ b/dnsforward/upstream.go
@@ -29,7 +29,8 @@ type Upstream interface {
 // plain DNS
 //
 type plainDNS struct {
-	address string
+	address   string
+	preferTCP bool
 }
 
 var defaultUDPClient = dns.Client{
@@ -46,6 +47,11 @@ var defaultTCPClient = dns.Client{
 func (p *plainDNS) Address() string { return p.address }
 
 func (p *plainDNS) Exchange(m *dns.Msg) (*dns.Msg, error) {
+	if p.preferTCP {
+		reply, _, err := defaultTCPClient.Exchange(m, p.address)
+		return reply, err
+	}
+
 	reply, _, err := defaultUDPClient.Exchange(m, p.address)
 	if err != nil && reply != nil && reply.Truncated {
 		log.Printf("Truncated message was received, retrying over TCP, question: %s", m.Question[0].String())
@@ -183,7 +189,12 @@ func GetUpstream(address string) (Upstream, error) {
 			if url.Port() == "" {
 				url.Host += ":53"
 			}
-			return &plainDNS{address: url.String()}, nil
+			return &plainDNS{address: url.Host}, nil
+		case "tcp":
+			if url.Port() == "" {
+				url.Host += ":53"
+			}
+			return &plainDNS{address: url.Host, preferTCP: true}, nil
 		case "tls":
 			if url.Port() == "" {
 				url.Host += ":853"