Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix pigweed tokenizer port (#26283)
Browse files Browse the repository at this point in the history
Issue introduced in: #25351

Encoded message should also contain the token.

Signed-off-by: Marius Tache <[email protected]>
marius-alex-tache authored and pull[bot] committed Nov 21, 2023
1 parent 9c7d567 commit b0b407b
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/lib/support/logging/CHIPLogging.cpp
Original file line number Diff line number Diff line change
@@ -53,10 +53,13 @@ void HandleTokenizedLog(uint32_t levels, pw_tokenizer_Token token, pw_tokenizer_
{
uint8_t encoded_message[PW_TOKENIZER_CFG_ENCODING_BUFFER_SIZE_BYTES];

memcpy(encoded_message, &token, sizeof(token));

va_list args;
va_start(args, types);
// Use the C argument encoding API, since the C++ API requires C++17.
const size_t encoded_size = pw_tokenizer_EncodeArgs(types, args, encoded_message, sizeof(encoded_message));
const size_t encoded_size = sizeof(token) +
pw_tokenizer_EncodeArgs(types, args, encoded_message + sizeof(token), sizeof(encoded_message) - sizeof(token));
va_end(args);

uint8_t log_category = levels >> 8 & 0xFF;

0 comments on commit b0b407b

Please sign in to comment.