kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve SDP parsing warning messages

Browse Source 
* 'Unsupported media type' is only reported when that is in fact the case,
   not when a supported media type is included in an 'm' line that has an
   invalid format.

* All warning messages related to parsing 'm' lines now include the 'm' line contents.

* (minor bugfix) newline added to port-number-zero warning messages.

* Warning messages improved to use RFC-specified terminology for various items.

* Warnings for offers that include more than one port for a single media type now
  include the media type.

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

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368268 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2012-06-01 20:31:15 +00:00
parent 6016094db7
commit 66e5c30716
1 changed files with 201 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

355
channels/chan_sip.c
View File

@@ -9045,7 +9045,7 @@ static int sockaddr_is_null_or_any(const struct ast_sockaddr *addr)
return ast_sockaddr_isnull(addr) || ast_sockaddr_is_any(addr); return ast_sockaddr_isnull(addr) || ast_sockaddr_is_any(addr);
} }
/*! \brief Process SIP SDP offer, select formats and activate RTP channels /*! \brief Process SIP SDP offer, select formats and activate media channels
If offer is rejected, we will not change any properties of the call If offer is rejected, we will not change any properties of the call
Return 0 on success, a negative value on errors. Return 0 on success, a negative value on errors.
Must be called after find_sdp(). Must be called after find_sdp().
@@ -9072,16 +9072,16 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
struct ast_sockaddr videosa; struct ast_sockaddr videosa;
struct ast_sockaddr textsa; struct ast_sockaddr textsa;
struct ast_sockaddr imagesa; struct ast_sockaddr imagesa;
struct ast_sockaddr *sa = NULL; /*!< RTP Audio host IP */ struct ast_sockaddr *sa = NULL; /*!< RTP audio destination IP address */
struct ast_sockaddr *vsa = NULL; /*!< RTP video host IP */ struct ast_sockaddr *vsa = NULL; /*!< RTP video destination IP address */
struct ast_sockaddr *tsa = NULL; /*!< RTP text host IP */ struct ast_sockaddr *tsa = NULL; /*!< RTP text destination IP address */
struct ast_sockaddr *isa = NULL; /*!< UDPTL host ip */ struct ast_sockaddr *isa = NULL; /*!< UDPTL image destination IP address */
int portno = -1; /*!< RTP Audio port number */ int portno = -1; /*!< RTP audio destination port number */
int vportno = -1; /*!< RTP Video port number */ int vportno = -1; /*!< RTP video destination port number */
int tportno = -1; /*!< RTP Text port number */ int tportno = -1; /*!< RTP text destination port number */
int udptlportno = -1; /*!< UDPTL Image port number */ int udptlportno = -1; /*!< UDPTL image destination port number */
/* Peer capability is the capability in the SDP, non codec is RFC2833 DTMF (101) */ /* Peer capability is the capability in the SDP, non codec is RFC2833 DTMF (101) */
struct ast_format_cap *peercapability = ast_format_cap_alloc_nolock(); struct ast_format_cap *peercapability = ast_format_cap_alloc_nolock();
struct ast_format_cap *vpeercapability = ast_format_cap_alloc_nolock(); struct ast_format_cap *vpeercapability = ast_format_cap_alloc_nolock();
struct ast_format_cap *tpeercapability = ast_format_cap_alloc_nolock(); struct ast_format_cap *tpeercapability = ast_format_cap_alloc_nolock();
@@ -9106,9 +9106,9 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
int numberofports; int numberofports;
int numberofmediastreams = 0; int numberofmediastreams = 0;
int last_rtpmap_codec = 0; int last_rtpmap_codec = 0;
int red_data_pt[10]; /* For T.140 red */ int red_data_pt[10]; /* For T.140 RED */
int red_num_gen = 0; /* For T.140 red */ int red_num_gen = 0; /* For T.140 RED */
char red_fmtp[100] = "empty"; /* For T.140 red */ char red_fmtp[100] = "empty"; /* For T.140 RED */
int debug = sip_debug_test_pvt(p); int debug = sip_debug_test_pvt(p);
/* START UNKNOWN */ /* START UNKNOWN */
@@ -9137,14 +9137,6 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
memset(p->offered_media, 0, sizeof(p->offered_media)); memset(p->offered_media, 0, sizeof(p->offered_media));
if (p->vrtp) {
ast_rtp_codecs_payloads_clear(&newvideortp, NULL);
}
if (p->trtp) {
ast_rtp_codecs_payloads_clear(&newtextrtp, NULL);
}
/* Scan for the first media stream (m=) line to limit scanning of globals */ /* Scan for the first media stream (m=) line to limit scanning of globals */
nextm = get_sdp_iterate(&next, req, "m"); nextm = get_sdp_iterate(&next, req, "m");
if (ast_strlen_zero(nextm)) { if (ast_strlen_zero(nextm)) {
@@ -9191,7 +9183,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
break; break;
} }
ast_debug(3, "Processing session-level SDP %c=%s... %s\n", type, value, (processed == TRUE)? "OK." : "UNSUPPORTED."); ast_debug(3, "Processing session-level SDP %c=%s... %s\n", type, value, (processed == TRUE)? "OK." : "UNSUPPORTED OR FAILED.");
} }
/* default: novideo and notext set */ /* default: novideo and notext set */
@@ -9208,153 +9200,207 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
char protocol[5] = {0,}; char protocol[5] = {0,};
int x; int x;
numberofports = 1; numberofports = 0;
len = -1; len = -1;
start = next; start = next;
m = nextm; m = nextm;
iterator = next; iterator = next;
nextm = get_sdp_iterate(&next, req, "m"); nextm = get_sdp_iterate(&next, req, "m");
/* Search for audio media definition */ /* Check for 'audio' media offer */
if ((sscanf(m, "audio %30u/%30u RTP/%4s %n", &x, &numberofports, protocol, &len) == 3 && len > 0) || if (strncmp(m, "audio ", 6) == 0) {
(sscanf(m, "audio %30u RTP/%4s %n", &x, protocol, &len) == 2 && len > 0)) { if ((sscanf(m, "audio %30u/%30u RTP/%4s %n", &x, &numberofports, protocol, &len) == 3 && len > 0) ||
if (x == 0) { (sscanf(m, "audio %30u RTP/%4s %n", &x, protocol, &len) == 2 && len > 0)) {
ast_log(LOG_WARNING, "ignoring 'audio' media offer because port number is zero\n"); if (x == 0) {
continue; ast_log(LOG_WARNING, "Ignoring audio media offer because port number is zero\n");
} continue;
if (!strcmp(protocol, "SAVP")) { }
secure_audio = 1;
} else if (strcmp(protocol, "AVP")) {
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].order_offered = ++numberofmediastreams;
portno = x;
/* Scan through the RTP payload types specified in a "m=" line: */ /* Check number of ports offered for stream */
codecs = m + len; if (numberofports > 1) {
ast_copy_string(p->offered_media[SDP_AUDIO].codecs, codecs, sizeof(p->offered_media[SDP_AUDIO].codecs)); ast_log(LOG_WARNING, "%d ports offered for audio media, not supported by Asterisk. Will try anyway...\n", numberofports);
for (; !ast_strlen_zero(codecs); codecs = ast_skip_blanks(codecs + len)) { }
if (sscanf(codecs, "%30u%n", &codec, &len) != 1) {
ast_log(LOG_WARNING, "Error in codec string '%s'\n", codecs); if (!strcmp(protocol, "SAVP")) {
secure_audio = 1;
} else if (strcmp(protocol, "AVP")) {
ast_log(LOG_WARNING, "Unknown RTP profile in audio offer: %s\n", m);
continue;
}
if (p->offered_media[SDP_AUDIO].order_offered) {
ast_log(LOG_WARNING, "Rejecting non-primary audio stream: %s\n", m);
res = -1; res = -1;
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
if (debug)
ast_verbose("Found RTP audio format %d\n", codec);
ast_rtp_codecs_payloads_set_m_type(&newaudiortp, NULL, codec); audio = TRUE;
} p->offered_media[SDP_AUDIO].order_offered = ++numberofmediastreams;
/* Search for video media definition */ portno = x;
} else if ((sscanf(m, "video %30u/%30u RTP/%4s %n", &x, &numberofports, protocol, &len) == 3 && len > 0) ||
(sscanf(m, "video %30u RTP/%4s %n", &x, protocol, &len) == 2 && len > 0)) { /* Scan through the RTP payload types specified in a "m=" line: */
if (x == 0) { codecs = m + len;
ast_log(LOG_WARNING, "ignoring 'video' media offer because port number is zero\n"); ast_copy_string(p->offered_media[SDP_AUDIO].codecs, codecs, sizeof(p->offered_media[SDP_AUDIO].codecs));
continue; for (; !ast_strlen_zero(codecs); codecs = ast_skip_blanks(codecs + len)) {
} if (sscanf(codecs, "%30u%n", &codec, &len) != 1) {
if (!strcmp(protocol, "SAVP")) { ast_log(LOG_WARNING, "Invalid syntax in RTP audio format list: %s\n", codecs);
secure_video = 1; res = -1;
} else if (strcmp(protocol, "AVP")) { goto process_sdp_cleanup;
ast_log(LOG_WARNING, "unknown SDP media protocol in offer: %s\n", protocol); }
continue; if (debug) {
} ast_verbose("Found RTP audio format %d\n", codec);
if (p->offered_media[SDP_VIDEO].order_offered) { }
ast_log(LOG_WARNING, "Multiple video streams are not supported\n");
res = -3; ast_rtp_codecs_payloads_set_m_type(&newaudiortp, NULL, codec);
}
} else {
ast_log(LOG_WARNING, "Rejecting audio media offer due to invalid or unsupported syntax: %s\n", m);
res = -1;
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
video = TRUE; }
p->novideo = FALSE; /* Check for 'video' media offer */
p->offered_media[SDP_VIDEO].order_offered = ++numberofmediastreams; else if (strncmp(m, "video ", 6) == 0) {
vportno = x; if ((sscanf(m, "video %30u/%30u RTP/%4s %n", &x, &numberofports, protocol, &len) == 3 && len > 0) ||
(sscanf(m, "video %30u RTP/%4s %n", &x, protocol, &len) == 2 && len > 0)) {
if (x == 0) {
ast_log(LOG_WARNING, "Ignoring video media offer because port number is zero\n");
continue;
}
/* Scan through the RTP payload types specified in a "m=" line: */ /* Check number of ports offered for stream */
codecs = m + len; if (numberofports > 1) {
ast_copy_string(p->offered_media[SDP_VIDEO].codecs, codecs, sizeof(p->offered_media[SDP_VIDEO].codecs)); ast_log(LOG_WARNING, "%d ports offered for video media, not supported by Asterisk. Will try anyway...\n", numberofports);
for (; !ast_strlen_zero(codecs); codecs = ast_skip_blanks(codecs + len)) { }
if (sscanf(codecs, "%30u%n", &codec, &len) != 1) {
ast_log(LOG_WARNING, "Error in codec string '%s'\n", codecs); if (!strcmp(protocol, "SAVP")) {
secure_video = 1;
} else if (strcmp(protocol, "AVP")) {
ast_log(LOG_WARNING, "Unknown RTP profile in video offer: %s\n", m);
continue;
}
if (p->offered_media[SDP_VIDEO].order_offered) {
ast_log(LOG_WARNING, "Rejecting non-primary video stream: %s\n", m);
res = -1; res = -1;
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
if (debug)
ast_verbose("Found RTP video format %d\n", codec); video = TRUE;
ast_rtp_codecs_payloads_set_m_type(&newvideortp, NULL, codec); p->novideo = FALSE;
} p->offered_media[SDP_VIDEO].order_offered = ++numberofmediastreams;
/* Search for text media definition */ vportno = x;
} else if ((sscanf(m, "text %30u/%30u RTP/AVP %n", &x, &numberofports, &len) == 2 && len > 0) ||
(sscanf(m, "text %30u RTP/AVP %n", &x, &len) == 1 && len > 0)) { /* Scan through the RTP payload types specified in a "m=" line: */
if (x == 0) { codecs = m + len;
ast_log(LOG_WARNING, "ignoring 'text' media offer because port number is zero\n"); ast_copy_string(p->offered_media[SDP_VIDEO].codecs, codecs, sizeof(p->offered_media[SDP_VIDEO].codecs));
continue; for (; !ast_strlen_zero(codecs); codecs = ast_skip_blanks(codecs + len)) {
} if (sscanf(codecs, "%30u%n", &codec, &len) != 1) {
if (p->offered_media[SDP_TEXT].order_offered) { ast_log(LOG_WARNING, "Invalid syntax in RTP video format list: %s\n", codecs);
ast_log(LOG_WARNING, "Multiple text streams are not supported\n"); res = -1;
res = -3; goto process_sdp_cleanup;
}
if (debug) {
ast_verbose("Found RTP video format %d\n", codec);
}
ast_rtp_codecs_payloads_set_m_type(&newvideortp, NULL, codec);
}
} else {
ast_log(LOG_WARNING, "Rejecting video media offer due to invalid or unsupported syntax: %s\n", m);
res = -1;
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
text = TRUE; }
p->notext = FALSE; /* Check for 'text' media offer */
p->offered_media[SDP_TEXT].order_offered = ++numberofmediastreams; else if (strncmp(m, "text ", 5) == 0) {
tportno = x; if ((sscanf(m, "text %30u/%30u RTP/AVP %n", &x, &numberofports, &len) == 2 && len > 0) ||
(sscanf(m, "text %30u RTP/AVP %n", &x, &len) == 1 && len > 0)) {
if (x == 0) {
ast_log(LOG_WARNING, "Ignoring text media offer because port number is zero\n");
continue;
}
/* Scan through the RTP payload types specified in a "m=" line: */ /* Check number of ports offered for stream */
codecs = m + len; if (numberofports > 1) {
ast_copy_string(p->offered_media[SDP_TEXT].codecs, codecs, sizeof(p->offered_media[SDP_TEXT].codecs)); ast_log(LOG_WARNING, "%d ports offered for text media, not supported by Asterisk. Will try anyway...\n", numberofports);
for (; !ast_strlen_zero(codecs); codecs = ast_skip_blanks(codecs + len)) { }
if (sscanf(codecs, "%30u%n", &codec, &len) != 1) {
ast_log(LOG_WARNING, "Error in codec string '%s'\n", codecs); if (p->offered_media[SDP_TEXT].order_offered) {
ast_log(LOG_WARNING, "Rejecting non-primary text stream: %s\n", m);
res = -1; res = -1;
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
if (debug)
ast_verbose("Found RTP text format %d\n", codec);
ast_rtp_codecs_payloads_set_m_type(&newtextrtp, NULL, codec);
}
/* Search for image media definition */
} else if (((sscanf(m, "image %30u udptl t38%n", &x, &len) == 1 && len > 0) ||
(sscanf(m, "image %30u UDPTL t38%n", &x, &len) == 1 && len > 0))) {
if (x == 0) {
ast_log(LOG_WARNING, "ignoring 'image' media offer because port number is zero\n");
continue;
}
if (initialize_udptl(p)) {
continue;
}
if (p->offered_media[SDP_IMAGE].order_offered) { text = TRUE;
ast_log(LOG_WARNING, "Multiple T.38 streams are not supported\n"); p->notext = FALSE;
res = -3; p->offered_media[SDP_TEXT].order_offered = ++numberofmediastreams;
tportno = x;
/* Scan through the RTP payload types specified in a "m=" line: */
codecs = m + len;
ast_copy_string(p->offered_media[SDP_TEXT].codecs, codecs, sizeof(p->offered_media[SDP_TEXT].codecs));
for (; !ast_strlen_zero(codecs); codecs = ast_skip_blanks(codecs + len)) {
if (sscanf(codecs, "%30u%n", &codec, &len) != 1) {
ast_log(LOG_WARNING, "Invalid syntax in RTP video format list: %s\n", codecs);
res = -1;
goto process_sdp_cleanup;
}
if (debug) {
ast_verbose("Found RTP text format %d\n", codec);
}
ast_rtp_codecs_payloads_set_m_type(&newtextrtp, NULL, codec);
}
} else {
ast_log(LOG_WARNING, "Rejecting text media offer due to invalid or unsupported syntax: %s\n", m);
res = -1;
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
image = TRUE; }
if (debug) /* Check for 'image' media offer */
ast_verbose("Got T.38 offer in SDP in dialog %s\n", p->callid); else if (strncmp(m, "image ", 6) == 0) {
p->offered_media[SDP_IMAGE].order_offered = ++numberofmediastreams; if (((sscanf(m, "image %30u udptl t38%n", &x, &len) == 1 && len > 0) ||
udptlportno = x; (sscanf(m, "image %30u UDPTL t38%n", &x, &len) == 1 && len > 0))) {
if (x == 0) {
ast_log(LOG_WARNING, "Ignoring image media offer because port number is zero\n");
continue;
}
if (p->t38.state != T38_ENABLED) { if (initialize_udptl(p)) {
memset(&p->t38.their_parms, 0, sizeof(p->t38.their_parms)); res = -1;
goto process_sdp_cleanup;
}
/* default EC to none, the remote end should if (p->offered_media[SDP_IMAGE].order_offered) {
* respond with the EC they want to use */ ast_log(LOG_WARNING, "Rejecting non-primary image stream: %s\n", m);
ast_udptl_set_error_correction_scheme(p->udptl, UDPTL_ERROR_CORRECTION_NONE); res = -1;
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].order_offered = ++numberofmediastreams;
udptlportno = x;
if (p->t38.state != T38_ENABLED) {
memset(&p->t38.their_parms, 0, sizeof(p->t38.their_parms));
/* default EC to none, the remote end should
* respond with the EC they want to use */
ast_udptl_set_error_correction_scheme(p->udptl, UDPTL_ERROR_CORRECTION_NONE);
}
} else {
ast_log(LOG_WARNING, "Rejecting image media offer due to invalid or unsupported syntax: %s\n", m);
res = -1;
goto process_sdp_cleanup;
} }
} else { } else {
ast_log(LOG_WARNING, "Unsupported SDP media type in offer: %s\n", m); ast_log(LOG_WARNING, "Unsupported top-level media type in offer: %s\n", m);
continue; continue;
} }
/* Check for number of ports */
if (numberofports > 1)
ast_log(LOG_WARNING, "SDP offered %d ports for media, not supported by Asterisk. Will try anyway...\n", numberofports);
/* Media stream specific parameters */ /* Media stream specific parameters */
while ((type = get_sdp_line(&iterator, next - 1, req, &value)) != '\0') { while ((type = get_sdp_line(&iterator, next - 1, req, &value)) != '\0') {
int processed = FALSE; int processed = FALSE;
@@ -9424,13 +9470,12 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
} }
ast_debug(3, "Processing media-level (%s) SDP %c=%s... %s\n", ast_debug(3, "Processing media-level (%s) SDP %c=%s... %s\n",
(audio == TRUE)? "audio" : (video == TRUE)? "video" : "image", (audio == TRUE)? "audio" : (video == TRUE)? "video" : (text == TRUE)? "text" : "image",
type, value, type, value,
(processed == TRUE)? "OK." : "UNSUPPORTED."); (processed == TRUE)? "OK." : "UNSUPPORTED OR FAILED.");
} }
} }
/* Sanity checks */ /* Sanity checks */
if (!sa && !vsa && !tsa && !isa) { if (!sa && !vsa && !tsa && !isa) {
ast_log(LOG_WARNING, "Insufficient information in SDP (c=)...\n"); ast_log(LOG_WARNING, "Insufficient information in SDP (c=)...\n");
@@ -9438,41 +9483,42 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
if (portno == -1 && vportno == -1 && udptlportno == -1 && tportno == -1) { if ((portno == -1) &&
/* No acceptable offer found in SDP - we have no ports */ (vportno == -1) &&
/* Do not change RTP or VRTP if this is a re-invite */ (tportno == -1) &&
(udptlportno == -1)) {
ast_log(LOG_WARNING, "Failing due to no acceptable offer found\n"); ast_log(LOG_WARNING, "Failing due to no acceptable offer found\n");
res = -2; res = -1;
goto process_sdp_cleanup; 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 = -1;
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
if (!secure_audio && p->srtp) { if (!secure_audio && p->srtp) {
ast_log(LOG_WARNING, "We are requesting SRTP, but they responded without it!\n"); ast_log(LOG_WARNING, "We are requesting SRTP for audio, but they responded without it!\n");
res = -4; res = -1;
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
if (secure_video && !(p->vsrtp && (ast_test_flag(p->vsrtp, SRTP_CRYPTO_OFFER_OK)))) { if (secure_video && !(p->vsrtp && (ast_test_flag(p->vsrtp, SRTP_CRYPTO_OFFER_OK)))) {
ast_log(LOG_WARNING, "Can't provide secure video requested in SDP offer\n"); ast_log(LOG_WARNING, "Can't provide secure video requested in SDP offer\n");
res = -4; res = -1;
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
if (!p->novideo && !secure_video && p->vsrtp) { if (!p->novideo && !secure_video && p->vsrtp) {
ast_log(LOG_WARNING, "We are requesting SRTP, but they responded without it!\n"); ast_log(LOG_WARNING, "We are requesting SRTP for video, but they responded without it!\n");
res = -4; res = -1;
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
if (!(secure_audio || secure_video) && ast_test_flag(&p->flags[1], SIP_PAGE2_USE_SRTP)) { if (!(secure_audio || secure_video) && ast_test_flag(&p->flags[1], SIP_PAGE2_USE_SRTP)) {
ast_log(LOG_WARNING, "Matched device setup to use SRTP, but request was not!\n"); ast_log(LOG_WARNING, "Matched device setup to use SRTP, but request was not!\n");
res = -4; res = -1;
goto process_sdp_cleanup; goto process_sdp_cleanup;
} }
@@ -9522,12 +9568,12 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
} }
if (portno != -1 || vportno != -1 || tportno != -1) { if (portno != -1 || vportno != -1 || tportno != -1) {
/* We are now ready to change the sip session and p->rtp and p->vrtp with the offered codecs, since /* We are now ready to change the sip session and RTP structures with the offered codecs, since
they are acceptable */ they are acceptable */
ast_format_cap_copy(p->jointcaps, newjointcapability); /* Our joint codec profile for this call */ 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 */ ast_format_cap_copy(p->peercaps, newpeercapability); /* The other side's capability in latest offer */
p->jointnoncodeccapability = newnoncodeccapability; /* DTMF capabilities */ p->jointnoncodeccapability = newnoncodeccapability; /* DTMF capabilities */
/* respond with single most preferred joint codec, limiting the other side's choice */ /* respond with single most preferred joint codec, limiting the other side's choice */
if (ast_test_flag(&p->flags[1], SIP_PAGE2_PREFERRED_CODEC)) { if (ast_test_flag(&p->flags[1], SIP_PAGE2_PREFERRED_CODEC)) {
ast_codec_choose(&p->prefs, p->jointcaps, 1, &tmp_fmt); ast_codec_choose(&p->prefs, p->jointcaps, 1, &tmp_fmt);
@@ -9621,6 +9667,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
ast_verbose("Peer doesn't provide T.140\n"); ast_verbose("Peer doesn't provide T.140\n");
} }
} }
/* Setup image address and port */ /* Setup image address and port */
if (p->udptl) { if (p->udptl) {
if (udptlportno > 0) { if (udptlportno > 0) {