Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv31660/channels
Modified Files:
chan_sip.c
Log Message:
don't abort Asterisk load if configuration not found (issue #5115)
don't register channel type until after config has been loaded
Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.853
retrieving revision 1.854
diff -u -d -r1.853 -r1.854
--- chan_sip.c 14 Sep 2005 02:45:37 -0000 1.853
+++ chan_sip.c 14 Sep 2005 02:52:11 -0000 1.854
@@ -12414,15 +12414,14 @@
ast_log(LOG_WARNING, "Unable to create I/O context\n");
}
+ reload_config(); /* Load the configuration from sip.conf */
+
/* Make sure we can register our sip channel type */
if (ast_channel_register(&sip_tech)) {
ast_log(LOG_ERROR, "Unable to register channel type %s\n",
channeltype);
return -1;
}
- if (reload_config()) /* Load the configuration from sip.conf */
- return -1;
-
/* Register all CLI functions for SIP */
ast_cli_register_multiple(my_clis, sizeof(my_clis)/ sizeof(my_clis[0]));
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
