useTCP: OpenBSD & FreeBSD support

golang · Jan 8, 2019 · 2b9348a · 2b9348a
1 parent 8197318
commit 2b9348a
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/src/net/dnsconfig_unix.go b/src/net/dnsconfig_unix.go
@@ -116,11 +116,13 @@ func dnsReadConfig(filename string) *dnsConfig {
 					conf.attempts = n
 				case s == "rotate":
 					conf.rotate = true
-				case s == "use-vc":
-					// Linux glibc option:
+				case s == "use-vc" || s == "usevc" || s == "tcp":
+					// Linux (use-vc), FreeBSD (usevc) and OpenBSD (tcp) option:
 					// http://man7.org/linux/man-pages/man5/resolv.conf.5.html
 					// "Sets RES_USEVC in _res.options.
 					//  This option forces the use of TCP for DNS resolutions."
+					// https://www.freebsd.org/cgi/man.cgi?query=resolv.conf&sektion=5&manpath=freebsd-release-ports
+					// https://man.openbsd.org/resolv.conf.5
 					conf.useTCP = true
 				default:
 					conf.unknownOpt = true

diff --git a/src/net/dnsconfig_unix_test.go b/src/net/dnsconfig_unix_test.go
@@ -103,7 +103,29 @@ var dnsReadConfigTests = []struct {
 		},
 	},
 	{
-		name: "testdata/use-vc-resolv.conf",
+		name: "testdata/linux-use-vc-resolv.conf",
+		want: &dnsConfig{
+			servers:  defaultNS,
+			ndots:    1,
+			useTCP:   true,
+			timeout:  5 * time.Second,
+			attempts: 2,
+			search:   []string{"domain.local."},
+		},
+	},
+	{
+		name: "testdata/freebsd-usevc-resolv.conf",
+		want: &dnsConfig{
+			servers:  defaultNS,
+			ndots:    1,
+			useTCP:   true,
+			timeout:  5 * time.Second,
+			attempts: 2,
+			search:   []string{"domain.local."},
+		},
+	},
+	{
+		name: "testdata/openbsd-tcp-resolv.conf",
 		want: &dnsConfig{
 			servers:  defaultNS,
 			ndots:    1,

diff --git a/src/net/testdata/freebsd-usevc-resolv.conf b/src/net/testdata/freebsd-usevc-resolv.conf
@@ -0,0 +1 @@
+options usevc
diff --git a/src/net/testdata/use-vc-resolv.conf → src/net/testdata/linux-use-vc-resolv.conf b/src/net/testdata/use-vc-resolv.conf → src/net/testdata/linux-use-vc-resolv.conf
diff --git a/src/net/testdata/openbsd-tcp-resolv.conf b/src/net/testdata/openbsd-tcp-resolv.conf
@@ -0,0 +1 @@
+options tcp