passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accept LZO regardless of framing

This commit is contained in:
Davide De Rosa 2019-03-19 23:17:04 +01:00
parent 9a6f3d638c
commit 4b9ffcfb4e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TunnelKit/Sources/Core/DataPath.m
View File

@ -117,7 +117,7 @@
[self.decrypter setPeerId:peerId]; [self.decrypter setPeerId:peerId];
[self setCompressionFraming:compressionFraming]; [self setCompressionFraming:compressionFraming];
if (LZOIsSupported() && (compressionFraming == CompressionFramingNativeCompLZO) && (compressionAlgorithm == CompressionAlgorithmNativeLZO)) { if (LZOIsSupported() && (compressionAlgorithm == CompressionAlgorithmNativeLZO)) {
self.lzo = LZOCreate(); self.lzo = LZOCreate();
} }
} }

18
TunnelKit/Sources/Core/SessionProxy.swift
View File

@ -912,20 +912,20 @@ public class SessionProxy {
reply = optionalReply reply = optionalReply
log.debug("Received PUSH_REPLY: \"\(reply.maskedDescription)\"") log.debug("Received PUSH_REPLY: \"\(reply.maskedDescription)\"")
if let framing = reply.compressionFraming, let compression = reply.compressionAlgorithm, compression != .disabled { if let framing = reply.compressionFraming, let compression = reply.compressionAlgorithm {
switch framing { switch compression {
case .compress: case .disabled:
log.error("Server has new compression enabled and this is currently unsupported (\(framing))") break
throw SessionError.serverCompression
case .compLZO: case .LZO:
if !LZOIsSupported() { if !LZOIsSupported() {
log.error("Server has legacy LZO compression enabled and this was not built into the library (\(framing))") log.error("Server has LZO compression enabled and this was not built into the library (framing=\(framing))")
throw SessionError.serverCompression throw SessionError.serverCompression
} }
default: case .other:
break log.error("Server has non-LZO compression enabled and this is currently unsupported (framing=\(framing))")
throw SessionError.serverCompression
} }
} }
} catch let e { } catch let e {