diff --git a/Cargo.toml b/Cargo.toml index f55c043..f6d2861 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,7 @@ indoc = "0.3" md5 = "0.7" nom = "5.1" serde = { version = "1.0", features = ["derive"] } +socket2 = "0.3" structopt = "0.3" toml = "0.5" yaserde = "0.3.16" diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index aa03fdb..d036eaf 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -78,7 +78,7 @@ impl BcCamera { } pub fn connect(&mut self) -> Result<()> { - self.connection = Some(BcConnection::new(self.address)?); + self.connection = Some(BcConnection::new(self.address, self.rx_timeout)?); Ok(()) } diff --git a/src/bc_protocol/connection.rs b/src/bc_protocol/connection.rs index fadcb55..29bda8e 100644 --- a/src/bc_protocol/connection.rs +++ b/src/bc_protocol/connection.rs @@ -2,10 +2,12 @@ use crate::bc; use crate::bc::model::*; use err_derive::Error; use log::*; +use socket2::{Socket, Domain, Type}; use std::collections::BTreeMap; use std::collections::btree_map::Entry; use std::net::{TcpStream, Shutdown, SocketAddr}; use std::thread::JoinHandle; +use std::time::Duration; use std::sync::{Arc, Mutex}; use std::sync::mpsc::{channel, Sender, Receiver}; @@ -44,8 +46,8 @@ pub enum Error { } impl BcConnection { - pub fn new(addr: SocketAddr) -> Result { - let tcp_conn = TcpStream::connect(addr)?; + pub fn new(addr: SocketAddr, timeout: Duration) -> Result { + let tcp_conn = connect_to(addr, timeout)?; let subscribers: Arc>>> = Default::default(); let mut subs = subscribers.clone(); @@ -137,3 +139,21 @@ impl<'a> Drop for BcSubscription<'a> { self.conn.subscribers.lock().unwrap().remove(&self.msg_id); } } + +/// Helper to create a TcpStream with a connect timeout +fn connect_to(addr: SocketAddr, timeout: Duration) -> Result { + let socket = match addr { + SocketAddr::V4(_) => { + Socket::new(Domain::ipv4(), Type::stream(), None)? + } + SocketAddr::V6(_) => { + let s = Socket::new(Domain::ipv6(), Type::stream(), None)?; + s.set_only_v6(false)?; + s + } + }; + + socket.connect_timeout(&addr.into(), timeout)?; + + Ok(socket.into_tcp_stream()) +}