From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 6 Jul 2007 15:55:41 +0000 (+0000)
Subject: (closes issue #10125)
X-Git-Tag: 1.2.21~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed261253d5d9f2d2cadead21b3d1a10fe9c0d922;p=thirdparty%2Fasterisk.git

(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.2@73678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e8ca9dd0c1..e01fbf9e37 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11672,8 +11672,12 @@ static void *do_monitor(void *data)
 			sip_do_reload();
 
 			/* 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);