[asterisk-commits] dvossel: branch 1.6.0 r222876 - in /branches/1.6.0: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Oct  8 14:42:57 2009
New Revision: 222876

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

........
  r222873 | dvossel | 2009-10-08 14:35:30 -0500 (Thu, 08 Oct 2009) | 6 lines
  
  fixes an ast_netsock_list memory leak.
  
  ABE-1998
  Review: https://reviewboard.asterisk.org/r/395/
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/netsock.h
    branches/1.6.0/main/netsock.c

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

Modified: branches/1.6.0/include/asterisk/netsock.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/include/asterisk/netsock.h?view=diff&rev=222876&r1=222875&r2=222876
==============================================================================
--- branches/1.6.0/include/asterisk/netsock.h (original)
+++ branches/1.6.0/include/asterisk/netsock.h Thu Oct  8 14:42:57 2009
@@ -46,8 +46,6 @@
 struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct io_context *ioc,
 					 struct sockaddr_in *bindaddr, int tos, int cos, ast_io_cb callback, void *data);
 
-int ast_netsock_free(struct ast_netsock_list *list, struct ast_netsock *netsock);
-
 int ast_netsock_release(struct ast_netsock_list *list);
 
 struct ast_netsock *ast_netsock_find(struct ast_netsock_list *list,

Modified: branches/1.6.0/main/netsock.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/netsock.c?view=diff&rev=222876&r1=222875&r2=222876
==============================================================================
--- branches/1.6.0/main/netsock.c (original)
+++ branches/1.6.0/main/netsock.c Thu Oct  8 14:42:57 2009
@@ -74,6 +74,7 @@
 {
 	ASTOBJ_CONTAINER_DESTROYALL(list, ast_netsock_destroy);
 	ASTOBJ_CONTAINER_DESTROY(list);
+	ast_free(list);
 
 	return 0;
 }