[asterisk-commits] tilghman: trunk r96547 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jan  4 13:35:00 2008
New Revision: 96547

URL: http://svn.digium.com/view/asterisk?view=rev&rev=96547
Log:
Merged revisions 96525 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r96525 | tilghman | 2008-01-04 13:27:25 -0600 (Fri, 04 Jan 2008) | 4 lines

If you change the bindaddr in sip.conf to a non-bound address and reload, sip goes kablooie.
Reported and patched by: one47
(Closes issue #11535)

........

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=96547&r1=96546&r2=96547
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Jan  4 13:35:00 2008
@@ -17054,6 +17054,9 @@
 					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);
+			} else if (sipsock_read_id) {
+				ast_io_remove(io, sipsock_read_id);
+				sipsock_read_id = NULL;
 			}
 		}