summaryrefslogtreecommitdiff
path: root/apps/app_mixmonitor.c
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2015-03-13 01:12:35 +0000
committerCorey Farrell <git@cfware.com>2015-03-13 01:12:35 +0000
commitc08fd275bf8c45dc09084f104521cbff04eab25b (patch)
tree09cc14b9a9190254980ec88b981d6f561ec8a9b5 /apps/app_mixmonitor.c
parent38ee441ea7debef3ebf6b162fc290b121fa3588d (diff)
Logger: Convert 'struct ast_callid' to unsigned int.
Switch logger callid's from AO2 objects to simple integers. This helps in two ways. Copying integers is faster than referencing AO2 objects, so this will result in a small reduction in logger overhead. This also erases the possibility of an infinate loop caused by an invalid callid in threadstorage. ASTERISK-24833 #comment Committed callid conversion to trunk. Reported by: Corey Farrell Review: https://reviewboard.asterisk.org/r/4466/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_mixmonitor.c')
-rw-r--r--apps/app_mixmonitor.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index e6f4053c0..35df01433 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -295,12 +295,12 @@ struct vm_recipient {
struct mixmonitor {
struct ast_audiohook audiohook;
- struct ast_callid *callid;
char *filename;
char *filename_read;
char *filename_write;
char *post_process;
char *name;
+ ast_callid callid;
unsigned int flags;
struct ast_autochan *autochan;
struct mixmonitor_ds *mixmonitor_ds;
@@ -545,9 +545,6 @@ static void mixmonitor_free(struct mixmonitor *mixmonitor)
/* clean stringfields */
ast_string_field_free_memory(mixmonitor);
- if (mixmonitor->callid) {
- ast_callid_unref(mixmonitor->callid);
- }
ast_free(mixmonitor);
}
}