Merge pull request #283 from wangliangliang2/master

remove happydns

Author: longbai

Podfile

@@ -1,7 +1,7 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
 def shared_dependencies
-  pod 'HappyDNS', '>= 0.3'
+#  pod 'HappyDNS', '>= 0.3'
 end
 
 def test_dependencies

QiniuSDK/BigData/QNPipeline.m

@@ -99,7 +99,7 @@ - (instancetype)init:(QNPipelineConfig*)config {
         }
         _config = config;
 #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)
-        _httpManager = [[QNSessionManager alloc] initWithProxy:nil timeout:config.timeoutInterval urlConverter:nil dns:nil];
+        _httpManager = [[QNSessionManager alloc] initWithProxy:nil timeout:config.timeoutInterval urlConverter:nil];
 #endif
     }
     return self;

QiniuSDK/Http/QNSessionManager.h

@@ -9,8 +9,7 @@
 
 - (instancetype)initWithProxy:(NSDictionary *)proxyDict
                       timeout:(UInt32)timeout
-                 urlConverter:(QNUrlConvert)converter
-                          dns:(QNDnsManager *)dns;
+                 urlConverter:(QNUrlConvert)converter;
 
 - (void)multipartPost:(NSString *)url
              withData:(NSData *)data

QiniuSDK/Http/QNSessionManager.m

@@ -6,7 +6,6 @@
 //  Copyright (c) 2014年 Qiniu. All rights reserved.
 //
 
-#import "HappyDNS.h"
 #import "QNAsyncRun.h"
 #import "QNConfiguration.h"
 #import "QNResponseInfo.h"
@@ -69,16 +68,14 @@ @interface QNSessionManager ()
 @property (nonatomic, strong) QNUrlConvert converter;
 @property bool noProxy;
 @property (nonatomic, strong) NSDictionary *proxyDict;
-@property (nonatomic) QNDnsManager *dns;
 @property (nonatomic, strong) NSOperationQueue *delegateQueue;
 @end
 
 @implementation QNSessionManager
 
 - (instancetype)initWithProxy:(NSDictionary *)proxyDict
                       timeout:(UInt32)timeout
-                 urlConverter:(QNUrlConvert)converter
-                          dns:(QNDnsManager *)dns {
+                 urlConverter:(QNUrlConvert)converter {
     if (self = [super init]) {
         if (proxyDict != nil) {
             _noProxy = NO;
@@ -89,14 +86,13 @@ - (instancetype)initWithProxy:(NSDictionary *)proxyDict
         _delegateQueue = [[NSOperationQueue alloc] init];
         _timeout = timeout;
         _converter = converter;
-        _dns = dns;
     }
 
     return self;
 }
 
 - (instancetype)init {
-    return [self initWithProxy:nil timeout:60 urlConverter:nil dns:nil];
+    return [self initWithProxy:nil timeout:60 urlConverter:nil];
 }
 
 + (QNResponseInfo *)buildResponseInfo:(NSHTTPURLResponse *)response
@@ -140,21 +136,6 @@ - (void)sendRequest:(NSMutableURLRequest *)request
         url = [[NSURL alloc] initWithString:_converter(u)];
         request.URL = url;
         domain = url.host;
-    } else if (_noProxy && _dns != nil && [url.scheme isEqualToString:@"http"]) {
-        if (isIpV6FullySupported() || ![QNIP isV6]) {
-            ips = [_dns queryWithDomain:[[QNDomain alloc] init:domain hostsFirst:NO hasCname:YES maxTtl:1000]];
-            double duration = [[NSDate date] timeIntervalSinceDate:startTime];
-
-            if (ips == nil || ips.count == 0) {
-                NSError *error = [[NSError alloc] initWithDomain:domain code:-1003 userInfo:@{ @"error" : @"unkonwn host" }];
-
-                QNResponseInfo *info = [QNResponseInfo responseInfoWithNetError:error host:domain duration:duration];
-                NSLog(@"failure %@", info);
-
-                completeBlock(info, nil);
-                return;
-            }
-        }
     }
     [self sendRequest2:request withCompleteBlock:completeBlock withProgressBlock:progressBlock withCancelBlock:cancelBlock withIpArray:ips withIndex:0 withDomain:domain withRetryTimes:3 withStartTime:startTime withAccess:access];
 }

QiniuSDK/Storage/QNConfiguration.h

@@ -25,7 +25,6 @@ extern const UInt32 kQNBlockSize;
 typedef NSString * (^QNUrlConvert)(NSString *url);
 
 @class QNConfigurationBuilder;
-@class QNDnsManager;
 @class QNZone;
 /**
  *    Builder block
@@ -74,7 +73,6 @@ typedef void (^QNConfigurationBuilderBlock)(QNConfigurationBuilder *builder);
 
 @property (nonatomic, readonly) QNUrlConvert converter;
 
-@property (nonatomic, readonly) QNDnsManager *dns;
 
 @property (readonly) BOOL disableATS;
 
@@ -182,7 +180,6 @@ typedef void (^QNPrequeryReturn)(int code);
 
 @interface QNAutoZone : QNZone
 
-- (instancetype)initWithDns:(QNDnsManager *)dns;
 
 - (NSString *)up:(QNUpToken *)token
          isHttps:(BOOL)isHttps
@@ -230,7 +227,6 @@ typedef void (^QNPrequeryReturn)(int code);
 
 @property (nonatomic, strong) QNUrlConvert converter;
 
-@property (nonatomic, strong) QNDnsManager *dns;
 
 @property (assign) BOOL disableATS;
 

QiniuSDK/Storage/QNConfiguration.m

@@ -7,25 +7,13 @@
 //
 
 #import "QNConfiguration.h"
-#import "HappyDNS.h"
-#import "QNNetworkInfo.h"
 #import "QNResponseInfo.h"
 #import "QNSessionManager.h"
 #import "QNSystem.h"
 #import "QNUpToken.h"
 
 const UInt32 kQNBlockSize = 4 * 1024 * 1024;
 
-static QNDnsManager *initDns(QNConfigurationBuilder *builder) {
-    QNDnsManager *d = builder.dns;
-    if (d == nil) {
-        id<QNResolverDelegate> r1 = [QNResolver systemResolver];
-        id<QNResolverDelegate> r2 = [[QNResolver alloc] initWithAddress:@"119.29.29.29"];
-        id<QNResolverDelegate> r3 = [[QNResolver alloc] initWithAddress:@"114.114.115.115"];
-        d = [[QNDnsManager alloc] init:[NSArray arrayWithObjects:r1, r2, r3, nil] networkInfo:[QNNetworkInfo normal]];
-    }
-    return d;
-}
 
 @implementation QNConfiguration
 
@@ -51,11 +39,7 @@ - (instancetype)initWithBuilder:(QNConfigurationBuilder *)builder {
         _converter = builder.converter;
 
         _disableATS = builder.disableATS;
-        if (_disableATS) {
-            _dns = initDns(builder);
-        } else {
-            _dns = nil;
-        }
+        
         _zone = builder.zone;
 
         _useHttps = builder.useHttps;
@@ -69,7 +53,7 @@ @implementation QNConfigurationBuilder
 
 - (instancetype)init {
     if (self = [super init]) {
-        _zone = [[QNAutoZone alloc] initWithDns:nil];
+        _zone = [[QNAutoZone alloc] init];
         _chunkSize = 2 * 1024 * 1024;
         _putThreshold = 4 * 1024 * 1024;
         _retryMax = 3;
@@ -346,16 +330,14 @@ @implementation QNAutoZone {
     NSMutableDictionary *cache;
     NSLock *lock;
     QNSessionManager *sesionManager;
-    QNDnsManager *dns;
 }
 
-- (instancetype)initWithDns:(QNDnsManager *)dns1 {
+- (instancetype)init{
     if (self = [super init]) {
-        dns = dns1;
         server = @"https://uc.qbox.me";
         cache = [NSMutableDictionary new];
         lock = [NSLock new];
-        sesionManager = [[QNSessionManager alloc] initWithProxy:nil timeout:10 urlConverter:nil dns:dns];
+        sesionManager = [[QNSessionManager alloc] initWithProxy:nil timeout:10 urlConverter:nil];
     }
     return self;
 }

QiniuSDK/Storage/QNUploadManager.m

@@ -72,7 +72,7 @@ - (instancetype)initWithConfiguration:(QNConfiguration *)config {
         }
         _config = config;
 #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)
-        _httpManager = [[QNSessionManager alloc] initWithProxy:config.proxy timeout:config.timeoutInterval urlConverter:config.converter dns:config.dns];
+        _httpManager = [[QNSessionManager alloc] initWithProxy:config.proxy timeout:config.timeoutInterval urlConverter:config.converter];
 #endif
     }
     return self;

QiniuSDKTests/QNAutoZoneTest.m

@@ -15,7 +15,6 @@
 #import "QNResponseInfo.h"
 #import "QNSessionManager.h"
 
-#import "HappyDNS.h"
 #import "QNConfiguration.h"
 
 #import "QNTestConfig.h"
@@ -38,7 +37,7 @@ - (void)tearDown {
 }
 
 - (void)testHttp {
-    QNAutoZone* autoZone = [[QNAutoZone alloc] initWithDns:nil];
+    QNAutoZone* autoZone = [[QNAutoZone alloc] init];
     QNUpToken* tok = [QNUpToken parse:g_token];
     __block int x = 0;
     __block int c = 0;

QiniuSDKTests/QNFormUploadTest.m

@@ -12,7 +12,6 @@
 
 #import "QiniuSDK.h"
 
-#import "HappyDns.h"
 #import "QNSystem.h"
 #import "QNTestConfig.h"
 

QiniuSDKTests/QNResumeUploadTest.m

@@ -10,7 +10,6 @@
 
 #import <AGAsyncTestHelper.h>
 
-#import "HappyDNS.h"
 #import "QiniuSDK.h"
 
 #import "QNTempFile.h"