Merge from remote branch

2021-09-08 04:42:56 +08:00
parent 9254d2411e 5b7f0de48b
commit 6ddd9e6fb8
33 changed files with 857 additions and 320 deletions
--- a/config/config.go
+++ b/config/config.go
@ -516,6 +516,9 @@ func parseNameServer(servers []string) ([]dns.NameServer, error) {
 			clearURL := url.URL{Scheme: "https", Host: u.Host, Path: u.Path}
 			addr = clearURL.String()
 			dnsNetType = "https" // DNS over HTTPS
+		case "dhcp":
+			addr = u.Host
+			dnsNetType = "dhcp" // UDP from DHCP
 		default:
 			return nil, fmt.Errorf("DNS NameServer[%d] unsupport scheme: %s", idx, u.Scheme)
 		}