sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

Added error checking to functions called from Communication

Browse Source
This commit is contained in:
EricLiu2000
2019-06-13 16:01:35 -04:00
parent a16f2843d8
commit 519e64fb17
12 changed files with 77 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
communication/encoder.cpp
+13 -6
View File
@@ -13,11 +13,13 @@ bool Encoder::encode(std::vector<uint8_t>& result, const std::shared_ptr<Message
switch(message->network.getType()) {
case Network::Type::Ethernet: {
auto ethmsg = std::dynamic_pointer_cast<EthernetMessage>(message);
if(!ethmsg)
if(!ethmsg) {
err(APIError::MessageFormattingError);
return false; // The message was not a properly formed EthernetMessage
}
useResultAsBuffer = true;
if(!HardwareEthernetPacket::EncodeFromMessage(*ethmsg, result))
if(!HardwareEthernetPacket::EncodeFromMessage(*ethmsg, result, err))
return false;
break;
@@ -26,14 +28,18 @@ bool Encoder::encode(std::vector<uint8_t>& result, const std::shared_ptr<Message
case Network::Type::SWCAN:
case Network::Type::LSFTCAN: {
auto canmsg = std::dynamic_pointer_cast<CANMessage>(message);
if(!canmsg)
if(!canmsg) {
err(APIError::MessageFormattingError);
return false; // The message was not a properly formed CANMessage
}
if(!supportCANFD && canmsg->isCANFD)
if(!supportCANFD && canmsg->isCANFD) {
err(APIError::CANFDNotSupported);
return false; // This device does not support CAN FD
}
useResultAsBuffer = true;
if(!HardwareCANPacket::EncodeFromMessage(*canmsg, result))
if(!HardwareCANPacket::EncodeFromMessage(*canmsg, result, err))
return false; // The CANMessage was malformed
break;
@@ -69,6 +75,7 @@ bool Encoder::encode(std::vector<uint8_t>& result, const std::shared_ptr<Message
break;
}
default:
err(APIError::UnexpectedNetworkType);
return false;
}
}