Skip to content

Commit 482c397

Browse files
artemiv4novartemiv4nov
committed
Update the code base to 4.5.8
1 parent 6b8d277 commit 482c397

File tree

362 files changed

+5138
-3439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

362 files changed

+5138
-3439
lines changed

‎AdGuardSDK/AdGuardSDK.xcodeproj/project.pbxproj‎

Lines changed: 47 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
241D084D26F23ED00008FD17 /* DnsBackgroundFetchUpdaterMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241D084B26F23ED00008FD17 /* DnsBackgroundFetchUpdaterMock.swift */; };
3232
241D085026F247F10008FD17 /* DnsProvidersManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241D084F26F247F10008FD17 /* DnsProvidersManagerMock.swift */; };
3333
241D085126F247F10008FD17 /* DnsProvidersManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241D084F26F247F10008FD17 /* DnsProvidersManagerMock.swift */; };
34+
2433F2B42BB5991B00B2B0C6 /* InternetState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2433F2B32BB5991B00B2B0C6 /* InternetState.swift */; };
35+
2433F2B52BB5991B00B2B0C6 /* InternetState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2433F2B32BB5991B00B2B0C6 /* InternetState.swift */; };
36+
2433F2C12BB5BCC000B2B0C6 /* NetworkStateInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2433F2C02BB5BCC000B2B0C6 /* NetworkStateInfo.swift */; };
37+
2433F2C22BB5BCC000B2B0C6 /* NetworkStateInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2433F2C02BB5BCC000B2B0C6 /* NetworkStateInfo.swift */; };
3438
2456E6F726F24A2A001B1760 /* DnsUserRulesManagersProviderMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2456E6F626F24A2A001B1760 /* DnsUserRulesManagersProviderMock.swift */; };
3539
2465359726E74B7200234EA5 /* DnsProtection+UserRules.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2465359626E74B7200234EA5 /* DnsProtection+UserRules.swift */; };
3640
2465359826E74B7200234EA5 /* DnsProtection+UserRules.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2465359626E74B7200234EA5 /* DnsProtection+UserRules.swift */; };
@@ -393,7 +397,6 @@
393397
B2673DD827173F0700E04747 /* SafariProtection+Migrations.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2673DD727173F0700E04747 /* SafariProtection+Migrations.swift */; };
394398
B2673DDA27173F0700E04747 /* SafariProtection+Migrations.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2673DD727173F0700E04747 /* SafariProtection+Migrations.swift */; };
395399
B2673E8627179C8F00E04747 /* SafariAdGuardSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = B2673E8527179C8F00E04747 /* SafariAdGuardSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
396-
B26B92222718273000F1D482 /* Reachability in Frameworks */ = {isa = PBXBuildFile; productRef = B26B92212718273000F1D482 /* Reachability */; };
397400
B26B925527198FC800F1D482 /* Constant.swift in Sources */ = {isa = PBXBuildFile; fileRef = B26B924A27198FC800F1D482 /* Constant.swift */; };
398401
B26B925627198FC800F1D482 /* Constant.swift in Sources */ = {isa = PBXBuildFile; fileRef = B26B924A27198FC800F1D482 /* Constant.swift */; };
399402
B26B925727198FC800F1D482 /* DomainParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = B26B924B27198FC800F1D482 /* DomainParser.swift */; };
@@ -425,7 +428,6 @@
425428
C7913D932760E6FA0040309A /* Array+ConcurrentMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7913D922760E6FA0040309A /* Array+ConcurrentMap.swift */; };
426429
D049EE9B26B2F31A00B8088B /* Dictionary+Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = D049EB9426B17C0A00B8088B /* Dictionary+Utils.swift */; };
427430
D049EE9E26B2F33200B8088B /* CharacterSet+Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = D049EB9326B17C0A00B8088B /* CharacterSet+Utils.swift */; };
428-
D04F6A952718307700224DEF /* ContentBlockerConverter in Frameworks */ = {isa = PBXBuildFile; productRef = D04F6A942718307700224DEF /* ContentBlockerConverter */; };
429431
D04F6AAF27183D3100224DEF /* AdGuardSdkDependencies.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2C8E9AF2717008C00ACDED8 /* AdGuardSdkDependencies.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
430432
D080EED82721C74B00146FB2 /* NESettingsExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D080EED72721C74B00146FB2 /* NESettingsExtensionTests.swift */; };
431433
D080EEFB2726F03100146FB2 /* UrlUtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D080EEFA2726F03100146FB2 /* UrlUtilsTests.swift */; };
@@ -437,6 +439,8 @@
437439
D0DA0A1B27184EBA007681B2 /* SQLite in Frameworks */ = {isa = PBXBuildFile; productRef = D0DA0A1A27184EBA007681B2 /* SQLite */; };
438440
D0DA0A292718567F007681B2 /* AGDnsProxy in Frameworks */ = {isa = PBXBuildFile; productRef = D0DA0A282718567F007681B2 /* AGDnsProxy */; };
439441
D0DA0A2A2718586D007681B2 /* AdGuardAGDnsProxyDependencies.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0DA0A2127185672007681B2 /* AdGuardAGDnsProxyDependencies.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
442+
D70B17972D0CBBFD000A827C /* ContentBlockerConverter in Frameworks */ = {isa = PBXBuildFile; productRef = D70B17962D0CBBFD000A827C /* ContentBlockerConverter */; };
443+
D70B17F22D11F287000A827C /* ContentBlockerConverter in Frameworks */ = {isa = PBXBuildFile; productRef = D70B17F12D11F287000A827C /* ContentBlockerConverter */; };
440444
/* End PBXBuildFile section */
441445

442446
/* Begin PBXContainerItemProxy section */
@@ -474,6 +478,8 @@
474478
241D084826F23C7F0008FD17 /* DnsProtectionBackgroundFetchTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DnsProtectionBackgroundFetchTest.swift; sourceTree = "<group>"; };
475479
241D084B26F23ED00008FD17 /* DnsBackgroundFetchUpdaterMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DnsBackgroundFetchUpdaterMock.swift; sourceTree = "<group>"; };
476480
241D084F26F247F10008FD17 /* DnsProvidersManagerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DnsProvidersManagerMock.swift; sourceTree = "<group>"; };
481+
2433F2B32BB5991B00B2B0C6 /* InternetState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InternetState.swift; sourceTree = "<group>"; };
482+
2433F2C02BB5BCC000B2B0C6 /* NetworkStateInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkStateInfo.swift; sourceTree = "<group>"; };
477483
2456E6F626F24A2A001B1760 /* DnsUserRulesManagersProviderMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DnsUserRulesManagersProviderMock.swift; sourceTree = "<group>"; };
478484
2465359626E74B7200234EA5 /* DnsProtection+UserRules.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DnsProtection+UserRules.swift"; sourceTree = "<group>"; };
479485
2491693029C8A6AF004E6DB8 /* providers_i18n.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = providers_i18n.json; sourceTree = "<group>"; };
@@ -768,7 +774,9 @@
768774
isa = PBXFrameworksBuildPhase;
769775
buildActionMask = 2147483647;
770776
files = (
777+
D70B17972D0CBBFD000A827C /* ContentBlockerConverter in Frameworks */,
771778
7E16F29826FA0E5E00383410 /* OrderedCollections in Frameworks */,
779+
D70B17F22D11F287000A827C /* ContentBlockerConverter in Frameworks */,
772780
);
773781
runOnlyForDeploymentPostprocessing = 0;
774782
};
@@ -777,8 +785,6 @@
777785
buildActionMask = 2147483647;
778786
files = (
779787
D0DA0A1B27184EBA007681B2 /* SQLite in Frameworks */,
780-
D04F6A952718307700224DEF /* ContentBlockerConverter in Frameworks */,
781-
B26B92222718273000F1D482 /* Reachability in Frameworks */,
782788
B2C8E9B92717009800ACDED8 /* Zip in Frameworks */,
783789
);
784790
runOnlyForDeploymentPostprocessing = 0;
@@ -813,6 +819,16 @@
813819
path = SystemLibsResolv;
814820
sourceTree = "<group>";
815821
};
822+
2433F2B92BB5993D00B2B0C6 /* NetworkUtils */ = {
823+
isa = PBXGroup;
824+
children = (
825+
2433F2B32BB5991B00B2B0C6 /* InternetState.swift */,
826+
7E6E819326C2A05A00925F96 /* NetworkUtils.swift */,
827+
2433F2C02BB5BCC000B2B0C6 /* NetworkStateInfo.swift */,
828+
);
829+
path = NetworkUtils;
830+
sourceTree = "<group>";
831+
};
816832
7E21AA8026E5FACA00FF44A0 /* CompaniesStatistics */ = {
817833
isa = PBXGroup;
818834
children = (
@@ -1396,8 +1412,8 @@
13961412
7E6E819126C2A05A00925F96 /* Utils */ = {
13971413
isa = PBXGroup;
13981414
children = (
1415+
2433F2B92BB5993D00B2B0C6 /* NetworkUtils */,
13991416
7E6E819226C2A05A00925F96 /* Value+Types.swift */,
1400-
7E6E819326C2A05A00925F96 /* NetworkUtils.swift */,
14011417
);
14021418
path = Utils;
14031419
sourceTree = "<group>";
@@ -1739,6 +1755,8 @@
17391755
name = SharedAdGuardSDK;
17401756
packageProductDependencies = (
17411757
7E16F29726FA0E5E00383410 /* OrderedCollections */,
1758+
D70B17962D0CBBFD000A827C /* ContentBlockerConverter */,
1759+
D70B17F12D11F287000A827C /* ContentBlockerConverter */,
17421760
);
17431761
productName = SharedAdGuardSDK;
17441762
productReference = 7EC8A37F26E7697C005244CF /* SharedAdGuardSDK.framework */;
@@ -1760,8 +1778,6 @@
17601778
name = AdGuardSdkDependencies;
17611779
packageProductDependencies = (
17621780
B2C8E9B82717009800ACDED8 /* Zip */,
1763-
B26B92212718273000F1D482 /* Reachability */,
1764-
D04F6A942718307700224DEF /* ContentBlockerConverter */,
17651781
D0DA0A1A27184EBA007681B2 /* SQLite */,
17661782
);
17671783
productName = AdGuardSdkDependencies;
@@ -1859,9 +1875,8 @@
18591875
D0B01EF226B1753A00F67AD2 /* XCRemoteSwiftPackageReference "SQLite.swift" */,
18601876
D049E9CE26B17B2100B8088B /* XCRemoteSwiftPackageReference "Zip" */,
18611877
7E966B8926C27E68006B57BD /* XCRemoteSwiftPackageReference "DnsLibs" */,
1862-
D0A3CF9026E7AADE006E90AD /* XCRemoteSwiftPackageReference "Reachability" */,
18631878
7E16F29626FA0E5E00383410 /* XCRemoteSwiftPackageReference "swift-collections" */,
1864-
D04F6A932718307700224DEF /* XCRemoteSwiftPackageReference "SafariConverterLib" */,
1879+
D70B17F02D11F287000A827C /* XCRemoteSwiftPackageReference "SafariConverterLib" */,
18651880
);
18661881
productRefGroup = D0A0E39626B16B03005344D2 /* Products */;
18671882
projectDirPath = "";
@@ -1980,6 +1995,7 @@
19801995
B26B925F27198FC800F1D482 /* Rule.swift in Sources */,
19811996
7E6E803C26C299DE00925F96 /* NetworkUtilsMock.swift in Sources */,
19821997
7E6E813D26C2A05300925F96 /* MetaStorage+Filters.swift in Sources */,
1998+
2433F2B52BB5991B00B2B0C6 /* InternetState.swift in Sources */,
19831999
7E6E81C926C2A05B00925F96 /* DnsUserRulesStorage.swift in Sources */,
19842000
7E6E811D26C2A05300925F96 /* RequestsFactory+Safari.swift in Sources */,
19852001
7E6E815126C2A05300925F96 /* ContentBlockersInfoStorage.swift in Sources */,
@@ -2073,6 +2089,7 @@
20732089
7E6E815D26C2A05300925F96 /* SafariProtection+Configuration.swift in Sources */,
20742090
7E6E816326C2A05300925F96 /* SafariProtection+Filters.swift in Sources */,
20752091
7ED0B19F26C4269600B0CE7B /* Constants+Files.swift in Sources */,
2092+
2433F2C22BB5BCC000B2B0C6 /* NetworkStateInfo.swift in Sources */,
20762093
7E6E81E426C2A05B00925F96 /* CustomDnsProvidersStorage.swift in Sources */,
20772094
7E9B1DF226F229450003EB0E /* DnsProxyConfigurationProvider.swift in Sources */,
20782095
7E6E812F26C2A05300925F96 /* MetaStorage.swift in Sources */,
@@ -2219,6 +2236,7 @@
22192236
files = (
22202237
B26B926227198FC800F1D482 /* BasicRulesParser.swift in Sources */,
22212238
7E6E81A226C2A05B00925F96 /* DnsRequestProcessedEvent.swift in Sources */,
2239+
2433F2B42BB5991B00B2B0C6 /* InternetState.swift in Sources */,
22222240
7E6E81B226C2A05B00925F96 /* Constants+Statistics.swift in Sources */,
22232241
7E6E81E326C2A05B00925F96 /* CustomDnsProvidersStorage.swift in Sources */,
22242242
2465359726E74B7200234EA5 /* DnsProtection+UserRules.swift in Sources */,
@@ -2275,6 +2293,7 @@
22752293
7E6E81BC26C2A05B00925F96 /* DnsLogStatistics.swift in Sources */,
22762294
B26B926027198FC800F1D482 /* RulesParser.swift in Sources */,
22772295
7E6E81D426C2A05B00925F96 /* NetworkUtils.swift in Sources */,
2296+
2433F2C12BB5BCC000B2B0C6 /* NetworkStateInfo.swift in Sources */,
22782297
7E6E81D226C2A05B00925F96 /* Value+Types.swift in Sources */,
22792298
7ED2008E26EE64AC001E8422 /* DnsProxy.swift in Sources */,
22802299
);
@@ -2943,7 +2962,7 @@
29432962
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
29442963
GCC_WARN_UNUSED_FUNCTION = YES;
29452964
GCC_WARN_UNUSED_VARIABLE = YES;
2946-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
2965+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
29472966
MACOSX_DEPLOYMENT_TARGET = 11.2;
29482967
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
29492968
MTL_FAST_MATH = YES;
@@ -3006,7 +3025,7 @@
30063025
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
30073026
GCC_WARN_UNUSED_FUNCTION = YES;
30083027
GCC_WARN_UNUSED_VARIABLE = YES;
3009-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
3028+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
30103029
MACOSX_DEPLOYMENT_TARGET = 11.2;
30113030
MTL_ENABLE_DEBUG_INFO = NO;
30123031
MTL_FAST_MATH = YES;
@@ -3191,8 +3210,8 @@
31913210
isa = XCRemoteSwiftPackageReference;
31923211
repositoryURL = "https://github.com/AdguardTeam/DnsLibs";
31933212
requirement = {
3194-
kind = exactVersion;
3195-
version = 2.3.5;
3213+
branch = "v2.5.51@swift-5";
3214+
kind = branch;
31963215
};
31973216
};
31983217
D049E9CE26B17B2100B8088B /* XCRemoteSwiftPackageReference "Zip" */ = {
@@ -3203,28 +3222,20 @@
32033222
revision = 059e7346082d02de16220cd79df7db18ddeba8c3;
32043223
};
32053224
};
3206-
D04F6A932718307700224DEF /* XCRemoteSwiftPackageReference "SafariConverterLib" */ = {
3225+
D0B01EF226B1753A00F67AD2 /* XCRemoteSwiftPackageReference "SQLite.swift" */ = {
32073226
isa = XCRemoteSwiftPackageReference;
3208-
repositoryURL = "https://github.com/AdguardTeam/SafariConverterLib";
3227+
repositoryURL = "https://github.com/stephencelis/SQLite.swift.git";
32093228
requirement = {
32103229
kind = exactVersion;
3211-
version = 2.0.48;
3212-
};
3213-
};
3214-
D0A3CF9026E7AADE006E90AD /* XCRemoteSwiftPackageReference "Reachability" */ = {
3215-
isa = XCRemoteSwiftPackageReference;
3216-
repositoryURL = "https://github.com/ashleymills/Reachability.swift";
3217-
requirement = {
3218-
kind = upToNextMajorVersion;
3219-
minimumVersion = 5.0.0;
3230+
version = 0.13.0;
32203231
};
32213232
};
3222-
D0B01EF226B1753A00F67AD2 /* XCRemoteSwiftPackageReference "SQLite.swift" */ = {
3233+
D70B17F02D11F287000A827C /* XCRemoteSwiftPackageReference "SafariConverterLib" */ = {
32233234
isa = XCRemoteSwiftPackageReference;
3224-
repositoryURL = "https://github.com/stephencelis/SQLite.swift.git";
3235+
repositoryURL = "https://github.com/AdguardTeam/SafariConverterLib";
32253236
requirement = {
32263237
kind = exactVersion;
3227-
version = 0.13.0;
3238+
version = 2.1.1;
32283239
};
32293240
};
32303241
/* End XCRemoteSwiftPackageReference section */
@@ -3235,21 +3246,11 @@
32353246
package = 7E16F29626FA0E5E00383410 /* XCRemoteSwiftPackageReference "swift-collections" */;
32363247
productName = OrderedCollections;
32373248
};
3238-
B26B92212718273000F1D482 /* Reachability */ = {
3239-
isa = XCSwiftPackageProductDependency;
3240-
package = D0A3CF9026E7AADE006E90AD /* XCRemoteSwiftPackageReference "Reachability" */;
3241-
productName = Reachability;
3242-
};
32433249
B2C8E9B82717009800ACDED8 /* Zip */ = {
32443250
isa = XCSwiftPackageProductDependency;
32453251
package = D049E9CE26B17B2100B8088B /* XCRemoteSwiftPackageReference "Zip" */;
32463252
productName = Zip;
32473253
};
3248-
D04F6A942718307700224DEF /* ContentBlockerConverter */ = {
3249-
isa = XCSwiftPackageProductDependency;
3250-
package = D04F6A932718307700224DEF /* XCRemoteSwiftPackageReference "SafariConverterLib" */;
3251-
productName = ContentBlockerConverter;
3252-
};
32533254
D0DA0A1A27184EBA007681B2 /* SQLite */ = {
32543255
isa = XCSwiftPackageProductDependency;
32553256
package = D0B01EF226B1753A00F67AD2 /* XCRemoteSwiftPackageReference "SQLite.swift" */;
@@ -3260,6 +3261,15 @@
32603261
package = 7E966B8926C27E68006B57BD /* XCRemoteSwiftPackageReference "DnsLibs" */;
32613262
productName = AGDnsProxy;
32623263
};
3264+
D70B17962D0CBBFD000A827C /* ContentBlockerConverter */ = {
3265+
isa = XCSwiftPackageProductDependency;
3266+
productName = ContentBlockerConverter;
3267+
};
3268+
D70B17F12D11F287000A827C /* ContentBlockerConverter */ = {
3269+
isa = XCSwiftPackageProductDependency;
3270+
package = D70B17F02D11F287000A827C /* XCRemoteSwiftPackageReference "SafariConverterLib" */;
3271+
productName = ContentBlockerConverter;
3272+
};
32633273
/* End XCSwiftPackageProductDependency section */
32643274
};
32653275
rootObject = D0A0E38C26B16B03005344D2 /* Project object */;

‎AdGuardSDK/AdGuardSDK/DNS/DnsProviders/DnsProvidersManager/CustomDnsProvidersStorage.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ final class CustomDnsProvidersStorage: CustomDnsProvidersStorageProtocol {
205205
throw CustomDnsProvidersStorageError.emptyUpstreams
206206
}
207207

208-
let protocols = try upstreams.map { try networkUtils.getProtocol(from: $0) }
208+
let protocols = try upstreams.map { try networkUtils.getProtocol(from: $0, configuration.dnsImplementation) }
209209
guard protocols.allElementsAreEqual else {
210210
throw CustomDnsProvidersStorageError.differentDnsProtocols(upstreams: upstreams)
211211
}

‎AdGuardSDK/AdGuardSDK/DNS/PacketTunnelProvider/AGDnsProxy+Extension.swift‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ extension AGDns64Settings {
9999
let dns64Settings = AGDns64Settings()
100100
dns64Settings.upstreams = upstreams.map { AGDnsUpstream.initialize(from: $0) }
101101
dns64Settings.maxTries = 2
102-
dns64Settings.waitTimeMs = AGDnsProxyConfig.defaultTimeoutMs
102+
dns64Settings.waitTimeMs = 5_000 // With DnsLibs 2.4.16+ we set wait time as 5 seconds
103103

104104
return dns64Settings
105105
}
@@ -117,7 +117,7 @@ extension AGDns64Settings {
117117

118118
extension AGDnsProxyConfig {
119119
/// AGDnsProxy Fallback timeout
120-
public static let defaultTimeoutMs = 60_000
120+
public static let defaultTimeoutMs = 0 // With DnsLibs 2.4.16+ we set default timeout as 0
121121

122122
/// Initializer for `AGDnsProxyConfig` from `DnsProxyConfiguration`
123123
/// We use `DnsProxyConfiguration` to be able to test how we configure `AGDnsProxyConfig`
@@ -153,6 +153,7 @@ extension AGDnsProxyConfig {
153153
dnsProxyConfiguration.blockEch = false
154154
dnsProxyConfiguration.helperPath = defaultConfig.helperPath
155155
dnsProxyConfiguration.upstreamTimeoutMs = UInt(AGDnsProxyConfig.defaultTimeoutMs)
156+
dnsProxyConfiguration.enableServfailOnUpstreamsFailure = false // With DnsLibs 2.4.16+ we disable servfail on upstreams failure
156157
return dnsProxyConfiguration
157158
}
158159

@@ -184,7 +185,7 @@ extension AGDnsProxyConfig {
184185
}
185186
}
186187

187-
extension AGBlockingMode {
188+
extension AGDnsBlockingMode {
188189
var extendedDescription: String {
189190
switch self {
190191
case .AGBM_REFUSED:

‎AdGuardSDK/AdGuardSDK/DNS/PacketTunnelProvider/DnsProxyConfiguration.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ struct DnsProxyUpstream: Equatable {
5858
// MARK: - DnsProxyBlockingMode
5959

6060
extension DnsProxyBlockingMode {
61-
var agRulesBlockingMode: AGBlockingMode {
61+
var agRulesBlockingMode: AGDnsBlockingMode {
6262
switch self {
6363
case .defaultMode: return AGDnsProxyConfig.getDefault().adblockRulesBlockingMode
6464
case .refused: return .AGBM_REFUSED
@@ -68,7 +68,7 @@ extension DnsProxyBlockingMode {
6868
}
6969
}
7070

71-
var agHostsRulesBlockingMode: AGBlockingMode {
71+
var agHostsRulesBlockingMode: AGDnsBlockingMode {
7272
switch self {
7373
case .defaultMode: return AGDnsProxyConfig.getDefault().hostsRulesBlockingMode
7474
case .refused: return .AGBM_REFUSED

‎AdGuardSDK/AdGuardSDK/DNS/PacketTunnelProvider/DnsProxyConfigurationProvider.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ final class DnsProxyConfigurationProvider: DnsProxyConfigurationProviderProtocol
105105
}
106106

107107
// DNS fallbacks.
108-
let fallbacks = getDnsUpstreams(from: lowLevelConfiguration.fallbackServers ?? [])
108+
let fallbacks = getDnsUpstreams(from: lowLevelConfiguration.fallbackServers ?? networkUtils.systemDnsServers)
109109
let proxyFallbacks: [DnsProxyUpstream] = fallbacks.map {
110110
let id = nextUpstreamId
111111
let dnsProxy = DnsProxyUpstream(dnsUpstreamInfo: $0, dnsBootstraps: bootstraps, id: id, outboundInterface: outboundInterface)
@@ -180,7 +180,7 @@ final class DnsProxyConfigurationProvider: DnsProxyConfigurationProviderProtocol
180180
/// Creates upstreams objects from String representation and sets their protocols (DoH, DoT, etc..)
181181
private func getDnsUpstreams(from upstreams: [String]) -> [DnsUpstream] {
182182
return upstreams.map {
183-
let prot = try? networkUtils.getProtocol(from: $0)
183+
let prot = try? networkUtils.getProtocol(from: $0, .adGuard)
184184
return DnsUpstream(upstream: $0, protocol: prot ?? .dns)
185185
}
186186
}

0 commit comments

Comments
 (0)