diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2020-08-03 12:49:22 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2020-08-03 16:48:09 +0300 |
| commit | ceb07a5fb29baab48657204f94810e56e1de038b (patch) | |
| tree | 438c25a9c2c874dd60d1c7e20f0ee02e3734bb4a /tracking | |
| parent | 0e39222fa2f83b8e2d985ff808a583dc266d60b0 (diff) | |
[tracking] Review fixes.
Diffstat (limited to 'tracking')
| -rw-r--r-- | tracking/protocol.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tracking/protocol.cpp b/tracking/protocol.cpp index 9308c5b10a..5f4ec91bc9 100644 --- a/tracking/protocol.cpp +++ b/tracking/protocol.cpp @@ -23,10 +23,12 @@ vector<uint8_t> CreateDataPacketImpl(Container const & points, uint32_t version = tracking::Protocol::Encoder::kLatestVersion; switch (type) { - case tracking::Protocol::PacketType::Error: ASSERT(false, ("Error DATA packet.")); return {}; case tracking::Protocol::PacketType::DataV0: version = 0; break; case tracking::Protocol::PacketType::DataV1: version = 1; break; - case tracking::Protocol::PacketType::AuthV0: ASSERT(false, ("Not a DATA packet.")); break; + case tracking::Protocol::PacketType::Error: + case tracking::Protocol::PacketType::AuthV0: + LOG(LERROR, ("Error creating DATA packet. PacketType =", type)); + return {}; } tracking::Protocol::Encoder::SerializeDataPoints(version, writer, points); @@ -97,10 +99,12 @@ string Protocol::DecodeAuthPacket(Protocol::PacketType type, vector<uint8_t> con { switch (type) { - case Protocol::PacketType::Error: ASSERT(false, ("Error AUTH packet.")); break; case Protocol::PacketType::AuthV0: return string(begin(data), end(data)); + case Protocol::PacketType::Error: case Protocol::PacketType::DataV0: - case Protocol::PacketType::DataV1: ASSERT(false, ("Not an AUTH packet.")); break; + case Protocol::PacketType::DataV1: + LOG(LERROR, ("Error decoding AUTH packet. PacketType =", type)); + break; } return string(); } @@ -115,14 +119,16 @@ Protocol::DataElementsVec Protocol::DecodeDataPacket(PacketType type, vector<uin { switch (type) { - case Protocol::PacketType::Error: ASSERT(false, ("Error DATA packet.")); return {}; case Protocol::PacketType::DataV0: Encoder::DeserializeDataPoints(0 /* version */, src, points); break; case Protocol::PacketType::DataV1: Encoder::DeserializeDataPoints(1 /* version */, src, points); break; - case Protocol::PacketType::AuthV0: ASSERT(false, ("Not a DATA packet.")); break; + case Protocol::PacketType::Error: + case Protocol::PacketType::AuthV0: + LOG(LERROR, ("Error decoding DATA packet. PacketType =", type)); + return {}; } return points; } |