Also parse dhcp-option DNS6 as DNS server for compatibility with OpenVPN 2

schwabe · schwabe · commit 8c10b92bec05 · 2017-12-24T20:11:32.000+01:00
diff --git a/openvpn/tun/client/tunprop.hpp b/openvpn/tun/client/tunprop.hpp
@@ -485,7 +485,7 @@ namespace openvpn {
 	      const Option& o = opt[*i];
 	      try {
 		const std::string& type = o.get(1, 64);
-		if (type == "DNS")
+		if (type == "DNS" || type == "DNS6")
 		  {
 		    o.exact_args(3);
 		    const IP::Addr ip = IP::Addr::from_string(o.get(2, 256), "dns-server-ip");

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ namespace openvpn {`
`485`	`485`	`const Option& o = opt[*i];`
`486`	`486`	`try {`
`487`	`487`	`const std::string& type = o.get(1, 64);`
`488`		`- if (type == "DNS")`
	`488`	`+ if (type == "DNS" \|\| type == "DNS6")`
`489`	`489`	`{`
`490`	`490`	`o.exact_args(3);`
`491`	`491`	`const IP::Addr ip = IP::Addr::from_string(o.get(2, 256), "dns-server-ip");`