summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-03-09 20:53:37 +0000
committerJoshua Colp <jcolp@digium.com>2007-03-09 20:53:37 +0000
commit5629ee02926344dacd2d03f5c0ef2898d7f3c211 (patch)
tree669b0f07e213612172665fe8e7ad25526dfcc01d
parentb1678e3b5080c8d7bf9b0aa382e47eb34827dd04 (diff)
Merged revisions 58584 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r58584 | file | 2007-03-09 15:49:47 -0500 (Fri, 09 Mar 2007) | 10 lines Merged revisions 58579 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r58579 | file | 2007-03-09 15:46:43 -0500 (Fri, 09 Mar 2007) | 2 lines If we are unable to lookup the host in a c line we have to abort, otherwise the previous data is gone and we will (potentially) have no data when all is said and done. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58592 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_sip.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 98a43b979..efc1142cc 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -5237,14 +5237,20 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
} else {
/* XXX This could block for a long time, and block the main thread! XXX */
if (audio) {
- if ( !(hp = ast_gethostbyname(host, &audiohp)))
+ if ( !(hp = ast_gethostbyname(host, &audiohp))) {
ast_log(LOG_WARNING, "Unable to lookup RTP Audio host in secondary c= line, '%s'\n", c);
+ return -2;
+ }
} else if (video) {
- if (!(vhp = ast_gethostbyname(host, &videohp)))
+ if (!(vhp = ast_gethostbyname(host, &videohp))) {
ast_log(LOG_WARNING, "Unable to lookup RTP video host in secondary c= line, '%s'\n", c);
+ return -2;
+ }
} else if (text) {
- if (!(thp = ast_gethostbyname(host, &texthp)))
+ if (!(thp = ast_gethostbyname(host, &texthp))) {
ast_log(LOG_WARNING, "Unable to lookup RTP text host in secondary c= line, '%s'\n", c);
+ return -2;
+ }
}
}