automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44230 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index db02bb60b847d07e18fbedb80ebeaefe7ddc1b96..3bf9f8a64985e017cb67b6c5525ae418376df2d9 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -442,6 +442,7 @@ static int expiry = DEFAULT_EXPIRY;
 
 static struct sched_context *sched;
 static struct io_context *io;
+static int *sipsock_read_id;
 
 #define SIP_MAX_HEADERS                64                      /*!< Max amount of SIP headers to read */
 #define SIP_MAX_LINES          64                      /*!< Max amount of lines in SIP attachment (like SDP) */
@@ -11551,7 +11552,7 @@ static void *do_monitor(void *data)
 
        /* Add an I/O event to our UDP socket */
        if (sipsock > -1) 
-               ast_io_add(io, sipsock, sipsock_read, AST_IO_IN, NULL);
+               sipsock_read_id = ast_io_add(io, sipsock, sipsock_read, AST_IO_IN, NULL);
        
        /* This thread monitors all the frame relay interfaces which are not yet in use
           (and thus do not have a separate thread) indefinitely */
@@ -11566,6 +11567,10 @@ static void *do_monitor(void *data)
                        if (option_verbose > 0)
                                ast_verbose(VERBOSE_PREFIX_1 "Reloading SIP\n");
                        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);
                }
                /* Check for interfaces needing to be killed */
                ast_mutex_lock(&iflock);