diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-28 17:57:40 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-28 17:57:40 +0000 |
commit | dd6a958af6e4b48544c1f4bdbb30daf6f9c90d09 (patch) | |
tree | abc171eff7421351b7198c0b4dbe92d6261ee378 | |
parent | ac80f396880402ab93e38c54cc1c92a91c3c1a75 (diff) |
Merged revisions 266292 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r266292 | dvossel | 2010-05-28 12:55:38 -0500 (Fri, 28 May 2010) | 9 lines
fixes crash when creation of UDPTL fails
(closes issue #17264)
Reported by: falves11
Patches:
issue_17264_reviewboard_fix.diff uploaded by dvossel (license 671)
issue_17264_1.6.2_reviewboard_fix.diff uploaded by dvossel (license 671)
Tested by: falves11
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@266293 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_sip.c | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index cb7cf3caf..fd0e47dbb 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5145,12 +5145,15 @@ static int create_addr_from_peer(struct sip_pvt *dialog, struct sip_peer *peer) } dialog->prefs = peer->prefs; if (ast_test_flag(&dialog->flags[1], SIP_PAGE2_T38SUPPORT)) { - if (!dialog->udptl) { - /* t38pt_udptl was enabled in the peer and not in [general] */ - dialog->udptl = ast_udptl_new_with_bindaddr(sched, io, 0, bindaddr.sin_addr); + /* t38pt_udptl was enabled in the peer and not in [general] */ + if (dialog->udptl || (!dialog->udptl && (dialog->udptl = ast_udptl_new_with_bindaddr(sched, io, 0, bindaddr.sin_addr)))) { + dialog->t38_maxdatagram = peer->t38_maxdatagram; + set_t38_capabilities(dialog); + } else { + /* It is impossible to support T38 without udptl */ + ast_debug(1, "UDPTL creation failed on dialog.\n"); + ast_clear_flag(&dialog->flags[1], SIP_PAGE2_T38SUPPORT); } - dialog->t38_maxdatagram = peer->t38_maxdatagram; - set_t38_capabilities(dialog); } else if (dialog->udptl) { ast_udptl_destroy(dialog->udptl); dialog->udptl = NULL; @@ -6437,7 +6440,7 @@ static int interpret_t38_parameters(struct sip_pvt *p, const struct ast_control_ { int res = 0; - if (!ast_test_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT)) { + if (!ast_test_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT) || !p->udptl) { return -1; } switch (parameters->request_response) { @@ -7249,8 +7252,13 @@ static struct sip_pvt *sip_alloc(ast_string_field callid, struct sockaddr_in *si p->vrtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr); if (ast_test_flag(&p->flags[1], SIP_PAGE2_TEXTSUPPORT)) p->trtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr); - if (ast_test_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT)) - p->udptl = ast_udptl_new_with_bindaddr(sched, io, 0, bindaddr.sin_addr); + if (ast_test_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT)) { + if (!(p->udptl = ast_udptl_new_with_bindaddr(sched, io, 0, bindaddr.sin_addr))) { + /* udptl creation failed, T38 can not be supported on this dialog */ + ast_log(LOG_ERROR, "UDPTL creation failed\n"); + ast_clear_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT); + } + } if (!p->rtp|| (ast_test_flag(&p->flags[1], SIP_PAGE2_VIDEOSUPPORT) && !p->vrtp) || (ast_test_flag(&p->flags[1], SIP_PAGE2_TEXTSUPPORT) && !p->trtp)) { ast_log(LOG_WARNING, "Unable to create RTP audio %s%ssession: %s\n", @@ -20073,9 +20081,15 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int } /* If T38 is needed but not present, then make it magically appear */ - if (ast_test_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT) && !p->udptl && (p->udptl = ast_udptl_new_with_bindaddr(sched, io, 0, bindaddr.sin_addr))) { - p->t38_maxdatagram = global_t38_maxdatagram; - set_t38_capabilities(p); + if (ast_test_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT) && !p->udptl) { + if ((p->udptl = ast_udptl_new_with_bindaddr(sched, io, 0, bindaddr.sin_addr))) { + p->t38_maxdatagram = global_t38_maxdatagram; + set_t38_capabilities(p); + } else { + /* udptl creation failed, T38 can not be supported on this dialog */ + ast_debug(1, "UDPTL creation failed on dialog.\n"); + ast_clear_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT); + } } /* We have a succesful authentication, process the SDP portion if there is one */ |