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

EthernetPacketizer: Correct reassembly for RAD devices 

The RAD devices will give us a packet size larger than the packet,
as they specify the size of the entire reassembly.
v0.3.0-dev
Paul Hollinsky 2022-03-03 20:24:31 -05:00
parent adad9b3761
commit f05fd5e201
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
communication/ethernetpacketizer.cpp
View File

@ -93,7 +93,7 @@ bool EthernetPacketizer::inputUp(std::vector<uint8_t> bytes) {
reassembling = true; reassembling = true;
reassemblingId = packet.packetNumber; reassemblingId = packet.packetNumber;
reassemblingData = std::move(bytes); reassemblingData = std::move(packet.payload);
return !processedUpBytes.empty(); // If there are other packets in the pipe return !processedUpBytes.empty(); // If there are other packets in the pipe
} }
@ -139,7 +139,7 @@ int EthernetPacketizer::EthernetPacket::loadBytestream(const std::vector<uint8_t
srcMAC[i] = bytestream[i + 6]; srcMAC[i] = bytestream[i + 6];
etherType = (bytestream[12] << 8) | bytestream[13]; etherType = (bytestream[12] << 8) | bytestream[13];
icsEthernetHeader = (bytestream[14] << 24) | (bytestream[15] << 16) | (bytestream[16] << 8) | bytestream[17]; icsEthernetHeader = (bytestream[14] << 24) | (bytestream[15] << 16) | (bytestream[16] << 8) | bytestream[17];
uint16_t payloadSize = bytestream[18] | (bytestream[19] << 8); payloadSize = bytestream[18] | (bytestream[19] << 8);
packetNumber = bytestream[20] | (bytestream[21] << 8); packetNumber = bytestream[20] | (bytestream[21] << 8);
uint16_t packetInfo = bytestream[22] | (bytestream[23] << 8); uint16_t packetInfo = bytestream[22] | (bytestream[23] << 8);
firstPiece = packetInfo & 1; firstPiece = packetInfo & 1;
@ -147,17 +147,15 @@ int EthernetPacketizer::EthernetPacket::loadBytestream(const std::vector<uint8_t
bufferHalfFull = (packetInfo >> 2) & 2; bufferHalfFull = (packetInfo >> 2) & 2;
payload = std::vector<uint8_t>(bytestream.begin() + 24, bytestream.end()); payload = std::vector<uint8_t>(bytestream.begin() + 24, bytestream.end());
size_t payloadActualSize = payload.size(); size_t payloadActualSize = payload.size();
if(payloadActualSize < payloadSize) if(payloadActualSize > payloadSize)
errorWhileDecodingFromBytestream = 1;
else
payload.resize(payloadSize); payload.resize(payloadSize);
return errorWhileDecodingFromBytestream; return errorWhileDecodingFromBytestream;
} }
std::vector<uint8_t> EthernetPacketizer::EthernetPacket::getBytestream() const { std::vector<uint8_t> EthernetPacketizer::EthernetPacket::getBytestream() const {
size_t payloadSize = payload.size(); uint16_t actualPayloadSize = uint16_t(payload.size());
std::vector<uint8_t> bytestream; std::vector<uint8_t> bytestream;
bytestream.reserve(6 + 6 + 2 + 4 + 2 + 2 + 2 + payloadSize); bytestream.reserve(6 + 6 + 2 + 4 + 2 + 2 + 2 + actualPayloadSize);
for(size_t i = 0; i < 6; i++) for(size_t i = 0; i < 6; i++)
bytestream.push_back(destMAC[i]); bytestream.push_back(destMAC[i]);
for(size_t i = 0; i < 6; i++) for(size_t i = 0; i < 6; i++)
@ -170,9 +168,10 @@ std::vector<uint8_t> EthernetPacketizer::EthernetPacket::getBytestream() const {
bytestream.push_back((uint8_t)(icsEthernetHeader >> 16)); bytestream.push_back((uint8_t)(icsEthernetHeader >> 16));
bytestream.push_back((uint8_t)(icsEthernetHeader >> 8)); bytestream.push_back((uint8_t)(icsEthernetHeader >> 8));
bytestream.push_back((uint8_t)(icsEthernetHeader)); bytestream.push_back((uint8_t)(icsEthernetHeader));
uint16_t declaredPayloadSize = payloadSize ? payloadSize : actualPayloadSize;
// The payload size comes next, it's little endian // The payload size comes next, it's little endian
bytestream.push_back((uint8_t)(payloadSize)); bytestream.push_back((uint8_t)(declaredPayloadSize));
bytestream.push_back((uint8_t)(payloadSize >> 8)); bytestream.push_back((uint8_t)(declaredPayloadSize >> 8));
// Packet number is little endian // Packet number is little endian
bytestream.push_back((uint8_t)(packetNumber)); bytestream.push_back((uint8_t)(packetNumber));
bytestream.push_back((uint8_t)(packetNumber >> 8)); bytestream.push_back((uint8_t)(packetNumber >> 8));

1
include/icsneo/communication/ethernetpacketizer.h
View File

@ -49,6 +49,7 @@ public:
uint8_t srcMAC[6] = { 0x00, 0xFC, 0x70, 0xFF, 0xFF, 0xFF }; uint8_t srcMAC[6] = { 0x00, 0xFC, 0x70, 0xFF, 0xFF, 0xFF };
uint16_t etherType = 0xCAB1; // Big endian, Should be 0xCAB1 or 0xCAB2 uint16_t etherType = 0xCAB1; // Big endian, Should be 0xCAB1 or 0xCAB2
uint32_t icsEthernetHeader = 0xAAAA5555; // Big endian, Should be 0xAAAA5555 uint32_t icsEthernetHeader = 0xAAAA5555; // Big endian, Should be 0xAAAA5555
uint16_t payloadSize = 0; // If this is a multi-piece message, this is the size of the expected reassembly
// At this point in the packet, there is a 16-bit payload size, little endian // At this point in the packet, there is a 16-bit payload size, little endian
// This is calculated from payload size in getBytestream // This is calculated from payload size in getBytestream
uint16_t packetNumber = 0; uint16_t packetNumber = 0;