diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-02-27 11:20:23 +0800 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-03-02 21:29:23 +0800 |
| commit | a8e76d7e36eb111586fa52de33c303c959d02cc9 (patch) | |
| tree | 42341de3ad4edd26949dfacd120f1084413ae4a6 | |
| parent | f720577fb80af171d3672c081297c8686e5d65f2 (diff) | |
| download | mullvadvpn-a8e76d7e36eb111586fa52de33c303c959d02cc9.tar.xz mullvadvpn-a8e76d7e36eb111586fa52de33c303c959d02cc9.zip | |
IPC in separate crate
| -rw-r--r-- | Cargo.lock | 10 | ||||
| -rw-r--r-- | Cargo.toml | 6 | ||||
| -rw-r--r-- | src/lib.rs | 2 | ||||
| -rw-r--r-- | talpid_ipc/Cargo.toml | 14 | ||||
| -rw-r--r-- | talpid_ipc/src/ipc/mod.rs (renamed from src/ipc/mod.rs) | 0 | ||||
| -rw-r--r-- | talpid_ipc/src/ipc/nop_ipc.rs (renamed from src/ipc/nop_ipc.rs) | 0 | ||||
| -rw-r--r-- | talpid_ipc/src/ipc/zmq_ipc.rs (renamed from src/ipc/zmq_ipc.rs) | 0 | ||||
| -rw-r--r-- | talpid_ipc/src/lib.rs | 9 |
8 files changed, 36 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index 302fcf47dc..be0b367869 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,6 +165,16 @@ dependencies = [ "assert_matches 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "clonablechild 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "talpid_ipc 0.1.0", + "zmq 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "talpid_ipc" +version = "0.1.0" +dependencies = [ + "assert_matches 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "zmq 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/Cargo.toml b/Cargo.toml index f7c00b584b..7ac25c9748 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,8 +8,8 @@ description = "Core backend functionality of the Mullvad VPN client" clonablechild = "0.1" error-chain = "0.8" -[target.'cfg(not(windows))'.dependencies] -zmq = "0.8" +[dependencies.talpid_ipc] +path = "talpid_ipc" [target.'cfg(not(windows))'.dependencies] zmq = "0.8" @@ -18,4 +18,4 @@ zmq = "0.8" assert_matches = "1.0" [workspace] -members = ["talpid_openvpn_plugin", "talpid_cli"] +members = ["talpid_openvpn_plugin", "talpid_cli", "talpid_ipc"] diff --git a/src/lib.rs b/src/lib.rs index 1aa8b8d5f1..f8e5e96a46 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -16,5 +16,3 @@ pub mod process; /// Network primitives. pub mod net; - -mod ipc; diff --git a/talpid_ipc/Cargo.toml b/talpid_ipc/Cargo.toml new file mode 100644 index 0000000000..6bacc0f9a7 --- /dev/null +++ b/talpid_ipc/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "talpid_ipc" +version = "0.1.0" +authors = ["Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"] +description = "IPC client and server for talpid" + +[dependencies] +error-chain = "0.8" + +[target.'cfg(not(windows))'.dependencies] +zmq = "0.8" + +[dev-dependencies] +assert_matches = "1.0" diff --git a/src/ipc/mod.rs b/talpid_ipc/src/ipc/mod.rs index afb140f4c6..afb140f4c6 100644 --- a/src/ipc/mod.rs +++ b/talpid_ipc/src/ipc/mod.rs diff --git a/src/ipc/nop_ipc.rs b/talpid_ipc/src/ipc/nop_ipc.rs index 78860cab95..78860cab95 100644 --- a/src/ipc/nop_ipc.rs +++ b/talpid_ipc/src/ipc/nop_ipc.rs diff --git a/src/ipc/zmq_ipc.rs b/talpid_ipc/src/ipc/zmq_ipc.rs index 0dcc8d96ae..0dcc8d96ae 100644 --- a/src/ipc/zmq_ipc.rs +++ b/talpid_ipc/src/ipc/zmq_ipc.rs diff --git a/talpid_ipc/src/lib.rs b/talpid_ipc/src/lib.rs new file mode 100644 index 0000000000..1cc3ec497c --- /dev/null +++ b/talpid_ipc/src/lib.rs @@ -0,0 +1,9 @@ +#[cfg(test)] +#[macro_use] +extern crate assert_matches; + +#[macro_use] +extern crate error_chain; + +mod ipc; +pub use ipc::*; |