diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 57fa95d..e3814d0 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -54,7 +54,10 @@ pub enum Error { DroppedConnection(#[error(source)] std::sync::mpsc::RecvError), #[error(display = "Timeout")] - Timeout(#[error(source)] std::sync::mpsc::RecvTimeoutError), + Timeout, + + #[error(display = "Dropped connection")] + TimeoutDisconnected, #[error(display = "Credential error")] AuthFailed, @@ -66,6 +69,15 @@ pub enum Error { Other(&'static str), } +impl<'a> From for Error { + fn from(k: std::sync::mpsc::RecvTimeoutError) -> Self { + match k { + std::sync::mpsc::RecvTimeoutError::Timeout => Error::Timeout, + std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDisconnected, + } + } +} + impl Drop for BcCamera { fn drop(&mut self) { self.disconnect(); diff --git a/src/bc_protocol/connection.rs b/src/bc_protocol/connection.rs index 8d29504..a9052a4 100644 --- a/src/bc_protocol/connection.rs +++ b/src/bc_protocol/connection.rs @@ -58,8 +58,15 @@ impl BcConnection { let connections_isencrypted = is_encrypted.clone(); let rx_thread = std::thread::spawn(move || { let mut context = BcContext::new(); - context.set_encrypted(connections_isencrypted); - while BcConnection::poll(&mut context, &conn, &mut subs).is_ok() {} + while { + match BcConnection::poll(&mut context, &conn, &mut subs) { + Ok(_) => true, + Err(err) => { + error!("Deserialization error: {:?}", err); + false + } + } + } {} }); Ok(BcConnection {