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

Return protocol family depending on version

Browse Source
This commit is contained in:
Sergey Abramchuk
2017-06-22 21:19:19 +03:00
parent 6d2de5cb4e
commit 0714a6d0f6
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenVPN Adapter/OpenVPNAdapter.mm
+17 -5
View File
@@ -593,10 +593,11 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
return; return;
} }
uint32_t protocol = UINT32_MAX; uint32_t version = UINT32_MAX;
[data getBytes:&protocol length:prefixSize]; [data getBytes:&version length:prefixSize];
version = CFSwapInt32BigToHost(version);
protocol = CFSwapInt32BigToHost(protocol);
uint8_t protocol = [self getProtocolFamily:version];
NSData *packet = [data subdataWithRange:NSMakeRange(prefixSize, data.length - prefixSize)]; NSData *packet = [data subdataWithRange:NSMakeRange(prefixSize, data.length - prefixSize)];
#else #else
@@ -604,7 +605,10 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
uint8_t header = 0; uint8_t header = 0;
[data getBytes:&header length:1]; [data getBytes:&header length:1];
uint32_t protocol = openvpn::IPHeader::version(header); uint32_t version = openvpn::IPHeader::version(header);
uint8_t protocol = [self getProtocolFamily:version];
NSData *packet = data; NSData *packet = data;
#endif #endif
@@ -684,6 +688,14 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
return [NSString stringWithUTF8String:subnet.c_str()]; return [NSString stringWithUTF8String:subnet.c_str()];
} }
- (uint8_t)getProtocolFamily:(uint32_t)version {
switch (version) {
case 4: return PF_INET;
case 6: return PF_INET6;
default: return PF_UNSPEC;
}
}
- (void)performAsyncBlock:(void (^)())block { - (void)performAsyncBlock:(void (^)())block {
dispatch_queue_t mainQueue = dispatch_get_main_queue(); dispatch_queue_t mainQueue = dispatch_get_main_queue();
dispatch_async(mainQueue, block); dispatch_async(mainQueue, block);