Skip to content

Commit

Permalink
Merge pull request #49 from HuYuee/master
Browse files Browse the repository at this point in the history 
Feature/v1.11.0
  • Loading branch information
@HuYuee
HuYuee authored Nov 6, 2024
2 parents d545155 + 7ffd886 commit 8cb1d03
Show file tree
Hide file tree
Showing 58 changed files with 80 additions and 161 deletions.
59 changes: 21 additions & 38 deletions HTTPDNSDemo/MSDKDnsDemo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 54;
objectVersion = 46;
objects = {

/* Begin PBXAggregateTarget section */
Expand Down Expand Up @@ -52,12 +52,12 @@
5F1A214C28C0AE810008E8FC /* SNIViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F1A214B28C0AE800008E8FC /* SNIViewController.m */; };
5F2B79B12B95A8E800C4A4D3 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F2B79AF2B95A8E800C4A4D3 /* WebViewController.m */; };
5F2B79B32B95A9EA00C4A4D3 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F2B79B22B95A9EA00C4A4D3 /* WebKit.framework */; };
5F4290212C64B7E40088444D /* MSDKDns_C11.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F4290202C64B7E40088444D /* MSDKDns_C11.xcframework */; };
5F85CB9328B3A2A5003D20D1 /* HttpDnsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F85CB9228B3A2A4003D20D1 /* HttpDnsViewController.m */; };
5F85CB9728B3A368003D20D1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4426DD521C29406A007D0A9E /* libz.tbd */; };
5F85CB9928B3A37B003D20D1 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F85CB9828B3A37B003D20D1 /* CoreFoundation.framework */; };
5F85CB9A28B3A38B003D20D1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 44F12A8B1B48E8A800812340 /* Security.framework */; };
5F85CB9B28B3A393003D20D1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 44F12A8B1B48E8A800812340 /* Security.framework */; };
5FDE19A42CD8A8AE00785816 /* MSDKDns_C11.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FDE19A32CD8A8AE00785816 /* MSDKDns_C11.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -141,10 +141,10 @@
5F2B79AF2B95A8E800C4A4D3 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewController.m; sourceTree = "<group>"; };
5F2B79B02B95A8E800C4A4D3 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewController.h; sourceTree = "<group>"; };
5F2B79B22B95A9EA00C4A4D3 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
5F4290202C64B7E40088444D /* MSDKDns_C11.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MSDKDns_C11.xcframework; path = ../HTTPDNSLibs/MSDKDns_C11/MSDKDns_C11.xcframework; sourceTree = "<group>"; };
5F5DAF5428A602AD00BF5B79 /* testConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = testConfig.h; sourceTree = "<group>"; };
5F85CB9228B3A2A4003D20D1 /* HttpDnsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpDnsViewController.m; sourceTree = "<group>"; };
5F85CB9828B3A37B003D20D1 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
5FDE19A32CD8A8AE00785816 /* MSDKDns_C11.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MSDKDns_C11.framework; path = "../../../../../Library/Developer/Xcode/DerivedData/sdkWorkspace-fzwspzfjxkyulaczlxnxaymfxjfm/Build/Products/Debug-iphoneos/MSDKDns_C11.framework"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -165,14 +165,14 @@
44F12A851B48E7F300812340 /* QuartzCore.framework in Frameworks */,
44F12A831B48E7EC00812340 /* CoreText.framework in Frameworks */,
44F12A811B48E7E500812340 /* ImageIO.framework in Frameworks */,
5F4290212C64B7E40088444D /* MSDKDns_C11.xcframework in Frameworks */,
44F12A7F1B48E7DE00812340 /* CoreData.framework in Frameworks */,
44F12A7D1B48E7D700812340 /* CFNetwork.framework in Frameworks */,
5F85CB9728B3A368003D20D1 /* libz.tbd in Frameworks */,
44F12A791B48E7C600812340 /* MobileCoreServices.framework in Frameworks */,
5F85CB9B28B3A393003D20D1 /* Security.framework in Frameworks */,
44F12A771B48E7BF00812340 /* CoreGraphics.framework in Frameworks */,
44F12A751B48E7B600812340 /* Foundation.framework in Frameworks */,
5FDE19A42CD8A8AE00785816 /* MSDKDns_C11.framework in Frameworks */,
5F85CB9928B3A37B003D20D1 /* CoreFoundation.framework in Frameworks */,
44F12A731B48E7B000812340 /* UIKit.framework in Frameworks */,
44F12A711B48E7AB00812340 /* SystemConfiguration.framework in Frameworks */,
Expand All @@ -194,7 +194,7 @@
isa = PBXGroup;
children = (
5F2B79B22B95A9EA00C4A4D3 /* WebKit.framework */,
5F4290202C64B7E40088444D /* MSDKDns_C11.xcframework */,
5FDE19A32CD8A8AE00785816 /* MSDKDns_C11.framework */,
5F85CB9828B3A37B003D20D1 /* CoreFoundation.framework */,
);
name = Frameworks;
Expand Down Expand Up @@ -352,6 +352,7 @@
};
44F12A4C1B48E52A00812340 = {
CreatedOnToolsVersion = 6.4;
ProvisioningStyle = Manual;
TestTargetID = 44F12A331B48E52A00812340;
};
44F12A9D1B48EC3000812340 = {
Expand Down Expand Up @@ -571,17 +572,13 @@
"$(PROJECT_DIR)/MSDKDnsDemo",
"$(PROJECT_DIR)/../MSDKDns",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/../**",
"$(PROJECT_DIR)/..",
);
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = MSDKDnsDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"$(PROJECT_DIR)/../..",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(PROJECT_DIR)/../..";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-ObjC",
Expand Down Expand Up @@ -611,17 +608,13 @@
"$(PROJECT_DIR)/MSDKDnsDemo",
"$(PROJECT_DIR)/../MSDKDns",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/../**",
"$(PROJECT_DIR)/..",
);
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = MSDKDnsDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"$(PROJECT_DIR)/../..",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(PROJECT_DIR)/../..";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-ObjC",
Expand All @@ -639,6 +632,7 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
Expand All @@ -650,12 +644,9 @@
"$(inherited)",
);
INFOPLIST_FILE = MSDKDnsDemoTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MSDKDnsDemo.app/MSDKDnsDemo";
};
name = Debug;
Expand All @@ -664,19 +655,17 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
INFOPLIST_FILE = MSDKDnsDemoTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MSDKDnsDemo.app/MSDKDnsDemo";
};
name = Release;
Expand Down Expand Up @@ -735,17 +724,13 @@
"$(PROJECT_DIR)/MSDKDnsDemo",
"$(PROJECT_DIR)/../MSDKDns",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/../**",
"$(PROJECT_DIR)/..",
);
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = MSDKDnsDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"$(PROJECT_DIR)/../..",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(PROJECT_DIR)/../..";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-ObjC",
Expand All @@ -764,19 +749,17 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
INFOPLIST_FILE = MSDKDnsDemoTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MSDKDnsDemo.app/MSDKDnsDemo";
};
name = DailyBuild;
Expand Down
25 changes: 0 additions & 25 deletions HTTPDNSDemo/MSDKDnsDemo/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,6 @@
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSAllowsArbitraryLoadsForMedia</key>
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>119.28.28.98</key>
<dict>
<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
<true/>
</dict>
<key>119.29.29.98</key>
<dict>
<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
<true/>
</dict>
<key>183.47.126.139</key>
<dict>
<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
<true/>
</dict>
<key>183.47.126.140</key>
<dict>
<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
<true/>
</dict>
</dict>
</dict>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
Expand Down
9 changes: 0 additions & 9 deletions HTTPDNSDemo/MSDKDnsDemoTests/MSDKDnsDemoTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ - (void)testHTTPDesIPV4 {
config->encryptType = HttpDnsEncryptTypeDES;
// config->debug = YES;
config->httpOnly = YES;
config->minutesBeforeSwitchToMain = 1;
config->retryTimesBeforeSwitchServer = 2;
config->enableReport = YES;
config->addressType = HttpDnsAddressTypeIPv4;
Expand All @@ -215,7 +214,6 @@ - (void)testHTTPDesIPV6 {
config->encryptType = HttpDnsEncryptTypeDES;
// config->debug = YES;
config->httpOnly = YES;
config->minutesBeforeSwitchToMain = 1;
config->retryTimesBeforeSwitchServer = 2;
config->enableReport = YES;
config->addressType = HttpDnsAddressTypeIPv6;
Expand All @@ -239,7 +237,6 @@ - (void)testHTTPDesIPBoth {
config->encryptType = HttpDnsEncryptTypeDES;
// config->debug = YES;
config->httpOnly = YES;
config->minutesBeforeSwitchToMain = 1;
config->retryTimesBeforeSwitchServer = 2;
config->enableReport = YES;
config->addressType = HttpDnsAddressTypeDual;
Expand All @@ -265,7 +262,6 @@ - (void)testHTTPAesIPV4 {
config->encryptType = HttpDnsEncryptTypeAES;
// config->debug = YES;
config->httpOnly = YES;
config->minutesBeforeSwitchToMain = 1;
config->retryTimesBeforeSwitchServer = 2;
config->enableReport = YES;
config->addressType = HttpDnsAddressTypeIPv4;
Expand All @@ -291,7 +287,6 @@ - (void)testHTTPAesIPV6 {
config->encryptType = HttpDnsEncryptTypeAES;
// config->debug = YES;
config->httpOnly = YES;
config->minutesBeforeSwitchToMain = 1;
config->retryTimesBeforeSwitchServer = 2;
config->enableReport = YES;
config->addressType = HttpDnsAddressTypeIPv6;
Expand All @@ -315,7 +310,6 @@ - (void)testHTTPAesIPBoth {
config->encryptType = HttpDnsEncryptTypeAES;
// config->debug = YES;
config->httpOnly = YES;
config->minutesBeforeSwitchToMain = 1;
config->retryTimesBeforeSwitchServer = 2;
config->enableReport = YES;
config->addressType = HttpDnsAddressTypeDual;
Expand All @@ -341,7 +335,6 @@ - (void)testHTTPSIPV4 {
config->encryptType = HttpDnsEncryptTypeHTTPS;
// config->debug = YES;
config->httpOnly = YES;
config->minutesBeforeSwitchToMain = 1;
config->retryTimesBeforeSwitchServer = 2;
config->enableReport = YES;
config->addressType = HttpDnsAddressTypeIPv4;
Expand All @@ -367,7 +360,6 @@ - (void)testHTTPSIPV6 {
config->encryptType = HttpDnsEncryptTypeHTTPS;
// config->debug = YES;
config->httpOnly = YES;
config->minutesBeforeSwitchToMain = 1;
config->retryTimesBeforeSwitchServer = 2;
config->enableReport = YES;
config->addressType = HttpDnsAddressTypeIPv6;
Expand All @@ -391,7 +383,6 @@ - (void)testHTTPSIPBoth {
config->encryptType = HttpDnsEncryptTypeHTTPS;
// config->debug = YES;
config->httpOnly = YES;
config->minutesBeforeSwitchToMain = 1;
config->retryTimesBeforeSwitchServer = 2;
config->enableReport = YES;
config->addressType = HttpDnsAddressTypeDual;
Expand Down
4 changes: 2 additions & 2 deletions HTTPDNSLibs/MSDKDns/MSDKDns.xcframework/ios-arm64/MSDKDns.framework/Headers/MSDKDns.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef __MSDKDns_H__
#define __MSDKDns_H__

#define MSDKDns_Version @"1.10.5"
#define MSDKDns_Version @"1.11.0"

#import <Foundation/Foundation.h>

Expand Down Expand Up @@ -35,7 +35,7 @@ typedef struct DnsConfigStruct {
NSString* routeIp; // 可选，DNS 请求的 ECS（EDNS-Client-Subnet）值，默认情况下 HTTPDNS 服务器会查询客户端出口 IP 为 DNS 线路查询 IP，可以指定线路 IP 地址。支持 IPv4/IPv6 地址传入
BOOL httpOnly;// 可选，是否仅返回 httpDns 解析结果。默认 false，即当 httpDns 解析失败时会返回 localDns 解析结果，设置为 true 时，仅返回 httpDns 的解析结果
NSUInteger retryTimesBeforeSwitchServer; // 可选，切换ip之前重试次数, 默认3次
NSUInteger minutesBeforeSwitchToMain; // 可选，设置切回主ip间隔时长，默认10分钟
NSUInteger minutesBeforeSwitchToMain __attribute__((deprecated("v1.11.0及以上不支持该设置"))); // 可选，设置切回主ip间隔时长，默认10分钟
BOOL enableReport; // 是否开启解析异常上报，默认NO，不上报
BOOL enableExperimentalBugly; // 实验性参数，仅提供给内部特定团队使用，请勿启用
} DnsConfig;
Expand Down
Binary file modified HTTPDNSLibs/MSDKDns/MSDKDns.xcframework/ios-arm64/MSDKDns.framework/Info.plist
View file
Binary file not shown.
Binary file modified HTTPDNSLibs/MSDKDns/MSDKDns.xcframework/ios-arm64/MSDKDns.framework/MSDKDns
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions ...SDKDns/MSDKDns.xcframework/ios-arm64_x86_64-simulator/MSDKDns.framework/Headers/MSDKDns.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef __MSDKDns_H__
#define __MSDKDns_H__

#define MSDKDns_Version @"1.10.5"
#define MSDKDns_Version @"1.11.0"

#import <Foundation/Foundation.h>

Expand Down Expand Up @@ -35,7 +35,7 @@ typedef struct DnsConfigStruct {
NSString* routeIp; // 可选，DNS 请求的 ECS（EDNS-Client-Subnet）值，默认情况下 HTTPDNS 服务器会查询客户端出口 IP 为 DNS 线路查询 IP，可以指定线路 IP 地址。支持 IPv4/IPv6 地址传入
BOOL httpOnly;// 可选，是否仅返回 httpDns 解析结果。默认 false，即当 httpDns 解析失败时会返回 localDns 解析结果，设置为 true 时，仅返回 httpDns 的解析结果
NSUInteger retryTimesBeforeSwitchServer; // 可选，切换ip之前重试次数, 默认3次
NSUInteger minutesBeforeSwitchToMain; // 可选，设置切回主ip间隔时长，默认10分钟
NSUInteger minutesBeforeSwitchToMain __attribute__((deprecated("v1.11.0及以上不支持该设置"))); // 可选，设置切回主ip间隔时长，默认10分钟
BOOL enableReport; // 是否开启解析异常上报，默认NO，不上报
BOOL enableExperimentalBugly; // 实验性参数，仅提供给内部特定团队使用，请勿启用
} DnsConfig;
Expand Down
Binary file modified ...SLibs/MSDKDns/MSDKDns.xcframework/ios-arm64_x86_64-simulator/MSDKDns.framework/Info.plist
View file
Binary file not shown.
Binary file modified HTTPDNSLibs/MSDKDns/MSDKDns.xcframework/ios-arm64_x86_64-simulator/MSDKDns.framework/MSDKDns
View file
Binary file not shown.
Binary file modified ...Dns.xcframework/ios-arm64_x86_64-simulator/MSDKDns.framework/_CodeSignature/CodeDirectory
View file
Binary file not shown.
Binary file modified ...cframework/ios-arm64_x86_64-simulator/MSDKDns.framework/_CodeSignature/CodeRequirements-1
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions ...Dns.xcframework/ios-arm64_x86_64-simulator/MSDKDns.framework/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<dict>
<key>Info.plist</key>
<data>
ZD2/fCiBY0BjFEFLudh+7/9URVc=
/+88VJ3k7Na+6jaw/8x+lI2QnSM=
</data>
<key>PrivacyInfo.xcprivacy</key>
<data>
CyIAYZ38Bdk0mH7kk9ILnzSfEes=
</data>
<key>Versions/A/Headers/MSDKDns.h</key>
<data>
MGeiRRSz/p5QMFNEuPQnlBOABMM=
wcleY9+B9dQLGNthCFASGhjeJLg=
</data>
<key>Versions/A/Headers/MSDKDnsHttpMessageTools.h</key>
<data>
Expand All @@ -38,11 +38,11 @@
<dict>
<key>hash</key>
<data>
MGeiRRSz/p5QMFNEuPQnlBOABMM=
wcleY9+B9dQLGNthCFASGhjeJLg=
</data>
<key>hash2</key>
<data>
VZcG7ODcG2S0oK7ju/oNDVHuuE8QRHS5PTT/BxPSUTg=
Aua7Vqdts9rJuX1I6yC+0u2BCV1WUjw6DPIBlvlUIAg=
</data>
</dict>
<key>Versions/A/Headers/MSDKDnsHttpMessageTools.h</key>
Expand Down
Loading

0 comments on commit 8cb1d03

Please sign in to comment.