fix:优化dns校验

garenwang · garenwang · commit 5efc8da67dfc · 2023-06-14T15:57:05.000+08:00
diff --git a/Podfile b/Podfile
@@ -5,6 +5,7 @@ use_frameworks!
 target 'QCloudCOSXMLDemo' do
  pod 'QCloudCOSXML', path:'.'
  pod 'QCloudCore', path:'.'
+ pod 'QCloudQuic', path:'.'
 
 target 'QCloudCOSXMLDemoTests' do
   inherit! :search_paths
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,26 +1,34 @@
 PODS:
-  - QCloudCore (6.1.4):
-    - QCloudCore/Default (= 6.1.4)
-  - QCloudCore/Default (6.1.4)
-  - QCloudCOSXML (6.1.4):
-    - QCloudCOSXML/Default (= 6.1.4)
-  - QCloudCOSXML/Default (6.1.4):
-    - QCloudCore (= 6.1.4)
+  - QCloudCore (6.2.4):
+    - QCloudCore/Default (= 6.2.4)
+  - QCloudCore/Default (6.2.4)
+  - QCloudCOSXML (6.2.4):
+    - QCloudCOSXML/Default (= 6.2.4)
+  - QCloudCOSXML/Default (6.2.4):
+    - QCloudCore (= 6.2.4)
+  - QCloudQuic (6.2.4):
+    - QCloudQuic/Default (= 6.2.4)
+  - QCloudQuic/Default (6.2.4):
+    - QCloudCOSXML (= 6.2.4)
 
 DEPENDENCIES:
   - QCloudCore (from `.`)
   - QCloudCOSXML (from `.`)
+  - QCloudQuic (from `.`)
 
 EXTERNAL SOURCES:
   QCloudCore:
     :path: "."
   QCloudCOSXML:
     :path: "."
+  QCloudQuic:
+    :path: "."
 
 SPEC CHECKSUMS:
-  QCloudCore: f02b07282d80787ff99572f67391f9fb6b015a31
-  QCloudCOSXML: 261cc38f69abeb6901fc831d843b5569c7d26674
+  QCloudCore: 9e77dfc0afd2a1ad623a6d203fbf5899197ea23a
+  QCloudCOSXML: 20afbfede77ad27f42ff7b51c12b89d4e026ec06
+  QCloudQuic: b1a1feb53e602b5c4f5423b9088e0d4b5f37bc73
 
-PODFILE CHECKSUM: 384b99448c6c2fa2f931b43a3eacbd13f1ec5751
+PODFILE CHECKSUM: 87053f234f38ae6a394978f26bcb119015f9918e
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/QCloudCOSXML.podspec b/QCloudCOSXML.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
 
 
-s.version              = "6.2.3"
+s.version              = "6.2.4"
 
 
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
@@ -22,15 +22,15 @@ s.version              = "6.2.3"
   s.subspec 'Default' do |default|
   default.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
 
-  default.dependency "QCloudCore",'6.2.3'
+  default.dependency "QCloudCore",'6.2.4'
     end
   s.subspec 'Slim' do |slim|
   slim.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
-  slim.dependency "QCloudCore/WithoutMTA",'6.2.3'
+  slim.dependency "QCloudCore/WithoutMTA",'6.2.4'
   end
   s.subspec 'Transfer' do |transfer|
   transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
-  transfer.dependency "QCloudCore/WithoutMTA",'6.2.3'
+  transfer.dependency "QCloudCore/WithoutMTA",'6.2.4'
 
   end
 
diff --git a/QCloudCOSXML/Classes/QCloudCOSXMLVersion.h b/QCloudCOSXML/Classes/QCloudCOSXMLVersion.h
@@ -5,12 +5,12 @@
 
 #ifndef QCloudCOSXMLModuleVersion_h
 #define QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersionNumber 602003
+#define QCloudCOSXMLModuleVersionNumber 602004
 
 //dependency
 
 //
 FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleVersion;
 FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleName;
 
-#endif
+#endif
diff --git a/QCloudCOSXML/Classes/QCloudCOSXMLVersion.m b/QCloudCOSXML/Classes/QCloudCOSXMLVersion.m
@@ -1,5 +1,5 @@
 #import "QCloudCOSXMLVersion.h"
-NSString * const QCloudCOSXMLModuleVersion = @"6.2.3";
+NSString * const QCloudCOSXMLModuleVersion = @"6.2.4";
 NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
 @interface QCloudQCloudCOSXMLLoad : NSObject
 @end
@@ -26,4 +26,4 @@ + (void) load
 #pragma clang diagnostic pop
     }
 }
-@end
+@end
diff --git a/QCloudCOSXMLDemo.xcodeproj/project.pbxproj b/QCloudCOSXMLDemo.xcodeproj/project.pbxproj
@@ -386,6 +386,7 @@
 				1AB143E81E601E0500830F93 /* Sources */,
 				1AB143E91E601E0500830F93 /* Frameworks */,
 				1AB143EA1E601E0500830F93 /* Resources */,
+				DCD67776C472EB71B0527419 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -516,6 +517,24 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		DCD67776C472EB71B0527419 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-frameworks.sh",
+				"${PODS_ROOT}/../QCloudQuic/Classes/QuicFramework/Tquic.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Tquic.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
diff --git a/QCloudCOSXMLDemo.xcworkspace/xcuserdata/garenwang.xcuserdatad/UserInterfaceState.xcuserstate b/QCloudCOSXMLDemo.xcworkspace/xcuserdata/garenwang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/QCloudCOSXMLDemo.xcworkspace/xcuserdata/garenwang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/QCloudCOSXMLDemo.xcworkspace/xcuserdata/garenwang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -3,4 +3,38 @@
    uuid = "165449C0-52F3-40C4-AFF7-66760E7AA713"
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "BCF3D2A1-32A1-40EA-9471-0E01F7205DB9"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "QCloudCore/Classes/Base/QCLOUDRestNet/DNSCache/QCloudHttpDNS.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "226"
+            endingLineNumber = "226"
+            landmarkName = "getIPListFromToHost(mHost, mPort)"
+            landmarkType = "9">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "2AA966A4-2E82-4BCB-A5E0-2D45F490F8DD"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "QCloudCore/Classes/Base/QCLOUDRestNet/DNSCache/QCloudHttpDNS.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "253"
+            endingLineNumber = "253"
+            landmarkName = "getIPListFromToHost(mHost, mPort)"
+            landmarkType = "9">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>
diff --git a/QCloudCore.podspec b/QCloudCore.podspec
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudCore"
 
 
-s.version              = "6.2.3"
+s.version              = "6.2.4"
 
 
 
diff --git a/QCloudCore/Classes/Base/QCLOUDRestNet/DNSCache/QCloudHttpDNS.m b/QCloudCore/Classes/Base/QCLOUDRestNet/DNSCache/QCloudHttpDNS.m
@@ -226,6 +226,9 @@ - (void)prepareFetchIPListForHost:(NSString *)host port:(NSString *)port {
         if (res->ai_family == AF_INET6) {
             addr6 = (struct sockaddr_in6 *)res->ai_addr;
             newChar = inet_ntop(AF_INET6, &addr6->sin6_addr, ipbuf, sizeof(ipbuf));
+            if(newChar == NULL){
+                continue;
+            }
             NSString *TempA = [[NSString alloc] initWithCString:(const char *)newChar encoding:NSASCIIStringEncoding];
             NSString *TempB = [NSString stringWithUTF8String:IP_ADDR_IPv6.UTF8String];
 
@@ -234,6 +237,9 @@ - (void)prepareFetchIPListForHost:(NSString *)host port:(NSString *)port {
         } else {
             addr = (struct sockaddr_in *)res->ai_addr;
             newChar = inet_ntop(AF_INET, &addr->sin_addr, ipbuf, sizeof(ipbuf));
+            if(newChar == NULL){
+                continue;
+            }
             NSString *TempA = [[NSString alloc] initWithCString:(const char *)newChar encoding:NSASCIIStringEncoding];
             NSString *TempB = [NSString stringWithUTF8String:IP_ADDR_IPv4.UTF8String];
 
@@ -244,8 +250,9 @@ - (void)prepareFetchIPListForHost:(NSString *)host port:(NSString *)port {
         QCloudLogInfo(@"host[%s] ipList:%@", mHost, ipList);
     }
 
-    freeaddrinfo(res0);
-
+    if(res0 != NULL){
+        freeaddrinfo(res0);
+    }
     return ipList;
 }
 @end
diff --git a/QCloudCore/Classes/Base/QCloudCoreVersion.h b/QCloudCore/Classes/Base/QCloudCoreVersion.h
@@ -5,12 +5,12 @@
 
 #ifndef QCloudCoreModuleVersion_h
 #define QCloudCoreModuleVersion_h
-#define QCloudCoreModuleVersionNumber 602003
+#define QCloudCoreModuleVersionNumber 602004
 
 //dependency
 
 //
 FOUNDATION_EXTERN NSString * const QCloudCoreModuleVersion;
 FOUNDATION_EXTERN NSString * const QCloudCoreModuleName;
 
-#endif
+#endif
diff --git a/QCloudCore/Classes/Base/QCloudCoreVersion.m b/QCloudCore/Classes/Base/QCloudCoreVersion.m
@@ -1,5 +1,5 @@
 #import "QCloudCoreVersion.h"
-NSString * const QCloudCoreModuleVersion = @"6.2.3";
+NSString * const QCloudCoreModuleVersion = @"6.2.4";
 NSString * const QCloudCoreModuleName = @"QCloudCore";
 @interface QCloudQCloudCoreLoad : NSObject
 @end
@@ -26,4 +26,4 @@ + (void) load
 #pragma clang diagnostic pop
     }
 }
-@end
+@end
diff --git a/QCloudQuic.podspec b/QCloudQuic.podspec
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudQuic"
 
 
-s.version              = "6.2.3"
+s.version              = "6.2.4"
 
 
   s.summary          = "QCloudQuic 腾讯云iOS-SDK组件"
@@ -39,12 +39,12 @@ s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
   s.subspec 'Default' do |default|
     default.source_files = 'QCloudQuic/Classes/*', 'QCloudQuic/Classes/QCloudBase/**/*','QCloudQuic/Classes/QuicFramework//*.{h}'
   default.vendored_frameworks = 'QCloudQuic/Classes/QuicFramework/Tquic.framework'
-  default.dependency "QCloudCOSXML",'6.2.3'
+  default.dependency "QCloudCOSXML",'6.2.4'
   end
   s.subspec 'Slim' do |slim|
     slim.source_files = 'QCloudQuic/Classes/*', 'QCloudQuic/Classes/QCloudBase/**/*','QCloudQuic/Classes/QuicFramework//*.{h}'
   slim.vendored_frameworks = 'QCloudQuic/Classes/QuicFramework/Tquic.framework'
-  slim.dependency "QCloudCOSXML/Slim",'6.2.3'
+  slim.dependency "QCloudCOSXML/Slim",'6.2.4'
   end
 
   
diff --git a/QCloudQuic/Classes/QCloudQuicVersion.h b/QCloudQuic/Classes/QCloudQuicVersion.h
@@ -5,12 +5,12 @@
 
 #ifndef QCloudQuicModuleVersion_h
 #define QCloudQuicModuleVersion_h
-#define QCloudQuicModuleVersionNumber 602003
+#define QCloudQuicModuleVersionNumber 602004
 
 //dependency
 
 //
 FOUNDATION_EXTERN NSString * const QCloudQuicModuleVersion;
 FOUNDATION_EXTERN NSString * const QCloudQuicModuleName;
 
-#endif
+#endif
diff --git a/QCloudQuic/Classes/QCloudQuicVersion.m b/QCloudQuic/Classes/QCloudQuicVersion.m
@@ -1,5 +1,5 @@
 #import "QCloudQuicVersion.h"
-NSString * const QCloudQuicModuleVersion = @"6.2.3";
+NSString * const QCloudQuicModuleVersion = @"6.2.4";
 NSString * const QCloudQuicModuleName = @"QCloudQuic";
 @interface QCloudQCloudQuicLoad : NSObject
 @end
@@ -26,4 +26,4 @@ + (void) load
 #pragma clang diagnostic pop
     }
 }
-@end
+@end

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#import "QCloudCOSXMLVersion.h"`
`2`		`-NSString * const QCloudCOSXMLModuleVersion = @"6.2.3";`
	`2`	`+NSString * const QCloudCOSXMLModuleVersion = @"6.2.4";`
`3`	`3`	`NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";`
`4`	`4`	`@interface QCloudQCloudCOSXMLLoad : NSObject`
`5`	`5`	`@end`
`@@ -26,4 +26,4 @@ + (void) load`
`26`	`26`	`#pragma clang diagnostic pop`
`27`	`27`	`}`
`28`	`28`	`}`
`29`		`-@end`
	`29`	`+@end`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ Pod::Spec.new do \|s\|`
`10`	`10`	`s.name = "QCloudCore"`
`11`	`11`
`12`	`12`
`13`		`-s.version = "6.2.3"`
	`13`	`+s.version = "6.2.4"`
`14`	`14`
`15`	`15`
`16`	`16`