Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC-iOS
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
311
Issues
311
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
VLC-iOS
Commits
91fcd6df
Commit
91fcd6df
authored
May 20, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add an ARC-fork of Reachability to determine the network status
parent
3b6690bd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
364 additions
and
0 deletions
+364
-0
AspenProject/Reachability.h
AspenProject/Reachability.h
+88
-0
AspenProject/Reachability.m
AspenProject/Reachability.m
+266
-0
VLC for iOS.xcodeproj/project.pbxproj
VLC for iOS.xcodeproj/project.pbxproj
+10
-0
No files found.
AspenProject/Reachability.h
0 → 100644
View file @
91fcd6df
/*
File: Reachability.h
Abstract: Basic demonstration of how to use the SystemConfiguration Reachablity APIs.
Version: 2.2
Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Inc.
("Apple") in consideration of your agreement to the following terms, and your
use, installation, modification or redistribution of this Apple software
constitutes acceptance of these terms. If you do not agree with these terms,
please do not use, install, modify or redistribute this Apple software.
In consideration of your agreement to abide by the following terms, and subject
to these terms, Apple grants you a personal, non-exclusive license, under
Apple's copyrights in this original Apple software (the "Apple Software"), to
use, reproduce, modify and redistribute the Apple Software, with or without
modifications, in source and/or binary forms; provided that if you redistribute
the Apple Software in its entirety and without modifications, you must retain
this notice and the following text and disclaimers in all such redistributions
of the Apple Software.
Neither the name, trademarks, service marks or logos of Apple Inc. may be used
to endorse or promote products derived from the Apple Software without specific
prior written permission from Apple. Except as expressly stated in this notice,
no other rights or licenses, express or implied, are granted by Apple herein,
including but not limited to any patent rights that may be infringed by your
derivative works or by other works in which the Apple Software may be
incorporated.
The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO
WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
COMBINATION WITH YOUR PRODUCTS.
IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR
DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF
CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copyright (C) 2010 Apple Inc. All Rights Reserved.
*/
#import <Foundation/Foundation.h>
#import <SystemConfiguration/SystemConfiguration.h>
typedef
enum
{
NotReachable
=
0
,
ReachableViaWiFi
,
ReachableViaWWAN
}
NetworkStatus
;
#define kReachabilityChangedNotification @"kNetworkReachabilityChangedNotification"
@interface
Reachability
:
NSObject
{
BOOL
localWiFiRef
;
SCNetworkReachabilityRef
reachabilityRef
;
}
//reachabilityWithHostName- Use to check the reachability of a particular host name.
+
(
Reachability
*
)
reachabilityWithHostName
:
(
NSString
*
)
hostName
;
//reachabilityWithAddress- Use to check the reachability of a particular IP address.
+
(
Reachability
*
)
reachabilityWithAddress
:
(
const
struct
sockaddr_in
*
)
hostAddress
;
//reachabilityForInternetConnection- checks whether the default route is available.
// Should be used by applications that do not connect to a particular host
+
(
Reachability
*
)
reachabilityForInternetConnection
;
//reachabilityForLocalWiFi- checks whether a local wifi connection is available.
+
(
Reachability
*
)
reachabilityForLocalWiFi
;
//Start listening for reachability notifications on the current run loop
-
(
BOOL
)
startNotifier
;
-
(
void
)
stopNotifier
;
-
(
NetworkStatus
)
currentReachabilityStatus
;
//WWAN may be available, but not active until a connection has been established.
//WiFi may require a connection for VPN on Demand.
-
(
BOOL
)
connectionRequired
;
@end
AspenProject/Reachability.m
0 → 100644
View file @
91fcd6df
/*
File: Reachability.m
Abstract: Basic demonstration of how to use the SystemConfiguration Reachablity APIs.
Version: 2.2
Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Inc.
("Apple") in consideration of your agreement to the following terms, and your
use, installation, modification or redistribution of this Apple software
constitutes acceptance of these terms. If you do not agree with these terms,
please do not use, install, modify or redistribute this Apple software.
In consideration of your agreement to abide by the following terms, and subject
to these terms, Apple grants you a personal, non-exclusive license, under
Apple's copyrights in this original Apple software (the "Apple Software"), to
use, reproduce, modify and redistribute the Apple Software, with or without
modifications, in source and/or binary forms; provided that if you redistribute
the Apple Software in its entirety and without modifications, you must retain
this notice and the following text and disclaimers in all such redistributions
of the Apple Software.
Neither the name, trademarks, service marks or logos of Apple Inc. may be used
to endorse or promote products derived from the Apple Software without specific
prior written permission from Apple. Except as expressly stated in this notice,
no other rights or licenses, express or implied, are granted by Apple herein,
including but not limited to any patent rights that may be infringed by your
derivative works or by other works in which the Apple Software may be
incorporated.
The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO
WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
COMBINATION WITH YOUR PRODUCTS.
IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR
DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF
CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copyright (C) 2010 Apple Inc. All Rights Reserved.
*/
#import <sys/socket.h>
#import <netinet/in.h>
#import <netinet6/in6.h>
#import <arpa/inet.h>
#import <ifaddrs.h>
#import <netdb.h>
#import <CoreFoundation/CoreFoundation.h>
#import "Reachability.h"
#define kShouldPrintReachabilityFlags 1
static
void
PrintReachabilityFlags
(
SCNetworkReachabilityFlags
flags
,
const
char
*
comment
)
{
#if kShouldPrintReachabilityFlags
NSLog
(
@"Reachability Flag Status: %c%c %c%c%c%c%c%c%c %s
\n
"
,
(
flags
&
kSCNetworkReachabilityFlagsIsWWAN
)
?
'W'
:
'-'
,
(
flags
&
kSCNetworkReachabilityFlagsReachable
)
?
'R'
:
'-'
,
(
flags
&
kSCNetworkReachabilityFlagsTransientConnection
)
?
't'
:
'-'
,
(
flags
&
kSCNetworkReachabilityFlagsConnectionRequired
)
?
'c'
:
'-'
,
(
flags
&
kSCNetworkReachabilityFlagsConnectionOnTraffic
)
?
'C'
:
'-'
,
(
flags
&
kSCNetworkReachabilityFlagsInterventionRequired
)
?
'i'
:
'-'
,
(
flags
&
kSCNetworkReachabilityFlagsConnectionOnDemand
)
?
'D'
:
'-'
,
(
flags
&
kSCNetworkReachabilityFlagsIsLocalAddress
)
?
'l'
:
'-'
,
(
flags
&
kSCNetworkReachabilityFlagsIsDirect
)
?
'd'
:
'-'
,
comment
);
#endif
}
@implementation
Reachability
static
void
ReachabilityCallback
(
SCNetworkReachabilityRef
target
,
SCNetworkReachabilityFlags
flags
,
void
*
info
)
{
#pragma unused (target, flags)
//We're on the main RunLoop, so an NSAutoreleasePool is not necessary, but is added defensively
// in case someon uses the Reachablity object in a different thread.
@autoreleasepool
{
Reachability
*
noteObject
=
(
__bridge
Reachability
*
)
info
;
// Post a notification to notify the client that the network reachability changed.
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
kReachabilityChangedNotification
object
:
noteObject
];
}
}
-
(
BOOL
)
startNotifier
{
BOOL
retVal
=
NO
;
SCNetworkReachabilityContext
context
=
{
0
,
(
__bridge
void
*
)(
self
),
NULL
,
NULL
,
NULL
};
if
(
SCNetworkReachabilitySetCallback
(
reachabilityRef
,
ReachabilityCallback
,
&
context
))
{
if
(
SCNetworkReachabilityScheduleWithRunLoop
(
reachabilityRef
,
CFRunLoopGetCurrent
(),
kCFRunLoopDefaultMode
))
{
retVal
=
YES
;
}
}
return
retVal
;
}
-
(
void
)
stopNotifier
{
if
(
reachabilityRef
!=
NULL
)
{
SCNetworkReachabilityUnscheduleFromRunLoop
(
reachabilityRef
,
CFRunLoopGetCurrent
(),
kCFRunLoopDefaultMode
);
}
}
-
(
void
)
dealloc
{
[
self
stopNotifier
];
if
(
reachabilityRef
!=
NULL
)
CFRelease
(
reachabilityRef
);
}
+
(
Reachability
*
)
reachabilityWithHostName
:
(
NSString
*
)
hostName
;
{
Reachability
*
retVal
=
NULL
;
SCNetworkReachabilityRef
reachability
=
SCNetworkReachabilityCreateWithName
(
NULL
,
[
hostName
UTF8String
]);
if
(
reachability
!=
NULL
)
{
retVal
=
[[
self
alloc
]
init
];
if
(
retVal
!=
NULL
)
{
retVal
->
reachabilityRef
=
reachability
;
retVal
->
localWiFiRef
=
NO
;
}
}
return
retVal
;
}
+
(
Reachability
*
)
reachabilityWithAddress
:
(
const
struct
sockaddr_in
*
)
hostAddress
;
{
SCNetworkReachabilityRef
reachability
=
SCNetworkReachabilityCreateWithAddress
(
kCFAllocatorDefault
,
(
const
struct
sockaddr
*
)
hostAddress
);
Reachability
*
retVal
=
NULL
;
if
(
reachability
!=
NULL
)
{
retVal
=
[[
self
alloc
]
init
];
if
(
retVal
!=
NULL
)
{
retVal
->
reachabilityRef
=
reachability
;
retVal
->
localWiFiRef
=
NO
;
}
}
return
retVal
;
}
+
(
Reachability
*
)
reachabilityForInternetConnection
;
{
struct
sockaddr_in
zeroAddress
;
bzero
(
&
zeroAddress
,
sizeof
(
zeroAddress
));
zeroAddress
.
sin_len
=
sizeof
(
zeroAddress
);
zeroAddress
.
sin_family
=
AF_INET
;
return
[
self
reachabilityWithAddress
:
&
zeroAddress
];
}
+
(
Reachability
*
)
reachabilityForLocalWiFi
;
{
struct
sockaddr_in
localWifiAddress
;
bzero
(
&
localWifiAddress
,
sizeof
(
localWifiAddress
));
localWifiAddress
.
sin_len
=
sizeof
(
localWifiAddress
);
localWifiAddress
.
sin_family
=
AF_INET
;
// IN_LINKLOCALNETNUM is defined in <netinet/in.h> as 169.254.0.0
localWifiAddress
.
sin_addr
.
s_addr
=
htonl
(
IN_LINKLOCALNETNUM
);
Reachability
*
retVal
=
[
self
reachabilityWithAddress
:
&
localWifiAddress
];
if
(
retVal
!=
NULL
)
{
retVal
->
localWiFiRef
=
YES
;
}
return
retVal
;
}
#pragma mark Network Flag Handling
-
(
NetworkStatus
)
localWiFiStatusForFlags
:
(
SCNetworkReachabilityFlags
)
flags
{
PrintReachabilityFlags
(
flags
,
"localWiFiStatusForFlags"
);
BOOL
retVal
=
NotReachable
;
if
((
flags
&
kSCNetworkReachabilityFlagsReachable
)
&&
(
flags
&
kSCNetworkReachabilityFlagsIsDirect
))
{
retVal
=
ReachableViaWiFi
;
}
return
retVal
;
}
-
(
NetworkStatus
)
networkStatusForFlags
:
(
SCNetworkReachabilityFlags
)
flags
{
PrintReachabilityFlags
(
flags
,
"networkStatusForFlags"
);
if
((
flags
&
kSCNetworkReachabilityFlagsReachable
)
==
0
)
{
// if target host is not reachable
return
NotReachable
;
}
BOOL
retVal
=
NotReachable
;
if
((
flags
&
kSCNetworkReachabilityFlagsConnectionRequired
)
==
0
)
{
// if target host is reachable and no connection is required
// then we'll assume (for now) that your on Wi-Fi
retVal
=
ReachableViaWiFi
;
}
if
((((
flags
&
kSCNetworkReachabilityFlagsConnectionOnDemand
)
!=
0
)
||
(
flags
&
kSCNetworkReachabilityFlagsConnectionOnTraffic
)
!=
0
))
{
// ... and the connection is on-demand (or on-traffic) if the
// calling application is using the CFSocketStream or higher APIs
if
((
flags
&
kSCNetworkReachabilityFlagsInterventionRequired
)
==
0
)
{
// ... and no [user] intervention is needed
retVal
=
ReachableViaWiFi
;
}
}
if
((
flags
&
kSCNetworkReachabilityFlagsIsWWAN
)
==
kSCNetworkReachabilityFlagsIsWWAN
)
{
// ... but WWAN connections are OK if the calling application
// is using the CFNetwork (CFSocketStream?) APIs.
retVal
=
ReachableViaWWAN
;
}
return
retVal
;
}
-
(
BOOL
)
connectionRequired
;
{
NSAssert
(
reachabilityRef
!=
NULL
,
@"connectionRequired called with NULL reachabilityRef"
);
SCNetworkReachabilityFlags
flags
;
if
(
SCNetworkReachabilityGetFlags
(
reachabilityRef
,
&
flags
))
{
return
(
flags
&
kSCNetworkReachabilityFlagsConnectionRequired
);
}
return
NO
;
}
-
(
NetworkStatus
)
currentReachabilityStatus
{
NSAssert
(
reachabilityRef
!=
NULL
,
@"currentNetworkStatus called with NULL reachabilityRef"
);
NetworkStatus
retVal
=
NotReachable
;
SCNetworkReachabilityFlags
flags
;
if
(
SCNetworkReachabilityGetFlags
(
reachabilityRef
,
&
flags
))
{
if
(
localWiFiRef
)
{
retVal
=
[
self
localWiFiStatusForFlags
:
flags
];
}
else
{
retVal
=
[
self
networkStatusForFlags
:
flags
];
}
}
return
retVal
;
}
@end
VLC for iOS.xcodeproj/project.pbxproj
View file @
91fcd6df
...
...
@@ -68,6 +68,8 @@
7D3EAFFE174A265C002062C2
/* vlcetix72.png in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7D3EAFFA174A265C002062C2
/* vlcetix72.png */
;
};
7D3EAFFF174A265C002062C2
/* vlcetix114.png in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7D3EAFFB174A265C002062C2
/* vlcetix114.png */
;
};
7D3EB000174A265C002062C2
/* vlcetix144.png in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7D3EAFFC174A265C002062C2
/* vlcetix144.png */
;
};
7D3EB012174A3530002062C2
/* Reachability.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7D3EB011174A3530002062C2
/* Reachability.m */
;
};
7D3EB014174A353E002062C2
/* SystemConfiguration.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7D3EB013174A353E002062C2
/* SystemConfiguration.framework */
;
};
7D6B07BC1716C9B8003280C4
/* AQGridView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7D6B07A61716C9B8003280C4
/* AQGridView.m */
;
};
7D6B07BD1716C9B8003280C4
/* AQGridViewAnimatorItem.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7D6B07AA1716C9B8003280C4
/* AQGridViewAnimatorItem.m */
;
};
7D6B07BE1716C9B8003280C4
/* AQGridViewCell.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7D6B07AC1716C9B8003280C4
/* AQGridViewCell.m */
;
};
...
...
@@ -234,6 +236,9 @@
7D3EAFFB174A265C002062C2
/* vlcetix114.png */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
image.png
;
path
=
vlcetix114.png
;
sourceTree
=
"<group>"
;
};
7D3EAFFC174A265C002062C2
/* vlcetix144.png */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
image.png
;
path
=
vlcetix144.png
;
sourceTree
=
"<group>"
;
};
7D3EB00A174A280C002062C2
/* vlcetix1024.png */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
image.png
;
path
=
vlcetix1024.png
;
sourceTree
=
"<group>"
;
};
7D3EB010174A3530002062C2
/* Reachability.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
Reachability.h
;
sourceTree
=
"<group>"
;
};
7D3EB011174A3530002062C2
/* Reachability.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
Reachability.m
;
sourceTree
=
"<group>"
;
};
7D3EB013174A353E002062C2
/* SystemConfiguration.framework */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
wrapper.framework
;
name
=
SystemConfiguration.framework
;
path
=
System/Library/Frameworks/SystemConfiguration.framework
;
sourceTree
=
SDKROOT
;
};
7D6B07A51716C9B8003280C4
/* AQGridView.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
AQGridView.h
;
path
=
ImportedSources/AQGridView/Classes/AQGridView.h
;
sourceTree
=
SOURCE_ROOT
;
};
7D6B07A61716C9B8003280C4
/* AQGridView.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
AQGridView.m
;
path
=
ImportedSources/AQGridView/Classes/AQGridView.m
;
sourceTree
=
SOURCE_ROOT
;
};
7D6B07A71716C9B8003280C4
/* AQGridView+CellLayout.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
"AQGridView+CellLayout.h"
;
path
=
"ImportedSources/AQGridView/Classes/AQGridView+CellLayout.h"
;
sourceTree
=
SOURCE_ROOT
;
};
...
...
@@ -346,6 +351,7 @@
isa
=
PBXFrameworksBuildPhase
;
buildActionMask
=
2147483647
;
files
=
(
7D3EB014174A353E002062C2
/* SystemConfiguration.framework in Frameworks */
,
293DF2F417494F8200BB880F
/* DropboxSDK.framework in Frameworks */
,
2915544317490D4A00B86CAD
/* Security.framework in Frameworks */
,
7DDD0429172D98E5005A7B10
/* CFNetwork.framework in Frameworks */
,
...
...
@@ -616,6 +622,7 @@
7D94FCD216DE7D1000F2623B
=
{
isa
=
PBXGroup
;
children
=
(
7D3EB013174A353E002062C2
/* SystemConfiguration.framework */
,
7D94FCE416DE7D1000F2623B
/* AspenProject */
,
CC1BBC441704936500A20CBF
/* External VLC Libraries */
,
7D94FCDD16DE7D1000F2623B
/* Frameworks */
,
...
...
@@ -720,6 +727,8 @@
7DADC5601704FACC001DAC63
/* Imported */
=
{
isa
=
PBXGroup
;
children
=
(
7D3EB010174A3530002062C2
/* Reachability.h */
,
7D3EB011174A3530002062C2
/* Reachability.m */
,
291553E817490A0400B86CAD
/* CocoaHTTPServer */
,
7D6B07A41716C9AD003280C4
/* AQGridView */
,
7D6B07A31716C9A6003280C4
/* OBSlider */
,
...
...
@@ -955,6 +964,7 @@
7D6BA1171748EFE100C0E203
/* VLCAddMediaViewController.m in Sources */
,
29CE2D44174912C600922D8F
/* VLCHTTPUploaderController.m in Sources */
,
7D6BA11E17491F5F00C0E203
/* VLCSettingsViewController.m in Sources */
,
7D3EB012174A3530002062C2
/* Reachability.m in Sources */
,
);
runOnlyForDeploymentPostprocessing
=
0
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment