sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Legacy: Correct Ethernet message translation 

* Fixes NetIDs over 255
* Fixes data lengths over 255
* Avoids writing unexpected messages to client
v0.3.0-dev
Paul Hollinsky 2022-02-21 20:56:27 -05:00
parent 94e0ea1fe0
commit dfd8768bbf
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
api/icsneolegacy/icsneolegacy.cpp
View File

@ -63,33 +63,40 @@ static NeoDevice OldNeoDeviceFromNew(const neodevice_t *newnd)
return oldnd; return oldnd;
} }
static void NeoMessageToSpyMessage(const neodevice_t *device, const neomessage_t &newmsg, icsSpyMessage &oldmsg) static bool NeoMessageToSpyMessage(const neodevice_t* device, const neomessage_t& newmsg, icsSpyMessage& oldmsg)
{ {
memset(&oldmsg, 0, sizeof(icsSpyMessage)); memset(&oldmsg, 0, sizeof(icsSpyMessage));
oldmsg.NumberBytesData = (uint8_t)std::min(newmsg.length, (size_t)255);
oldmsg.NumberBytesHeader = 4;
oldmsg.ExtraDataPtr = (void*)newmsg.data;
oldmsg.ExtraDataPtrEnabled = newmsg.length > 8 ? 1 : 0;
memcpy(oldmsg.Data, newmsg.data, std::min(newmsg.length, (size_t)8));
oldmsg.ArbIDOrHeader = *(uint32_t *)newmsg.header;
oldmsg.NetworkID = (uint8_t)newmsg.netid; // Note: NetID remapping from the original API is not supported
oldmsg.DescriptionID = newmsg.description;
oldmsg.StatusBitField = newmsg.status.statusBitfield[0];
oldmsg.StatusBitField2 = newmsg.status.statusBitfield[1];
oldmsg.StatusBitField3 = newmsg.status.statusBitfield[2];
oldmsg.StatusBitField4 = newmsg.status.statusBitfield[3];
switch (Network::Type(newmsg.type)) switch (Network::Type(newmsg.type))
{ {
case Network::Type::CAN: case Network::Type::CAN:
case Network::Type::SWCAN: case Network::Type::SWCAN:
case Network::Type::LSFTCAN: case Network::Type::LSFTCAN:
oldmsg.Protocol = newmsg.status.canfdFDF ? SPY_PROTOCOL_CANFD : SPY_PROTOCOL_CAN; oldmsg.Protocol = newmsg.status.canfdFDF ? SPY_PROTOCOL_CANFD : SPY_PROTOCOL_CAN;
oldmsg.NumberBytesData = static_cast<uint8_t>(std::min(newmsg.length, (size_t)255));
oldmsg.NumberBytesHeader = 4;
break; break;
case Network::Type::Ethernet: case Network::Type::Ethernet:
oldmsg.Protocol = SPY_PROTOCOL_ETHERNET; oldmsg.Protocol = SPY_PROTOCOL_ETHERNET;
oldmsg.NumberBytesData = static_cast<uint8_t>(newmsg.length & 0xFF);
oldmsg.NumberBytesHeader = static_cast<uint8_t>(newmsg.length >> 8);
break; break;
default:
return false;
} }
oldmsg.ExtraDataPtr = (void*)newmsg.data;
oldmsg.ExtraDataPtrEnabled = newmsg.length > 8 ? 1 : 0;
memcpy(oldmsg.Data, newmsg.data, std::min(newmsg.length, (size_t)8));
oldmsg.ArbIDOrHeader = *reinterpret_cast<const uint32_t*>(newmsg.header);
oldmsg.NetworkID = static_cast<uint8_t>(newmsg.netid); // Note: NetID remapping from the original API is not supported
oldmsg.NetworkID2 = static_cast<uint8_t>(newmsg.netid >> 8);
oldmsg.DescriptionID = newmsg.description;
oldmsg.StatusBitField = newmsg.status.statusBitfield[0];
oldmsg.StatusBitField2 = newmsg.status.statusBitfield[1];
oldmsg.StatusBitField3 = newmsg.status.statusBitfield[2];
oldmsg.StatusBitField4 = newmsg.status.statusBitfield[3];
// Timestamp - epoch = 1/1/2007 - 25ns per tick most of the time // Timestamp - epoch = 1/1/2007 - 25ns per tick most of the time
uint64_t t = newmsg.timestamp; uint64_t t = newmsg.timestamp;
uint16_t res = 0; uint16_t res = 0;
@ -110,6 +117,8 @@ static void NeoMessageToSpyMessage(const neodevice_t *device, const neomessage_t
oldmsg.TimeStampHardwareID = HARDWARE_TIMESTAMP_ID_NONE; oldmsg.TimeStampHardwareID = HARDWARE_TIMESTAMP_ID_NONE;
} }
} }
return true;
} }
static inline bool Within(size_t value, size_t min, size_t max) static inline bool Within(size_t value, size_t min, size_t max)
@ -356,11 +365,14 @@ int LegacyDLLExport icsneoGetMessages(void *hObject, icsSpyMessage *pMsg, int *p
if (!icsneo_getMessages(device, messages, &messageCount, 0)) if (!icsneo_getMessages(device, messages, &messageCount, 0))
return false; return false;
*pNumberOfMessages = (int)messageCount; *pNumberOfMessages = 0;
*pNumberOfErrors = 0; *pNumberOfErrors = 0;
for (size_t i = 0; i < messageCount; i++) for (size_t i = 0; i < messageCount; i++)
NeoMessageToSpyMessage(device, messages[i], pMsg[i]); {
if (NeoMessageToSpyMessage(device, messages[i], pMsg[*pNumberOfMessages]))
(*pNumberOfMessages)++;
}
return true; return true;
} }