github/OpenVPNAdapter
4
0
Fork 0
mirror of https://github.com/deneraraujo/OpenVPNAdapter.git synced 2026-02-11 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Return current reachability status using openvpn::Reachability class

Browse Source
This commit is contained in:
Sergey Abramchuk
2017-10-05 15:45:13 +03:00
parent ae3e8ee0c3
commit cb4490ad0d
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenVPN Adapter/OpenVPNReachability.h
View File

@@ -16,7 +16,7 @@
- (nonnull instancetype)init;
- (void)startTrackingWithCallback:(nullable void (^)(OpenVPNReachabilityStatus))callback;
- (void)startTrackingWithCallback:(nonnull void (^)(OpenVPNReachabilityStatus))callback;
- (void)stopTracking;
@end

34
OpenVPN Adapter/OpenVPNReachability.mm
View File

@@ -6,15 +6,18 @@
//
//
#import <openvpn/apple/reachable.hpp>
#import "OpenVPNReachability.h"
#import "OpenVPNReachability+Internal.h"
@interface OpenVPNReachability () {
BOOL _isTracking;
OpenVPNReachabilityStatus _reachabilityStatus;
}
@property (assign, nonatomic) OpenVPNReachabilityTracker *reachabilityTracker;
@property (assign, nonatomic) OpenVPNReachabilityTracker *tracker;
@property (assign, nonatomic) Reachability *reachability;
@property (copy, nonatomic) void (^ reachabilityStatusChangedBlock)(OpenVPNReachabilityStatus);
@end
@@ -22,10 +25,7 @@
@implementation OpenVPNReachability (Internal)
- (void)updateReachabilityStatus:(OpenVPNReachabilityStatus)status {
_reachabilityStatus = status;
if (self.reachabilityStatusChangedBlock) {
self.reachabilityStatusChangedBlock(status);
}
if (self.reachabilityStatusChangedBlock) { self.reachabilityStatusChangedBlock(status); }
}
@end
@@ -37,16 +37,21 @@
}
- (OpenVPNReachabilityStatus)reachabilityStatus {
return _reachabilityStatus;
ReachabilityInterface::Status status = self.reachability->reachable();
switch (status) {
case ReachabilityInterface::NotReachable: return OpenVPNReachabilityStatusNotReachable;
case ReachabilityInterface::ReachableViaWiFi: return OpenVPNReachabilityStatusReachableViaWiFi;
case ReachabilityInterface::ReachableViaWWAN: return OpenVPNReachabilityStatusReachableViaWWAN;
}
}
- (nonnull instancetype)init {
self = [super init];
if (self) {
_isTracking = NO;
_reachabilityStatus = OpenVPNReachabilityStatusNotReachable;
self.reachabilityTracker = new OpenVPNReachabilityTracker(true, false, (__bridge void *)self);
self.tracker = new OpenVPNReachabilityTracker(true, false, (__bridge void *)self);
self.reachability = new Reachability(true, true);
}
return self;
}
@@ -56,21 +61,24 @@
dispatch_queue_t main = dispatch_get_main_queue();
dispatch_async(main, ^{
self.reachabilityTracker->reachability_tracker_schedule();
self.tracker->reachability_tracker_schedule();
});
_isTracking = YES;
}
- (void)stopTracking {
dispatch_queue_t main = dispatch_get_main_queue();
dispatch_async(main, ^{
self.reachabilityTracker->reachability_tracker_cancel();
self.tracker->reachability_tracker_cancel();
});
_isTracking = NO;
}
- (void)dealloc {
delete self.reachabilityTracker;
delete self.tracker;
delete self.reachability;
}
@end