diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-03-07 09:34:44 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-03-07 09:34:44 +0100 |
| commit | f3b45296b9d1decbc737698e3ad34ac9b75d5130 (patch) | |
| tree | 7704c87cb631cbc7ae153b1ed561abd2e32279f8 /src | |
| parent | f085642d25c2f91095ce01d324a59b5cee23e8b0 (diff) | |
| parent | 8e8e0bbb496c5c68e57884178f197c2584fcb660 (diff) | |
| download | mullvadvpn-f3b45296b9d1decbc737698e3ad34ac9b75d5130.tar.xz mullvadvpn-f3b45296b9d1decbc737698e3ad34ac9b75d5130.zip | |
Merge branch 'send-event-also'
Diffstat (limited to 'src')
| -rw-r--r-- | src/process/openvpn.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/process/openvpn.rs b/src/process/openvpn.rs index 2d25deb965..b533b32b67 100644 --- a/src/process/openvpn.rs +++ b/src/process/openvpn.rs @@ -1,3 +1,5 @@ +extern crate openvpn_ffi; + use super::monitor::{ChildSpawner, ChildMonitor}; use clonablechild::{ClonableChild, ChildExt}; @@ -160,7 +162,7 @@ impl ChildSpawner for OpenVpnCommand { /// Possible events from OpenVPN pub enum OpenVpnEvent { /// An event from the plugin loaded into OpenVPN. - PluginEvent(Result<HashMap<String, String>>), + PluginEvent(Result<(openvpn_ffi::OpenVpnPluginEvent, HashMap<String, String>)>), /// The OpenVPN process exited. The bool indicates if the process exited cleanly. Shutdown(bool), } |