From c0e33b03c35b9ef27aea6c5716a5e44f0e1636e7 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 14 Feb 2011 07:01:46 +0000
Subject: [PATCH] Making trunk compile again.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307752 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
addons/chan_ooh323.c | 23 ++++++++++++-----------
addons/ooh323c/src/ooCmdChannel.c | 2 +-
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index 1a520f4db5..2df7c2299a 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -1236,17 +1236,18 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d
}
break;
case AST_CONTROL_RINGING:
- if (ast->_state == AST_STATE_RING || ast->_state == AST_STATE_RINGING) {
- if (!p->alertsent) {
- if (gH323Debug) {
- ast_debug(1, "Sending manual ringback for %s, res = %d\n",
- callToken,
- ooManualRingback(callToken));
- } else {
- ooManualRingback(callToken);
+ if (ast->_state == AST_STATE_RING || ast->_state == AST_STATE_RINGING) {
+ if (!p->alertsent) {
+ if (gH323Debug) {
+ ast_debug(1, "Sending manual ringback for %s, res = %d\n",
+ callToken,
+ ooManualRingback(callToken));
+ } else {
+ ooManualRingback(callToken);
+ }
+ p->alertsent = 1;
}
- p->alertsent = 1;
- }
+ }
break;
case AST_CONTROL_SRCUPDATE:
ast_rtp_instance_update_source(p->rtp);
@@ -4095,7 +4096,7 @@ static int ooh323_set_udptl_peer(struct ast_channel *chan, struct ast_udptl *udp
memset(&p->udptlredirip, 0, sizeof(p->udptlredirip));
ast_mutex_unlock(&p->lock);
- free(callToken);
+ /* free(callToken); */
return 0;
}
diff --git a/addons/ooh323c/src/ooCmdChannel.c b/addons/ooh323c/src/ooCmdChannel.c
index ff39882737..31a74169c0 100644
--- a/addons/ooh323c/src/ooCmdChannel.c
+++ b/addons/ooh323c/src/ooCmdChannel.c
@@ -56,7 +56,7 @@ int ooCreateCallCmdConnection(OOH323CallData* call)
OOTRACEINFO2("INFO: create cmd connect for call: %lx\n", call);
- call->CmdChanLock = ast_calloc(1, sizeof(ast_mutex_t));
+ call->CmdChanLock = calloc(1, sizeof(ast_mutex_t));
ast_mutex_init(call->CmdChanLock);
--
GitLab