From 7bebd0c8a0f68971153a297329b9ea039a273b58 Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Tue, 16 Apr 2024 08:35:39 +0200
Subject: [PATCH] Revert "Add DoH/DoT options"

This reverts commit 73d9152fa0cb661db0348a1ac11dbbf998422a50.
---
 .../WireGuardKit/InterfaceConfiguration.swift    |  6 +-----
 .../PacketTunnelSettingsGenerator.swift          | 16 +---------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/Sources/WireGuardKit/InterfaceConfiguration.swift b/Sources/WireGuardKit/InterfaceConfiguration.swift
index ad63b18..d99d969 100644
--- a/Sources/WireGuardKit/InterfaceConfiguration.swift
+++ b/Sources/WireGuardKit/InterfaceConfiguration.swift
@@ -11,8 +11,6 @@ public struct InterfaceConfiguration {
     public var mtu: UInt16?
     public var dns = [DNSServer]()
     public var dnsSearch = [String]()
-    public var dnsHTTPSURL: URL?
-    public var dnsTLSServerName: String?
 
     public init(privateKey: PrivateKey) {
         self.privateKey = privateKey
@@ -29,8 +27,6 @@ extension InterfaceConfiguration: Equatable {
             lhs.listenPort == rhs.listenPort &&
             lhs.mtu == rhs.mtu &&
             lhs.dns == rhs.dns &&
-            lhs.dnsSearch == rhs.dnsSearch &&
-            lhs.dnsHTTPSURL == rhs.dnsHTTPSURL &&
-            lhs.dnsTLSServerName == rhs.dnsTLSServerName
+            lhs.dnsSearch == rhs.dnsSearch
     }
 }
diff --git a/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift b/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift
index f013af5..6f1edc8 100644
--- a/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift
+++ b/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift
@@ -85,25 +85,11 @@ class PacketTunnelSettingsGenerator {
 
         if !tunnelConfiguration.interface.dnsSearch.isEmpty || !tunnelConfiguration.interface.dns.isEmpty {
             let dnsServerStrings = tunnelConfiguration.interface.dns.map { $0.stringRepresentation }
-
-            let dnsSettings: NEDNSSettings
-            if let dnsHTTPSURL = tunnelConfiguration.interface.dnsHTTPSURL {
-                let dohSettings = NEDNSOverHTTPSSettings(servers: dnsServerStrings)
-                dohSettings.serverURL = dnsHTTPSURL
-                dnsSettings = dohSettings
-            } else if let dnsTLSServerName = tunnelConfiguration.interface.dnsTLSServerName {
-                let dotSettings = NEDNSOverTLSSettings(servers: dnsServerStrings)
-                dotSettings.serverName = dnsTLSServerName
-                dnsSettings = dotSettings
-            } else {
-                dnsSettings = NEDNSSettings(servers: dnsServerStrings)
-            }
-
+            let dnsSettings = NEDNSSettings(servers: dnsServerStrings)
             dnsSettings.searchDomains = tunnelConfiguration.interface.dnsSearch
             if !tunnelConfiguration.interface.dns.isEmpty {
                 dnsSettings.matchDomains = [""] // All DNS queries must first go through the tunnel's DNS
             }
-
             networkSettings.dnsSettings = dnsSettings
         }