evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactored the Reachability status logic

Browse source
This commit is contained in:
Kevin Harwood 2012-03-20 11:48:54 -05:00
parent 428c13e1e0
commit 50c136f5d4
1 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
AFNetworking/AFHTTPClient.m
View file

@ -354,27 +354,19 @@ static void AFReachabilityReleaseCallback(const void *info) {
BOOL needsConnection = ((flags & kSCNetworkReachabilityFlagsConnectionRequired) != 0); BOOL needsConnection = ((flags & kSCNetworkReachabilityFlagsConnectionRequired) != 0);
BOOL isNetworkReachable = (isReachable && !needsConnection); BOOL isNetworkReachable = (isReachable && !needsConnection);
AFNetworkReachabilityStatus status = AFNetworkReachabilityStatusNotReachable; AFNetworkReachabilityStatus status = AFNetworkReachabilityStatusUnknown;
if(isNetworkReachable == NO) { if(isNetworkReachable == NO){
status = AFNetworkReachabilityStatusNotReachable; status = AFNetworkReachabilityStatusNotReachable;
} else {
#if TARGET_OS_IPHONE
if((flags & kSCNetworkReachabilityFlagsIsWWAN) != 0){
status = AFNetworkReachabilityStatusReachableViaWWAN;
}
#endif
struct sockaddr_in localWiFiAddress;
memset(&localWiFiAddress, '\0', sizeof(localWiFiAddress));
localWiFiAddress.sin_len = sizeof(localWiFiAddress);
localWiFiAddress.sin_family = AF_INET;
localWiFiAddress.sin_addr.s_addr = htonl(IN_LINKLOCALNETNUM);
SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, (const struct sockaddr *)&localWiFiAddress);
if (reachability != NULL) {
status = AFNetworkReachabilityStatusReachableViaWiFi;
}
} }
#if TARGET_OS_IPHONE
else if((flags & kSCNetworkReachabilityFlagsIsWWAN) != 0){
status = AFNetworkReachabilityStatusReachableViaWWAN;
}
#endif
else {
status = AFNetworkReachabilityStatusReachableViaWiFi;
}
return status; return status;
} }