added proper non-escaped variant
This commit is contained in:
parent
ece7dce6f7
commit
5fcac4d85b
@ -14,6 +14,10 @@ ReturnValue_t DleEncoder::encode(const uint8_t* sourceStream,
|
||||
size_t encodedIndex = 0, sourceIndex = 0;
|
||||
uint8_t nextByte;
|
||||
if (addStxEtx) {
|
||||
if(not escapeStxEtx) {
|
||||
destStream[0] = DLE_CHAR;
|
||||
++encodedIndex;
|
||||
}
|
||||
destStream[0] = STX_CHAR;
|
||||
++encodedIndex;
|
||||
}
|
||||
@ -61,6 +65,10 @@ ReturnValue_t DleEncoder::encode(const uint8_t* sourceStream,
|
||||
|
||||
if (sourceIndex == sourceLen and encodedIndex < maxDestLen) {
|
||||
if (addStxEtx) {
|
||||
if(not escapeStxEtx) {
|
||||
destStream[encodedIndex] = DLE_CHAR;
|
||||
++encodedIndex;
|
||||
}
|
||||
destStream[encodedIndex] = ETX_CHAR;
|
||||
++encodedIndex;
|
||||
}
|
||||
@ -72,16 +80,45 @@ ReturnValue_t DleEncoder::encode(const uint8_t* sourceStream,
|
||||
}
|
||||
}
|
||||
|
||||
ReturnValue_t DleEncoder::encodeEscaped(const uint8_t *sourceStream, size_t sourceLen,
|
||||
uint8_t *destStream, size_t maxDestLen, size_t *encodedLen, bool addStxEtx) {
|
||||
}
|
||||
|
||||
ReturnValue_t DleEncoder::encodeNonEscaped(const uint8_t *sourceStream, size_t sourceLen,
|
||||
uint8_t *destStream, size_t maxDestLen, size_t *encodedLen, bool addStxEtx) {
|
||||
}
|
||||
|
||||
ReturnValue_t DleEncoder::decode(const uint8_t *sourceStream,
|
||||
size_t sourceStreamLen, size_t *readLen, uint8_t *destStream,
|
||||
size_t maxDestStreamlen, size_t *decodedLen) {
|
||||
size_t encodedIndex = 0, decodedIndex = 0;
|
||||
uint8_t nextByte;
|
||||
if (*sourceStream != STX_CHAR) {
|
||||
if(not escapeStxEtx) {
|
||||
if (*sourceStream != DLE_CHAR) {
|
||||
return DECODING_ERROR;
|
||||
}
|
||||
++encodedIndex;
|
||||
}
|
||||
if (sourceStream[encodedIndex] != STX_CHAR) {
|
||||
return DECODING_ERROR;
|
||||
}
|
||||
|
||||
++encodedIndex;
|
||||
|
||||
if(escapeStxEtx) {
|
||||
return decodeStreamEscaped(encodedIndex, decodedIndex, sourceStream, sourceStreamLen,
|
||||
readLen, destStream, maxDestStreamlen, decodedLen);
|
||||
}
|
||||
else {
|
||||
return decodeStreamNonEscaped(encodedIndex, decodedIndex, sourceStream, sourceStreamLen,
|
||||
readLen, destStream, maxDestStreamlen, decodedLen);
|
||||
}
|
||||
}
|
||||
|
||||
ReturnValue_t DleEncoder::decodeStreamEscaped(size_t encodedIndex, size_t decodedIndex,
|
||||
const uint8_t *sourceStream, size_t sourceStreamLen, size_t *readLen, uint8_t *destStream,
|
||||
size_t maxDestStreamlen, size_t *decodedLen) {
|
||||
uint8_t nextByte;
|
||||
while ((encodedIndex < sourceStreamLen) && (decodedIndex < maxDestStreamlen)
|
||||
&& (sourceStream[encodedIndex] != ETX_CHAR)
|
||||
&& (sourceStream[encodedIndex] != STX_CHAR)) {
|
||||
@ -119,7 +156,6 @@ ReturnValue_t DleEncoder::decode(const uint8_t *sourceStream,
|
||||
++encodedIndex;
|
||||
++decodedIndex;
|
||||
}
|
||||
|
||||
if (sourceStream[encodedIndex] != ETX_CHAR) {
|
||||
*readLen = ++encodedIndex;
|
||||
return DECODING_ERROR;
|
||||
@ -131,3 +167,34 @@ ReturnValue_t DleEncoder::decode(const uint8_t *sourceStream,
|
||||
}
|
||||
}
|
||||
|
||||
ReturnValue_t DleEncoder::decodeStreamNonEscaped(size_t encodedIndex, size_t decodedIndex,
|
||||
const uint8_t *sourceStream, size_t sourceStreamLen, size_t *readLen, uint8_t *destStream,
|
||||
size_t maxDestStreamlen, size_t *decodedLen) {
|
||||
uint8_t nextByte;
|
||||
while ((encodedIndex < sourceStreamLen) && (decodedIndex < maxDestStreamlen)) {
|
||||
if (sourceStream[encodedIndex] == DLE_CHAR) {
|
||||
nextByte = sourceStream[encodedIndex + 1];
|
||||
if(nextByte == STX_CHAR) {
|
||||
*readLen = ++encodedIndex;
|
||||
return DECODING_ERROR;
|
||||
}
|
||||
else if(nextByte == DLE_CHAR) {
|
||||
// The next byte is a DLE character that was escaped by another
|
||||
// DLE character, so we can write it to the destination stream.
|
||||
destStream[decodedIndex] = nextByte;
|
||||
++encodedIndex;
|
||||
}
|
||||
else if(nextByte == ETX_CHAR) {
|
||||
// End of stream reached
|
||||
return RETURN_OK;
|
||||
}
|
||||
}
|
||||
else {
|
||||
destStream[decodedIndex] = sourceStream[encodedIndex];
|
||||
}
|
||||
++encodedIndex;
|
||||
++decodedIndex;
|
||||
}
|
||||
return DECODING_ERROR;
|
||||
}
|
||||
|
||||
|
@ -90,6 +90,14 @@ public:
|
||||
size_t sourceStreamLen, size_t *readLen, uint8_t *destStream,
|
||||
size_t maxDestStreamlen, size_t *decodedLen);
|
||||
|
||||
ReturnValue_t decodeStreamEscaped(size_t encodedIndex, size_t decodedIndex,
|
||||
const uint8_t *sourceStream, size_t sourceStreamLen, size_t *readLen,
|
||||
uint8_t *destStream, size_t maxDestStreamlen, size_t *decodedLen);
|
||||
|
||||
ReturnValue_t decodeStreamNonEscaped(size_t encodedIndex, size_t decodedIndex,
|
||||
const uint8_t *sourceStream, size_t sourceStreamLen, size_t *readLen,
|
||||
uint8_t *destStream, size_t maxDestStreamlen, size_t *decodedLen);
|
||||
|
||||
private:
|
||||
|
||||
bool escapeStxEtx;
|
||||
|
Loading…
Reference in New Issue
Block a user