Making trunk compile again.
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 14 Feb 2011 07:01:46 +0000 (07:01 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 14 Feb 2011 07:01:46 +0000 (07:01 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307752 65c4cc65-6c06-0410-ace0-fbb531ad65f3

addons/chan_ooh323.c
addons/ooh323c/src/ooCmdChannel.c

index 1a520f4..2df7c22 100644 (file)
@@ -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;
 }
 
index ff39882..31a7416 100644 (file)
@@ -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);