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

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Jul  6 11:00:03 2007
New Revision: 73680

URL: http://svn.digium.com/view/asterisk?view=rev&rev=73680
Log:
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.

........

................

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=73680&r1=73679&r2=73680
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Jul  6 11:00:03 2007
@@ -16002,8 +16002,12 @@
 			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 */