From 80a75b20a6179140f1cd1aaf0f3327f13ce94dff Mon Sep 17 00:00:00 2001 From: twistedddx Date: Tue, 1 Dec 2020 16:03:09 +1030 Subject: [PATCH 01/25] Dissector - Add BC to BC magic 0x0fedcba0 Co-authored-by: twistedddx --- dissector/baichuan.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dissector/baichuan.lua b/dissector/baichuan.lua index c91b8e2..d837eb3 100644 --- a/dissector/baichuan.lua +++ b/dissector/baichuan.lua @@ -165,7 +165,12 @@ end function get_header_len(buffer) local magic = buffer(0, 4):le_uint() - if magic ~= 0x0abcdef0 then + if magic == 0x0abcdef0 then + -- Client <-> BC + elseif magic == 0x0fedcba0 then + -- BC <-> BC + else + -- Unknown magic return -1 -- No header found end local header_len = header_lengths[buffer(18, 2):le_uint()] From 2e8126cd739f12d5f54a55f35ee6323ecd7637ac Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Tue, 1 Dec 2020 23:32:04 -0600 Subject: [PATCH 02/25] config: allow hostnames for camera addresses This offers more flexibility, as a camera system admin only needs a DNS assignment rather than DHCP. The syntax is still as expected: address = "cameras.example.com:9000" This is especially handy in more complex topologies, where one or more specified "camera" may actually be pointed at a system providing a tunnel through to multiple cameras; names make it easier to identify said gateway machine. All IPs that the given name resolves to are tried so that we correctly handle, e.g., a name with both AAAA and A records. Note that addresses are no longer validated up front, but instead simply get resolved when the connection attempt is made. Name resolution will be aborted after ~60s of failure. --- src/bc_protocol.rs | 43 +++++++++++++++++++++++++++++-------------- src/config.rs | 3 +-- src/main.rs | 4 ++-- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 09b78aa..72fb7bd 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -58,6 +58,9 @@ pub enum Error { #[error(display = "Credential error")] AuthFailed, + #[error(display = "Failed to translate camera address")] + AddrResolutionError, + #[error(display = "ADPCM Decoding Error")] AdpcmDecodingError(&'static str), @@ -81,22 +84,34 @@ impl Drop for BcCamera { } impl BcCamera { - pub fn new_with_addr(hostname: T) -> Result { - let address = hostname - .to_socket_addrs()? - .next() - .ok_or(Error::Other("Address resolution failed"))?; + pub fn connect(host: T) -> Result { + let addr_iter = match host.to_socket_addrs() { + Ok(iter) => iter, + Err(_) => return Err(Error::AddrResolutionError), + }; - Ok(Self { - address, - connection: None, - logged_in: false, - }) - } + for addr in addr_iter { + debug!("Trying {}", addr); + let conn = match BcConnection::new(addr, RX_TIMEOUT) { + Ok(conn) => conn, + Err(err) => match err { + connection::Error::CommunicationError(ref err) => { + debug!("Assuming timeout from {}", err); + continue; + } + err => return Err(err.into()), + }, + }; - pub fn connect(&mut self) -> Result<()> { - self.connection = Some(BcConnection::new(self.address, RX_TIMEOUT)?); - Ok(()) + debug!("Success: {}", addr); + return Ok(Self { + address: addr, + connection: Some(conn), + logged_in: false, + }); + } + + return Err(Error::Timeout); } pub fn disconnect(&mut self) { diff --git a/src/config.rs b/src/config.rs index 79b4af5..d99ae55 100644 --- a/src/config.rs +++ b/src/config.rs @@ -2,7 +2,6 @@ use lazy_static::lazy_static; use regex::Regex; use serde::Deserialize; use std::clone::Clone; -use std::net::SocketAddr; use std::time::Duration; use validator::{Validate, ValidationError}; use validator_derive::Validate; @@ -45,7 +44,7 @@ pub struct CameraConfig { pub name: String, #[serde(rename = "address")] - pub camera_addr: SocketAddr, + pub camera_addr: String, pub username: String, pub password: Option, diff --git a/src/main.rs b/src/main.rs index ffba065..44a63f3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -198,7 +198,6 @@ fn camera_main( ) -> Result { let mut connected = false; (|| { - let mut camera = BcCamera::new_with_addr(camera_config.camera_addr)?; if camera_config.timeout.is_some() { warn!("The undocumented `timeout` config option has been removed and is no longer needed."); warn!("Please update your config file."); @@ -208,7 +207,8 @@ fn camera_main( "{}: Connecting to camera at {}", camera_config.name, camera_config.camera_addr ); - camera.connect()?; + + let mut camera = BcCamera::connect(&camera_config.camera_addr)?; camera.login(&camera_config.username, camera_config.password.as_deref())?; From d7e84891f60b17da73fcab1793b48bfb8b4f6072 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sat, 28 Nov 2020 18:08:46 +0700 Subject: [PATCH 03/25] Bump minimum glib version and update dependencies Co-Authored-By: twistedddx Co-Authored-By: George Hilliard --- Cargo.lock | 408 +++++++++++++++++++++++++++-------------------------- Cargo.toml | 2 +- 2 files changed, 207 insertions(+), 203 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aaa95d0..d279233 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,9 +2,9 @@ # It is not intended for manual editing. [[package]] name = "aho-corasick" -version = "0.7.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" dependencies = [ "memchr", ] @@ -20,15 +20,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.32" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b" +checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4" [[package]] name = "arrayvec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "atty" @@ -43,15 +43,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "base-x" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1" +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" [[package]] name = "bitflags" @@ -72,10 +72,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] -name = "clap" -version = "2.33.1" +name = "cfg-if" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", @@ -86,6 +92,12 @@ dependencies = [ "vec_map", ] +[[package]] +name = "const_fn" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab" + [[package]] name = "cookie-factory" version = "0.3.1" @@ -98,7 +110,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -108,12 +120,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" dependencies = [ - "cfg-if", "crossbeam-utils", + "maybe-uninit", ] [[package]] @@ -134,7 +146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "lazy_static", "maybe-uninit", @@ -148,7 +160,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "maybe-uninit", ] @@ -160,7 +172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -172,15 +184,15 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] name = "either" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "env_logger" -version = "0.7.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e" dependencies = [ "atty", "humantime", @@ -204,10 +216,20 @@ dependencies = [ ] [[package]] -name = "futures" -version = "0.3.5" +name = "form_urlencoded" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0" dependencies = [ "futures-channel", "futures-core", @@ -220,9 +242,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" dependencies = [ "futures-core", "futures-sink", @@ -230,15 +252,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" +checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" [[package]] name = "futures-executor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65" dependencies = [ "futures-core", "futures-task", @@ -247,15 +269,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" +checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" [[package]] name = "futures-macro" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" dependencies = [ "proc-macro-hack", "proc-macro2", @@ -265,24 +287,24 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" +checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" [[package]] name = "futures-task" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" +checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" dependencies = [ "once_cell", ] [[package]] name = "futures-util" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" dependencies = [ "futures-channel", "futures-core", @@ -300,9 +322,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5492e80b45e6c56214894a9a0cbe1340ab5066eb44a2dbe151393b6d7942c0" +checksum = "1fb60242bfff700772dae5d9e3a1f7aa2e4ebccf18b89662a16acb2822568561" dependencies = [ "bitflags", "futures", @@ -321,21 +343,22 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35993626299fbcaa73c0a19be8fdd01c950f9f3d3ac9cb4fb5532b924ab1a5d7" +checksum = "5e24fb752f8f5d2cf6bbc2c606fd2bc989c81c5e2fe321ab974d54f8b6344eac" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", + "winapi", ] [[package]] name = "glib" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e0533f48640d86e8e2f3cee778a9f97588d4a0bec8be065ee51ea52346d6c1" +checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" dependencies = [ "bitflags", "futures-channel", @@ -368,9 +391,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6cda4af5c2f4507b7a3535b798dca2135293f4bc3a17f399ce244ef15841c4c" +checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" dependencies = [ "libc", "system-deps", @@ -389,12 +412,12 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.16.2" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce4ce1ba28d3293b8cb8c3d33f50e6da2e5cfeefa59a0d10d922ab8015791609" +checksum = "5d50f822055923f1cbede233aa5dfd4ee957cf328fb3076e330886094e11d6cf" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 1.0.0", "futures-channel", "futures-core", "futures-util", @@ -413,9 +436,9 @@ dependencies = [ [[package]] name = "gstreamer-app" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e9ca4df66162132a8d0083c5c5a40dea29ac619acb02395dba09e26bc1c500" +checksum = "cc80888271338c3ede875d8cafc452eb207476ff5539dcbe0018a8f5b827af0e" dependencies = [ "bitflags", "futures-core", @@ -433,9 +456,9 @@ dependencies = [ [[package]] name = "gstreamer-app-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d739f1289f37352884d716df1c571d365fe3eacb8164bc1996e8070053c949" +checksum = "813f64275c9e7b33b828b9efcf9dfa64b95996766d4de996e84363ac65b87e3d" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -446,9 +469,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "872893487ce8876f18c63730402822804c5762869f631d8e3e6b18aafc8399f0" +checksum = "bafd01c56f59cb10f4b5a10f97bb4bdf8c2b2784ae5b04da7e2d400cf6e6afcf" dependencies = [ "bitflags", "glib", @@ -462,9 +485,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fd5a77d39b47568fba01274dfcb28dc32382513c697009f80b89ef63fd32fd" +checksum = "a4b7b6dc2d6e160a1ae28612f602bd500b3fa474ce90bf6bb2f08072682beef5" dependencies = [ "glib-sys", "gobject-sys", @@ -475,9 +498,9 @@ dependencies = [ [[package]] name = "gstreamer-net" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf6b7e17559f3afd74285d3007c9268bbd47ecb692dcb27944a2f54385aba73" +checksum = "0ff4b9468ce5fc3d366374d6e156f4e66f316ef2580d4e6c6167a5a090f48996" dependencies = [ "gio", "glib", @@ -490,9 +513,9 @@ dependencies = [ [[package]] name = "gstreamer-net-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc58fef62ae238322f24ca6589bf39f885888ab3c345b8ce15998f9a0f1b199" +checksum = "5317f292e00d1e7b966a3876ca7568abdab3d0559b2c050d1dd3bbbef9c5b99f" dependencies = [ "gio-sys", "glib-sys", @@ -504,13 +527,11 @@ dependencies = [ [[package]] name = "gstreamer-rtsp" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c0154054089449fa595da343660d37a9241cdb8a8794a982c7dfc4a82629f1" +checksum = "46370552813cfdf431f409dd5ffefa24ae80f3189a034ec098123f4cf1286389" dependencies = [ "bitflags", - "gio", - "gio-sys", "glib", "glib-sys", "gobject-sys", @@ -524,9 +545,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-server" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8e59ac0e59b7c503359d4c617d1ca447ce2d263397b80d96f66312fb75ffc4" +checksum = "cb39e0061d9aa519948276813e45249ae1cf41d098a04da490b085a1f2180466" dependencies = [ "bitflags", "gio", @@ -549,9 +570,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-server-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09f446a03f00fe0859ca41ca6ab0150392e261eab8151c1f0e1067356e34dce" +checksum = "372f48e74995eb4855bac56210ea97d8cf34ef5b328c225f35bdbf3fdedd0d06" dependencies = [ "gio-sys", "glib-sys", @@ -566,9 +587,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e12559129061c3b4cc218ff997f42a7ba8a23f3c0db356e8f5a54e12fa7c3dd" +checksum = "0938ef76af0226e3d9488957b5bfdd3359d01adc1d3b4792e166bc2cec86f1be" dependencies = [ "gio-sys", "glib-sys", @@ -581,9 +602,9 @@ dependencies = [ [[package]] name = "gstreamer-sdp" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ebbe4fbea4f2c67982c667ba57b64b01d43bc3dc1dc4a8d3512cb33a2adc7c1" +checksum = "36832b09858102a4def30d2eb0d599043914ef83674609d578feb80a0e6bd3f2" dependencies = [ "glib", "glib-sys", @@ -595,9 +616,9 @@ dependencies = [ [[package]] name = "gstreamer-sdp-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "289c7f258d3387ae91c6058555922d8cf0704fc2bc870d1a03190bc81b040655" +checksum = "405adf64f61c427c1c3cd6d928f0ca891bde2614b7bd31c3b3670ae0da3ac79a" dependencies = [ "glib-sys", "gobject-sys", @@ -608,9 +629,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1321f34d53bb5f60ab1aaf581e29b664b8d41601714ee1bb7dbea490b5b9ff60" +checksum = "fc1f154082d01af5718c5f8a8eb4f565a4ea5586ad8833a8fc2c2aa6844b601d" dependencies = [ "glib-sys", "gobject-sys", @@ -629,21 +650,18 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" dependencies = [ "libc", ] [[package]] name = "humantime" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] +checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" [[package]] name = "idna" @@ -658,9 +676,9 @@ dependencies = [ [[package]] name = "if_chain" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3360c7b59e5ffa2653671fb74b4741a5d343c03f331c0a4aeda42b5c2b0ec7d" +checksum = "1f7280c75fb2e2fc47080ec80ccc481376923acb04501957fc38f935c3de5088" [[package]] name = "indoc" @@ -714,16 +732,16 @@ checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" dependencies = [ "arrayvec", "bitflags", - "cfg-if", + "cfg-if 0.1.10", "ryu", "static_assertions", ] [[package]] name = "libc" -version = "0.2.74" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10" +checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" [[package]] name = "log" @@ -731,7 +749,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -754,15 +772,15 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memoffset" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ "autocfg", ] @@ -819,9 +837,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ "autocfg", "num-traits", @@ -829,9 +847,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b4d7360f362cfb50dde8143501e6940b22f644be75a4cc90b2d81968908138" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg", "num-integer", @@ -840,37 +858,24 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ "autocfg", ] [[package]] name = "once_cell" -version = "1.4.0" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" +checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" [[package]] name = "paste" -version = "0.1.18" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] +checksum = "7151b083b0664ed58ed669fcdd92f01c3d2fdbf10af4931a301474950b52bfa9" [[package]] name = "percent-encoding" @@ -880,18 +885,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pin-project" -version = "0.4.23" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" +checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "0.4.23" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" +checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" dependencies = [ "proc-macro2", "quote", @@ -906,15 +911,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "pretty-hex" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be91bcc43e73799dc46a6c194a55e7aae1d86cc867c860fd4a436019af21bd8c" +checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" [[package]] name = "proc-macro-crate" @@ -951,9 +956,9 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" @@ -963,19 +968,13 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" [[package]] name = "proc-macro2" -version = "1.0.19" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" dependencies = [ "unicode-xid", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" version = "1.0.7" @@ -993,9 +992,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "regex" -version = "1.3.9" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" dependencies = [ "aho-corasick", "memchr", @@ -1005,9 +1004,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.18" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" [[package]] name = "rustc_version" @@ -1020,14 +1019,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" [[package]] name = "ryu" @@ -1058,18 +1052,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.114" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.114" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" dependencies = [ "proc-macro2", "quote", @@ -1078,9 +1072,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.57" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" +checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779" dependencies = [ "itoa", "ryu", @@ -1101,11 +1095,11 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "socket2" -version = "0.3.12" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall", "winapi", @@ -1113,9 +1107,9 @@ dependencies = [ [[package]] name = "standback" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0437cfb83762844799a60e1e3b489d5ceb6a650fbacb86437badc1b6d87b246" +checksum = "cf906c8b8fc3f6ecd1046e01da1d8ddec83e48c8b08b84dcc02b585a6bedf5a8" dependencies = [ "version_check", ] @@ -1183,9 +1177,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.15" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" +checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" dependencies = [ "clap", "lazy_static", @@ -1194,9 +1188,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" +checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" dependencies = [ "heck", "proc-macro-error", @@ -1225,9 +1219,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.36" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250" +checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44" dependencies = [ "proc-macro2", "quote", @@ -1263,9 +1257,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" dependencies = [ "winapi-util", ] @@ -1281,18 +1275,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" +checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" +checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" dependencies = [ "proc-macro2", "quote", @@ -1310,11 +1304,11 @@ dependencies = [ [[package]] name = "time" -version = "0.2.16" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15" +checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b" dependencies = [ - "cfg-if", + "const_fn", "libc", "standback", "stdweb", @@ -1325,9 +1319,9 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9b6e9f095bc105e183e3cd493d72579be3181ad4004fceb01adbe9eecab2d" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" dependencies = [ "proc-macro-hack", "time-macros-impl", @@ -1348,15 +1342,24 @@ dependencies = [ [[package]] name = "tinyvec" -version = "0.3.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" +checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "toml" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" dependencies = [ "serde", ] @@ -1372,18 +1375,18 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.13" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" [[package]] name = "unicode-width" @@ -1399,16 +1402,17 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "unindent" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af41d708427f8fd0e915dcebb2cae0f0e6acb2a939b2d399c265c39a38a18942" +checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" [[package]] name = "url" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" dependencies = [ + "form_urlencoded", "idna", "matches", "percent-encoding", @@ -1464,19 +1468,19 @@ checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" [[package]] name = "wasm-bindgen" -version = "0.2.67" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c" +checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.67" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc71e4c5efa60fb9e74160e89b93353bc24059999c0ae0fb03affc39770310b0" +checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" dependencies = [ "bumpalo", "lazy_static", @@ -1489,9 +1493,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.67" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2" +checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1499,9 +1503,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.67" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556" +checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" dependencies = [ "proc-macro2", "quote", @@ -1512,9 +1516,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.67" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092" +checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" [[package]] name = "winapi" diff --git a/Cargo.toml b/Cargo.toml index dde0a86..2ea6183 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ cookie-factory = "0.3" crossbeam = "0.7" env_logger = "*" err-derive = "0.2" -glib = "*" +glib = ">=0.10.3" gio = "0.9" gstreamer = "0.16" gstreamer-app = "0.16" From 9b59888b08839d8e2efc4f873be1de6a12e62efd Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sun, 2 Aug 2020 17:17:18 +0700 Subject: [PATCH 04/25] Add macos build --- .github/workflows/build.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fa00f76..c886940 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -3,14 +3,15 @@ name: CI on: [push, pull_request] jobs: - ubuntu: + builds: name: build runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, windows-2019] + os: [ubuntu-18.04, windows-2019, macos-10.15] steps: - uses: actions/checkout@v2 + name: Checkout onto ${{ runner.os }} - if: runner.os == 'Linux' name: apt install gstreamer run: | @@ -24,6 +25,13 @@ jobs: echo "Updating Cargo environment" echo "C:\gstreamer\1.0\x86_64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append echo "GSTREAMER_1_0_ROOT_X86_64=C:\gstreamer\1.0\x86_64\" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - if: runner.os == 'macOS' + name: Install Gstreamer on macOS + run: | + curl -L 'https://gstreamer.freedesktop.org/data/pkg/osx/1.16.2/gstreamer-1.0-devel-1.16.2-x86_64.pkg' -o "$(pwd)/gstreamer-devel.pkg" + sudo installer -verbose -pkg "$(pwd)/gstreamer-devel.pkg" -target / + PKG_CONFIG_PATH="/Library/Frameworks/GStreamer.framework/Versions/1.0/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" + echo "PKG_CONFIG_PATH=${PKG_CONFIG_PATH}" >> "${GITHUB_ENV}" - name: Cache cargo registry uses: actions/cache@v1 with: From afdb0f495ce2b69ea1f25a32151f9e26a46bed04 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sun, 2 Aug 2020 17:31:03 +0700 Subject: [PATCH 05/25] Make armhf use matrix and add more Debian architectures --- .github/workflows/armhf.yml | 51 ------------- .github/workflows/build.yaml | 140 +++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 51 deletions(-) delete mode 100644 .github/workflows/armhf.yml diff --git a/.github/workflows/armhf.yml b/.github/workflows/armhf.yml deleted file mode 100644 index 9df0098..0000000 --- a/.github/workflows/armhf.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Build ARMHF - -on: [push, pull_request] - -jobs: - armhfbuild: - name: build-armhf - runs-on: ubuntu-latest - container: node:current-buster-slim - steps: - - uses: actions/checkout@v2 - - name: Install basic tools - run: | - apt-get update - apt-get install --assume-yes --no-install-recommends sudo curl ca-certificates build-essential - - name: Add armhf as a foreign architecture - run: | - sudo dpkg --add-architecture armhf - - name: Install cross compile tools - run: | - sudo apt-get update - sudo apt-get install --assume-yes --no-install-recommends gcc-arm-linux-gnueabihf - - name: Install armhf gstreamer - run: | - sudo apt-get update - sudo apt-get install --assume-yes --no-install-recommends \ - libgstrtspserver-1.0-dev:armhf \ - libgstreamer1.0-dev:armhf \ - libgtk2.0-dev:armhf - - name: Install rustup armv7 - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - target: armv7-unknown-linux-gnueabihf - - name: Build armfh - uses: actions-rs/cargo@v1 - with: - command: build - args: --release --all-features --target=armv7-unknown-linux-gnueabihf - env: - CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc - CC_armv7_unknown_linux_gnueabihf: arm-linux-gnueabihf-gcc - CXX_armv7_unknown_linux_gnueabihf: arm-linux-gnueabihf-g++ - PKG_CONFIG_ALLOW_CROSS: 1 - PKG_CONFIG_PATH: /usr/lib/arm-linux-gnueabihf/pkgconfig:/usr/share/pkgconfig/ - PKG_CONFIG_LIBDIR: /usr/lib/arm-linux-gnueabihf/pkgconfig:/usr/share/pkgconfig/ - - uses: actions/upload-artifact@v2 - with: - name: release-armhf - path: "target/armv7-unknown-linux-gnueabihf/release/neolink*" diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c886940..18e8b84 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -55,3 +55,143 @@ jobs: with: name: release-${{ matrix.os }} path: "target/release/neolink*" + armhfbuild: + name: build-armhf + runs-on: ubuntu-latest + container: "node:current-buster-slim" + steps: + - uses: actions/checkout@v2 + - name: Install basic tools + run: | + apt-get update + apt-get install --assume-yes --no-install-recommends sudo curl ca-certificates build-essential + - name: Add armhf as a foreign architecture + run: | + sudo dpkg --add-architecture armhf + - name: Install cross compile tools + run: | + sudo apt-get update + sudo apt-get install --assume-yes --no-install-recommends gcc-arm-linux-gnueabihf + - name: Install armhf gstreamer + run: | + sudo apt-get update + sudo apt-get install --assume-yes --no-install-recommends \ + libgstrtspserver-1.0-dev:armhf \ + libgstreamer1.0-dev:armhf \ + libgtk2.0-dev:armhf + - name: Install rustup armv7 + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + target: armv7-unknown-linux-gnueabihf + - name: Build armfh + uses: actions-rs/cargo@v1 + with: + command: build + args: --release --all-features --target=armv7-unknown-linux-gnueabihf + env: + CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc + CC_armv7_unknown_linux_gnueabihf: arm-linux-gnueabihf-gcc + CXX_armv7_unknown_linux_gnueabihf: arm-linux-gnueabihf-g++ + PKG_CONFIG_ALLOW_CROSS: 1 + PKG_CONFIG_PATH: /usr/lib/arm-linux-gnueabihf/pkgconfig:/usr/share/pkgconfig/ + PKG_CONFIG_LIBDIR: /usr/lib/arm-linux-gnueabihf/pkgconfig:/usr/share/pkgconfig/ + - uses: actions/upload-artifact@v2 + with: + name: release-armhf-buster + path: "target/armv7-unknown-linux-gnueabihf/release/neolink*" + + arm64build: + name: build-arm64 + runs-on: ubuntu-latest + container: "node:current-buster-slim" + steps: + - uses: actions/checkout@v2 + - name: Install basic tools + run: | + apt-get update + apt-get install --assume-yes --no-install-recommends sudo curl ca-certificates build-essential + - name: Add arm64 as a foreign architecture + run: | + sudo dpkg --add-architecture arm64 + - name: Install cross compile tools + run: | + sudo apt-get update + sudo apt-get install --assume-yes --no-install-recommends gcc-aarch64-linux-gnu + - name: Install arm64 gstreamer + run: | + sudo apt-get update + sudo apt-get install --assume-yes --no-install-recommends \ + libgstrtspserver-1.0-dev:arm64 \ + libgstreamer1.0-dev:arm64 \ + libgtk2.0-dev:arm64 + - name: Install rustup arm64 + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + target: aarch64-unknown-linux-gnu + - name: Build arm64 + uses: actions-rs/cargo@v1 + with: + command: build + args: --release --all-features --target=aarch64-unknown-linux-gnu + env: + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc + CC_aarch64_unknown_linux_gnu: aarch64-linux-gnu-gcc + CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++ + PKG_CONFIG_ALLOW_CROSS: 1 + PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig/ + PKG_CONFIG_LIBDIR: /usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig/ + - uses: actions/upload-artifact@v2 + with: + name: release-arm64-buster + path: "target/aarch64-unknown-linux-gnu/release/neolink*" + + i386build: + name: build-i386 + runs-on: ubuntu-latest + container: "node:current-buster-slim" + steps: + - uses: actions/checkout@v2 + - name: Install basic tools + run: | + apt-get update + apt-get install --assume-yes --no-install-recommends sudo curl ca-certificates build-essential + - name: Add arm64 as a foreign architecture + run: | + sudo dpkg --add-architecture i386 + - name: Install cross compile tools + run: | + sudo apt-get update + sudo apt-get install --assume-yes --no-install-recommends gcc-i686-linux-gnu + - name: Install i386 gstreamer + run: | + sudo apt-get update + sudo apt-get install --assume-yes --no-install-recommends \ + libgstrtspserver-1.0-dev:i386 \ + libgstreamer1.0-dev:i386 \ + libgtk2.0-dev:i386 + - name: Install rustup i386 + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + target: i686-unknown-linux-gnu + - name: Build i386 + uses: actions-rs/cargo@v1 + with: + command: build + args: --release --all-features --target=i686-unknown-linux-gnu + env: + CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER: i686-linux-gnu-gcc + CC_i686_unknown_linux_gnu: i686-linux-gnu-gcc + CXX_i686_unknown_linux_gnu: i686-linux-gnu-g++ + PKG_CONFIG_ALLOW_CROSS: 1 + PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig:/usr/share/pkgconfig/ + PKG_CONFIG_LIBDIR: /usr/lib/i386-linux-gnu/pkgconfig:/usr/share/pkgconfig/ + - uses: actions/upload-artifact@v2 + with: + name: release-i386-buster + path: "target/i686-unknown-linux-gnu/release/neolink*" From 61e9baab530356ade1c78585c17b3bc45ee8e492 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Wed, 9 Dec 2020 00:33:35 -0600 Subject: [PATCH 06/25] Unify cross-build workflows using a matrix --- .cargo/config | 10 +++ .github/workflows/build.yaml | 162 +++++++++-------------------------- 2 files changed, 52 insertions(+), 120 deletions(-) diff --git a/.cargo/config b/.cargo/config index ac2b23f..2282ebe 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,2 +1,12 @@ [target.x86_64-pc-windows-msvc] rustflags = ["-C", "target-feature=+crt-static"] + +# TODO not good as a default +[target.armv7-unknown-linux-gnueabihf] +linker = "arm-linux-gnueabihf-gcc" + +[target.aarch64-unknown-linux-gnu] +linker = "aarch64-linux-gnu-gcc" + +[target.i686-unknown-linux-gnu] +linker = "i686-linux-gnu-gcc" diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 18e8b84..25e36a5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -3,7 +3,7 @@ name: CI on: [push, pull_request] jobs: - builds: + native: name: build runs-on: ${{ matrix.os }} strategy: @@ -55,143 +55,65 @@ jobs: with: name: release-${{ matrix.os }} path: "target/release/neolink*" - armhfbuild: - name: build-armhf + cross: + name: cross runs-on: ubuntu-latest container: "node:current-buster-slim" - steps: - - uses: actions/checkout@v2 - - name: Install basic tools - run: | - apt-get update - apt-get install --assume-yes --no-install-recommends sudo curl ca-certificates build-essential - - name: Add armhf as a foreign architecture - run: | - sudo dpkg --add-architecture armhf - - name: Install cross compile tools - run: | - sudo apt-get update - sudo apt-get install --assume-yes --no-install-recommends gcc-arm-linux-gnueabihf - - name: Install armhf gstreamer - run: | - sudo apt-get update - sudo apt-get install --assume-yes --no-install-recommends \ - libgstrtspserver-1.0-dev:armhf \ - libgstreamer1.0-dev:armhf \ - libgtk2.0-dev:armhf - - name: Install rustup armv7 - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + strategy: + fail-fast: false + matrix: + # Everyone has a slightly different screwball naming scheme; + # Rust uses the target triple, GCC generally targets a family + # with a specific prefix, and dpkg's arch does its own thing + include: + - arch: armhf target: armv7-unknown-linux-gnueabihf - - name: Build armfh - uses: actions-rs/cargo@v1 - with: - command: build - args: --release --all-features --target=armv7-unknown-linux-gnueabihf - env: - CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc - CC_armv7_unknown_linux_gnueabihf: arm-linux-gnueabihf-gcc - CXX_armv7_unknown_linux_gnueabihf: arm-linux-gnueabihf-g++ - PKG_CONFIG_ALLOW_CROSS: 1 - PKG_CONFIG_PATH: /usr/lib/arm-linux-gnueabihf/pkgconfig:/usr/share/pkgconfig/ - PKG_CONFIG_LIBDIR: /usr/lib/arm-linux-gnueabihf/pkgconfig:/usr/share/pkgconfig/ - - uses: actions/upload-artifact@v2 - with: - name: release-armhf-buster - path: "target/armv7-unknown-linux-gnueabihf/release/neolink*" - - arm64build: - name: build-arm64 - runs-on: ubuntu-latest - container: "node:current-buster-slim" - steps: - - uses: actions/checkout@v2 - - name: Install basic tools - run: | - apt-get update - apt-get install --assume-yes --no-install-recommends sudo curl ca-certificates build-essential - - name: Add arm64 as a foreign architecture - run: | - sudo dpkg --add-architecture arm64 - - name: Install cross compile tools - run: | - sudo apt-get update - sudo apt-get install --assume-yes --no-install-recommends gcc-aarch64-linux-gnu - - name: Install arm64 gstreamer - run: | - sudo apt-get update - sudo apt-get install --assume-yes --no-install-recommends \ - libgstrtspserver-1.0-dev:arm64 \ - libgstreamer1.0-dev:arm64 \ - libgtk2.0-dev:arm64 - - name: Install rustup arm64 - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + gcc: arm-linux-gnueabihf + pkgconfig: arm-linux-gnueabihf + - arch: arm64 target: aarch64-unknown-linux-gnu - - name: Build arm64 - uses: actions-rs/cargo@v1 - with: - command: build - args: --release --all-features --target=aarch64-unknown-linux-gnu - env: - CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc - CC_aarch64_unknown_linux_gnu: aarch64-linux-gnu-gcc - CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++ - PKG_CONFIG_ALLOW_CROSS: 1 - PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig/ - PKG_CONFIG_LIBDIR: /usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig/ - - uses: actions/upload-artifact@v2 - with: - name: release-arm64-buster - path: "target/aarch64-unknown-linux-gnu/release/neolink*" - - i386build: - name: build-i386 - runs-on: ubuntu-latest - container: "node:current-buster-slim" + gcc: aarch64-linux-gnu + pkgconfig: aarch64-linux-gnu + - arch: i386 + target: i686-unknown-linux-gnu + gcc: i686-linux-gnu + # on i686, the pkgconfig path doesn't match the prefix! + pkgconfig: i386-linux-gnu steps: - uses: actions/checkout@v2 - name: Install basic tools run: | apt-get update - apt-get install --assume-yes --no-install-recommends sudo curl ca-certificates build-essential - - name: Add arm64 as a foreign architecture + apt-get install --assume-yes --no-install-recommends curl ca-certificates + - name: Install ${{ matrix.arch }} cross compiler and gstreamer + id: setup run: | - sudo dpkg --add-architecture i386 - - name: Install cross compile tools - run: | - sudo apt-get update - sudo apt-get install --assume-yes --no-install-recommends gcc-i686-linux-gnu - - name: Install i386 gstreamer - run: | - sudo apt-get update - sudo apt-get install --assume-yes --no-install-recommends \ - libgstrtspserver-1.0-dev:i386 \ - libgstreamer1.0-dev:i386 \ - libgtk2.0-dev:i386 - - name: Install rustup i386 + dpkg --add-architecture ${{ matrix.arch }} + apt-get update + apt-get install --assume-yes --no-install-recommends \ + build-essential \ + gcc-${{ matrix.gcc }} \ + libgstrtspserver-1.0-dev:${{ matrix.arch }} \ + libgstreamer1.0-dev:${{ matrix.arch }} \ + libgtk2.0-dev:${{ matrix.arch }} \ + libglib2.0-dev:${{ matrix.arch }} + - name: Install ${{ matrix.arch }} Rust toolchain uses: actions-rs/toolchain@v1 with: toolchain: stable override: true - target: i686-unknown-linux-gnu - - name: Build i386 + target: ${{ matrix.target }} + profile: minimal + - name: Build uses: actions-rs/cargo@v1 with: command: build - args: --release --all-features --target=i686-unknown-linux-gnu + args: --release --all-features --target=${{ matrix.target }} env: - CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER: i686-linux-gnu-gcc - CC_i686_unknown_linux_gnu: i686-linux-gnu-gcc - CXX_i686_unknown_linux_gnu: i686-linux-gnu-g++ + # Retarget pkg-config as described in https://www.freedesktop.org/wiki/Software/pkg-config/CrossCompileProposal/ PKG_CONFIG_ALLOW_CROSS: 1 - PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig:/usr/share/pkgconfig/ - PKG_CONFIG_LIBDIR: /usr/lib/i386-linux-gnu/pkgconfig:/usr/share/pkgconfig/ + PKG_CONFIG_LIBDIR: /usr/lib/${{ matrix.pkgconfig }}/pkgconfig - uses: actions/upload-artifact@v2 with: - name: release-i386-buster - path: "target/i686-unknown-linux-gnu/release/neolink*" + name: release-${{ matrix.arch }}-buster + path: "target/${{ matrix.target }}/release/neolink*" From 17c293b3fd9793d043ab702bf3d1f375525cd685 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Thu, 10 Dec 2020 12:55:49 -0600 Subject: [PATCH 07/25] macOS: Do not cache build artifacts The GitHub-managed cache is missing crates when we cache the build. Disable this on macOS. --- .github/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 25e36a5..8fcf811 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -43,6 +43,7 @@ jobs: path: ~/.cargo/git key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo build + if: runner.os != 'macOS' # Random missing crates on macOS, unclear why uses: actions/cache@v1 with: path: target From ea0c91ee830b825aed57e6238890a8531922d9b0 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Thu, 10 Dec 2020 19:26:46 +0000 Subject: [PATCH 08/25] Add list of prebuilts and artifact download instructions --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1915358..d555528 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,13 @@ Neolink does not support other cameras such as the RLC-420, since they already [ In the future Neolink will be much easier to install. For now, follow these steps. +Builds are provided for the following platforms: + +- Windows x86_64 +- macOS x86_64 +- Ubuntu x86_64 +- Debian x86, x86_64, aarch64, armhf +- Docker ### Windows/Linux @@ -39,7 +46,10 @@ For now, follow these steps. Note that if you use Chocolatey to install Gstreamer, it does this automatically. -3. Download and extract a [prebuilt binary from continuous integration][ci-download] (click on the topmost commit for the most recent build). +3. Download and extract a [prebuilt binary from continuous integration][ci-download] + 1. Click on this link to go to the list of commits. + 2. Click on the topmost commit to go to the most recent build's artifacts. + 3. Scroll to the bottom of the build results page and click on the artifact you want. 4. Write a configuration file for your cameras. See the section below. 5. Launch Neolink from a shell, passing your configuration file: From c581ad43f4fd51b70439139b821215778e64cea7 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Fri, 11 Dec 2020 08:30:20 -0600 Subject: [PATCH 09/25] Actions: Rename *.yaml to *.yml The app https://nightly.link/ requires .yml extensions due to a bug: oprypin/nightly.link#3 Easy enough to change extensions. --- .github/workflows/{build.yaml => build.yml} | 0 .github/workflows/{docker.yaml => docker.yml} | 0 .github/workflows/{style_checks.yaml => style_checks.yml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{build.yaml => build.yml} (100%) rename .github/workflows/{docker.yaml => docker.yml} (100%) rename .github/workflows/{style_checks.yaml => style_checks.yml} (100%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yml similarity index 100% rename from .github/workflows/build.yaml rename to .github/workflows/build.yml diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yml similarity index 100% rename from .github/workflows/docker.yaml rename to .github/workflows/docker.yml diff --git a/.github/workflows/style_checks.yaml b/.github/workflows/style_checks.yml similarity index 100% rename from .github/workflows/style_checks.yaml rename to .github/workflows/style_checks.yml From ea4f4130ce7fe5433d16917f44d62c0e0cecb513 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Fri, 11 Dec 2020 09:20:45 -0600 Subject: [PATCH 10/25] readme: Add direct download links to latest CI builds --- README.md | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index d555528..9a1808e 100644 --- a/README.md +++ b/README.md @@ -29,11 +29,13 @@ In the future Neolink will be much easier to install. For now, follow these steps. Builds are provided for the following platforms: -- Windows x86_64 -- macOS x86_64 -- Ubuntu x86_64 -- Debian x86, x86_64, aarch64, armhf -- Docker +- Windows x86_64 ([download][win-ci-download]) +- macOS x86_64 ([download][macos-ci-download]) +- Ubuntu x86_64 ([download][ubuntu-ci-download]) +- Debian x86 ([download][debian-x86-ci-download]) +- Debian aarch64 ([download][debian-aarch-ci-download]) +- Debian armhf ([download][debian-armhf-ci-download]) +- Docker x86 (see below) ### Windows/Linux @@ -46,10 +48,9 @@ Builds are provided for the following platforms: Note that if you use Chocolatey to install Gstreamer, it does this automatically. -3. Download and extract a [prebuilt binary from continuous integration][ci-download] - 1. Click on this link to go to the list of commits. - 2. Click on the topmost commit to go to the most recent build's artifacts. - 3. Scroll to the bottom of the build results page and click on the artifact you want. +3. Download and unpack Neolink from the links above. + 1. Note: you can also click on [this link][ci-download] to see all historical builds. + You will need to be logged in to GitHub to download directly from the builds page. 4. Write a configuration file for your cameras. See the section below. 5. Launch Neolink from a shell, passing your configuration file: @@ -65,6 +66,13 @@ neolink --config my_config.toml [gstreamer]: https://gstreamer.freedesktop.org/documentation/installing/index.html [ci-download]: https://github.com/thirtythreeforty/neolink/actions?query=workflow%3ACI+branch%3Amaster+ +[win-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-ubuntu-18.04.zip +[macos-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-macos-10.15.zip +[ubuntu-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-ubuntu-18.04.zip +[debian-x86-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-arm64-buster.zip +[debian-armhf-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-armhf-buster.zip +[debian-aarch-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-arm64-buster.zip + ### Docker A Docker image is also available containing Neolink and all its dependencies. From 2b0f465c252cf5643bfd8c4e260661160ed134bb Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Fri, 11 Dec 2020 09:22:35 -0600 Subject: [PATCH 11/25] readme: Fix typos in download links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9a1808e..6fdd7bd 100644 --- a/README.md +++ b/README.md @@ -66,10 +66,10 @@ neolink --config my_config.toml [gstreamer]: https://gstreamer.freedesktop.org/documentation/installing/index.html [ci-download]: https://github.com/thirtythreeforty/neolink/actions?query=workflow%3ACI+branch%3Amaster+ -[win-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-ubuntu-18.04.zip +[win-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-windows-2019.zip [macos-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-macos-10.15.zip [ubuntu-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-ubuntu-18.04.zip -[debian-x86-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-arm64-buster.zip +[debian-x86-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-i386-buster.zip [debian-armhf-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-armhf-buster.zip [debian-aarch-ci-download]: https://nightly.link/thirtythreeforty/neolink/workflows/build/master/release-arm64-buster.zip From d01f5684b4922929a2ebfb600671ba7a2125f0b0 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Mon, 14 Dec 2020 22:11:55 -0600 Subject: [PATCH 12/25] Fix Docker build: pull gst-rtsp-server from Alpine testing Closes #104 on GitHub. --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e59a34a..400feb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,11 @@ FROM docker.io/rust:1-alpine AS build MAINTAINER thirtythreeforty@gmail.com -RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \ +# Until Alpine merges gst-rtsp-server into a release, pull all Gstreamer packages +# from the "testing" release +RUN apk add --no-cache \ + -X http://dl-cdn.alpinelinux.org/alpine/edge/main \ + -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \ gst-rtsp-server-dev RUN apk add --no-cache musl-dev gcc From c342434848a2aa3c3b08489318006f9141a25703 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Mon, 14 Dec 2020 22:26:15 -0600 Subject: [PATCH 13/25] Refactor: move camera management into new function --- src/main.rs | 54 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/src/main.rs b/src/main.rs index 44a63f3..7f0ae5b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -216,29 +216,7 @@ fn camera_main( info!("{}: Connected and logged in", camera_config.name); if manage { - let cam_time = camera.get_time()?; - if let Some(time) = cam_time { - info!( - "{}: Camera time is already set: {}", - camera_config.name, time - ); - } else { - let new_time = time::OffsetDateTime::now_local(); - warn!( - "{}: Camera has no time set, setting to {}", - camera_config.name, new_time - ); - camera.set_time(new_time)?; - let cam_time = camera.get_time()?; - if let Some(time) = cam_time { - info!( - "{}: Camera time is now set: {}", - camera_config.name, time - ); - } else { - error!("{}: Camera did not accept new time (is {} an admin?)", camera_config.name, camera_config.username); - } - } + do_camera_management(&mut camera, camera_config)?; } info!( @@ -249,3 +227,33 @@ fn camera_main( })() .map_err(|err| CameraErr { connected, err }) } + +fn do_camera_management( + camera: &mut BcCamera, + camera_config: &CameraConfig, +) -> Result<(), neolink::Error> { + let cam_time = camera.get_time()?; + if let Some(time) = cam_time { + info!( + "{}: Camera time is already set: {}", + camera_config.name, time + ); + } else { + let new_time = time::OffsetDateTime::now_local(); + warn!( + "{}: Camera has no time set, setting to {}", + camera_config.name, new_time + ); + camera.set_time(new_time)?; + let cam_time = camera.get_time()?; + if let Some(time) = cam_time { + info!("{}: Camera time is now set: {}", camera_config.name, time); + } else { + error!( + "{}: Camera did not accept new time (is {} an admin?)", + camera_config.name, camera_config.username + ); + } + } + Ok(()) +} From b8118dadc959dbead5d723acaf66d75985bde0c3 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Mon, 14 Dec 2020 22:26:28 -0600 Subject: [PATCH 14/25] Remove usage of deprecated env_logger::from_env() --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 7f0ae5b..4ad0b98 100644 --- a/src/main.rs +++ b/src/main.rs @@ -33,7 +33,7 @@ pub enum Error { } fn main() -> Result<(), Error> { - env_logger::from_env(Env::default().default_filter_or("info")).init(); + env_logger::Builder::from_env(Env::default().default_filter_or("info")).init(); info!( "Neolink {} {}", From f4612b8f8d9dc6e0c3462932e8e9d4c5c4a47c9b Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Mon, 14 Dec 2020 22:37:15 -0600 Subject: [PATCH 15/25] Fix use of deprecated time::OffsetDateTime::now_local() --- src/main.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 4ad0b98..29e60d9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -239,7 +239,11 @@ fn do_camera_management( camera_config.name, time ); } else { - let new_time = time::OffsetDateTime::now_local(); + use time::OffsetDateTime; + // We'd like now_local() but it's deprecated - try to get the local time, but if no + // time zone, fall back to UTC. + let new_time = OffsetDateTime::try_now_local().unwrap_or(OffsetDateTime::now_utc()); + warn!( "{}: Camera has no time set, setting to {}", camera_config.name, new_time From 5ccfd6a0d8d1f8a77523a0f1679b8da00fa2c7b3 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Mon, 14 Dec 2020 22:40:28 -0600 Subject: [PATCH 16/25] Fix clippy lints --- src/bc_protocol.rs | 2 +- src/main.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 72fb7bd..ec5e737 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -111,7 +111,7 @@ impl BcCamera { }); } - return Err(Error::Timeout); + Err(Error::Timeout) } pub fn disconnect(&mut self) { diff --git a/src/main.rs b/src/main.rs index 29e60d9..1ee8a39 100644 --- a/src/main.rs +++ b/src/main.rs @@ -242,7 +242,8 @@ fn do_camera_management( use time::OffsetDateTime; // We'd like now_local() but it's deprecated - try to get the local time, but if no // time zone, fall back to UTC. - let new_time = OffsetDateTime::try_now_local().unwrap_or(OffsetDateTime::now_utc()); + let new_time = + OffsetDateTime::try_now_local().unwrap_or_else(|_| OffsetDateTime::now_utc()); warn!( "{}: Camera has no time set, setting to {}", From bdd270d3cad43172faae9572a8a48c70c455482c Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Tue, 15 Dec 2020 16:19:43 +0000 Subject: [PATCH 17/25] build.rs: Add GITHUB_SHA detection --- build.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/build.rs b/build.rs index d265dfe..801c327 100644 --- a/build.rs +++ b/build.rs @@ -18,6 +18,10 @@ fn build_ver() { } fn git_ver() -> Option { + github_ver().or_else(git_cmd_ver) +} + +fn git_cmd_ver() -> Option { let mut git_cmd = Command::new("git"); git_cmd.args(&["describe", "--tags"]); @@ -32,6 +36,15 @@ fn git_ver() -> Option { } } +fn github_ver() -> Option { + if let Ok(sha1) = env::var("GITHUB_SHA") { + println!("cargo:rerun-if-env-changed=GITHUB_SHA"); + Some(sha1) + } else { + None + } +} + #[cfg(windows)] fn platform_cfg() { let gstreamer_dir = env::var_os("GSTREAMER_1_0_ROOT_X86_64") From e00ed786acbad9f149f2ca4d35b6af29cd5a3c87 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Sun, 20 Dec 2020 01:16:18 -0600 Subject: [PATCH 18/25] bc: add VersionInfo --- src/bc/xml.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/bc/xml.rs b/src/bc/xml.rs index 727ae68..7c46dc0 100644 --- a/src/bc/xml.rs +++ b/src/bc/xml.rs @@ -35,6 +35,8 @@ pub struct BcXml { pub login_net: Option, #[yaserde(rename = "DeviceInfo")] pub device_info: Option, + #[yaserde(rename = "VersionInfo")] + pub version_info: Option, #[yaserde(rename = "Preview")] pub preview: Option, #[yaserde(rename = "SystemGeneral")] @@ -103,6 +105,17 @@ pub struct DeviceInfo { pub resolution: Resolution, } +#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +pub struct VersionInfo { + pub name: String, + pub serialNumber: String, + pub buildDay: String, + pub hardwareVersion: String, + pub cfgVersion: String, + pub firmwareVersion: String, + pub detail: String, +} + #[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] pub struct Resolution { #[yaserde(rename = "resolutionName")] From ce8c2d3648d85a9e36ba220ddd510a610471d4da Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Sun, 20 Dec 2020 01:17:33 -0600 Subject: [PATCH 19/25] BcCamera: add a version() function for VersionInfo --- src/bc/model.rs | 1 + src/bc_protocol.rs | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/src/bc/model.rs b/src/bc/model.rs index 9ddc4e8..bedea12 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -5,6 +5,7 @@ pub(super) const MAGIC_HEADER: u32 = 0xabcdef0; pub const MSG_ID_LOGIN: u32 = 1; pub const MSG_ID_VIDEO: u32 = 3; +pub const MSG_ID_VERSION: u32 = 80; pub const MSG_ID_PING: u32 = 93; pub const MSG_ID_GET_GENERAL: u32 = 104; pub const MSG_ID_SET_GENERAL: u32 = 105; diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index ec5e737..0ca9222 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -250,6 +250,51 @@ impl BcCamera { Ok(()) } + pub fn version(&self) -> Result { + let connection = self + .connection + .as_ref() + .expect("Must be connected to get version info"); + let sub_version = connection.subscribe(MSG_ID_VERSION)?; + + let version = Bc { + meta: BcMeta { + msg_id: MSG_ID_VERSION, + client_idx: 0, + encrypted: true, + class: 0x6414, + }, + body: BcBody::ModernMsg(ModernMsg { + ..Default::default() + }), + }; + + sub_version.send(version)?; + + let modern_reply = sub_version.rx.recv_timeout(RX_TIMEOUT)?; + let version_info; + match modern_reply.body { + BcBody::ModernMsg(ModernMsg { + xml: + Some(BcXml { + version_info: Some(info), + .. + }), + .. + }) => { + version_info = info; + } + _ => { + return Err(Error::UnintelligibleReply { + reply: modern_reply, + why: "Expected a VersionInfo message", + }) + } + } + + Ok(version_info) + } + pub fn ping(&self) -> Result<()> { let connection = self.connection.as_ref().expect("Must be connected to ping"); let sub_ping = connection.subscribe(MSG_ID_PING)?; From 6a432b30ad46786a408164e9058386e580f50870 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Sun, 20 Dec 2020 01:19:20 -0600 Subject: [PATCH 20/25] main: report camera firmware version --- src/main.rs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main.rs b/src/main.rs index 1ee8a39..a80ad38 100644 --- a/src/main.rs +++ b/src/main.rs @@ -260,5 +260,20 @@ fn do_camera_management( ); } } + + let version_info = camera.version(); + if version_info.is_ok() { + info!( + "{}: Camera reports firmware version {}", + camera_config.name, + version_info.unwrap().firmwareVersion + ); + } else { + info!( + "{}: Could not fetch version information", + camera_config.name + ); + } + Ok(()) } From 64af3dce1a5f3bdab7ac151938050914633ca4de Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sun, 20 Dec 2020 19:14:47 -0600 Subject: [PATCH 21/25] Docker: also install testing packages in release container Actually closes #104 on GitHub --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 400feb2..2ff879a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,10 @@ RUN cargo build --release # Create the release container. Match the base OS used to build FROM docker.io/alpine:latest -RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing libgcc \ +RUN apk add --no-cache \ + -X http://dl-cdn.alpinelinux.org/alpine/edge/main \ + -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + libgcc \ tzdata \ gstreamer \ gst-plugins-base \ From a91979d2b6b442b9afe10227c7e9e4eb507fb985 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sun, 20 Dec 2020 19:37:49 -0600 Subject: [PATCH 22/25] Allow older version of Rust to build adpcm --- src/bc_protocol/adpcm.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bc_protocol/adpcm.rs b/src/bc_protocol/adpcm.rs index e8b8793..a42b0cd 100644 --- a/src/bc_protocol/adpcm.rs +++ b/src/bc_protocol/adpcm.rs @@ -225,7 +225,7 @@ pub fn adpcm_to_pcm(bytes: &[u8]) -> Result, Error> { // Some formats e.g. OKI are not in the full PCM range of values // To convert we must scale it to the i16 range // We also cast to i16 at this point ready for the conversion to u8 bytes of the output - let scaled_sample = (sample as i32 * (i16::MAX as i32) + let scaled_sample = (sample as i32 * (std::i16::MAX as i32) / (context.max_sample_size - 1) as i32) as i16; From ae86407483f7cf07c5a30b2b13491d0084bb4a3c Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sun, 20 Dec 2020 19:54:31 -0600 Subject: [PATCH 23/25] Don't unwrap while checking camera version --- src/main.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index a80ad38..8214b49 100644 --- a/src/main.rs +++ b/src/main.rs @@ -261,12 +261,15 @@ fn do_camera_management( } } - let version_info = camera.version(); - if version_info.is_ok() { + use neolink::bc::xml::VersionInfo; + if let Ok(VersionInfo { + firmwareVersion: firmware_version, + .. + }) = camera.version() + { info!( "{}: Camera reports firmware version {}", - camera_config.name, - version_info.unwrap().firmwareVersion + camera_config.name, firmware_version ); } else { info!( From a7202fa9e14df82dd44c34ee007fdbe7656bd0bd Mon Sep 17 00:00:00 2001 From: twistedddx Date: Wed, 13 Jan 2021 22:46:37 +1030 Subject: [PATCH 24/25] config sample for tls_client_auth, stream, channel_id remove deprecated format --- sample_config.toml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sample_config.toml b/sample_config.toml index 3c1e8d1..cbe4fa2 100644 --- a/sample_config.toml +++ b/sample_config.toml @@ -2,6 +2,7 @@ # You can chage this to a specfic network e.g. "192.168.1.101" here # Or to no networks e.g. this computer only "127.0.0.1" bind = "0.0.0.0" + # Default port is 8554 but you can change it by uncommenting the following # bind_port = 8554 @@ -11,6 +12,10 @@ bind = "0.0.0.0" # If TLS is activated you must connect with "rtsps://" and not "rtsp://" # certificate = "/path/to/pem/with/cert/and/key" +# Choose if the client is required to provide a certificate signed by the server's CA. +# none|requested|required - default none +# tls_client_auth = "required" + # You can password protect the rtsp server mount points by adding users # like the following me and someone. If you do not add [[users]] # then anyone can connect without a password or username @@ -30,15 +35,22 @@ name = "driveway" username = "admin" password = "12345678" address = "192.168.1.187:9000" + # By default any of the users can connect (or anyone at all if no users are specfied) # You can uncomment the following to permit only specfic users # permitted_users = [ "me" ] +# By default "both" "mainStream" and "subStream" are connected +# If your device has user connection limits try a single stream instead. +# stream = "mainStream" + + [[cameras]] name = "storage shed" username = "admin" password = "987654321" address = "192.168.1.245:9000" -# By default the camera is assumed to be in H.265 format -# Some camera's e.g. E1 use H.264. You can use the following to change this -# format = "h264" + +# By default channel_id = 0. Eg the first connected camera on the device +# Note this counts from 0. An 8 channel NVR would have channels 0 through 7 +# channel_id = 1 From 5c83472fae89884f5df06475785ec3ee08612448 Mon Sep 17 00:00:00 2001 From: twistedddx Date: Mon, 14 Dec 2020 21:33:25 +1030 Subject: [PATCH 25/25] Update documentation for status code and additional encryption offset data --- dissector/messages.md | 453 +++++++++++++++++++++--------------------- dissector/protocol.md | 64 ++++-- 2 files changed, 270 insertions(+), 247 deletions(-) diff --git a/dissector/messages.md b/dissector/messages.md index b1f851c..3b1f904 100644 --- a/dissector/messages.md +++ b/dissector/messages.md @@ -11,9 +11,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------| - | f0 de bc 0a | 01 00 00 00 | 2c 07 00 00 | 00 00 00 01 | 01 | dc | 14 65 | + | magic | message id | message length | encryption offset | encrypt | unknown | message class | + |--------------|--------------|----------------|-------------------|---------|---------|---------------| + | f0 de bc 0a | 01 00 00 00 | 2c 07 00 00 | 00 00 00 01 | 01 | dc | 14 65 | - Body @@ -29,9 +29,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------| - | f0 de bc 0a | 01 00 00 00 | 91 00 00 00 | 00 00 00 01 | 01 | dd | 14 66 | + | magic | message id | message length | encryption offset | encrypt | unknown | message class | + |--------------|--------------|----------------|-------------------|---------|---------|---------------| + | f0 de bc 0a | 01 00 00 00 | 91 00 00 00 | 00 00 00 01 | 01 | dd | 14 66 | - Body @@ -47,16 +47,17 @@ a PR to improve it. - **Notes:** Sends back a NONCE used for the modern login message. This is effectively an upgrade request to use the modern xml style over legacy. - A legacy camera likely replies differently but I don't have one to test on. + Legacy cameras respond with status code `c8 00`, message class `00 00` and a basic camera description payload. + The legacy protocol beyond this point is not documented and not implemented in Neolink. - 1: Login Modern - Client - Header - | Magic | Message ID | Message Length | Encryption Offset | Encryption Flag | Unknown | Message Class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | f0 de bc 0a | 01 00 00 00 | 28 01 00 00 | 00 00 00 01 | 00 | 00 | 14 64 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | f0 de bc 0a | 01 00 00 00 | 28 01 00 00 | 00 00 00 01 | 00 00 | 14 64 | 00 00 00 00 | - Binary @@ -79,9 +80,9 @@ a PR to improve it. - Header - | Magic | Message ID | Message Length | Encryption Offset | Encryption Flag | Unknown | Message Class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | f0 de bc 0a | 01 00 00 00 | 2e 06 00 00 | 00 00 00 01 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | f0 de bc 0a | 01 00 00 00 | 2e 06 00 00 | 00 00 00 01 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -173,9 +174,9 @@ a PR to improve it. - Header - | Magic | Message ID | Message Length | Encryption Offset | Encryption Flag | Unknown | Message Class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | f0 de bc 0a | 03 00 00 00 | aa 00 00 00 | 00 00 00 09 | 00 | 00 | 14 64 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | f0 de bc 0a | 03 00 00 00 | aa 00 00 00 | 00 00 00 09 | 00 00 | 14 64 | 00 00 00 00 | - Binary @@ -196,9 +197,9 @@ a PR to improve it. - Header - | Magic | Message ID | Message Length | Encryption Offset | Encryption Flag | Unknown | Message Class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | f0 de bc 0a | 03 00 00 00 | 8a 00 00 00 | 00 00 00 09 | c8 | 00 | 00 00 | 6a 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | f0 de bc 0a | 03 00 00 00 | 8a 00 00 00 | 00 00 00 09 | c8 00 | 00 00 | 6a 00 00 00 | - Body @@ -222,9 +223,9 @@ a PR to improve it. - Header - | Magic | Message ID | Message Length | Encryption Offset | Encryption Flag | Unknown | Message Class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | f0 de bc 0a | 03 00 00 00 | e8 5e 00 00 | 00 00 00 09 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | f0 de bc 0a | 03 00 00 00 | e8 5e 00 00 | 00 00 00 09 | c8 00 | 00 00 | 00 00 00 00 | - Body @@ -237,9 +238,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 04 | 00 00 00 86 | 2b 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 04 | 00 00 00 86 | 2b 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Binary @@ -257,9 +258,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 04 | 00 00 00 00 | 2b 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 04 | 00 00 00 00 | 2b 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - 10: `` @@ -267,9 +268,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 0a | 00 00 00 68 | 0b 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 0a | 00 00 00 68 | 0b 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -284,9 +285,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 0a | 00 00 01 f7 | 0b 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 0a | 00 00 01 f7 | 0b 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -320,9 +321,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 12 | 00 00 00 a4 | 1e 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 12 | 00 00 00 a4 | 1e 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Binary @@ -341,9 +342,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 12 | 00 00 00 00 | 1e 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 12 | 00 00 00 00 | 1e 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - 25: `` (write) @@ -351,9 +352,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 19 | 00 00 05 c2 | 64 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 19 | 00 00 05 c2 | 64 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -452,9 +453,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 19 | 00 00 00 00 | 64 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 19 | 00 00 00 00 | 64 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - 26: `` @@ -463,9 +464,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 1a | 00 00 00 68 | 2d 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 1a | 00 00 00 68 | 2d 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -480,9 +481,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 1a | 00 00 05 7c | 2d 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 1a | 00 00 05 7c | 2d 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -575,17 +576,17 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 1f | 00 00 00 00 | 05 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 1f | 00 00 00 00 | 05 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Camera - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 1f | 00 00 00 00 | 05 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 1f | 00 00 00 00 | 05 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - **Notes:** The camera will not send message 33 to the client until after this msg has been recieved @@ -596,9 +597,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 21 | 00 00 00 f0 | 05 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 21 | 00 00 00 f0 | 05 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -622,9 +623,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 2c | 00 00 00 68 | 30 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 2c | 00 00 00 68 | 30 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -639,9 +640,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 2c | 00 00 01 df | 30 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 2c | 00 00 01 df | 30 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -675,9 +676,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 2d | 00 00 02 23 | 32 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 2d | 00 00 02 23 | 32 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -716,9 +717,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 2d | 00 00 00 00 | 32 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 2d | 00 00 00 00 | 32 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - 52: `` @@ -726,9 +727,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 34 | 00 00 00 68 | 36 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 34 | 00 00 00 68 | 36 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -743,9 +744,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 34 | 00 00 00 96 | 36 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 34 | 00 00 00 96 | 36 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -766,9 +767,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 35 | 00 00 01 d7 | 38 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 35 | 00 00 01 d7 | 38 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -813,9 +814,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 35 | 00 00 00 00 | 38 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 35 | 00 00 00 00 | 38 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - 54: `` @@ -823,9 +824,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 36 | 00 00 00 68 | 14 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 36 | 00 00 00 68 | 14 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -840,9 +841,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 36 | 00 00 00 ed | 14 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 36 | 00 00 00 ed | 14 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -865,9 +866,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 37 | 00 00 01 3b | 16 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 37 | 00 00 01 3b | 16 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -896,9 +897,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 37 | 00 00 00 00 | 16 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 37 | 00 00 00 00 | 16 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - 56: `` @@ -906,9 +907,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 38 | 00 00 00 68 | 1d 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 38 | 00 00 00 68 | 1d 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -923,9 +924,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 38 | 00 00 03 61 | 1d 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 38 | 00 00 03 61 | 1d 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -975,9 +976,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 39 | 00 00 02 bc | 1f 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 39 | 00 00 02 bc | 1f 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -1023,9 +1024,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 39 | 00 00 00 00 | 1f 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 39 | 00 00 00 00 | 1f 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - 58: `` @@ -1033,9 +1034,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 3a | 00 00 00 6b | 03 00 00 00 | 00 | 00 | 64 14 | 00 00 00 6b | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 3a | 00 00 00 6b | 03 00 00 00 | 00 00 | 64 14 | 00 00 00 6b | - Body @@ -1050,9 +1051,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 3a | 00 00 03 a4 | 03 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 3a | 00 00 03 a4 | 03 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1116,17 +1117,17 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 4c | 00 00 00 00 | 22 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 4c | 00 00 00 00 | 22 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Camera - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 4c | 00 00 01 69 | 22 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 4c | 00 00 01 69 | 22 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1158,9 +1159,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 4d | 00 00 01 5b | 25 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 4d | 00 00 01 5b | 25 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Binary @@ -1190,9 +1191,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 4d | 00 00 00 00 | 14 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 4d | 00 00 00 00 | 14 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - 78: `` @@ -1200,9 +1201,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 4e | 00 00 00 d3 | 1b 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 4e | 00 00 00 d3 | 1b 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1225,9 +1226,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 4f | 00 00 01 3b | 1b 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 4f | 00 00 01 3b | 1b 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1253,17 +1254,17 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 50 | 00 00 00 00 | 08 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 50 | 00 00 00 00 | 08 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Camera - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 50 | 00 00 01 f0 | 08 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 50 | 00 00 01 f0 | 08 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1292,9 +1293,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 51 | 00 00 00 68 | 19 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 51 | 00 00 00 68 | 19 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -1309,9 +1310,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 51 | 00 00 04 30 | 19 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 51 | 00 00 04 30 | 19 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1380,9 +1381,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 52 | 00 00 05 da | 1a 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 52 | 00 00 05 da | 1a 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -1475,9 +1476,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 52 | 00 00 00 00 | 1a 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 52 | 00 00 00 00 | 1a 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - 93: `` @@ -1485,9 +1486,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 5d | 00 00 00 00 | 17 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 5d | 00 00 00 00 | 17 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - 102: `` @@ -1495,17 +1496,17 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 66 | 00 00 00 00 | 07 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 66 | 00 00 00 00 | 07 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Camera - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 66 | 00 00 00 55 | 07 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 66 | 00 00 00 55 | 07 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1522,17 +1523,17 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 68 | 00 00 00 00 | 0a 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 68 | 00 00 00 00 | 0a 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Camera - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 68 | 00 00 01 a5 | 0a 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 68 | 00 00 01 a5 | 0a 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1565,17 +1566,17 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 73 | 00 00 00 00 | 0c 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 73 | 00 00 00 00 | 0c 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Camera - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 73 | 00 00 00 75 | 0c 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 73 | 00 00 00 75 | 0c 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1594,9 +1595,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 84 | 00 00 00 68 | 65 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 84 | 00 00 00 68 | 65 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -1611,9 +1612,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 84 | 00 00 05 7c | 65 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 84 | 00 00 05 7c | 65 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1706,17 +1707,17 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 85 | 00 00 00 00 | 06 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 85 | 00 00 00 00 | 06 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Camera - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 85 | 00 00 00 7f | 06 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 85 | 00 00 00 7f | 06 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1736,17 +1737,17 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 92 | 00 00 00 00 | 04 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 92 | 00 00 00 00 | 04 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Camera - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 92 | 00 00 02 fc | 04 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 92 | 00 00 02 fc | 04 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1789,9 +1790,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 97 | 00 00 00 a7 | 02 00 00 00 | 00 | 00 | 64 14 | 00 00 00 a7 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 97 | 00 00 00 a7 | 02 00 00 00 | 00 00 | 64 14 | 00 00 00 a7 | - Body @@ -1807,9 +1808,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 97 | 00 00 03 ac | 02 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 97 | 00 00 03 ac | 02 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1856,9 +1857,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 be | 00 00 00 68 | 0d 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 be | 00 00 00 68 | 0d 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -1873,9 +1874,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 be | 00 00 00 86 | 0d 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 be | 00 00 00 86 | 0d 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -1895,17 +1896,17 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 c0 | 00 00 00 00 | 05 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 c0 | 00 00 00 00 | 05 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Camera - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 c0 | 00 00 00 00 | 05 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 c0 | 00 00 00 00 | 05 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - 199: `` @@ -1913,17 +1914,17 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 c7 | 00 00 00 00 | 02 00 00 00 | 00 | 00 | 64 14 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 c7 | 00 00 00 00 | 02 00 00 00 | 00 00 | 64 14 | 00 00 00 00 | - Camera - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 c7 | 00 00 05 f6 | 02 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 c7 | 00 00 05 f6 | 02 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -2007,9 +2008,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 d0 | 00 00 00 68 | 2e 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 d0 | 00 00 00 68 | 2e 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -2024,9 +2025,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 d0 | 00 00 00 c2 | 2e 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 d0 | 00 00 00 c2 | 2e 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | - Binary @@ -2048,9 +2049,9 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 d1 | 00 00 01 10 | 85 00 00 00 | 00 | 00 | 64 14 | 00 00 00 68 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 d1 | 00 00 01 10 | 85 00 00 00 | 00 00 | 64 14 | 00 00 00 68 | - Body @@ -2078,6 +2079,6 @@ a PR to improve it. - Header - | magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | Binary Offset | - |--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| - | 0a bc de f0 | 00 00 00 d1 | 00 00 00 00 | 85 00 00 00 | c8 | 00 | 00 00 | 00 00 00 00 | + | Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | + |--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| + | 0a bc de f0 | 00 00 00 d1 | 00 00 00 00 | 85 00 00 00 | c8 00 | 00 00 | 00 00 00 00 | diff --git a/dissector/protocol.md b/dissector/protocol.md index fd81dce..55552f1 100644 --- a/dissector/protocol.md +++ b/dissector/protocol.md @@ -16,29 +16,38 @@ Each message has the general format: The header has the format: -| magic | message id | message length | encryption offset | Encryption flag | Unknown | message class | -|--------------|--------------|----------------|-------------------|-----------------|---------|---------------| -| f0 de bc 0a | 01 00 00 00 | 2c 07 00 00 | 00 00 00 01 | 01 | dc | 14 65 | +| magic | message id | message length | encryption offset | encrypt | unknown | message class | +|--------------|--------------|----------------|-------------------|---------|---------|---------------| +| f0 de bc 0a | 01 00 00 00 | 2c 07 00 00 | 00 00 00 01 | 01 | dc | 14 65 | + +- Magic 4 bytes +- ID 4 bytes +- Message length 4 bytes +- Encryption offset 4 bytes +- Encryption flag 1 byte +- Unknown 1 byte +- Message class 2 bytes Or -| Magic | Message ID | Message Length | Encryption Offset | Encryption Flag | Unknown | Message Class | Binary Offset | -|--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| -| f0 de bc 0a | 01 00 00 00 | 28 01 00 00 | 00 00 00 01 | 00 | 00 | 14 64 | 00 00 00 00 | +| Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | +|--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| +| f0 de bc 0a | 01 00 00 00 | 28 01 00 00 | 00 00 00 01 | c8 00 | 14 64 | 00 00 00 00 | - Magic 4 bytes - ID 4 bytes - Message length 4 bytes - Encryption offset 4 bytes -- Encryption flag (not always honoured by clients) 1 byte -- Unknown 1 byte (always zero) +- Status Code 2 bytes +- Message class 2 bytes - Binary offset 4 bytes (Presence depend on message class) #### Magic -The magic bytes for BC messages is always `f0 de bc 0a`. When receiving packet -this should be used to quickly discard invalid packets. +The magic bytes for BC messages is always `f0 de bc 0a` for client <-> device. +Or magic `a0 cd ed 0f` for device <-> device, eg NVR <-> IPC. +When receiving packet these should be used to quickly discard invalid packets. #### Message ID @@ -80,19 +89,32 @@ The key is the same for all cameras. Older cameras do not use encryption and all messages are sent as plain text. +The offset bytes are actually made up of other useful information +channel_id 1 byte - NVR channel related to request/response or `00` if N/A. +stream_id 1 byte - `00`=clear, `01`=fluent, `04`=balanced +unknown 1 byte - Always `00` +message_handle 1 byte - client increments per request, replies use request handle + #### Encryption Flag -This flag is 0 for unencrypted or non zero for encrypted. This flag seems -only to be valid during the login step, and seems to be arbitrary otherwise. +This flag is 0 for unencrypted or non zero for encrypted. Clients should decide to use encryption or not based on this byte that the -camera send during login. Then should use that same setting for all further +camera sent during login. Then should use that same setting for all further messages with the camera. #### Unknown -The purpose of this byte is unknown but is always zero. If you figure out -what it does please submit a PR. +The purpose of this byte is unknown. +Observed - `dc` = client request, `dd` = device reply +If you figure out what it does please submit a PR. + +#### Status Code + +In a request this is set to `00 00`. +In a reply this is a http style response code. +`c8 00` = 200 OK +`90 01` = 400 Bad Request #### Message class @@ -191,9 +213,9 @@ the [docs](dissector/mediapacket.md) Other data can be received from the camera by sending the appropriate header to the camera. For example sending the header for ID 78 -| Magic | Message ID | Message Length | Encryption Offset | Encryption Flag | Unknown | Message Class | Binary Offset | -|--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| -| f0 de bc 0a | 4e 00 00 00 | d3 00 00 00 | 08 db 9c 00 | c8 | 00 | 00 00 | 00 00 00 00 | +| Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | +|--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| +| f0 de bc 0a | 4e 00 00 00 | d3 00 00 00 | 08 db 9c 00 | c8 00 | 00 00 | 00 00 00 00 | The camera will reply with an xml with brightness and contrast @@ -214,9 +236,9 @@ Some message IDs also require input along with the request header. For example ID 151 which is the users ability info requires the header -| Magic | Message ID | Message Length | Encryption Offset | Encryption Flag | Unknown | Message Class | Binary Offset | -|--------------|--------------|----------------|-------------------|-----------------|---------|---------------|---------------| -| f0 de bc 0a | 97 00 00 00 | a7 00 00 00 | 00 00 00 02 | 00 | 00 | 14 64 | a7 00 00 00 | +| Magic | Message ID | Message Length | Encryption Offset | Status Code | Message Class | Binary Offset | +|--------------|--------------|----------------|-------------------|-------------------|---------------|---------------| +| f0 de bc 0a | 97 00 00 00 | a7 00 00 00 | 00 00 00 02 | 00 00 | 14 64 | a7 00 00 00 | and the body of