sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chan_iax2: Fix jitterbuffer regression prior to receiving audio. 

ASTERISK_29392 (a security fix) introduced a regression by
not processing frames when we don't have an audio format.

Currently, chan_iax2 only calls jb_get to read frames from
the jitterbuffer when the voiceformat has been set on the pvt.
However, this only happens when we receive a voice frame, which
means that prior to receiving voice frames, other types of frames
get stalled completely in the jitterbuffer.

To fix this, we now fallback to using the format negotiated during
call setup until we've actually received a voice frame with a format.
This ensures we're always able to read from the jitterbuffer.

ASTERISK-30354 #close
ASTERISK-30162 #close

Change-Id: Ie4fd1e8e088a145ad89e0427c2100a530e964fe9
This commit is contained in:
Naveen Albert 2022-12-14 16:00:51 +00:00 committed by George Joseph
parent 827222d607
commit ede67a99be
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
channels/chan_iax2.c
View File

@ -4158,9 +4158,19 @@ static void __get_from_jb(const void *p)
now.tv_usec += 1000;
ms = ast_tvdiff_ms(now, pvt->rxcore);
voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat);
if (voicefmt && ms >= (next = jb_next(pvt->jb))) {
if (ms >= (next = jb_next(pvt->jb))) {
voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat);
if (!voicefmt) {
/* pvt->voiceformat won't be set if we haven't received any voice frames yet.
* In this case, fall back to using the format negotiated during call setup,
* so we don't stall the jitterbuffer completely. */
voicefmt = ast_format_compatibility_bitfield2format(pvt->peerformat);
}
if (!voicefmt) {
/* Really shouldn't happen, but if it does, should be looked into */
ast_log(LOG_WARNING, "No voice format and no peer format available on %s, backlogging frame\n", ast_channel_name(pvt->owner));
goto cleanup; /* Don't crash if there's no voice format */
}
ret = jb_get(pvt->jb, &frame, ms, ast_format_get_default_ms(voicefmt));
switch(ret) {
case JB_OK:
@ -4202,6 +4212,7 @@ static void __get_from_jb(const void *p)
break;
}
}
cleanup:
if (pvt)
update_jbsched(pvt);
ast_mutex_unlock(&iaxsl[callno]);