[svn-commits] kmoore: branch 10 r344386 - in /branches/10: ./ channels/ channels/sip/include/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Nov 10 12:14:27 CST 2011
Author: kmoore
Date: Thu Nov 10 12:14:20 2011
New Revision: 344386
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=344386
Log:
Fix several bugs with SDP parsing and well-formedness of responses
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
Modified:
branches/10/ (props changed)
branches/10/channels/chan_sip.c
branches/10/channels/sip/include/sip.h
Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Modified: branches/10/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_sip.c?view=diff&rev=344386&r1=344385&r2=344386
==============================================================================
--- branches/10/channels/chan_sip.c (original)
+++ branches/10/channels/chan_sip.c Thu Nov 10 12:14:20 2011
@@ -9010,9 +9010,13 @@
ast_log(LOG_WARNING, "unknown SDP media protocol in offer: %s\n", protocol);
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;
- p->offered_media[SDP_AUDIO].offered = TRUE;
- numberofmediastreams++;
+ p->offered_media[SDP_AUDIO].order_offered = ++numberofmediastreams;
portno = x;
/* Scan through the RTP payload types specified in a "m=" line: */
@@ -9038,10 +9042,14 @@
ast_log(LOG_WARNING, "unknown SDP media protocol in offer: %s\n", protocol);
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;
p->novideo = FALSE;
- p->offered_media[SDP_VIDEO].offered = TRUE;
- numberofmediastreams++;
+ p->offered_media[SDP_VIDEO].order_offered = ++numberofmediastreams;
vportno = x;
/* Scan through the RTP payload types specified in a "m=" line: */
@@ -9060,10 +9068,14 @@
/* Search for text media definition */
} 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)) {
+ 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;
p->notext = FALSE;
- p->offered_media[SDP_TEXT].offered = TRUE;
- numberofmediastreams++;
+ p->offered_media[SDP_TEXT].order_offered = ++numberofmediastreams;
tportno = x;
/* Scan through the RTP payload types specified in a "m=" line: */
@@ -9082,12 +9094,16 @@
/* Search for image media definition */
} 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) )) {
+ 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;
if (debug)
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;
- numberofmediastreams++;
if (p->t38.state != T38_ENABLED) {
memset(&p->t38.their_parms, 0, sizeof(p->t38.their_parms));
@@ -9190,13 +9206,6 @@
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)))) {
ast_log(LOG_WARNING, "Can't provide secure audio requested in SDP offer\n");
res = -4;
@@ -9241,7 +9250,7 @@
ast_format_cap_append(newpeercapability, tpeercapability);
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");
/* Do NOT Change current setting */
res = -1;
@@ -9270,6 +9279,17 @@
ast_rtp_lookup_mime_multiple2(s1, NULL, p->noncodeccapability, 0, 0),
ast_rtp_lookup_mime_multiple2(s2, NULL, peernoncodeccapability, 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 */
@@ -9280,16 +9300,6 @@
if (debug) {
ast_verbose("Peer audio RTP is at port %s\n",
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);
@@ -11670,47 +11680,94 @@
add_content(resp, owner);
add_content(resp, subject);
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, session_time);
- 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 if (p->offered_media[SDP_AUDIO].offered) {
- 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);
- }
- 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 if (p->offered_media[SDP_VIDEO].offered) {
- 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);
- }
- 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 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");
+ /* if this is a response to an invite, order our offers properly */
+ if (p->offered_media[SDP_AUDIO].order_offered ||
+ p->offered_media[SDP_VIDEO].order_offered ||
+ p->offered_media[SDP_TEXT].order_offered ||
+ p->offered_media[SDP_IMAGE].order_offered) {
+ 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 {
+ /* generate new SDP from scratch, no offers */
+ 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);
+ }
+ }
+ 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);
+ }
+ }
+ 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);
+ }
+ }
+ if (add_t38) {
+ add_content(resp, m_modem->str);
+ add_content(resp, a_modem->str);
+ }
}
/* Update lastrtprx when we send our SDP */
Modified: branches/10/channels/sip/include/sip.h
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/sip/include/sip.h?view=diff&rev=344386&r1=344385&r2=344386
==============================================================================
--- branches/10/channels/sip/include/sip.h (original)
+++ branches/10/channels/sip/include/sip.h Thu Nov 10 12:14:20 2011
@@ -943,7 +943,7 @@
/*! \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. */
struct offered_media {
- int offered;
+ int order_offered; /*!< Order the media was offered in. Not offered is 0 */
char codecs[128];
};
More information about the svn-commits
mailing list