0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 17:51:53 +00:00

fixup! fixup! fixup! Lib: CBOR message streams and channels

This commit is contained in:
Maria Matejka 2024-10-20 23:58:02 +02:00
parent d9ed03394d
commit 107fb6d551

View File

@ -20,9 +20,17 @@ cbor_parser_init(struct cbor_parser_context *ctx, linpool *lp, uint max_depth)
ctx->lp = lp; ctx->lp = lp;
ctx->flush = lp_save(lp); ctx->flush = lp_save(lp);
ctx->type = 0xff;
ctx->stack_countdown[0] = 1; ctx->stack_countdown[0] = 1;
ctx->stack_pos = 0;
ctx->stack_max = max_depth; ctx->stack_max = max_depth;
ctx->target_buf = NULL;
ctx->target_len = 0;
ctx->type = 0xff;
ctx->partial_state = CPE_TYPE;
ctx->partial_countdown = 0;
} }
struct cbor_parser_context * struct cbor_parser_context *
@ -386,7 +394,7 @@ cbor_channel_create(struct cbor_stream *stream, u64 id)
.parse = stream->parse, .parse = stream->parse,
}; };
log(L_TRACE "CBOR channel create in stream %p, id %lu", stream, id); log(L_TRACE "CBOR channel create in stream %p, id 0X%lx", stream, id);
HASH_INSERT(stream->channels, CCH, cch); HASH_INSERT(stream->channels, CCH, cch);
return cch; return cch;
} }
@ -417,7 +425,7 @@ cbor_channel_done(struct cbor_channel *channel)
struct cbor_stream *stream = channel->stream; struct cbor_stream *stream = channel->stream;
bool active = (stream->cur_rx_channel == channel); bool active = (stream->cur_rx_channel == channel);
log(L_TRACE "CBOR channel%s done in stream %p, id %lu", log(L_TRACE "CBOR channel%s done in stream %p, id 0x%lx",
active ? " (active)" : "", stream, channel->id); active ? " (active)" : "", stream, channel->id);
if (active) if (active)