Merge pull request #37 from HuYuee/fix/setHijackDomain

Feature/v1.10.5

Author: HuYuee

MSDKDns.xcodeproj/project.pbxproj

@@ -1057,7 +1057,7 @@
 				LINK_WITH_STANDARD_LIBRARIES = NO;
 				MACH_O_TYPE = mh_object;
 				MACOSX_DEPLOYMENT_TARGET = "";
-				MARKETING_VERSION = 1.10.4;
+				MARKETING_VERSION = 1.10.5;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-fembed-bitcode";
 				OTHER_LDFLAGS = (
@@ -1104,7 +1104,7 @@
 				LINK_WITH_STANDARD_LIBRARIES = NO;
 				MACH_O_TYPE = mh_object;
 				MACOSX_DEPLOYMENT_TARGET = "";
-				MARKETING_VERSION = 1.10.4;
+				MARKETING_VERSION = 1.10.5;
 				OTHER_CFLAGS = "-fembed-bitcode";
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1147,7 +1147,7 @@
 				LINK_WITH_STANDARD_LIBRARIES = NO;
 				MACH_O_TYPE = mh_object;
 				MACOSX_DEPLOYMENT_TARGET = "";
-				MARKETING_VERSION = 1.10.4;
+				MARKETING_VERSION = 1.10.5;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-fembed-bitcode";
 				OTHER_LDFLAGS = (
@@ -1189,7 +1189,7 @@
 				LINK_WITH_STANDARD_LIBRARIES = NO;
 				MACH_O_TYPE = mh_object;
 				MACOSX_DEPLOYMENT_TARGET = "";
-				MARKETING_VERSION = 1.10.4;
+				MARKETING_VERSION = 1.10.5;
 				OTHER_CFLAGS = "-fembed-bitcode";
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1238,7 +1238,7 @@
 				LINK_WITH_STANDARD_LIBRARIES = NO;
 				MACH_O_TYPE = mh_object;
 				MACOSX_DEPLOYMENT_TARGET = "";
-				MARKETING_VERSION = 1.10.4;
+				MARKETING_VERSION = 1.10.5;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-fembed-bitcode";
 				OTHER_LDFLAGS = (
@@ -1286,7 +1286,7 @@
 				LINK_WITH_STANDARD_LIBRARIES = NO;
 				MACH_O_TYPE = mh_object;
 				MACOSX_DEPLOYMENT_TARGET = "";
-				MARKETING_VERSION = 1.10.4;
+				MARKETING_VERSION = 1.10.5;
 				OTHER_CFLAGS = "-fembed-bitcode";
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1324,7 +1324,7 @@
 				LINK_WITH_STANDARD_LIBRARIES = NO;
 				MACH_O_TYPE = mh_object;
 				MACOSX_DEPLOYMENT_TARGET = "";
-				MARKETING_VERSION = 1.10.4;
+				MARKETING_VERSION = 1.10.5;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-fembed-bitcode";
 				OTHER_LDFLAGS = (
@@ -1364,7 +1364,7 @@
 				LINK_WITH_STANDARD_LIBRARIES = NO;
 				MACH_O_TYPE = mh_object;
 				MACOSX_DEPLOYMENT_TARGET = "";
-				MARKETING_VERSION = 1.10.4;
+				MARKETING_VERSION = 1.10.5;
 				OTHER_CFLAGS = "-fembed-bitcode";
 				OTHER_LDFLAGS = (
 					"-ObjC",

MSDKDns/CacheManager/MSDKDnsParamsManager.h

@@ -26,6 +26,8 @@
 - (void)msdkDnsSetEnableReport: (BOOL)enableReport;
 - (void)msdkDnsSetEnableDetectHostServer: (BOOL)enableDetectHostServer;
 - (void)msdkDnsSetPreResolvedDomains: (NSArray *)domains;
+- (void)msdkDnsSetHijackDomainArray: (NSArray *)domains;
+- (void)msdkDnsSetNoHijackDomainArray: (NSArray *)domains;
 - (void)msdkDnsSetAddressType: (HttpDnsAddressType)addressType;
 - (void)msdkDnsSetKeepAliveDomains: (NSArray *)domains;
 - (void)msdkDnsSetIPRankData: (NSDictionary *)ipRankData;
@@ -49,6 +51,8 @@
 - (BOOL)msdkDnsGetEnableReport;
 - (BOOL)msdkDnsGetEnableDetectHostServer;
 - (NSArray *)msdkDnsGetPreResolvedDomains;
+- (NSArray *)msdkDnsGetHijackDomainArray;
+- (NSArray *)msdkDnsGetNoHijackDomainArray;
 - (HttpDnsAddressType)msdkDnsGetAddressType;
 - (NSArray *)msdkDnsGetKeepAliveDomains;
 - (NSDictionary *)msdkDnsGetIPRankData;

MSDKDns/CacheManager/MSDKDnsParamsManager.m

@@ -148,6 +148,18 @@ - (void)msdkDnsSetPreResolvedDomains: (NSArray *)domains {
     });
 }
 
+- (void)msdkDnsSetHijackDomainArray: (NSArray *)domains {
+    dispatch_async([MSDKDnsInfoTool msdkdns_queue], ^{
+        self.hijackDomainArray = [domains copy];
+    });
+}
+
+- (void)msdkDnsSetNoHijackDomainArray: (NSArray *)domains {
+    dispatch_async([MSDKDnsInfoTool msdkdns_queue], ^{
+        self.noHijackDomainArray = [domains copy];
+    });
+}
+
 - (void)msdkDnsSetAddressType: (HttpDnsAddressType)addressType {
     dispatch_async([MSDKDnsInfoTool msdkdns_queue], ^{
         self.msdkAddressType = addressType;
@@ -257,6 +269,14 @@ - (NSArray *)msdkDnsGetPreResolvedDomains {
     return _preResolvedDomains;
 }
 
+- (NSArray *)msdkDnsGetHijackDomainArray {
+    return _hijackDomainArray;
+}
+
+- (NSArray *)msdkDnsGetNoHijackDomainArray {
+    return _noHijackDomainArray;
+}
+
 - (HttpDnsAddressType)msdkDnsGetAddressType {
     return _msdkAddressType;
 }

MSDKDns/MSDKDns.h

@@ -5,7 +5,7 @@
 #ifndef __MSDKDns_H__
 #define __MSDKDns_H__
 
-#define MSDKDns_Version @"1.10.4"
+#define MSDKDns_Version @"1.10.5"
 
 #import <Foundation/Foundation.h>
 

MSDKDns/MSDKDns.m

@@ -151,13 +151,13 @@ - (void) WGSetEnableKeepDomainsAlive: (BOOL)enableKeepDomainsAlive {
 
 - (void) WGSetHijackDomainArray:(NSArray *)hijackDomainArray {
     if (hijackDomainArray) {
-        [[MSDKDnsParamsManager shareInstance] setHijackDomainArray:[hijackDomainArray copy]];
+        [[MSDKDnsParamsManager shareInstance] msdkDnsSetHijackDomainArray:hijackDomainArray];
     }
 }
 
 - (void) WGSetNoHijackDomainArray:(NSArray *)noHijackDomainArray {
     if (noHijackDomainArray) {
-        [[MSDKDnsParamsManager shareInstance] setNoHijackDomainArray:[noHijackDomainArray copy]];
+        [[MSDKDnsParamsManager shareInstance] msdkDnsSetNoHijackDomainArray:noHijackDomainArray];
     }
 }
 

MSDKDns/MSDKDnsHttpMessageTools.m

@@ -46,8 +46,8 @@ + (BOOL)canInitWithRequest:(NSURLRequest *)request {
     NSString * originHost = [request.allHTTPHeaderFields objectForKey:@"host"];
     NSString * domain = request.URL.host;
 
-    NSArray * hijackDomainArray = [[[MSDKDnsParamsManager shareInstance] hijackDomainArray] copy];
-    NSArray * noHijackDomainArray = [[[MSDKDnsParamsManager shareInstance] noHijackDomainArray] copy];
+    NSArray * hijackDomainArray = [[[MSDKDnsParamsManager shareInstance] msdkDnsGetHijackDomainArray] copy];
+    NSArray * noHijackDomainArray = [[[MSDKDnsParamsManager shareInstance] msdkDnsGetNoHijackDomainArray] copy];
 
     if (hijackDomainArray && (hijackDomainArray.count > 0)) {
         if ([url hasPrefix:@"https"] && [hijackDomainArray containsObject:domain]) {