diff options
author | Matthew Jordan <mjordan@digium.com> | 2014-09-06 22:21:17 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2014-09-06 22:21:17 +0000 |
commit | 8302bc7f0a72667a6d9fdc7d66828508977f1053 (patch) | |
tree | 47dc9ec45a99de761a1b9cd6bd6c4e3e6552fc46 | |
parent | df77a7c5f0235214e56cb8339501503daeb28864 (diff) |
main/rtp_engine: Format NTP timestamps as unsigned ints
On some systems, a timeval's tv_sec/tv_usec will be unsigned lont ints, as
opposed to long ints. When the RTP engine formats these as strings, it was
previously formatting them as signed integers, which can result in some
odd negative timestamp values (particularly on 32-bit systems). This patch
formats the values as unsigned long integers.
........
Merged revisions 422766 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@422767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | main/rtp_engine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/rtp_engine.c b/main/rtp_engine.c index 0c624ab61..a63819f63 100644 --- a/main/rtp_engine.c +++ b/main/rtp_engine.c @@ -1931,8 +1931,8 @@ static struct ast_json *rtcp_report_to_json(struct stasis_message *msg, if (payload->report->type == AST_RTP_RTCP_SR) { char sec[32]; char usec[32]; - snprintf(sec, sizeof(sec), "%ld", payload->report->sender_information.ntp_timestamp.tv_sec); - snprintf(usec, sizeof(usec), "%ld", payload->report->sender_information.ntp_timestamp.tv_usec); + snprintf(sec, sizeof(sec), "%lu", payload->report->sender_information.ntp_timestamp.tv_sec); + snprintf(usec, sizeof(usec), "%lu", payload->report->sender_information.ntp_timestamp.tv_usec); json_rtcp_sender_info = ast_json_pack("{s: s, s: s, s: i, s: i, s: i}", "ntp_timestamp_sec", sec, "ntp_timestamp_usec", usec, |