github/OpenVPNAdapter
github/OpenVPNAdapter
3
0
Fork 0
mirror of https://github.com/deneraraujo/OpenVPNAdapter.git synced 2024-10-16 02:02:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename a few delegate methods and fix memory warning

Browse Source
This commit is contained in:
Sergey Abramchuk 2018-01-17 11:56:38 +03:00
parent c956d61597
commit 51440587ad
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenVPN Adapter/OpenVPNClient.h
View File

@ -44,20 +44,22 @@ NS_ASSUME_NONNULL_BEGIN
- (BOOL)establishTunnel; - (BOOL)establishTunnel;
- (CFSocketNativeHandle)socketHandle; - (CFSocketNativeHandle)socketHandle;
- (void)clientEvent:(NSString *)eventName message:(nullable NSString *)message; - (void)clientEventName:(NSString *)eventName message:(nullable NSString *)message;
- (void)clientError:(NSString *)errorName fatal:(BOOL)fatal message:(nullable NSString *)message; - (void)clientErrorName:(NSString *)errorName fatal:(BOOL)fatal message:(nullable NSString *)message;
- (void)clientLog:(NSString *)logMessage; - (void)clientLogMessage:(NSString *)logMessage;
- (void)tick; - (void)tick;
- (void)resetSettings; - (void)resetSettings;
@end @end
NS_ASSUME_NONNULL_END
using namespace openvpn; using namespace openvpn;
class OpenVPNClient : public ClientAPI::OpenVPNClient { class OpenVPNClient : public ClientAPI::OpenVPNClient {
public: public:
OpenVPNClient(id<OpenVPNClientDelegate> _delegate); OpenVPNClient(id<OpenVPNClientDelegate> _Nonnull delegate);
bool tun_builder_new() override; bool tun_builder_new() override;
@ -93,7 +95,7 @@ public:
void clock_tick() override; void clock_tick() override;
private: private:
__weak id<OpenVPNClientDelegate> delegate; __weak id<OpenVPNClientDelegate> _Nonnull delegate;
}; };
NS_ASSUME_NONNULL_END

6
OpenVPN Adapter/OpenVPNClient.mm
View File

@ -153,15 +153,15 @@ void OpenVPNClient::event(const ClientAPI::Event& ev) {
NSString *message = [NSString stringWithUTF8String:ev.info.c_str()]; NSString *message = [NSString stringWithUTF8String:ev.info.c_str()];
if (ev.error) { if (ev.error) {
[this->delegate clientError:name fatal:ev.fatal message:message.length ? message : nil]; [this->delegate clientErrorName:name fatal:ev.fatal message:message.length ? message : nil];
} else { } else {
[this->delegate clientEvent:name message:message.length ? message : nil]; [this->delegate clientEventName:name message:message.length ? message : nil];
} }
} }
void OpenVPNClient::log(const ClientAPI::LogInfo& log) { void OpenVPNClient::log(const ClientAPI::LogInfo& log) {
NSString *logMessage = [NSString stringWithUTF8String:log.text.c_str()]; NSString *logMessage = [NSString stringWithUTF8String:log.text.c_str()];
[this->delegate clientLog:logMessage]; [this->delegate clientLogMessage:logMessage];
} }
void OpenVPNClient::clock_tick() { void OpenVPNClient::clock_tick() {