No server trait, return Id when started

1 files changed, 28 insertions, 6 deletions

diff --git a/talpid_ipc/src/lib.rs b/talpid_ipc/src/lib.rs
index 1cc3ec497c..75ace1d87e 100644
--- a/talpid_ipc/src/lib.rs
+++ b/talpid_ipc/src/lib.rs
@@ -1,9 +1,31 @@
-#[cfg(test)]
-#[macro_use]
-extern crate assert_matches;
-
 #[macro_use]
 extern crate error_chain;
 
-mod ipc;
-pub use ipc::*;
+#[cfg(windows)]
+#[path = "nop_ipc.rs"]
+mod ipc_impl;
+
+#[cfg(not(windows))]
+#[path = "zmq_ipc.rs"]
+mod ipc_impl;
+
+pub use self::ipc_impl::*;
+
+/// The type signature for functions accepting messages from the server.
+/// If the server fails in delivering the message for any reason it will
+/// put the cause in the Err part of the `Result`.
+pub type OnMessage<MessageType> = FnMut(Result<MessageType>) + Send + 'static;
+
+error_chain!{
+    errors {
+        ReadFailure {
+            description("Could not read IPC message")
+        }
+        CouldNotStartServer {
+            description("Failed to start the IPC server")
+        }
+        InvalidMessage(message: Vec<u8>) {
+            description("The IPC server got a message it did not know how to handle")
+        }
+    }
+}