From: David Vossel <dvossel@digium.com>
Date: Thu, 8 Oct 2009 19:42:57 +0000 (+0000)
Subject: Merged revisions 222873 via svnmerge from
X-Git-Tag: 1.6.0.18-rc1~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4afafcf938cebf5e5187e6539f2b92c06ca73d27;p=thirdparty%2Fasterisk.git

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/
........


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

diff --git a/include/asterisk/netsock.h b/include/asterisk/netsock.h
index 2aeb803b4a..95eeb8cd0b 100644
--- a/include/asterisk/netsock.h
+++ b/include/asterisk/netsock.h
@@ -46,8 +46,6 @@ struct ast_netsock *ast_netsock_bind(struct ast_netsock_list *list, struct io_co
 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,
diff --git a/main/netsock.c b/main/netsock.c
index 261e234d4b..c05bcee6d3 100644
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -74,6 +74,7 @@ int ast_netsock_release(struct ast_netsock_list *list)
 {
 	ASTOBJ_CONTAINER_DESTROYALL(list, ast_netsock_destroy);
 	ASTOBJ_CONTAINER_DESTROY(list);
+	ast_free(list);
 
 	return 0;
 }