[asterisk-commits] russell: trunk r54260 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Feb 13 15:57:31 2007
New Revision: 54260

URL: http://svn.digium.com/view/asterisk?view=rev&rev=54260
Log:
Merged revisions 54204 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r54204 | russell | 2007-02-13 13:42:00 -0600 (Tue, 13 Feb 2007) | 5 lines

If we fail to create the SIP socket, then return -1 from reload_config() so
that load_module() will return AST_MODULE_LOAD_DECLINE.  Otherwise, the console
will just get spammed with error messages every time chan_sip tries to send a
message.

........

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=54260&r1=54259&r2=54260
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Feb 13 15:57:31 2007
@@ -16882,6 +16882,7 @@
 		sipsock = socket(AF_INET, SOCK_DGRAM, 0);
 		if (sipsock < 0) {
 			ast_log(LOG_WARNING, "Unable to create SIP socket: %s\n", strerror(errno));
+			return -1;
 		} else {
 			/* Allow SIP clients on the same host to access us: */
 			const int reuseFlag = 1;