From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 6 Jul 2007 16:00:03 +0000 (+0000)
Subject: Merged revisions 73679 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0c37d2548933ccbb390ada037490c7919afea1f;p=thirdparty%2Fasterisk.git

Merged revisions 73679 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r73679 | russell | 2007-07-06 10:57:25 -0500 (Fri, 06 Jul 2007) | 15 lines

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/trunk@73680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ee68902b56..53e6379937 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16002,8 +16002,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 dialogs needing to be killed */