diff --git a/Cargo.toml b/Cargo.toml index dc2a4ce..b71d076 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,39 +1,11 @@ [package] name = "neolink" description = "A standards-compliant bridge to Reolink IP cameras" -version = "0.3.0" +version = "0.4.0" authors = ["George Hilliard "] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -aes = "0.6" -cfb-mode = "0.6" -cookie-factory = "0.3" -crossbeam = "0.7" -env_logger = "*" -err-derive = "0.2" -glib = ">=0.10.3" -gio = "0.9" -gstreamer = "0.16" -gstreamer-app = "0.16" -gstreamer-rtsp = "0.16" -gstreamer-rtsp-server = { version = "0.16", features = ["v1_12", "v1_14"]} -lazy_static = "1.4" -log = { version = "0.4" } -indoc = "0.3" -itertools = "0.9" -md5 = "0.7" -nom = "6.1.2" -regex = "1" -serde = { version = "1.0", features = ["derive"] } -socket2 = "0.3" -structopt = "0.3" -time = "0.2" -toml = "0.5" -yaserde = "0.3.16" -yaserde_derive = "0.3.16" -xml-rs = "0.8" -validator = "0.10" -validator_derive = "0.10" +[workspace] +members = [ + "crates/*", +] diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml new file mode 100644 index 0000000..9f7f54a --- /dev/null +++ b/crates/core/Cargo.toml @@ -0,0 +1,37 @@ +[package] +name = "neolink_core" +description = "Core services and structure for Reolink IP cameras" +version = "0.4.0" +authors = ["George Hilliard "] +edition = "2018" + +[dependencies] +aes = "0.6" +cfb-mode = "0.6" +cookie-factory = "0.3" +crossbeam = "0.7" +env_logger = "*" +err-derive = "0.2" +glib = ">=0.10.3" +gio = "0.9" +gstreamer = "0.16" +gstreamer-app = "0.16" +gstreamer-rtsp = "0.16" +gstreamer-rtsp-server = { version = "0.16", features = ["v1_12", "v1_14"]} +lazy_static = "1.4" +log = { version = "0.4" } +indoc = "0.3" +itertools = "0.9" +md5 = "0.7" +nom = "6.1.2" +regex = "1" +serde = { version = "1.0", features = ["derive"] } +socket2 = "0.3" +structopt = "0.3" +time = "0.2" +toml = "0.5" +yaserde = "0.3.16" +yaserde_derive = "0.3.16" +xml-rs = "0.8" +validator = "0.10" +validator_derive = "0.10" diff --git a/src/bc/de.rs b/crates/core/src/bc/de.rs similarity index 100% rename from src/bc/de.rs rename to crates/core/src/bc/de.rs diff --git a/src/bc/mod.rs b/crates/core/src/bc/mod.rs similarity index 100% rename from src/bc/mod.rs rename to crates/core/src/bc/mod.rs diff --git a/src/bc/model.rs b/crates/core/src/bc/model.rs similarity index 100% rename from src/bc/model.rs rename to crates/core/src/bc/model.rs diff --git a/src/bc/samples/EncryptionProtocol02_login.pcapng b/crates/core/src/bc/samples/EncryptionProtocol02_login.pcapng similarity index 100% rename from src/bc/samples/EncryptionProtocol02_login.pcapng rename to crates/core/src/bc/samples/EncryptionProtocol02_login.pcapng diff --git a/src/bc/samples/e1_firmwareupgrade.pcapng b/crates/core/src/bc/samples/e1_firmwareupgrade.pcapng similarity index 100% rename from src/bc/samples/e1_firmwareupgrade.pcapng rename to crates/core/src/bc/samples/e1_firmwareupgrade.pcapng diff --git a/src/bc/samples/model_sample_legacy_login.bin b/crates/core/src/bc/samples/model_sample_legacy_login.bin similarity index 100% rename from src/bc/samples/model_sample_legacy_login.bin rename to crates/core/src/bc/samples/model_sample_legacy_login.bin diff --git a/src/bc/samples/model_sample_modern_login.bin b/crates/core/src/bc/samples/model_sample_modern_login.bin similarity index 100% rename from src/bc/samples/model_sample_modern_login.bin rename to crates/core/src/bc/samples/model_sample_modern_login.bin diff --git a/src/bc/samples/modern_login_failed.bin b/crates/core/src/bc/samples/modern_login_failed.bin similarity index 100% rename from src/bc/samples/modern_login_failed.bin rename to crates/core/src/bc/samples/modern_login_failed.bin diff --git a/src/bc/samples/modern_login_success.bin b/crates/core/src/bc/samples/modern_login_success.bin similarity index 100% rename from src/bc/samples/modern_login_success.bin rename to crates/core/src/bc/samples/modern_login_success.bin diff --git a/src/bc/samples/modern_video_start1.bin b/crates/core/src/bc/samples/modern_video_start1.bin similarity index 100% rename from src/bc/samples/modern_video_start1.bin rename to crates/core/src/bc/samples/modern_video_start1.bin diff --git a/src/bc/samples/modern_video_start2.bin b/crates/core/src/bc/samples/modern_video_start2.bin similarity index 100% rename from src/bc/samples/modern_video_start2.bin rename to crates/core/src/bc/samples/modern_video_start2.bin diff --git a/src/bc/samples/xml_crypto_sample1.bin b/crates/core/src/bc/samples/xml_crypto_sample1.bin similarity index 100% rename from src/bc/samples/xml_crypto_sample1.bin rename to crates/core/src/bc/samples/xml_crypto_sample1.bin diff --git a/src/bc/samples/xml_crypto_sample1_plaintext.bin b/crates/core/src/bc/samples/xml_crypto_sample1_plaintext.bin similarity index 100% rename from src/bc/samples/xml_crypto_sample1_plaintext.bin rename to crates/core/src/bc/samples/xml_crypto_sample1_plaintext.bin diff --git a/src/bc/ser.rs b/crates/core/src/bc/ser.rs similarity index 100% rename from src/bc/ser.rs rename to crates/core/src/bc/ser.rs diff --git a/src/bc/xml.rs b/crates/core/src/bc/xml.rs similarity index 100% rename from src/bc/xml.rs rename to crates/core/src/bc/xml.rs diff --git a/src/bc/xml_crypto.rs b/crates/core/src/bc/xml_crypto.rs similarity index 100% rename from src/bc/xml_crypto.rs rename to crates/core/src/bc/xml_crypto.rs diff --git a/src/bc_protocol.rs b/crates/core/src/bc_protocol.rs similarity index 100% rename from src/bc_protocol.rs rename to crates/core/src/bc_protocol.rs diff --git a/src/bc_protocol/adpcm.rs b/crates/core/src/bc_protocol/adpcm.rs similarity index 100% rename from src/bc_protocol/adpcm.rs rename to crates/core/src/bc_protocol/adpcm.rs diff --git a/src/bc_protocol/connection.rs b/crates/core/src/bc_protocol/connection.rs similarity index 100% rename from src/bc_protocol/connection.rs rename to crates/core/src/bc_protocol/connection.rs diff --git a/src/bc_protocol/media_packet.rs b/crates/core/src/bc_protocol/media_packet.rs similarity index 100% rename from src/bc_protocol/media_packet.rs rename to crates/core/src/bc_protocol/media_packet.rs diff --git a/src/bc_protocol/time.rs b/crates/core/src/bc_protocol/time.rs similarity index 100% rename from src/bc_protocol/time.rs rename to crates/core/src/bc_protocol/time.rs diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs new file mode 100644 index 0000000..fe2d620 --- /dev/null +++ b/crates/core/src/lib.rs @@ -0,0 +1,10 @@ +#![allow(dead_code)] +#![allow(unused_variables)] +pub mod bc; +pub mod bc_protocol; +pub mod gst; + +#[derive(Debug)] +pub enum Never {} + +pub use bc_protocol::Error; diff --git a/crates/rtsp/Cargo.toml b/crates/rtsp/Cargo.toml new file mode 100644 index 0000000..95fc5a7 --- /dev/null +++ b/crates/rtsp/Cargo.toml @@ -0,0 +1,37 @@ +[package] +name = "neolink_rtsp" +description = "A standards-compliant bridge to Reolink IP cameras" +version = "0.4.0" +authors = ["George Hilliard "] +edition = "2018" + +[dependencies] +aes = "0.6" +cfb-mode = "0.6" +cookie-factory = "0.3" +crossbeam = "0.7" +env_logger = "*" +err-derive = "0.2" +glib = ">=0.10.3" +gio = "0.9" +gstreamer = "0.16" +gstreamer-app = "0.16" +gstreamer-rtsp = "0.16" +gstreamer-rtsp-server = { version = "0.16", features = ["v1_12", "v1_14"]} +lazy_static = "1.4" +log = { version = "0.4" } +indoc = "0.3" +itertools = "0.9" +md5 = "0.7" +nom = "6.1.2" +regex = "1" +serde = { version = "1.0", features = ["derive"] } +socket2 = "0.3" +structopt = "0.3" +time = "0.2" +toml = "0.5" +yaserde = "0.3.16" +yaserde_derive = "0.3.16" +xml-rs = "0.8" +validator = "0.10" +validator_derive = "0.10" diff --git a/src/cmdline.rs b/crates/rtsp/src/cmdline.rs similarity index 100% rename from src/cmdline.rs rename to crates/rtsp/src/cmdline.rs diff --git a/src/config.rs b/crates/rtsp/src/config.rs similarity index 100% rename from src/config.rs rename to crates/rtsp/src/config.rs diff --git a/src/gst.rs b/crates/rtsp/src/gst.rs similarity index 100% rename from src/gst.rs rename to crates/rtsp/src/gst.rs diff --git a/src/main.rs b/crates/rtsp/src/main.rs similarity index 100% rename from src/main.rs rename to crates/rtsp/src/main.rs diff --git a/src/lib.rs b/src/lib.rs index fe2d620..e69de29 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,10 +0,0 @@ -#![allow(dead_code)] -#![allow(unused_variables)] -pub mod bc; -pub mod bc_protocol; -pub mod gst; - -#[derive(Debug)] -pub enum Never {} - -pub use bc_protocol::Error;