From a64893cd488e982032af36a71be97cce9a3161b8 Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Wed, 17 Jan 2018 13:59:08 +0300 Subject: [PATCH] Initializer shouldn't return nil, and return socket setup error during socket configuration --- OpenVPN Adapter/OpenVPNPacketFlowBridge.h | 2 +- OpenVPN Adapter/OpenVPNPacketFlowBridge.mm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenVPN Adapter/OpenVPNPacketFlowBridge.h b/OpenVPN Adapter/OpenVPNPacketFlowBridge.h index e025354..7f77b42 100644 --- a/OpenVPN Adapter/OpenVPNPacketFlowBridge.h +++ b/OpenVPN Adapter/OpenVPNPacketFlowBridge.h @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) CFSocketRef packetFlowSocket; - (instancetype)init NS_UNAVAILABLE; -- (nullable instancetype)initWithPacketFlow:(id)packetFlow NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithPacketFlow:(id)packetFlow NS_DESIGNATED_INITIALIZER; - (BOOL)configureSocketsWithError:(NSError **)error; - (void)startReading; diff --git a/OpenVPN Adapter/OpenVPNPacketFlowBridge.mm b/OpenVPN Adapter/OpenVPNPacketFlowBridge.mm index a92dc3b..4c0cc9b 100644 --- a/OpenVPN Adapter/OpenVPNPacketFlowBridge.mm +++ b/OpenVPN Adapter/OpenVPNPacketFlowBridge.mm @@ -52,7 +52,7 @@ static void SocketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData }; *error = [NSError errorWithDomain:OpenVPNAdapterErrorDomain - code:OpenVPNAdapterErrorTUNSetupFailed + code:OpenVPNAdapterErrorSocketSetupFailed userInfo:userInfo]; } @@ -73,7 +73,7 @@ static void SocketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData }; *error = [NSError errorWithDomain:OpenVPNAdapterErrorDomain - code:OpenVPNAdapterErrorTUNSetupFailed + code:OpenVPNAdapterErrorSocketSetupFailed userInfo:userInfo]; } @@ -105,7 +105,7 @@ static void SocketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData }; *error = [NSError errorWithDomain:OpenVPNAdapterErrorDomain - code:OpenVPNAdapterErrorTUNSetupFailed + code:OpenVPNAdapterErrorSocketSetupFailed userInfo:userInfo]; } @@ -121,7 +121,7 @@ static void SocketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData }; *error = [NSError errorWithDomain:OpenVPNAdapterErrorDomain - code:OpenVPNAdapterErrorTUNSetupFailed + code:OpenVPNAdapterErrorSocketSetupFailed userInfo:userInfo]; }