minor refactor

This commit is contained in:
Scott Powell
2025-04-11 19:11:06 +10:00
parent 4704ea8dae
commit 1d4ae9f3c4
3 changed files with 23 additions and 23 deletions

View File

@@ -11,7 +11,7 @@ Packet::Packet() {
}
int Packet::getRawLength() const {
return 2 + path_len + payload_len + (hasTransCodes() ? 4 : 0);
return 2 + path_len + payload_len + (hasTransportCodes() ? 4 : 0);
}
void Packet::calculatePacketHash(uint8_t* hash) const {
@@ -28,9 +28,9 @@ void Packet::calculatePacketHash(uint8_t* hash) const {
uint8_t Packet::writeTo(uint8_t dest[]) const {
uint8_t i = 0;
dest[i++] = header;
if (hasTransCodes()) {
memcpy(&dest[i], &trans_codes[0], 2); i += 2;
memcpy(&dest[i], &trans_codes[1], 2); i += 2;
if (hasTransportCodes()) {
memcpy(&dest[i], &transport_codes[0], 2); i += 2;
memcpy(&dest[i], &transport_codes[1], 2); i += 2;
}
dest[i++] = path_len;
memcpy(&dest[i], path, path_len); i += path_len;
@@ -41,11 +41,11 @@ uint8_t Packet::writeTo(uint8_t dest[]) const {
bool Packet::readFrom(const uint8_t src[], uint8_t len) {
uint8_t i = 0;
header = src[i++];
if (hasTransCodes()) {
memcpy(&trans_codes[0], &src[i], 2); i += 2;
memcpy(&trans_codes[1], &src[i], 2); i += 2;
if (hasTransportCodes()) {
memcpy(&transport_codes[0], &src[i], 2); i += 2;
memcpy(&transport_codes[1], &src[i], 2); i += 2;
} else {
trans_codes[0] = trans_codes[1] = 0;
transport_codes[0] = transport_codes[1] = 0;
}
path_len = src[i++];
if (path_len > sizeof(path)) return false; // bad encoding