From 42c692b225bfaf7d67fd34ab337c759f4dd4690b Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Fri, 17 Mar 2017 20:12:07 +0300 Subject: [PATCH] Add method for handling OpenVPN log to the adapter delegate --- OpenVPN Adapter/OpenVPNAdapter+Public.h | 3 +++ OpenVPN Adapter/OpenVPNAdapter.mm | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenVPN Adapter/OpenVPNAdapter+Public.h b/OpenVPN Adapter/OpenVPNAdapter+Public.h index 121c022..8ba630f 100644 --- a/OpenVPN Adapter/OpenVPNAdapter+Public.h +++ b/OpenVPN Adapter/OpenVPNAdapter+Public.h @@ -34,6 +34,9 @@ NS_SWIFT_NAME(handle(event:message:)); - (void)handleError:(nonnull NSError *)error NS_SWIFT_NAME(handle(error:)); +- (void)handleLog:(nonnull NSString *)logMessage +NS_SWIFT_NAME(handle(logMessage:)); + @end @interface OpenVPNAdapter (Provider) diff --git a/OpenVPN Adapter/OpenVPNAdapter.mm b/OpenVPN Adapter/OpenVPNAdapter.mm index 0d886ab..ebd2817 100644 --- a/OpenVPN Adapter/OpenVPNAdapter.mm +++ b/OpenVPN Adapter/OpenVPNAdapter.mm @@ -248,8 +248,10 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData } - (void)handleLog:(const ClientAPI::LogInfo *)log { + NSAssert(self.delegate != nil, @"delegate property should not be nil"); + NSString *message = [NSString stringWithCString:log->text.c_str() encoding:NSUTF8StringEncoding]; - NSLog(@"%@", message); + [self.delegate handleLog:message]; } - (OpenVPNEvent)getEventIdentifierByName:(NSString *)eventName {