From 7ab46e4273d51c88ef2dce57987dabfa9b4af7d8 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Tue, 31 Aug 2021 20:55:12 +0700 Subject: [PATCH] Clean up files --- Cargo.lock | 87 +- .../src/bc_protocol/connection/_udpconn.rs | 926 ------------------ 2 files changed, 75 insertions(+), 938 deletions(-) delete mode 100644 crates/core/src/bc_protocol/connection/_udpconn.rs diff --git a/Cargo.lock b/Cargo.lock index 2b413d8..1933e7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -48,7 +48,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -77,7 +77,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -122,6 +122,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65c1bf4a04a88c54f589125563643d773f3254b5c38571395e2b591c693bbc81" +[[package]] +name = "c_linked_list" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" + [[package]] name = "cfb-mode" version = "0.6.0" @@ -195,11 +201,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" dependencies = [ "cfg-if 0.1.10", - "crossbeam-channel", + "crossbeam-channel 0.4.4", "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.7.2", ] [[package]] @@ -208,10 +214,20 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.5", +] + [[package]] name = "crossbeam-deque" version = "0.7.4" @@ -219,7 +235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" dependencies = [ "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -231,7 +247,7 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg", "cfg-if 0.1.10", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", "memoffset", @@ -245,7 +261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ "cfg-if 0.1.10", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -260,6 +276,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +dependencies = [ + "cfg-if 1.0.0", + "lazy_static", +] + [[package]] name = "discard" version = "1.0.4" @@ -373,6 +399,12 @@ dependencies = [ "slab", ] +[[package]] +name = "gcc" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" + [[package]] name = "generic-array" version = "0.14.4" @@ -383,6 +415,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "get_if_addrs" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abddb55a898d32925f3148bd281174a68eeb68bbfd9a5938a57b18f506ee4ef7" +dependencies = [ + "c_linked_list", + "get_if_addrs-sys", + "libc", + "winapi 0.2.8", +] + +[[package]] +name = "get_if_addrs-sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d04f9fb746cf36b191c00f3ede8bde9c8e64f9f4b05ae2694a9ccf5e3f5ab48" +dependencies = [ + "gcc", + "libc", +] + [[package]] name = "getrandom" version = "0.2.3" @@ -421,7 +475,7 @@ dependencies = [ "gobject-sys", "libc", "system-deps", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -886,9 +940,12 @@ dependencies = [ "assert_matches", "cfb-mode", "cookie-factory", + "crossbeam-channel 0.5.1", "env_logger", "err-derive", + "get_if_addrs", "indoc", + "lazy_static", "log", "md5", "nom", @@ -1218,7 +1275,7 @@ checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ "cfg-if 1.0.0", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1430,7 +1487,7 @@ dependencies = [ "stdweb", "time-macros", "version_check", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1648,6 +1705,12 @@ version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + [[package]] name = "winapi" version = "0.3.9" @@ -1670,7 +1733,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] diff --git a/crates/core/src/bc_protocol/connection/_udpconn.rs b/crates/core/src/bc_protocol/connection/_udpconn.rs deleted file mode 100644 index 8f3db4e..0000000 --- a/crates/core/src/bc_protocol/connection/_udpconn.rs +++ /dev/null @@ -1,926 +0,0 @@ -use super::{BcSubscription, Error, Result}; -use crate::bc; -use crate::bc::model::*; -use crate::bcudp; -use crate::bcudp::{model::*, xml::*}; -use crate::RX_TIMEOUT; -use crossbeam_channel::{ - unbounded, Receiver, RecvError, RecvTimeoutError, SendError, SendTimeoutError, Sender, -}; -use lazy_static::lazy_static; -use log::*; -use rand::{seq::SliceRandom, thread_rng, Rng}; -use socket2::{Domain, Socket, Type}; -use std::collections::btree_map::Entry; -use std::collections::BTreeMap; -use std::collections::HashMap; -use std::error::Error as StdErr; // Just need the traits -use std::io::{BufRead, Error as IoError, Read, Write}; -use std::net::{IpAddr, Ipv4Addr, SocketAddr, ToSocketAddrs, UdpSocket}; -use std::sync::{ - atomic::{AtomicBool, AtomicU32, Ordering}, - Arc, Mutex, -}; -use std::thread::JoinHandle; -use std::time::Duration; -use time::OffsetDateTime; - -type IoResult = std::result::Result; - -const WAIT_TIME: Duration = Duration::from_millis(500); - -// TODO: Path MTU discovery -const MTU: u32 = 1350; - -lazy_static! { - static ref P2P_RELAY_HOSTNAMES: [&'static str; 10] = [ - "p2p.reolink.com", - "p2p1.reolink.com", - "p2p2.reolink.com", - "p2p3.reolink.com", - "p2p14.reolink.com", - "p2p15.reolink.com", - "p2p6.reolink.com", - "p2p7.reolink.com", - "p2p8.reolink.com", - "p2p9.reolink.com", - ]; -} - -pub struct UdpSource { - socket: UdpSocket, - address: SocketAddr, - client_id: i32, - camera_id: i32, - mtu: u32, - - camera_acknowledged: Arc, - client_sent: Arc, - client_wants: Arc, - unacknowledged: Arc>>>, - aborter: AbortHandle, - // Buffered because a single read might not read a whole packet - read_buffer: Buffered, - write_buffer: Buffered, -} - -#[derive(Default, Clone)] -struct Buffered { - buffer: Vec, - consumed: usize, -} - -struct DiscoveryResult { - socket: UdpSocket, - address: SocketAddr, - client_id: i32, - camera_id: i32, - mtu: u32, -} - -#[derive(Clone)] -struct AbortHandle { - aborted: Arc, -} - -impl AbortHandle { - fn new() -> Self { - Self { - aborted: Arc::new(AtomicBool::new(false)), - } - } - - fn abort(&self) { - self.aborted.store(true, Ordering::Relaxed); - } - - fn is_aborted(&self) -> bool { - self.aborted.load(Ordering::Relaxed) - } -} - -impl UdpSource { - fn get_socket(_timeout: Duration) -> Result { - // Select a random port to bind to - let mut ports: Vec = (53500..54000).into_iter().collect(); - let mut rng = thread_rng(); - ports.shuffle(&mut rng); - - let addrs: Vec<_> = ports - .iter() - .map(|&port| SocketAddr::from(([0, 0, 0, 0], port))) - .collect(); - let socket = UdpSocket::bind(&addrs[..])?; - socket.set_read_timeout(Some(timeout))?; - socket.set_write_timeout(Some(timeout))?; - // socket.set_nonblocking(true)?; - socket.set_broadcast(true)?; - Ok(socket) - } - - fn retrying_send_to( - socket: &UdpSocket, - buf: &[u8], - addr: T, - ) -> IoResult<(usize, AbortHandle)> { - let addr = addr.to_socket_addrs()?.next().ok_or_else(|| { - IoError::new(std::io::ErrorKind::NotFound, Error::ConnectionUnavaliable) - })?; - Self::retrying_send_to_multi(socket, buf, &[addr]) - } - - fn retrying_send_to_multi( - socket: &UdpSocket, - buf: &[u8], - addrs: &[T], - ) -> IoResult<(usize, AbortHandle)> { - let handle = AbortHandle::new(); - - let addrs: Vec = addrs - .iter() - .map(|a| { - a.to_socket_addrs() - .ok() - .and_then(|mut a_iter| a_iter.next()) - }) - .flatten() - .collect(); - - let mut bytes_send = 0; - for addr in addrs.iter() { - bytes_send = socket.send_to(buf, &addr)?; - } - - let thread_buffer = buf.to_vec(); - let thread_handle = handle.clone(); - let thread_socket = socket.try_clone()?; - let thread_addr: Vec = addrs; - - const MAX_RETRIES: usize = 10; - - std::thread::spawn(move || { - std::thread::sleep(WAIT_TIME); - for _ in 0..MAX_RETRIES { - if thread_handle.is_aborted() { - break; - } - for addr in thread_addr.iter() { - let _ = thread_socket.send_to(&thread_buffer[..], &addr); - } - std::thread::sleep(WAIT_TIME); - } - }); - - Ok((bytes_send, handle)) - } - - fn discover_from_uuid_local( - uid: &str, - socket: &UdpSocket, - timeout: Duration, - ) -> Result { - let mut rng = thread_rng(); - // If tid is too large it will overflow during encrypt so we just use a random u8 - let tid: u32 = (rng.gen::()) as u32; - let client_id: i32 = rng.gen(); - let local_addr = socket.local_addr()?; - let port = local_addr.port(); - - let mtu = MTU; - - let msg = BcUdp::Discovery(UdpDiscovery { - tid, - payload: UdpXml { - c2d_c: Some(C2dC { - uid: uid.to_string(), - cli: ClientList { port: port as u32 }, - cid: client_id, - mtu, - debug: false, - os: "MAC".to_string(), - }), - ..Default::default() - }, - }); - - let mut buf = vec![]; - msg.serialize(&mut buf)?; - - let (amount_sent, abort) = Self::retrying_send_to_multi( - socket, - &buf[..], - &["255.255.255.255:2015", "255.255.255.255:2018"], - )?; - assert_eq!(amount_sent, buf.len()); - - let start_time = OffsetDateTime::now_utc(); - let camera_address; - let camera_id; - loop { - if (OffsetDateTime::now_utc() - start_time) <= timeout { - let mut buf = vec![0; mtu as usize]; - if let Ok((bytes_read, socket_addr)) = socket.recv_from(&mut buf) { - match BcUdp::deserialize(&buf[0..bytes_read]) { - Ok(BcUdp::Discovery(UdpDiscovery { - tid: _, - payload: - UdpXml { - d2c_c_r: Some(D2cCr { did, cid, .. }), - .. - }, - })) if cid == client_id => { - abort.abort(); - camera_address = socket_addr; - camera_id = did; - break; - } - Ok(smt) => debug!("Udp Discovery got this unexpected BcUdp {:?}", smt), - Err(_) => debug!( - "Udp Discovery got this unexpected binary: {:?}", - &buf[0..bytes_read] - ), - } - } - } else { - abort.abort(); - return Err(Error::Timeout); - } - } - - // Ensure we didn't forget to abort the sending - abort.abort(); - // Actual connection time! - socket.connect(camera_address)?; - - Ok(DiscoveryResult { - socket: socket.try_clone()?, - address: camera_address, - client_id, - camera_id, - mtu, - }) - } - - fn get_register( - uid: &str, - socket: &UdpSocket, - timeout: Duration, - tid: u32, - // client_id: u32, - ) -> Result { - // let local_addr = socket.local_addr()?; - // let local_port = local_addr.port(); - - let mtu = MTU; - - for p2p_relay in P2P_RELAY_HOSTNAMES.iter() { - debug!("Trying register: {}", p2p_relay); - let msg = BcUdp::Discovery(UdpDiscovery { - tid, - payload: UdpXml { - c2m_q: Some(C2mQ { - uid: uid.to_string(), - os: "MAC".to_string(), - }), - ..Default::default() - }, - }); - - let mut buf = vec![]; - msg.serialize(&mut buf)?; - - let (amount_sent, abort) = - Self::retrying_send_to(socket, &buf[..], format!("{}:9999", p2p_relay))?; - assert_eq!(amount_sent, buf.len()); - - let start_time = OffsetDateTime::now_utc(); - loop { - if (OffsetDateTime::now_utc() - start_time) <= timeout { - let mut buf = vec![0; mtu as usize]; - if let Ok((bytes_read, _)) = socket.recv_from(&mut buf) { - match BcUdp::deserialize(&buf[0..bytes_read]) { - Ok(BcUdp::Discovery(UdpDiscovery { - tid: _, - payload: - UdpXml { - m2c_q_r: Some(m2c_q_r), - .. - }, - })) if m2c_q_r.reg.port == 0 || m2c_q_r.reg.ip.is_empty() => { - // This register is empty - abort.abort(); - break; - } - Ok(BcUdp::Discovery(UdpDiscovery { - tid: _, - payload: - UdpXml { - m2c_q_r: Some(m2c_q_r), - .. - }, - })) => { - abort.abort(); - return Ok(m2c_q_r); - } - Ok(smt) => debug!("Udp Discovery got this unexpected BcUdp {:?}", smt), - Err(_) => debug!( - "Udp Discovery got this unexpected binary: {:?}", - &buf[0..bytes_read] - ), - } - } - } else { - abort.abort(); - // This p2p server didn't have the data we need try another - break; - } - } - } - debug!("All registers tried"); - Err(Error::ConnectionUnavaliable) - } - - fn discover_from_uuid_remote( - uid: &str, - socket: &UdpSocket, - timeout: Duration, - ) -> Result { - let local_addr = socket.local_addr()?; - let local_port = local_addr.port(); - - let mut rng = thread_rng(); - // If tid is too large it will overflow during encrypt so we just use a random u8 - let tid: u32 = (rng.gen::()) as u32; - let mtu = MTU; - let client_id: i32 = rng.gen(); - - let m2c_q_r = Self::get_register(uid, socket, timeout, tid)?; - - debug!("Got this information from the register: {:?}", m2c_q_r); - - let register_address = m2c_q_r.reg; - let relay_address = m2c_q_r.relay; - let log_address = m2c_q_r.log; - // let device_address = m2c_q_r.t; - - debug!("Register address found: {:?}", register_address); - debug!("Registering this address: {:?}", local_addr); - - let local_family = if local_addr.ip().is_ipv4() { 4 } else { 6 }; - let msg = BcUdp::Discovery(UdpDiscovery { - tid, - payload: UdpXml { - c2r_c: Some(C2rC { - uid: uid.to_string(), - cli: IpPort { - ip: local_addr.ip().to_string(), - port: local_port, - }, - relay: relay_address, - cid: client_id, - family: local_family, - debug: false, - os: "MAC".to_string(), - }), - ..Default::default() - }, - }); - - let mut buf = vec![]; - msg.serialize(&mut buf)?; - - let (amount_sent, abort) = Self::retrying_send_to( - socket, - &buf[..], - format!("{}:{}", register_address.ip, register_address.port), - )?; - assert_eq!(amount_sent, buf.len()); - - let device_sid; - let dev_loc; - let start_time = OffsetDateTime::now_utc(); - loop { - if (OffsetDateTime::now_utc() - start_time) <= timeout { - let mut buf = vec![0; mtu as usize]; - if let Ok((bytes_read, _)) = socket.recv_from(&mut buf) { - match BcUdp::deserialize(&buf[0..bytes_read]) { - // Got camera data from register - Ok(BcUdp::Discovery(UdpDiscovery { - tid: _, - payload: - UdpXml { - r2c_t: Some(R2cT { dev, cid, sid, .. }), - .. - }, - })) if cid == client_id => { - abort.abort(); - // Make a local request to the camera with the dev info - device_sid = sid; - dev_loc = dev; - break; - } - Ok(smt) => debug!("Udp Discovery got this unexpected BcUdp {:?}", smt), - Err(_) => debug!( - "Udp Discovery got this unexpected binary: {:?}", - &buf[0..bytes_read] - ), - } - } - } else { - abort.abort(); - return Err(Error::Timeout); - } - } - - debug!("Register revealed address as SID: {:?}", device_sid); - debug!("Register revealed address as IP: {:?}", dev_loc); - - // ensure abort - abort.abort(); - - let msg = BcUdp::Discovery(UdpDiscovery { - tid, - payload: UdpXml { - c2d_t: Some(C2dT { - sid: device_sid, - cid: client_id, - mtu, - conn: "local".to_string(), - }), - ..Default::default() - }, - }); - - let mut buf = vec![]; - msg.serialize(&mut buf)?; - - let (amount_sent, abort) = - Self::retrying_send_to(socket, &buf[..], format!("{}:{}", dev_loc.ip, dev_loc.port))?; - assert_eq!(amount_sent, buf.len()); - - let device_id; - let start_time = OffsetDateTime::now_utc(); - loop { - if (OffsetDateTime::now_utc() - start_time) <= timeout { - let mut buf = vec![0; mtu as usize]; - if let Ok((bytes_read, _)) = socket.recv_from(&mut buf) { - match BcUdp::deserialize(&buf[0..bytes_read]) { - // Got camera data from camera - Ok(BcUdp::Discovery(UdpDiscovery { - tid: _, - payload: - UdpXml { - d2c_t: Some(D2cT { cid, did, .. }), - .. - }, - })) if cid == client_id => { - device_id = did; - break; - } - // Got camera data from camera CFM - Ok(BcUdp::Discovery(UdpDiscovery { - tid: _, - payload: - UdpXml { - d2c_cfm: Some(D2cCfm { cid, did, .. }), - .. - }, - })) if cid == client_id => { - device_id = did; - break; - } - // Got camera data from camera disc - Ok(BcUdp::Discovery(UdpDiscovery { - tid: _, - payload: - UdpXml { - d2c_disc: Some(D2cDisc { cid, did, .. }), - .. - }, - })) if cid == client_id => { - device_id = did; - break; - } - Ok(smt) => debug!("Udp Discovery got this unexpected BcUdp {:?}", smt), - Err(_) => debug!( - "Udp Discovery got this unexpected binary: {:?}", - &buf[0..bytes_read] - ), - } - } - } else { - abort.abort(); - return Err(Error::Timeout); - } - } - - debug!("Got device ID as: {:?}", device_id); - - // Ensure aborted - abort.abort(); - - // Announce to the log that we will connect locally - let msg = BcUdp::Discovery(UdpDiscovery { - tid, - payload: UdpXml { - c2r_cfm: Some(C2rCfm { - sid: device_sid, - cid: client_id, - did: device_id, - conn: "local".to_string(), - rsp: 0, - }), - ..Default::default() - }, - }); - - let mut buf = vec![]; - msg.serialize(&mut buf)?; - - // Just let this retry to max limit as we don't get a reply - let (amount_sent, _) = Self::retrying_send_to( - socket, - &buf[..], - format!("{}:{}", log_address.ip, log_address.port), - )?; - assert_eq!(amount_sent, buf.len()); - - // Announce a map type connection (I think this means we could connect remotely) - let msg = BcUdp::Discovery(UdpDiscovery { - tid, - payload: UdpXml { - c2d_t: Some(C2dT { - sid: device_sid, - cid: client_id, - mtu, - conn: "map".to_string(), - }), - ..Default::default() - }, - }); - - let mut buf = vec![]; - msg.serialize(&mut buf)?; - - // Just let this retry to max limit as we don't get a reply - let (amount_sent, _) = - Self::retrying_send_to(socket, &buf[..], format!("{}:{}", dev_loc.ip, dev_loc.port))?; - assert_eq!(amount_sent, buf.len()); - - let camera_address: SocketAddr = format!("{}:{}", dev_loc.ip, dev_loc.port) - .to_socket_addrs()? - .next() - .ok_or(Error::ConnectionUnavaliable)?; - - socket.connect(camera_address)?; - - Ok(DiscoveryResult { - socket: socket.try_clone()?, - address: camera_address, - client_id, - camera_id: device_id, - mtu, - }) - } - - fn discover_from_uuid( - uid: &str, - timeout: Duration, - allow_remote: bool, - ) -> Result { - let socket = Self::get_socket(timeout)?; - match Self::discover_from_uuid_local(uid, &socket, timeout) { - Err(Error::Timeout) if allow_remote => { - Self::discover_from_uuid_remote(uid, &socket, timeout) - } - Ok(result) => Ok(result), - Err(e) => Err(e), - } - } - - /// It is possible to contact the reolink servers using udp to - /// learn the ip and port of the camera. By default I have turned - /// this feature off with no way to enable it from the usual - /// command line interface or config. - /// - /// However it may prove neccesary one day to use it so it is here in the - /// library and other programs may want to use it. - pub fn new_allow_remote(uid: &str, timeout: Duration) -> Result { - Self::new_with_remote(uid, timeout, true) - } - - pub fn new(uid: &str, timeout: Duration) -> Result { - Self::new_with_remote(uid, timeout, true) - } - - fn new_with_remote(uid: &str, timeout: Duration, allow_remote: bool) -> Result { - let discovery_result = Self::discover_from_uuid(uid, timeout, allow_remote)?; - info!("UID {:?} found at {:?}", uid, discovery_result.address); - - let (to_outgoing, outgoing) = unbounded(); - let (incoming, from_incoming) = unbounded(); - let me = UdpSource { - socket: discovery_result.socket, - address: discovery_result.address, - client_id: discovery_result.client_id, - camera_id: discovery_result.camera_id, - mtu: discovery_result.mtu, - incoming: from_incoming, - outgoing: to_outgoing, - camera_acknowledged: Default::default(), - unacknowledged: Default::default(), - client_sent: Default::default(), - client_wants: Default::default(), - aborter: AbortHandle::new(), - read_buffer: Default::default(), - write_buffer: Default::default(), - }; - - me.start_polling(outgoing, incoming)?; - - Ok(me) - } - - pub fn try_clone(&self) -> IoResult { - Ok(Self { - socket: self.socket.try_clone()?, - address: self.address, - client_id: self.client_id, - camera_id: self.camera_id, - mtu: self.mtu, - incoming: self.incoming.clone(), - outgoing: self.outgoing.clone(), - aborter: self.aborter.clone(), - camera_acknowledged: self.camera_acknowledged.clone(), - unacknowledged: self.unacknowledged.clone(), - client_sent: self.client_sent.clone(), - client_wants: self.client_wants.clone(), - // These are not shared mutable so they don't pollute each other buffer - read_buffer: Default::default(), - write_buffer: Default::default(), - }) - } - - fn start_polling( - &self, - outgoing: Receiver>, - incoming: Sender>, - ) -> IoResult<()> { - Ok(()) - } - - fn start_polling_outgoing(&self, outgoing: Receiver>) -> IoResult<()> { - let thread_socket = self.socket.try_clone()?; - let thread_aborter = self.aborter.clone(); - let thread_camera_id = self.camera_id; - let thread_client_sent = self.client_sent.clone(); - - std::thread::spawn(move || { - while !thread_aborter.is_aborted() { - match outgoing.recv_timeout(RX_TIMEOUT) { - Ok(msg) => { - let packet_id = thread_client_sent.fetch_add(1, Ordering::Relaxed); - let bcudp_msg = BcUdp::Data(UdpData { - connection_id: thread_camera_id, - packet_id, - payload: msg, - }); - - let mut buf = vec![]; - if let Err(e) = bcudp_msg.serialize(&mut buf) { - error!("Failed to serialize bcudp: {:?}, Err: {:?}", bcudp_msg, e); - thread_aborter.abort(); - break; - } - - if let Err(e) = thread_socket.send(&buf) { - error!("Failed to send udp data: {:?}, Err: {:?}", bcudp_msg, e); - thread_aborter.abort(); - break; - } - } - Err(RecvTimeoutError::Timeout) => {} - Err(RecvTimeoutError::Disconnected) => { - break; - } - } - } - }); - Ok(()) - } - - fn start_polling_ack(&self) -> IoResult<()> { - let thread_socket = self.socket.try_clone()?; - let thread_aborter = self.aborter.clone(); - let thread_unacknowledged = self.unacknowledged.clone(); - std::thread::spawn(move || while !thread_aborter.is_aborted() {}); - Ok(()) - } - - fn start_polling_incoming(&self, incoming: Sender>) -> IoResult<()> { - let mut thread_socket = self.socket.try_clone()?; - let thread_aborter = self.aborter.clone(); - let thread_mtu = self.mtu; - let thread_camera_acknowledged = self.camera_acknowledged.clone(); - let thread_client_wants = self.client_wants.clone(); - let thread_client_id = self.client_id; - let thread_camera_id = self.camera_id; - - std::thread::spawn(move || { - while !thread_aborter.is_aborted() { - let mut buf = vec![0; thread_mtu as usize]; - if let Ok(new_size) = thread_socket.recv(&mut buf) { - match BcUdp::deserialize(&buf[0..new_size]) { - Ok(bcudp_msg) => { - match bcudp_msg { - BcUdp::Discovery(UdpDiscovery { - payload: - UdpXml { - d2c_disc: Some(D2cDisc { cid, did }), - .. - }, - .. - }) if cid == thread_client_id && did == thread_camera_id => { - thread_aborter.abort(); - debug!("Client requested disconnect") - } - BcUdp::Discovery(packet) => { - debug!("Got unexpected discovery packet: {:?}", packet) - } - BcUdp::Ack(UdpAck { - connection_id, - packet_id, - }) if connection_id == thread_client_id => { - thread_camera_acknowledged - .fetch_max(packet_id, Ordering::Acquire); - } - BcUdp::Data(UdpData { - connection_id: cid, - packet_id, - payload, - }) if cid == thread_client_id => { - if let Ok(_) = thread_client_wants.fetch_update( - Ordering::SeqCst, - Ordering::SeqCst, - |v| { - if v == packet_id { - Some(v + 1) - } else { - None - } - }, - ) { - match incoming.send(payload) { - Ok(msg) => {} - Err(_) => { - error!("Failed to get payload from UDP"); - thread_aborter.abort(); - break; - } - } - } - } - }; - } - Err(e) => { - error!("Cannot deser UDP msg: {:?}", e); - thread_aborter.abort(); - break; - } - } - } - } - }); - - Ok(()) - } - - fn stop_polling(&self) { - self.aborter.abort(); - } -} - -// Ensuring polling stops -impl Drop for UdpSource { - fn drop(&mut self) { - self.stop_polling(); - } -} - -impl Read for UdpSource { - fn read(&mut self, buf: &mut [u8]) -> IoResult { - if self.aborter.is_aborted() { - return Err(IoError::new( - std::io::ErrorKind::ConnectionAborted, - "Connection dropped", - )); - } - let buffer = self.fill_buf()?; - let amt = std::cmp::min(buf.len(), buffer.len()); - - // First check if the amount of bytes we want to read is small: - // `copy_from_slice` will generally expand to a call to `memcpy`, and - // for a single byte the overhead is significant. - if amt == 1 { - buf[0] = buffer[0]; - } else { - buf[..amt].copy_from_slice(&buffer[..amt]); - } - - self.consume(amt); - - Ok(amt) - } -} - -impl BufRead for UdpSource { - fn fill_buf(&mut self) -> IoResult<&[u8]> { - // const CLEAR_CONSUMED_AT: usize = 1024; - // // This is a trade off between caching too much dead memory - // // and calling the drain method too often - // if self.read_buffer.consumed > CLEAR_CONSUMED_AT { - // let _ = self - // .read_buffer - // .buffer - // .drain(0..self.read_buffer.consumed) - // .collect::>(); - // self.read_buffer.consumed = 0; - // } - // if self.read_buffer.buffer.len() <= self.read_buffer.consumed { - // // Get next packet of the read queue - // let start_time = OffsetDateTime::now_utc(); - // while (start_time - OffsetDateTime::now_utc()) < RX_TIMEOUT { - // let mut lock = self.incoming.lock().unwrap(); - // if (*lock).contains_key(&self.next_to_consume.load(Ordering::Relaxed)) { - // let next = self.next_to_consume.fetch_add(1, Ordering::Relaxed); - // debug!("Removing: {}", next); - // if let Some(msg) = lock.remove(&next) { - // self.read_buffer.buffer.extend(msg.buf); - // break; - // } - // } - // } - // } - // - // Ok(&self.read_buffer.buffer.as_slice()[self.read_buffer.consumed..]) - } - - fn consume(&mut self, amt: usize) { - assert!(self.read_buffer.consumed + amt <= self.read_buffer.buffer.len()); - self.read_buffer.consumed += amt; - } -} - -const UDPDATA_HEADER_SIZE: usize = 20; -impl Write for UdpSource { - fn write(&mut self, buf: &[u8]) -> IoResult { - // if self.aborter.is_aborted() { - // return Err(IoError::new( - // std::io::ErrorKind::ConnectionAborted, - // "Connection dropped", - // )); - // } - // self.write_buffer.buffer.extend(buf.to_vec()); - // if self.write_buffer.buffer.len() > self.mtu as usize - UDPDATA_HEADER_SIZE { - // let _ = self.flush(); - // } - // Ok(buf.len()) - } - - fn flush(&mut self) -> IoResult<()> { - // if self.aborter.is_aborted() { - // return Err(IoError::new( - // std::io::ErrorKind::ConnectionAborted, - // "Connection dropped", - // )); - // } - // for chunk in self - // .write_buffer - // .buffer - // .chunks(self.mtu as usize - UDPDATA_HEADER_SIZE) - // { - // let packet_id = self.next_send_message.fetch_add(1, Ordering::Relaxed); - // let msg = BcUdp::Data(UdpData { - // connection_id: self.camera_id, - // packet_id, - // payload: chunk.to_vec(), - // }); - // let mut buf = vec![]; - // // If this errors it is unrecoverable - // // - // // It really shouldn't be able to Err though - // msg.serialize(&mut buf) - // .expect("Failed to serialize UDP Data"); - // debug!("Writing"); - // self.outgoing.lock().unwrap().insert( - // packet_id, - // QueuedMessage { - // time_last_tried: None, - // buf, - // }, - // ); - // } - // self.write_buffer.buffer.clear(); - // Ok(()) - } -}