AFNetworkingReachabilityManager support for IPv6. (#1)

* AFNetworkingReachabilityManager support for IPv6.

* Podspec update for 2.6.4.

Author: Ciprian Redinciuc

AFNetworking.podspec

@@ -1,17 +1,17 @@
 Pod::Spec.new do |s|
   s.name     = 'AFNetworking'
-  s.version  = '2.6.3'
+  s.version  = '2.6.4'
   s.license  = 'MIT'
   s.summary  = 'A delightful iOS and OS X networking framework.'
-  s.homepage = 'https://github.com/AFNetworking/AFNetworking'
+  s.homepage = 'https://github.com/custompods/AFNetworking'
   s.social_media_url = 'https://twitter.com/AFNetworking'
   s.authors  = { 'Mattt Thompson' => 'm@mattt.me' }
-  s.source   = { :git => 'https://github.com/AFNetworking/AFNetworking.git', :tag => s.version, :submodules => true }
+  s.source   = { :git => 'https://github.com/custompods/AFNetworking.git', :tag => s.version, :submodules => true }
   s.requires_arc = true
-  
+
   s.public_header_files = 'AFNetworking/AFNetworking.h'
   s.source_files = 'AFNetworking/AFNetworking.h'
-  
+
   pch_AF = <<-EOS
 #ifndef TARGET_OS_IOS
   #define TARGET_OS_IOS TARGET_OS_IPHONE
@@ -22,11 +22,11 @@ Pod::Spec.new do |s|
 #endif
 EOS
   s.prefix_header_contents = pch_AF
-  
+
   s.ios.deployment_target = '7.0'
   s.osx.deployment_target = '10.9'
   s.watchos.deployment_target = '2.0'
-  
+
   s.subspec 'Serialization' do |ss|
     ss.source_files = 'AFNetworking/AFURL{Request,Response}Serialization.{h,m}'
     ss.public_header_files = 'AFNetworking/AFURL{Request,Response}Serialization.h'
@@ -67,7 +67,7 @@ EOS
     ss.ios.deployment_target = '7.0'
     ss.osx.deployment_target = '10.9'
     ss.watchos.deployment_target = '2.0'
-    
+
     ss.dependency 'AFNetworking/Serialization'
     ss.ios.dependency 'AFNetworking/Reachability'
     ss.osx.dependency 'AFNetworking/Reachability'

AFNetworking/AFNetworkReachabilityManager.h

@@ -93,7 +93,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  Creates and returns a network reachability manager for the socket address.
 
- @param address The socket address (`sockaddr_in`) used to evaluate network reachability.
+ @param address The socket address (`sockaddr_in6`) used to evaluate network reachability.
 
  @return An initialized network reachability manager, actively monitoring the specified socket address.
  */

AFNetworking/AFNetworkReachabilityManager.m

@@ -53,7 +53,7 @@ static AFNetworkReachabilityStatus AFNetworkReachabilityStatusForFlags(SCNetwork
     BOOL canConnectionAutomatically = (((flags & kSCNetworkReachabilityFlagsConnectionOnDemand ) != 0) || ((flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0));
     BOOL canConnectWithoutUserInteraction = (canConnectionAutomatically && (flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0);
     BOOL isNetworkReachable = (isReachable && (!needsConnection || canConnectWithoutUserInteraction));
-
+    
     AFNetworkReachabilityStatus status = AFNetworkReachabilityStatusUnknown;
     if (isNetworkReachable == NO) {
         status = AFNetworkReachabilityStatusNotReachable;
@@ -66,7 +66,7 @@ static AFNetworkReachabilityStatus AFNetworkReachabilityStatusForFlags(SCNetwork
     else {
         status = AFNetworkReachabilityStatusReachableViaWiFi;
     }
-
+    
     return status;
 }
 
@@ -116,23 +116,32 @@ + (instancetype)sharedManager {
     static AFNetworkReachabilityManager *_sharedManager = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
+#if (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+        struct sockaddr_in6 address;
+        bzero(&address, sizeof(address));
+        address.sin6_len = sizeof(address);
+        address.sin6_family = AF_INET6;
+        
+        _sharedManager = [self managerForAddress:&address];
+#else
         struct sockaddr_in address;
         bzero(&address, sizeof(address));
         address.sin_len = sizeof(address);
         address.sin_family = AF_INET;
-
+        
         _sharedManager = [self managerForAddress:&address];
+#endif
     });
-
+    
     return _sharedManager;
 }
 
 #ifndef __clang_analyzer__
 + (instancetype)managerForDomain:(NSString *)domain {
     SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, [domain UTF8String]);
-
+    
     AFNetworkReachabilityManager *manager = [[self alloc] initWithReachability:reachability];
-
+    
     return manager;
 }
 #endif
@@ -141,7 +150,7 @@ + (instancetype)managerForDomain:(NSString *)domain {
 + (instancetype)managerForAddress:(const void *)address {
     SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, (const struct sockaddr *)address);
     AFNetworkReachabilityManager *manager = [[self alloc] initWithReachability:reachability];
-
+    
     return manager;
 }
 #endif
@@ -151,10 +160,10 @@ - (instancetype)initWithReachability:(SCNetworkReachabilityRef)reachability {
     if (!self) {
         return nil;
     }
-
+    
     self.networkReachability = CFBridgingRelease(reachability);
     self.networkReachabilityStatus = AFNetworkReachabilityStatusUnknown;
-
+    
     return self;
 }
 
@@ -185,27 +194,27 @@ - (BOOL)isReachableViaWiFi {
 
 - (void)startMonitoring {
     [self stopMonitoring];
-
+    
     if (!self.networkReachability) {
         return;
     }
-
+    
     __weak __typeof(self)weakSelf = self;
     AFNetworkReachabilityStatusBlock callback = ^(AFNetworkReachabilityStatus status) {
         __strong __typeof(weakSelf)strongSelf = weakSelf;
-
+        
         strongSelf.networkReachabilityStatus = status;
         if (strongSelf.networkReachabilityStatusBlock) {
             strongSelf.networkReachabilityStatusBlock(status);
         }
-
+        
     };
-
+    
     id networkReachability = self.networkReachability;
     SCNetworkReachabilityContext context = {0, (__bridge void *)callback, AFNetworkReachabilityRetainCallback, AFNetworkReachabilityReleaseCallback, NULL};
     SCNetworkReachabilitySetCallback((__bridge SCNetworkReachabilityRef)networkReachability, AFNetworkReachabilityCallback, &context);
     SCNetworkReachabilityScheduleWithRunLoop((__bridge SCNetworkReachabilityRef)networkReachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
-
+    
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0),^{
         SCNetworkReachabilityFlags flags;
         if (SCNetworkReachabilityGetFlags((__bridge SCNetworkReachabilityRef)networkReachability, &flags)) {
@@ -218,7 +227,7 @@ - (void)stopMonitoring {
     if (!self.networkReachability) {
         return;
     }
-
+    
     SCNetworkReachabilityUnscheduleFromRunLoop((__bridge SCNetworkReachabilityRef)self.networkReachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
 }
 
@@ -240,9 +249,9 @@ + (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
     if ([key isEqualToString:@"reachable"] || [key isEqualToString:@"reachableViaWWAN"] || [key isEqualToString:@"reachableViaWiFi"]) {
         return [NSSet setWithObject:@"networkReachabilityStatus"];
     }
-
+    
     return [super keyPathsForValuesAffectingValueForKey:key];
 }
 
 @end
-#endif
+#endif

Tests/Tests/AFNetworkReachabilityManagerTests.m

@@ -33,24 +33,32 @@ @implementation AFNetworkReachabilityManagerTests
 
 - (void)setUp {
     [super setUp];
-
+    
     //both of these manager objects should always be reachable when the tests are run
     self.domainReachability = [AFNetworkReachabilityManager managerForDomain:@"localhost"];
-
+    
     //don't use the shared manager because it retains state between tests
     //but recreate it each time in the same way that the shared manager is created
+#if (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+    struct sockaddr_in6 address;
+    bzero(&address, sizeof(address));
+    address.sin6_len = sizeof(address);
+    address.sin6_family = AF_INET6;
+    self.addressReachability = [AFNetworkReachabilityManager managerForAddress:&address];
+#else
     struct sockaddr_in address;
     bzero(&address, sizeof(address));
     address.sin_len = sizeof(address);
     address.sin_family = AF_INET;
     self.addressReachability = [AFNetworkReachabilityManager managerForAddress:&address];
+#endif
 }
 
 - (void)tearDown
 {
     [self.addressReachability stopMonitoring];
     [self.domainReachability stopMonitoring];
-
+    
     [super tearDown];
 }
 
@@ -73,17 +81,17 @@ - (void)verifyReachabilityNotificationGetsPostedWithManager:(AFNetworkReachabili
                                  status = [note.userInfo[AFNetworkingReachabilityNotificationStatusItem] integerValue];
                                  BOOL reachable = (status == AFNetworkReachabilityStatusReachableViaWiFi
                                                    || status == AFNetworkReachabilityStatusReachableViaWWAN);
-
+                                 
                                  XCTAssert(reachable,
                                            @"Expected network to be reachable but got '%@'",
                                            AFStringFromNetworkReachabilityStatus(status));
                                  XCTAssertEqual(reachable, manager.isReachable, @"Expected status to match 'isReachable'");
-
+                                 
                                  return YES;
                              }];
-
+    
     [manager startMonitoring];
-
+    
     [self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
@@ -98,20 +106,20 @@ - (void)testDomainReachabilityNotification {
 - (void)verifyReachabilityStatusBlockGetsCalledWithManager:(AFNetworkReachabilityManager *)manager
 {
     XCTestExpectation *expectation = [self expectationWithDescription:@"reachability status change block gets called"];
-
+    
     typeof(manager) __weak weakManager = manager;
     [manager setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
         BOOL reachable = (status == AFNetworkReachabilityStatusReachableViaWiFi
                           || status == AFNetworkReachabilityStatusReachableViaWWAN);
-
+        
         XCTAssert(reachable, @"Expected network to be reachable but got '%@'", AFStringFromNetworkReachabilityStatus(status));
         XCTAssertEqual(reachable, weakManager.isReachable, @"Expected status to match 'isReachable'");
-
+        
         [expectation fulfill];
     }];
-
+    
     [manager startMonitoring];
-
+    
     [self waitForExpectationsWithTimeout:5 handler:^(NSError *error) {
         [manager setReachabilityStatusChangeBlock:nil];
     }];
@@ -125,4 +133,4 @@ - (void)testDomainReachabilityBlock {
     [self verifyReachabilityStatusBlockGetsCalledWithManager:self.domainReachability];
 }
 
-@end
+@end