From f4724b2eae492b6235af639ebc821109f11cbd94 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 29 Jul 2025 08:45:13 -0400 Subject: [PATCH] MT#63317 annotate rtp_padding Change-Id: I47107efbc4114c1e40dd600607a5cc028a84855b --- lib/rtplib.c | 12 ++++++------ lib/rtplib.h | 3 ++- recording-daemon/packet.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/rtplib.c b/lib/rtplib.c index 909efa0c3..3b3cc8bc7 100644 --- a/lib/rtplib.c +++ b/lib/rtplib.c @@ -103,18 +103,18 @@ error: } -int rtp_padding(const struct rtp_header *header, str *payload) { +bool rtp_padding(const struct rtp_header *header, str *payload) { if (!header || !payload->s) - return 0; + return true; if (!(header->v_p_x_cc & 0x20)) - return 0; // no padding + return true; // no padding if (payload->len == 0) - return -1; + return false; unsigned int padding = (unsigned char) payload->s[payload->len - 1]; if (payload->len < padding) - return -1; + return false; payload->len -= padding; - return 0; + return true; } diff --git a/lib/rtplib.h b/lib/rtplib.h index 8e7c54830..ec30b9ed6 100644 --- a/lib/rtplib.h +++ b/lib/rtplib.h @@ -129,7 +129,8 @@ extern const int num_rfc_rtp_payload_types; __attribute__((nonnull(2))) struct rtp_header *rtp_payload(str *p, const str *s); -int rtp_padding(const struct rtp_header *header, str *payload); +__attribute__((nonnull(2))) +bool rtp_padding(const struct rtp_header *header, str *payload); const struct rtp_payload_type *rtp_get_rfc_payload_type(unsigned int type); const struct rtp_payload_type *rtp_get_rfc_codec(const str *codec); diff --git a/recording-daemon/packet.c b/recording-daemon/packet.c index b76bf062d..dfbd02054 100644 --- a/recording-daemon/packet.c +++ b/recording-daemon/packet.c @@ -186,7 +186,7 @@ void packet_process(stream_t *stream, unsigned char *buf, unsigned len) { if (!(packet->rtp = rtp_payload(&packet->payload, &bufstr))) goto err; - if (rtp_padding(packet->rtp, &packet->payload)) + if (!rtp_padding(packet->rtp, &packet->payload)) goto err; packet->p.seq = ntohs(packet->rtp->seq_num);