[asterisk-commits] file: trunk r58592 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Mar  9 14:53:37 2007
New Revision: 58592

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58592
Log:
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.

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=58592&r1=58591&r2=58592
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Mar  9 14:53:37 2007
@@ -5237,14 +5237,20 @@
 			} 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;
+					}
 				}
 			}