kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #278 in FS/freeswitch from ~ARTURZ/freeswitch:FS-7640-wraparound-proof-comparisions to master 

* commit '822cbefc4a1467d10ce2694c6fea61b4a7ffe3b3':
  FS-7640 Fix some comparisions in switch_rtp.c to be wraparound proof
This commit is contained in:
Mike Jerris 2015-08-26 13:36:47 -05:00
parent de3b0a0957 822cbefc4a
commit 1f493addf2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/switch_rtp.c
View File

@ -1888,7 +1888,7 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
int rate = 0; int rate = 0;
if (rtp_session->flags[SWITCH_RTP_FLAG_AUTO_CNG] && rtp_session->send_msg.header.ts && rtp_session->cng_pt != INVALID_PT && if (rtp_session->flags[SWITCH_RTP_FLAG_AUTO_CNG] && rtp_session->send_msg.header.ts && rtp_session->cng_pt != INVALID_PT &&
rtp_session->timer.samplecount >= (rtp_session->last_write_samplecount + (rtp_session->samples_per_interval * 60))) { (rtp_session->timer.samplecount - rtp_session->last_write_samplecount >= rtp_session->samples_per_interval * 60)) {
uint8_t data[10] = { 0 }; uint8_t data[10] = { 0 };
switch_frame_flag_t frame_flags = SFF_NONE; switch_frame_flag_t frame_flags = SFF_NONE;
data[0] = 65; data[0] = 65;
@ -6957,6 +6957,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
bytes = datalen; bytes = datalen;
m = (uint8_t) send_msg->header.m; m = (uint8_t) send_msg->header.m;
rtp_session->ts = ntohl(send_msg->header.ts);
if (flags && *flags & SFF_RFC2833) { if (flags && *flags & SFF_RFC2833) {
if (rtp_session->te == INVALID_PT) { if (rtp_session->te == INVALID_PT) {
@ -6994,7 +6995,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
if ((rtp_session->rtp_bugs & RTP_BUG_NEVER_SEND_MARKER)) { if ((rtp_session->rtp_bugs & RTP_BUG_NEVER_SEND_MARKER)) {
m = 0; m = 0;
} else { } else {
if ((!rtp_session->flags[SWITCH_RTP_FLAG_RESET] && rtp_session->ts > (rtp_session->last_write_ts + (rtp_session->samples_per_interval * 10))) if ((!rtp_session->flags[SWITCH_RTP_FLAG_RESET] && (rtp_session->ts - rtp_session->last_write_ts > rtp_session->samples_per_interval * 10))
|| rtp_session->ts == rtp_session->samples_per_interval) { || rtp_session->ts == rtp_session->samples_per_interval) {
m++; m++;
} }