Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ pub enum Error {
InvalidDtcFormatIdentifier(u8),
#[error("Reserved for legislative use: {0} ({1})")]
ReservedForLegislativeUse(String, u8),
#[error("UDS service not implemented: {0:?}")]
ServiceNotImplemented(crate::UdsServiceType),
}
91 changes: 75 additions & 16 deletions src/request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ impl<T: DiagnosticDefinition> WireFormat for Request<T> {
/// Some services allow for custom byte arrays at the end of the request
/// It is important that only the request data is passed to this function
/// or the deserialization could read unexpected data
#[allow(clippy::too_many_lines)]
fn decode<R: Read>(reader: &mut R) -> Result<Option<Self>, Error> {
let service = UdsServiceType::service_from_request_byte(reader.read_u8()?);
Ok(Some(match service {
Expand Down Expand Up @@ -309,22 +310,80 @@ impl<T: DiagnosticDefinition> WireFormat for Request<T> {
UdsServiceType::WriteDataByIdentifier => Self::WriteDataByIdentifier(
WriteDataByIdentifierRequest::decode_single_value(reader)?,
),
UdsServiceType::Authentication => todo!(),
UdsServiceType::AccessTimingParameters => todo!(),
UdsServiceType::SecuredDataTransmission => todo!(),
UdsServiceType::ResponseOnEvent => todo!(),
UdsServiceType::LinkControl => todo!(),
UdsServiceType::ReadMemoryByAddress => todo!(),
UdsServiceType::ReadScalingDataByIdentifier => todo!(),
UdsServiceType::ReadDataByIdentifierPeriodic => todo!(),
UdsServiceType::DynamicallyDefinedDataIdentifier => todo!(),
UdsServiceType::WriteMemoryByAddress => todo!(),
UdsServiceType::ClearDiagnosticInfo => todo!(),
UdsServiceType::InputOutputControlByIdentifier => todo!(),
UdsServiceType::RequestUpload => todo!(),
UdsServiceType::RequestFileTransfer => todo!(),
UdsServiceType::NegativeResponse => todo!(),
UdsServiceType::UnsupportedDiagnosticService => todo!(),
UdsServiceType::Authentication => {
return Err(Error::ServiceNotImplemented(UdsServiceType::Authentication));
}
UdsServiceType::AccessTimingParameters => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::AccessTimingParameters,
));
}
UdsServiceType::SecuredDataTransmission => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::SecuredDataTransmission,
));
}
UdsServiceType::ResponseOnEvent => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::ResponseOnEvent,
));
}
UdsServiceType::LinkControl => {
return Err(Error::ServiceNotImplemented(UdsServiceType::LinkControl));
}
UdsServiceType::ReadMemoryByAddress => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::ReadMemoryByAddress,
));
}
UdsServiceType::ReadScalingDataByIdentifier => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::ReadScalingDataByIdentifier,
));
}
UdsServiceType::ReadDataByIdentifierPeriodic => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::ReadDataByIdentifierPeriodic,
));
}
UdsServiceType::DynamicallyDefinedDataIdentifier => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::DynamicallyDefinedDataIdentifier,
));
}
UdsServiceType::WriteMemoryByAddress => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::WriteMemoryByAddress,
));
}
UdsServiceType::ClearDiagnosticInfo => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::ClearDiagnosticInfo,
));
}
UdsServiceType::InputOutputControlByIdentifier => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::InputOutputControlByIdentifier,
));
}
UdsServiceType::RequestUpload => {
return Err(Error::ServiceNotImplemented(UdsServiceType::RequestUpload));
}
UdsServiceType::RequestFileTransfer => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::RequestFileTransfer,
));
}
UdsServiceType::NegativeResponse => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::NegativeResponse,
));
}
UdsServiceType::UnsupportedDiagnosticService => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::UnsupportedDiagnosticService,
));
}
}))
}

Expand Down
79 changes: 65 additions & 14 deletions src/response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ impl<D: DiagnosticDefinition> Response<D> {
}

impl<D: DiagnosticDefinition> WireFormat for Response<D> {
#[allow(clippy::too_many_lines)]
fn decode<T: Read>(reader: &mut T) -> Result<Option<Self>, Error> {
let service = UdsServiceType::response_from_byte(reader.read_u8()?);
Ok(Some(match service {
Expand Down Expand Up @@ -203,23 +204,73 @@ impl<D: DiagnosticDefinition> WireFormat for Response<D> {
UdsServiceType::WriteDataByIdentifier => Self::WriteDataByIdentifier(
WriteDataByIdentifierResponse::decode_single_value(reader)?,
),
UdsServiceType::Authentication => todo!(),
UdsServiceType::AccessTimingParameters => todo!(),
UdsServiceType::SecuredDataTransmission => todo!(),
UdsServiceType::ResponseOnEvent => todo!(),
UdsServiceType::LinkControl => todo!(),
UdsServiceType::ReadMemoryByAddress => todo!(),
UdsServiceType::ReadScalingDataByIdentifier => todo!(),
UdsServiceType::ReadDataByIdentifierPeriodic => todo!(),
UdsServiceType::DynamicallyDefinedDataIdentifier => todo!(),
UdsServiceType::WriteMemoryByAddress => todo!(),
UdsServiceType::ClearDiagnosticInfo => todo!(),
UdsServiceType::InputOutputControlByIdentifier => todo!(),
UdsServiceType::RequestUpload => todo!(),
UdsServiceType::Authentication => {
return Err(Error::ServiceNotImplemented(UdsServiceType::Authentication));
}
UdsServiceType::AccessTimingParameters => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::AccessTimingParameters,
));
}
UdsServiceType::SecuredDataTransmission => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::SecuredDataTransmission,
));
}
UdsServiceType::ResponseOnEvent => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::ResponseOnEvent,
));
}
UdsServiceType::LinkControl => {
return Err(Error::ServiceNotImplemented(UdsServiceType::LinkControl));
}
UdsServiceType::ReadMemoryByAddress => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::ReadMemoryByAddress,
));
}
UdsServiceType::ReadScalingDataByIdentifier => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::ReadScalingDataByIdentifier,
));
}
UdsServiceType::ReadDataByIdentifierPeriodic => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::ReadDataByIdentifierPeriodic,
));
}
UdsServiceType::DynamicallyDefinedDataIdentifier => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::DynamicallyDefinedDataIdentifier,
));
}
UdsServiceType::WriteMemoryByAddress => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::WriteMemoryByAddress,
));
}
UdsServiceType::ClearDiagnosticInfo => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::ClearDiagnosticInfo,
));
}
UdsServiceType::InputOutputControlByIdentifier => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::InputOutputControlByIdentifier,
));
}
UdsServiceType::RequestUpload => {
return Err(Error::ServiceNotImplemented(UdsServiceType::RequestUpload));
}
UdsServiceType::TransferData => {
Self::TransferData(TransferDataResponse::decode_single_value(reader)?)
}
UdsServiceType::UnsupportedDiagnosticService => todo!(),
UdsServiceType::UnsupportedDiagnosticService => {
return Err(Error::ServiceNotImplemented(
UdsServiceType::UnsupportedDiagnosticService,
));
}
}))
}

Expand Down
Loading