From cef1401aeff07924db37b11ff4ba2c0ad45bf933 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 8 Oct 2024 13:21:33 -0400 Subject: [PATCH] MT#55283 unify types used for sequence numbers We use int or unsigned int everywhere, except in a few leftover places. Unify to (unsigned) int. Change-Id: I0896b2f177957c17b30a3d0cb6b3fb2beb4bd684 (cherry picked from commit f60ee917c9d08717299adabf82de7ddeede259ba) --- daemon/media_socket.c | 6 +++--- daemon/rtp.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/daemon/media_socket.c b/daemon/media_socket.c index 73125e071..71901aeea 100644 --- a/daemon/media_socket.c +++ b/daemon/media_socket.c @@ -2694,10 +2694,10 @@ static int stream_packet(struct packet_handler_ctx *phc) { atomic64_inc_na(&phc->mp.ssrc_in->stats->packets); atomic64_add_na(&phc->mp.ssrc_in->stats->bytes, phc->s.len); // no real sequencing, so this is rudimentary - uint64_t old_seq = atomic_get_na(&phc->mp.ssrc_in->stats->ext_seq); - uint64_t new_seq = ntohs(phc->mp.rtp->seq_num) | (old_seq & 0xffff0000UL); + unsigned int old_seq = atomic_get_na(&phc->mp.ssrc_in->stats->ext_seq); + unsigned int new_seq = ntohs(phc->mp.rtp->seq_num) | (old_seq & 0xffff0000UL); // XXX combine this with similar code elsewhere - long seq_diff = new_seq - old_seq; + int seq_diff = new_seq - old_seq; while (seq_diff < -60000) { new_seq += 0x10000; seq_diff += 0x10000; diff --git a/daemon/rtp.c b/daemon/rtp.c index b07a8bc25..283f6db7d 100644 --- a/daemon/rtp.c +++ b/daemon/rtp.c @@ -43,7 +43,7 @@ error: return -1; } -static uint64_t packet_index(struct ssrc_ctx *ssrc_ctx, struct rtp_header *rtp) { +static unsigned int packet_index(struct ssrc_ctx *ssrc_ctx, struct rtp_header *rtp) { uint16_t seq; seq = ntohs(rtp->seq_num); @@ -103,7 +103,7 @@ void rtp_append_mki(str *s, struct crypto_context *c) { int rtp_avp2savp(str *s, struct crypto_context *c, struct ssrc_ctx *ssrc_ctx) { struct rtp_header *rtp; str payload, to_auth; - uint64_t index; + unsigned int index; if (G_UNLIKELY(!ssrc_ctx)) return -1;