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

Refactor TUN packets reading

Browse Source
This commit is contained in:
Sergey Abramchuk
2017-07-06 16:16:19 +03:00
parent 248585943e
commit e745b43d52
1 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenVPN Adapter/OpenVPNAdapter.mm
+35 -27
View File
@@ -56,7 +56,7 @@
@property (weak, nonatomic) id<OpenVPNAdapterPacketFlow> packetFlow; @property (weak, nonatomic) id<OpenVPNAdapterPacketFlow> packetFlow;
- (void)readTUNPackets; - (void)readTUNPackets;
- (void)readVPNData:(NSData *)data; - (void)readVPNPacket:(NSData *)packet;
- (OpenVPNEvent)getEventIdentifierByName:(NSString *)eventName; - (OpenVPNEvent)getEventIdentifierByName:(NSString *)eventName;
- (NSString *)getDescriptionForErrorEvent:(OpenVPNEvent)event; - (NSString *)getDescriptionForErrorEvent:(OpenVPNEvent)event;
- (NSString *)getSubnetFromPrefixLength:(NSNumber *)prefixLength; - (NSString *)getSubnetFromPrefixLength:(NSNumber *)prefixLength;
@@ -73,7 +73,7 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
switch (type) { switch (type) {
case kCFSocketDataCallBack: case kCFSocketDataCallBack:
[adapter readVPNData:(__bridge NSData *)data]; [adapter readVPNPacket:(__bridge NSData *)data];
break; break;
default: default:
@@ -560,58 +560,66 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
- (void)readTUNPackets { - (void)readTUNPackets {
[self.packetFlow readPacketsWithCompletionHandler:^(NSArray<NSData *> * _Nonnull packets, NSArray<NSNumber *> * _Nonnull protocols) { [self.packetFlow readPacketsWithCompletionHandler:^(NSArray<NSData *> * _Nonnull packets, NSArray<NSNumber *> * _Nonnull protocols) {
[packets enumerateObjectsUsingBlock:^(NSData * data, NSUInteger idx, BOOL * stop) { [self writeVPNPackets:packets protocols:protocols];
NSMutableData *packet = [NSMutableData new];
#if TARGET_OS_IPHONE
// Prepend data with network protocol. It should be done because OpenVPN on iOS uses uint32_t prefixes containing network protocol.
NSNumber *protocol = protocols[idx];
uint32_t prefix = CFSwapInt32HostToBig((uint32_t)[protocol unsignedIntegerValue]);
[packet appendBytes:&prefix length:sizeof(prefix)];
#endif
[packet appendData:data];
// Send data to the VPN server
CFSocketSendData(self.vpnSocket, NULL, (CFDataRef)packet, 0.05);
}];
[self readTUNPackets]; [self readTUNPackets];
}]; }];
} }
- (void)writeVPNPackets:(NSArray<NSData *> *)packets protocols:(NSArray<NSNumber *> *)protocols {
[packets enumerateObjectsUsingBlock:^(NSData * data, NSUInteger idx, BOOL * stop) {
// Prepare data for sending
NSData *packet = [self prepareVPNPacket:data protocol:protocols[idx]];
// Send data to the VPN server
CFSocketSendData(self.vpnSocket, NULL, (CFDataRef)packet, 0.05);
}];
}
- (NSData *)prepareVPNPacket:(NSData *)packet protocol:(NSNumber *)protocol {
NSMutableData *data = [NSMutableData new];
#if TARGET_OS_IPHONE
// Prepend data with network protocol. It should be done because OpenVPN on iOS uses uint32_t prefixes containing network protocol.
uint32_t prefix = CFSwapInt32HostToBig((uint32_t)[protocol unsignedIntegerValue]);
[data appendBytes:&prefix length:sizeof(prefix)];
#endif
[data appendData:packet];
return [data copy];
}
#pragma mark OpenVPN -> TUN #pragma mark OpenVPN -> TUN
- (void)readVPNData:(NSData *)data { - (void)readVPNPacket:(NSData *)packet {
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
// Get network protocol from prefix // Get network protocol from prefix
NSUInteger prefixSize = sizeof(uint32_t); NSUInteger prefixSize = sizeof(uint32_t);
if (data.length < prefixSize) { if (packet.length < prefixSize) {
NSLog(@"Incorrect OpenVPN packet size"); NSLog(@"Incorrect OpenVPN packet size");
return; return;
} }
uint32_t protocol = PF_UNSPEC; uint32_t protocol = PF_UNSPEC;
[data getBytes:&protocol length:prefixSize]; [packet getBytes:&protocol length:prefixSize];
protocol = CFSwapInt32BigToHost(protocol); protocol = CFSwapInt32BigToHost(protocol);
NSRange range = NSMakeRange(prefixSize, data.length - prefixSize); NSRange range = NSMakeRange(prefixSize, packet.length - prefixSize);
NSData *packet = [data subdataWithRange:range]; NSData *data = [packet subdataWithRange:range];
#else #else
// Get network protocol from header // Get network protocol from header
uint8_t header = 0; uint8_t header = 0;
[data getBytes:&header length:1]; [packet getBytes:&header length:1];
uint32_t version = openvpn::IPHeader::version(header); uint32_t version = openvpn::IPHeader::version(header);
uint8_t protocol = [self getProtocolFamily:version]; uint8_t protocol = [self getProtocolFamily:version];
NSData *packet = data; NSData *data = packet;
#endif #endif
// Send the packet to the TUN interface // Send the packet to the TUN interface
if (![self.packetFlow writePackets:@[packet] withProtocols:@[@(protocol)]]) { if (![self.packetFlow writePackets:@[data] withProtocols:@[@(protocol)]]) {
NSLog(@"Failed to send OpenVPN packet to the TUN interface"); NSLog(@"Failed to send OpenVPN packet to the TUN interface");
} }
} }