Merge branch 'new-openvpn-plugin-crate'

1 files changed, 5 insertions, 12 deletions

diff --git a/talpid-openvpn-plugin/src/processing.rs b/talpid-openvpn-plugin/src/processing.rs
index e33097c633..5f3c8e4afd 100644
--- a/talpid-openvpn-plugin/src/processing.rs
+++ b/talpid-openvpn-plugin/src/processing.rs
@@ -1,5 +1,5 @@
-use openvpn_ffi;
-
+use openvpn_plugin;
+use std::collections::HashMap;
 use talpid_ipc::{IpcServerId, WsIpcClient};
 
 error_chain! {
@@ -18,14 +18,14 @@ pub struct EventProcessor {
 
 impl EventProcessor {
     pub fn new(server_id: IpcServerId) -> Result<EventProcessor> {
-        debug!("Creating EventProcessor");
+        trace!("Creating EventProcessor");
         let ipc_client = WsIpcClient::new(server_id).chain_err(|| "Unable to create IPC client")?;
         Ok(EventProcessor { ipc_client })
     }
 
     pub fn process_event(&mut self,
-                         event: openvpn_ffi::OpenVpnPluginEvent,
-                         env: openvpn_ffi::OpenVpnEnv)
+                         event: openvpn_plugin::types::OpenVpnPluginEvent,
+                         env: HashMap<String, String>)
                          -> Result<()> {
         trace!("Processing \"{:?}\" event", event);
         self.ipc_client
@@ -34,10 +34,3 @@ impl EventProcessor {
             .chain_err(|| ErrorKind::IpcSendingError)
     }
 }
-
-impl Drop for EventProcessor {
-    fn drop(&mut self) {
-        // TODO(linus): If we need, this is where we send some shutdown event or similar to core.
-        debug!("Dropping EventProcessor");
-    }
-}