KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

pus parser fixes

Browse Source
This commit is contained in:
Robin Müller 2020-07-06 20:17:05 +02:00
parent 8ba75fc3c2
commit fd1e612ea5
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tmtcservices/PusParser.cpp
View File

@ -18,7 +18,6 @@ ReturnValue_t PusParser::parsePusPackets(const uint8_t *frame,
return HasReturnvaluesIF::RETURN_FAILED; return HasReturnvaluesIF::RETURN_FAILED;
} }
size_t lengthField = frame[4] << 8 | frame[5]; size_t lengthField = frame[4] << 8 | frame[5];
if(lengthField == 0) { if(lengthField == 0) {
@ -26,32 +25,32 @@ ReturnValue_t PusParser::parsePusPackets(const uint8_t *frame,
} }
size_t packetSize = lengthField + 7; size_t packetSize = lengthField + 7;
if(lengthField > 0) { // Size of a pus packet is the value in the packet length field plus 7.
// Size of a pus packet is the value in the packet length field plus 7. if(packetSize > frameSize)
if(packetSize > frameSize) {
if(storeSplitPackets)
{ {
if(storeSplitPackets) indexSizePairFIFO.insert(indexSizePair(0, frameSize));
{
indexSizePairFIFO.insert(indexSizePair(0, frameSize));
}
else
{
sif::debug << "TcSerialPollingTask::readNextPacket: Next packet "
"larger than remaining frame," << std::endl;
sif::debug << "Throwing away packet. Detected packet size: "
<< packetSize << std::endl;
}
return SPLIT_PACKET;
} }
else else
{ {
indexSizePairFIFO.insert(indexSizePair(0, packetSize)); sif::debug << "TcSerialPollingTask::readNextPacket: Next packet "
if(packetSize == frameSize) { "larger than remaining frame," << std::endl;
return HasReturnvaluesIF::RETURN_OK; sif::debug << "Throwing away packet. Detected packet size: "
} << packetSize << std::endl;
}
return SPLIT_PACKET;
}
else
{
indexSizePairFIFO.insert(indexSizePair(0, packetSize));
if(packetSize == frameSize) {
sif::info << "test2" << std::endl;
return HasReturnvaluesIF::RETURN_OK;
} }
} }
// packet size is smaller than frame size, parse for more packets. // packet size is smaller than frame size, parse for more packets.
return readMultiplePackets(frame, frameSize, packetSize); return readMultiplePackets(frame, frameSize, packetSize);
} }
@ -59,6 +58,7 @@ ReturnValue_t PusParser::parsePusPackets(const uint8_t *frame,
ReturnValue_t PusParser::readMultiplePackets(const uint8_t *frame, ReturnValue_t PusParser::readMultiplePackets(const uint8_t *frame,
size_t frameSize, size_t startIndex) { size_t frameSize, size_t startIndex) {
while (startIndex < frameSize) { while (startIndex < frameSize) {
sif::info << "test" << std::endl;
ReturnValue_t result = readNextPacket(frame, frameSize, startIndex); ReturnValue_t result = readNextPacket(frame, frameSize, startIndex);
if(result != HasReturnvaluesIF::RETURN_OK) { if(result != HasReturnvaluesIF::RETURN_OK) {
return result; return result;