diff --git a/crates/core/src/bc_protocol/errors.rs b/crates/core/src/bc_protocol/errors.rs index ef79712..20db6a7 100644 --- a/crates/core/src/bc_protocol/errors.rs +++ b/crates/core/src/bc_protocol/errors.rs @@ -38,6 +38,10 @@ pub enum Error { why: &'static str, }, + /// Raised when the camera responds with a status code over than OK + #[error(display = "Camera responded with Service Unavaliable")] + CameraServiceUnavaliable, + /// Raised when a connection is dropped. #[error(display = "Dropped connection")] DroppedConnection(#[error(source)] std::sync::mpsc::RecvError), diff --git a/crates/core/src/bc_protocol/ledstate.rs b/crates/core/src/bc_protocol/ledstate.rs index 46bb2fa..e42be82 100644 --- a/crates/core/src/bc_protocol/ledstate.rs +++ b/crates/core/src/bc_protocol/ledstate.rs @@ -30,6 +30,9 @@ impl BcCamera { sub_get.send(get)?; let msg = sub_get.rx.recv_timeout(RX_TIMEOUT)?; + if msg.meta.response_code != 200 { + return Err(Error::CameraServiceUnavaliable); + } if let BcBody::ModernMsg(ModernMsg { payload: diff --git a/crates/core/src/bc_protocol/login.rs b/crates/core/src/bc_protocol/login.rs index 4e40a2f..3248275 100644 --- a/crates/core/src/bc_protocol/login.rs +++ b/crates/core/src/bc_protocol/login.rs @@ -105,6 +105,9 @@ impl BcCamera { sub_login.send(modern_login)?; let modern_reply = sub_login.rx.recv_timeout(RX_TIMEOUT)?; + if modern_reply.meta.response_code != 200 { + return Err(Error::CameraServiceUnavaliable); + } match modern_reply.body { BcBody::ModernMsg(ModernMsg { diff --git a/crates/core/src/bc_protocol/pirstate.rs b/crates/core/src/bc_protocol/pirstate.rs index 433ad88..7cd23cd 100644 --- a/crates/core/src/bc_protocol/pirstate.rs +++ b/crates/core/src/bc_protocol/pirstate.rs @@ -30,6 +30,9 @@ impl BcCamera { sub_get.send(get)?; let msg = sub_get.rx.recv_timeout(RX_TIMEOUT)?; + if msg.meta.response_code != 200 { + return Err(Error::CameraServiceUnavaliable); + } if let BcBody::ModernMsg(ModernMsg { payload: @@ -81,6 +84,9 @@ impl BcCamera { sub_set.send(get)?; let msg = sub_set.rx.recv_timeout(RX_TIMEOUT)?; + if msg.meta.response_code != 200 { + return Err(Error::CameraServiceUnavaliable); + } if let BcMeta { response_code: 200, .. diff --git a/crates/core/src/bc_protocol/time.rs b/crates/core/src/bc_protocol/time.rs index d92922c..a59a1ce 100644 --- a/crates/core/src/bc_protocol/time.rs +++ b/crates/core/src/bc_protocol/time.rs @@ -31,6 +31,9 @@ impl BcCamera { sub_get_general.send(get)?; let msg = sub_get_general.rx.recv_timeout(RX_TIMEOUT)?; + if msg.meta.response_code != 200 { + return Err(Error::CameraServiceUnavaliable); + } if let BcBody::ModernMsg(ModernMsg { payload: diff --git a/crates/core/src/bc_protocol/version.rs b/crates/core/src/bc_protocol/version.rs index db4c43e..9e6d166 100644 --- a/crates/core/src/bc_protocol/version.rs +++ b/crates/core/src/bc_protocol/version.rs @@ -28,6 +28,9 @@ impl BcCamera { sub_version.send(version)?; let modern_reply = sub_version.rx.recv_timeout(RX_TIMEOUT)?; + if modern_reply.meta.response_code != 200 { + return Err(Error::CameraServiceUnavaliable); + } let version_info; match modern_reply.body { BcBody::ModernMsg(ModernMsg {