diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-30 03:40:42 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-30 03:40:42 +0000 |
commit | e095143a373cde3c2cc71c19eeba003e4b1e9582 (patch) | |
tree | 37eb58df46eba1c7c6df0f3622b703faa0eaa0c7 /channels/chan_iax2.c | |
parent | fc79f14afc23faf0f7b783c82bc513a894ebdc33 (diff) |
Merged revisions 49063 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49063 | file | 2006-12-29 22:37:22 -0500 (Fri, 29 Dec 2006) | 2 lines
Initialize the packet queue in load_module instead of just declaring the list with the default value. (issue #8695 reported by ssokol)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49064 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
-rw-r--r-- | channels/chan_iax2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index dda1e688c..5eb447e99 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -632,9 +632,7 @@ struct chan_iax2_pvt { static struct ast_iax2_queue { AST_LIST_HEAD(, iax_frame) queue; int count; -} iaxq = { - .queue = AST_LIST_HEAD_INIT_VALUE -}; +} iaxq; static AST_LIST_HEAD_STATIC(users, iax2_user); @@ -9986,6 +9984,8 @@ static int __unload_module(void) AST_LIST_TRAVERSE_SAFE_END AST_LIST_UNLOCK(&dynamic_list); + AST_LIST_HEAD_DESTROY(&iaxq.queue); + ast_netsock_release(netsock); for (x=0;x<IAX_MAX_CALLS;x++) if (iaxs[x]) @@ -10059,6 +10059,8 @@ static int load_module(void) } ast_netsock_init(netsock); + + AST_LIST_HEAD_INIT(&iaxq.queue); ast_cli_register_multiple(cli_iax2, sizeof(cli_iax2) / sizeof(struct ast_cli_entry)); |