From e86e9a9fe3a637d6de37b8e09a62eb5552f90639 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" <kpfleming@digium.com> Date: Mon, 31 Oct 2005 23:16:27 +0000 Subject: [PATCH] allow netsock objects to be unref'd so they can disappear when needed (issue #5454) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6913 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 2 ++ include/asterisk/netsock.h | 2 ++ netsock.c | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 2ff97ca2b3..e4695d82ae 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -8640,6 +8640,7 @@ static int set_config(char *config_file, int reload) } if (defaultsockfd < 0) defaultsockfd = ast_netsock_sockfd(ns); + ast_netsock_unref(ns); } } } else if (!strcasecmp(v->name, "authdebug")) @@ -9568,6 +9569,7 @@ int load_module(void) if (option_verbose > 1) ast_verbose(VERBOSE_PREFIX_2 "Binding IAX2 to default address 0.0.0.0:%d\n", IAX_DEFAULT_PORTNO); defaultsockfd = ast_netsock_sockfd(ns); + ast_netsock_unref(ns); } } diff --git a/include/asterisk/netsock.h b/include/asterisk/netsock.h index dd1c3a8f61..73a2dd224d 100755 --- a/include/asterisk/netsock.h +++ b/include/asterisk/netsock.h @@ -59,6 +59,8 @@ const struct sockaddr_in *ast_netsock_boundaddr(const struct ast_netsock *ns); void *ast_netsock_data(const struct ast_netsock *ns); +void ast_netsock_unref(struct ast_netsock *ns); + #if defined(__cplusplus) || defined(c_plusplus) } #endif diff --git a/netsock.c b/netsock.c index da22c549cc..386f15660c 100755 --- a/netsock.c +++ b/netsock.c @@ -214,3 +214,8 @@ void *ast_netsock_data(const struct ast_netsock *ns) { return ns->data; } + +void ast_netsock_unref(struct ast_netsock *ns) +{ + ASTOBJ_UNREF(ns, ast_netsock_destroy); +} -- GitLab