summaryrefslogtreecommitdiff
path: root/main/bridge_channel.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 /main/bridge_channel.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 'main/bridge_channel.c')
-rw-r--r--main/bridge_channel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/bridge_channel.c b/main/bridge_channel.c
index ac72c8bc2..e9f1ca0bd 100644
--- a/main/bridge_channel.c
+++ b/main/bridge_channel.c
@@ -2755,7 +2755,7 @@ static void bridge_channel_destroy(void *obj)
struct ast_frame *fr;
if (bridge_channel->callid) {
- bridge_channel->callid = ast_callid_unref(bridge_channel->callid);
+ bridge_channel->callid = 0;
}
if (bridge_channel->bridge) {