[asterisk-commits] tilghman: trunk r307752 - in /trunk/addons: ./ ooh323c/src/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Feb 14 01:01:46 2011
New Revision: 307752

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307752
Log:
Making trunk compile again.

Modified:
    trunk/addons/chan_ooh323.c
    trunk/addons/ooh323c/src/ooCmdChannel.c

Modified: trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/chan_ooh323.c?view=diff&rev=307752&r1=307751&r2=307752
==============================================================================
--- trunk/addons/chan_ooh323.c (original)
+++ trunk/addons/chan_ooh323.c Mon Feb 14 01:01:46 2011
@@ -1236,17 +1236,18 @@
 		}
 	    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 @@
 		memset(&p->udptlredirip, 0, sizeof(p->udptlredirip));
 
 	ast_mutex_unlock(&p->lock);
-	free(callToken);
+	/* free(callToken); */
 	return 0;
 }
 

Modified: trunk/addons/ooh323c/src/ooCmdChannel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooCmdChannel.c?view=diff&rev=307752&r1=307751&r2=307752
==============================================================================
--- trunk/addons/ooh323c/src/ooCmdChannel.c (original)
+++ trunk/addons/ooh323c/src/ooCmdChannel.c Mon Feb 14 01:01:46 2011
@@ -56,7 +56,7 @@
 
     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);