From 1e588db75aefd3370f03cdf6b4d2e94998893381 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 6 Jul 2007 15:57:25 +0000 Subject: [PATCH] Merged revisions 73678 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r73678 | russell | 2007-07-06 10:55:41 -0500 (Fri, 06 Jul 2007) | 7 lines (closes issue #10125) Reported by: makoto Patches submitted by: makoto This fixes a crash in chan_sip that happens when the bindaddr setting is not valid on Asterisk startup, gets fixed, and then a reload gets issued. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@73679 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2585d5368e..92b29c9da6 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -15177,8 +15177,12 @@ static void *do_monitor(void *data) sip_do_reload(sip_reloadreason); /* Change the I/O fd of our UDP socket */ - if (sipsock > -1) - sipsock_read_id = ast_io_change(io, sipsock_read_id, sipsock, NULL, 0, NULL); + if (sipsock > -1) { + if (sipsock_read_id) + sipsock_read_id = ast_io_change(io, sipsock_read_id, sipsock, NULL, 0, NULL); + else + sipsock_read_id = ast_io_add(io, sipsock, sipsock_read, AST_IO_IN, NULL); + } } /* Check for interfaces needing to be killed */ ast_mutex_lock(&iflock);