kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 07:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix several bugs with SDP parsing and well-formedness of responses

Browse Source 
Fix bug ASTERISK-16558 which dealt with the order of responses to incoming
streams defined by SDP.

Fix unreported bug where offering multiple same-type streams would cause
Asterisk to reply with an incorrect SDP response missing one or more streams
without a proper declination.

Fix bugs related to a single non-audio stream being offered with responses
requesting codecs that were not offered in the initial invite along with an
additional audio stream that was not in the initial invite.

Review: https://reviewboard.asterisk.org/r/1516/
........

Merged revisions 344385 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 344386 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@344387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2011-11-10 18:15:02 +00:00
parent 3d44965e70
commit c225800646
2 changed files with 120 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
channels/chan_sip.c
View File

@@ -9019,9 +9019,13 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
ast_log(LOG_WARNING, "unknown SDP media protocol in offer: %s\n", protocol); ast_log(LOG_WARNING, "unknown SDP media protocol in offer: %s\n", protocol);
continue; continue;
} }
if (p->offered_media[SDP_AUDIO].order_offered) {
ast_log(LOG_WARNING, "Multiple audio streams are not supported\n");
res = -3;
goto process_sdp_cleanup;
}
audio = TRUE; audio = TRUE;
p->offered_media[SDP_AUDIO].offered = TRUE; p->offered_media[SDP_AUDIO].order_offered = ++numberofmediastreams;
numberofmediastreams++;
portno = x; portno = x;
/* Scan through the RTP payload types specified in a "m=" line: */ /* Scan through the RTP payload types specified in a "m=" line: */
@@ -9047,10 +9051,14 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
ast_log(LOG_WARNING, "unknown SDP media protocol in offer: %s\n", protocol); ast_log(LOG_WARNING, "unknown SDP media protocol in offer: %s\n", protocol);
continue; continue;
} }
if (p->offered_media[SDP_VIDEO].order_offered) {
ast_log(LOG_WARNING, "Multiple video streams are not supported\n");
res = -3;
goto process_sdp_cleanup;
}
video = TRUE; video = TRUE;
p->novideo = FALSE; p->novideo = FALSE;
p->offered_media[SDP_VIDEO].offered = TRUE; p->offered_media[SDP_VIDEO].order_offered = ++numberofmediastreams;
numberofmediastreams++;
vportno = x; vportno = x;
/* Scan through the RTP payload types specified in a "m=" line: */ /* Scan through the RTP payload types specified in a "m=" line: */
@@ -9069,10 +9077,14 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
/* Search for text media definition */ /* Search for text media definition */
} else if ((sscanf(m, "text %30u/%30u RTP/AVP %n", &x, &numberofports, &len) == 2 && len > 0 && x) || } else if ((sscanf(m, "text %30u/%30u RTP/AVP %n", &x, &numberofports, &len) == 2 && len > 0 && x) ||
(sscanf(m, "text %30u RTP/AVP %n", &x, &len) == 1 && len > 0 && x)) { (sscanf(m, "text %30u RTP/AVP %n", &x, &len) == 1 && len > 0 && x)) {
if (p->offered_media[SDP_TEXT].order_offered) {
ast_log(LOG_WARNING, "Multiple text streams are not supported\n");
res = -3;
goto process_sdp_cleanup;
}
text = TRUE; text = TRUE;
p->notext = FALSE; p->notext = FALSE;
p->offered_media[SDP_TEXT].offered = TRUE; p->offered_media[SDP_TEXT].order_offered = ++numberofmediastreams;
numberofmediastreams++;
tportno = x; tportno = x;
/* Scan through the RTP payload types specified in a "m=" line: */ /* Scan through the RTP payload types specified in a "m=" line: */
@@ -9091,12 +9103,16 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
/* Search for image media definition */ /* Search for image media definition */
} else if (p->udptl && ((sscanf(m, "image %30u udptl t38%n", &x, &len) == 1 && len > 0 && x) || } else if (p->udptl && ((sscanf(m, "image %30u udptl t38%n", &x, &len) == 1 && len > 0 && x) ||
(sscanf(m, "image %30u UDPTL t38%n", &x, &len) == 1 && len > 0 && x) )) { (sscanf(m, "image %30u UDPTL t38%n", &x, &len) == 1 && len > 0 && x) )) {
if (p->offered_media[SDP_IMAGE].order_offered) {
ast_log(LOG_WARNING, "Multiple T.38 streams are not supported\n");
res = -3;
goto process_sdp_cleanup;
}
image = TRUE; image = TRUE;
if (debug) if (debug)
ast_verbose("Got T.38 offer in SDP in dialog %s\n", p->callid); ast_verbose("Got T.38 offer in SDP in dialog %s\n", p->callid);
p->offered_media[SDP_IMAGE].offered = TRUE; p->offered_media[SDP_IMAGE].order_offered = ++numberofmediastreams;
udptlportno = x; udptlportno = x;
numberofmediastreams++;
if (p->t38.state != T38_ENABLED) { if (p->t38.state != T38_ENABLED) {
memset(&p->t38.their_parms, 0, sizeof(p->t38.their_parms)); memset(&p->t38.their_parms, 0, sizeof(p->t38.their_parms));
@@ -9199,13 +9215,6 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
if (numberofmediastreams > 3) {
/* We have too many fax, audio and/or video and/or text media streams, fail this offer */
ast_log(LOG_WARNING, "Faling due to too many media streams\n");
res = -3;
goto process_sdp_cleanup;
}
if (secure_audio && !(p->srtp && (ast_test_flag(p->srtp, SRTP_CRYPTO_OFFER_OK)))) { if (secure_audio && !(p->srtp && (ast_test_flag(p->srtp, SRTP_CRYPTO_OFFER_OK)))) {
ast_log(LOG_WARNING, "Can't provide secure audio requested in SDP offer\n"); ast_log(LOG_WARNING, "Can't provide secure audio requested in SDP offer\n");
res = -4; res = -4;
@@ -9250,7 +9259,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
ast_format_cap_append(newpeercapability, tpeercapability); ast_format_cap_append(newpeercapability, tpeercapability);
ast_format_cap_joint_copy(p->caps, newpeercapability, newjointcapability); ast_format_cap_joint_copy(p->caps, newpeercapability, newjointcapability);
if (ast_format_cap_is_empty(newjointcapability) && (portno != -1)) { if (ast_format_cap_is_empty(newjointcapability) && udptlportno == -1) {
ast_log(LOG_NOTICE, "No compatible codecs, not accepting this offer!\n"); ast_log(LOG_NOTICE, "No compatible codecs, not accepting this offer!\n");
/* Do NOT Change current setting */ /* Do NOT Change current setting */
res = -1; res = -1;
@@ -9281,6 +9290,17 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
ast_rtp_lookup_mime_multiple2(s3, NULL, newnoncodeccapability, 0, 0)); ast_rtp_lookup_mime_multiple2(s3, NULL, newnoncodeccapability, 0, 0));
} }
/* We are now ready to change the sip session and p->rtp and p->vrtp with the offered codecs, since
they are acceptable */
ast_format_cap_copy(p->jointcaps, newjointcapability); /* Our joint codec profile for this call */
ast_format_cap_copy(p->peercaps, newpeercapability); /* The other sides capability in latest offer */
p->jointnoncodeccapability = newnoncodeccapability; /* DTMF capabilities */
if (ast_test_flag(&p->flags[1], SIP_PAGE2_PREFERRED_CODEC)) { /* respond with single most preferred joint codec, limiting the other side's choice */
ast_codec_choose(&p->prefs, p->jointcaps, 1, &tmp_fmt);
ast_format_cap_set(p->jointcaps, &tmp_fmt);
}
/* Setup audio address and port */ /* Setup audio address and port */
if (p->rtp) { if (p->rtp) {
if (portno > 0) { if (portno > 0) {
@@ -9290,16 +9310,6 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
ast_verbose("Peer audio RTP is at port %s\n", ast_verbose("Peer audio RTP is at port %s\n",
ast_sockaddr_stringify(sa)); ast_sockaddr_stringify(sa));
} }
/* We are now ready to change the sip session and p->rtp and p->vrtp with the offered codecs, since
they are acceptable */
ast_format_cap_copy(p->jointcaps, newjointcapability); /* Our joint codec profile for this call */
ast_format_cap_copy(p->peercaps, newpeercapability); /* The other sides capability in latest offer */
p->jointnoncodeccapability = newnoncodeccapability; /* DTMF capabilities */
if (ast_test_flag(&p->flags[1], SIP_PAGE2_PREFERRED_CODEC)) { /* respond with single most preferred joint codec, limiting the other side's choice */
ast_codec_choose(&p->prefs, p->jointcaps, 1, &tmp_fmt);
ast_format_cap_set(p->jointcaps, &tmp_fmt);
}
ast_rtp_codecs_payloads_copy(&newaudiortp, ast_rtp_instance_get_codecs(p->rtp), p->rtp); ast_rtp_codecs_payloads_copy(&newaudiortp, ast_rtp_instance_get_codecs(p->rtp), p->rtp);
/* Ensure RTCP is enabled since it may be inactive /* Ensure RTCP is enabled since it may be inactive
@@ -11679,47 +11689,94 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
add_content(resp, owner); add_content(resp, owner);
add_content(resp, subject); add_content(resp, subject);
add_content(resp, connection); add_content(resp, connection);
if (needvideo) /* only if video response is appropriate */ /* only if video response is appropriate */
if (needvideo) {
add_content(resp, bandwidth); add_content(resp, bandwidth);
}
add_content(resp, session_time); add_content(resp, session_time);
if (needaudio) { /* if this is a response to an invite, order our offers properly */
add_content(resp, m_audio->str); if (p->offered_media[SDP_AUDIO].order_offered ||
add_content(resp, a_audio->str); p->offered_media[SDP_VIDEO].order_offered ||
add_content(resp, hold); p->offered_media[SDP_TEXT].order_offered ||
if (a_crypto) { p->offered_media[SDP_IMAGE].order_offered) {
add_content(resp, a_crypto); int i;
/* we have up to 3 streams as limited by process_sdp */
for (i = 1; i <= 3; i++) {
if (p->offered_media[SDP_AUDIO].order_offered == i) {
if (needaudio) {
add_content(resp, m_audio->str);
add_content(resp, a_audio->str);
add_content(resp, hold);
if (a_crypto) {
add_content(resp, a_crypto);
}
} else {
snprintf(dummy_answer, sizeof(dummy_answer), "m=audio 0 RTP/AVP %s\r\n", p->offered_media[SDP_AUDIO].codecs);
add_content(resp, dummy_answer);
}
} else if (p->offered_media[SDP_VIDEO].order_offered == i) {
if (needvideo) { /* only if video response is appropriate */
add_content(resp, m_video->str);
add_content(resp, a_video->str);
add_content(resp, hold); /* Repeat hold for the video stream */
if (v_a_crypto) {
add_content(resp, v_a_crypto);
}
} else {
snprintf(dummy_answer, sizeof(dummy_answer), "m=video 0 RTP/AVP %s\r\n", p->offered_media[SDP_VIDEO].codecs);
add_content(resp, dummy_answer);
}
} else if (p->offered_media[SDP_TEXT].order_offered == i) {
if (needtext) { /* only if text response is appropriate */
add_content(resp, m_text->str);
add_content(resp, a_text->str);
add_content(resp, hold); /* Repeat hold for the text stream */
if (t_a_crypto) {
add_content(resp, t_a_crypto);
}
} else {
snprintf(dummy_answer, sizeof(dummy_answer), "m=text 0 RTP/AVP %s\r\n", p->offered_media[SDP_TEXT].codecs);
add_content(resp, dummy_answer);
}
} else if (p->offered_media[SDP_IMAGE].order_offered == i) {
if (add_t38) {
add_content(resp, m_modem->str);
add_content(resp, a_modem->str);
} else {
add_content(resp, "m=image 0 udptl t38\r\n");
}
}
} }
} else if (p->offered_media[SDP_AUDIO].offered) { } else {
snprintf(dummy_answer, sizeof(dummy_answer), "m=audio 0 RTP/AVP %s\r\n", p->offered_media[SDP_AUDIO].codecs); /* generate new SDP from scratch, no offers */
add_content(resp, dummy_answer); if (needaudio) {
} add_content(resp, m_audio->str);
if (needvideo) { /* only if video response is appropriate */ add_content(resp, a_audio->str);
add_content(resp, m_video->str); add_content(resp, hold);
add_content(resp, a_video->str); if (a_crypto) {
add_content(resp, hold); /* Repeat hold for the video stream */ add_content(resp, a_crypto);
if (v_a_crypto) { }
add_content(resp, v_a_crypto);
} }
} else if (p->offered_media[SDP_VIDEO].offered) { if (needvideo) { /* only if video response is appropriate */
snprintf(dummy_answer, sizeof(dummy_answer), "m=video 0 RTP/AVP %s\r\n", p->offered_media[SDP_VIDEO].codecs); add_content(resp, m_video->str);
add_content(resp, dummy_answer); add_content(resp, a_video->str);
} add_content(resp, hold); /* Repeat hold for the video stream */
if (needtext) { /* only if text response is appropriate */ if (v_a_crypto) {
add_content(resp, m_text->str); add_content(resp, v_a_crypto);
add_content(resp, a_text->str); }
add_content(resp, hold); /* Repeat hold for the text stream */ }
if (t_a_crypto) { if (needtext) { /* only if text response is appropriate */
add_content(resp, t_a_crypto); add_content(resp, m_text->str);
add_content(resp, a_text->str);
add_content(resp, hold); /* Repeat hold for the text stream */
if (t_a_crypto) {
add_content(resp, t_a_crypto);
}
}
if (add_t38) {
add_content(resp, m_modem->str);
add_content(resp, a_modem->str);
} }
} else if (p->offered_media[SDP_TEXT].offered) {
snprintf(dummy_answer, sizeof(dummy_answer), "m=text 0 RTP/AVP %s\r\n", p->offered_media[SDP_TEXT].codecs);
add_content(resp, dummy_answer);
}
if (add_t38) {
add_content(resp, m_modem->str);
add_content(resp, a_modem->str);
} else if (p->offered_media[SDP_IMAGE].offered) {
add_content(resp, "m=image 0 udptl t38\r\n");
} }
/* Update lastrtprx when we send our SDP */ /* Update lastrtprx when we send our SDP */

2
channels/sip/include/sip.h
View File

@@ -944,7 +944,7 @@ struct sip_st_cfg {
/*! \brief Structure for remembering offered media in an INVITE, to make sure we reply /*! \brief Structure for remembering offered media in an INVITE, to make sure we reply
to all media streams. In theory. In practise, we try our best. */ to all media streams. In theory. In practise, we try our best. */
struct offered_media { struct offered_media {
int offered; int order_offered; /*!< Order the media was offered in. Not offered is 0 */
char codecs[128]; char codecs[128];
}; };