[asterisk-commits] tilghman: branch 1.6.1 r152444 - in /branches/1.6.1: ./ channels/chan_mgcp.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Oct 28 16:40:07 CDT 2008


Author: tilghman
Date: Tue Oct 28 16:40:06 2008
New Revision: 152444

URL: http://svn.digium.com/view/asterisk?view=rev&rev=152444
Log:
Merged revisions 152442 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r152442 | tilghman | 2008-10-28 16:38:26 -0500 (Tue, 28 Oct 2008) | 7 lines
  
  Only re-add the io port if it was closed, otherwise reload causes a memory
  leak.
  (closes issue #13785)
   Reported by: eliel
   Patches: 
         chan_mgcp.c.patch uploaded by eliel (license 64)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_mgcp.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_mgcp.c?view=diff&rev=152444&r1=152443&r2=152444
==============================================================================
--- branches/1.6.1/channels/chan_mgcp.c (original)
+++ branches/1.6.1/channels/chan_mgcp.c Tue Oct 28 16:40:06 2008
@@ -3431,8 +3431,9 @@
 			ast_verb(1, "Reloading MGCP\n");
 			reload_config(1);
 			/* Add an I/O event to our UDP socket */
-			if (mgcpsock > -1) 
+			if (mgcpsock > -1 && !mgcpsock_read_id) {
 				mgcpsock_read_id = ast_io_add(io, mgcpsock, mgcpsock_read, AST_IO_IN, NULL);
+			}
 		}
 
 		/* Check for interfaces needing to be killed */




More information about the asterisk-commits mailing list