Merge pull request #28 from longbai/ios8.2

dns 函数修正

Author: longbai

CHANGELOG.md

@@ -1,5 +1,10 @@
 #Changelog
 
+## 7.0.9 (2015-)
+
+### 修正
+* dns解析函数
+
 ## 7.0.8 (2015-01-25)
 
 ### 增加

QiniuSDK.xcodeproj/project.pbxproj

@@ -144,7 +144,7 @@
 		DF0D23CC19DCE6C400D6B68F /* QNResponseInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNResponseInfo.h; sourceTree = "<group>"; };
 		DF0D23CE19DCE6E500D6B68F /* QNResponseInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNResponseInfo.m; sourceTree = "<group>"; };
 		DF293C9019DB85CB00799011 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		DF293C9319DB860200799011 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
+		DF293C9319DB860200799011 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
 		DF293C9619DB865800799011 /* QNCrc32Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNCrc32Test.m; sourceTree = "<group>"; };
 		DF293C9C19DBC2AE00799011 /* QNUserAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNUserAgent.h; sourceTree = "<group>"; };
 		DF293C9D19DBC2AE00799011 /* QNUserAgent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNUserAgent.m; sourceTree = "<group>"; };

QiniuSDK/Common/QNVersion.h

@@ -11,4 +11,4 @@
 /**
  *    sdk 版本
  */
-static const NSString *kQiniuVersion = @"7.0.8";
+static const NSString *kQiniuVersion = @"7.0.9";

QiniuSDK/Http/QNDns.m

@@ -11,28 +11,52 @@
 
 #import "QNDns.h"
 
+static NSArray *getAddresses(CFHostRef hostRef) {
+	Boolean lookup = CFHostStartInfoResolution(hostRef, kCFHostAddresses, NULL);
+	if (!lookup) {
+		return nil;
+	}
+	CFArrayRef addresses = CFHostGetAddressing(hostRef, &lookup);
+	if (!lookup) {
+		return nil;
+	}
+
+	char buf[32];
+	__block NSMutableArray *ret = [[NSMutableArray alloc] init];
+
+	// Iterate through the records to extract the address information
+	struct sockaddr_in *remoteAddr;
+	for (int i = 0; i < CFArrayGetCount(addresses); i++) {
+		CFDataRef saData = (CFDataRef)CFArrayGetValueAtIndex(addresses, i);
+		remoteAddr = (struct sockaddr_in *)CFDataGetBytePtr(saData);
+
+		if (remoteAddr != NULL) {
+			const char *p = inet_ntop(AF_INET, &(remoteAddr->sin_addr), buf, 32);
+			NSString *ip = [NSString stringWithUTF8String:p];
+			[ret addObject:ip];
+			NSLog(@"Resolved %u->%@", i, ip);
+		}
+	}
+	return ret;
+}
+
 @implementation QNDns
 
 + (NSArray *)getAddresses:(NSString *)hostName {
-	CFHostRef hostRef = CFHostCreateWithName(kCFAllocatorDefault, (__bridge CFStringRef)hostName);
+	// Convert the hostname into a StringRef
+	CFStringRef hostNameRef = CFStringCreateWithCString(kCFAllocatorDefault, [hostName UTF8String], kCFStringEncodingASCII);
 
-	Boolean lookup = CFHostStartInfoResolution(hostRef, kCFHostAddresses, NULL);
-	NSArray *addresses = (__bridge NSArray *)CFHostGetAddressing(hostRef, &lookup);
-	__block NSMutableArray *ret = [[NSMutableArray alloc] init];
-	[addresses enumerateObjectsUsingBlock: ^(id obj, NSUInteger idx, BOOL *stop) {
-	    struct in_addr *data = (__bridge struct in_addr *)obj;
-	    char buf[32];
-	    const char *p = inet_ntop(AF_INET, (void *)data, buf, 32);
-	    NSString *ip = [NSString stringWithUTF8String:p];
-	    [ret addObject:ip];
-//        NSLog(@"Resolved %lu->%@", (unsigned long)idx, ip);
-	}];
+	CFHostRef hostRef = CFHostCreateWithName(kCFAllocatorDefault, hostNameRef);
+	NSArray *ret = getAddresses(hostRef);
+
+	CFRelease(hostRef);
+	CFRelease(hostNameRef);
 	return ret;
 }
 
 + (NSString *)getAddressesString:(NSString *)hostName {
 	NSArray *result = [QNDns getAddresses:hostName];
-	if (result.count == 0) {
+	if (result == nil || result.count == 0) {
 		return @"";
 	}
 	return [result componentsJoinedByString:@";"];

QiniuSDK/Http/QNHttpManager.m

@@ -12,7 +12,6 @@
 #import "QNHttpManager.h"
 #import "QNUserAgent.h"
 #import "QNResponseInfo.h"
-#import "QNDns.h"
 
 @interface QNHttpManager ()
 @property (nonatomic) AFHTTPRequestOperationManager *httpManager;

QiniuSDK/Http/QNResponseInfo.m

@@ -8,7 +8,6 @@
 
 
 #import "QNResponseInfo.h"
-#import "QNDns.h"
 
 const int kQNFileError = -4;
 const int kQNInvalidArgument = -3;
@@ -57,9 +56,6 @@ - (instancetype)initWithStatus:(int)status
 		_error = error;
 		_host = host;
 		_duration = duration;
-		if (error.code != -1003) {
-			_serverIp = [QNDns getAddressesString:host];
-		}
 	}
 	return self;
 }
@@ -85,7 +81,6 @@ - (instancetype)init:(int)status
 		_host = [host copy];
 		_duration = duration;
 		if (status != 200) {
-			_serverIp = [QNDns getAddressesString:host];
 			if (body == nil) {
 				_error = [[NSError alloc] initWithDomain:domain code:_statusCode userInfo:nil];
 			}
@@ -112,7 +107,7 @@ - (instancetype)init:(int)status
 }
 
 - (NSString *)description {
-	return [NSString stringWithFormat:@"<%@: %p, status: %d, requestId: %@, xlog: %@, xvia: %@, host: %@ duration:%f s serverIp:%@ error: %@>", NSStringFromClass([self class]), self, _statusCode, _reqId, _xlog, _xvia, _host, _duration, _serverIp, _error];
+	return [NSString stringWithFormat:@"<%@: %p, status: %d, requestId: %@, xlog: %@, xvia: %@, host: %@ duration:%f s error: %@>", NSStringFromClass([self class]), self, _statusCode, _reqId, _xlog, _xvia, _host, _duration, _error];
 }
 
 - (BOOL)isCancelled {

QiniuSDK/Http/QNSessionManager.m

@@ -12,7 +12,6 @@
 #import "QNSessionManager.h"
 #import "QNUserAgent.h"
 #import "QNResponseInfo.h"
-#import "QNDns.h"
 #import "QNAsyncRun.h"
 
 #if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)

QiniuSDKTests/QNDnsTest.m

@@ -21,7 +21,9 @@ - (void)testQiniu {
     NSString* ip = [[QNDns getAddresses:host] objectAtIndex:0];
     XCTAssert(ip != nil, @"Pass");
     NSLog(@"dns result %@", ip);
-    
+}
+
+- (void)testNoHost {
     NSString* nohost = @"nodns.qiniu.com";
     NSArray* noip = [QNDns getAddresses:nohost];
     XCTAssert(noip.count == 0, @"Pass");

README.md

@@ -42,9 +42,18 @@ pod "Qiniu", "~> 7.0"
 
 ## 测试
 
+### 所有测试
+
 ``` bash
 $ xctool -workspace QiniuSDK.xcworkspace -scheme "QiniuSDK Mac" -sdk macosx -configuration Release test -test-sdk macosx
 ```
+### 指定测试
+
+可以在单元测试上修改，熟悉SDK
+
+``` bash
+$ xctool -workspace QiniuSDK.xcworkspace -scheme "QiniuSDK Mac" -sdk macosx -configuration Debug test -test-sdk macosx -only "QiniuSDK MacTests:QNResumeUploadTest/test500k"
+```
 
 ## 常见问题