[asterisk-commits] may: branch may/ooh323_qsig r369783 - in /team/may/ooh323_qsig/addons: ./ ooh...

[SVN commits to the Asterisk project]

Author: may
Date: Sat Jul  7 17:57:39 2012
New Revision: 369783

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369783
Log:
adjust codes to the current channel interface

Modified:
    team/may/ooh323_qsig/addons/chan_ooh323.c
    team/may/ooh323_qsig/addons/ooh323c/src/ooh323.c

Modified: team/may/ooh323_qsig/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_qsig/addons/chan_ooh323.c?view=diff&rev=369783&r1=369782&r2=369783
==============================================================================
--- team/may/ooh323_qsig/addons/chan_ooh323.c (original)
+++ team/may/ooh323_qsig/addons/chan_ooh323.c Sat Jul  7 17:57:39 2012
@@ -1335,15 +1335,18 @@
 			|| ast_strlen_zero(ast_channel_connected(ast)->id.name.str)) {
 			break;
 		}
-		if (!ast->connected.id.number.valid
-			|| ast_strlen_zero(ast->connected.id.number.str)) {
+
+		if (!ast_channel_connected(ast)->id.number.valid
+			|| ast_strlen_zero(ast_channel_connected(ast)->id.number.str)) {
 			break;
 		}
+
 		if (gH323Debug) {
 			ast_debug(1, "Sending connected line info for %s (%s)\n",
 				callToken, ast_channel_connected(ast)->id.name.str);
 		}
-		ooSetANI(callToken, ast_channel_connected(ast)->id.name.str);
+		ooSetANI(callToken, ast_channel_connected(ast)->id.name.str,
+					ast_channel_connected(ast)->id.number.str);
 		break;
 
       case AST_CONTROL_T38_PARAMETERS:
@@ -1782,8 +1785,10 @@
 		connected.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
 		ast_channel_queue_connected_line_update(c, &connected, &update_connected);
 	}
-	if (c->_state != AST_STATE_UP)
+
+	if (ast_channel_state(c) != AST_STATE_UP) {
 		ast_setstate(c, AST_STATE_RINGING);
+	}
 
 	ast_queue_control(c, (hold) ? AST_CONTROL_HOLD : AST_CONTROL_UNHOLD);
       	ast_channel_unlock(c);
@@ -1842,8 +1847,8 @@
 		if (name) {
 			if (transfer) {
 				update_redirecting.from.name = 1;
-				redirecting.from.name.valid = c->caller.id.name.valid;
-				redirecting.from.name.str = ast_strdup(c->caller.id.name.str);
+				redirecting.from.name.valid = ast_channel_caller(c)->id.name.valid;
+				redirecting.from.name.str = ast_strdup(ast_channel_caller(c)->id.name.str);
 				pbx_builtin_setvar_helper(c, "XFERNAME",
 									name);
 			} else {
@@ -1855,11 +1860,11 @@
 		if (number) {
 			if (transfer) {
 				update_redirecting.from.number = 1;
-				redirecting.from.number.valid = c->caller.id.number.valid;
-				redirecting.from.number.str = ast_strdup(c->caller.id.number.str);
-				if (c->caller.id.number.valid && c->caller.id.number.str)
+				redirecting.from.number.valid = ast_channel_caller(c)->id.number.valid;
+				redirecting.from.number.str = ast_strdup(ast_channel_caller(c)->id.number.str);
+				if (ast_channel_caller(c)->id.number.valid && ast_channel_caller(c)->id.number.str)
 						pbx_builtin_setvar_helper(c, "BLINDTRANSFER",
-										c->caller.id.number.str);
+										ast_channel_caller(c)->id.number.str);
 				pbx_builtin_setvar_helper(c, "XFERNUM",
 								number);
 			} else {
@@ -3787,7 +3792,7 @@
 		.onReceivedDTMF = ooh323_onReceivedDigit,
 		.onModeChanged = onModeChanged,
 		.onQSigData = onQSigData,
-		.onNotify = onNotify
+		.onNotify = onNotify,
 		.onModeChanged = onModeChanged,
 		.onMediaChanged = (cb_OnMediaChanged) setup_rtp_remote,
 	};

Modified: team/may/ooh323_qsig/addons/ooh323c/src/ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_qsig/addons/ooh323c/src/ooh323.c?view=diff&rev=369783&r1=369782&r2=369783
==============================================================================
--- team/may/ooh323_qsig/addons/ooh323c/src/ooh323.c (original)
+++ team/may/ooh323_qsig/addons/ooh323c/src/ooh323.c Sat Jul  7 17:57:39 2012
@@ -715,7 +715,7 @@
       return OO_FAILED;
    }
 
-   ooHandleH2250ID(call, information->protocolIdentifier);
+   ooHandleH2250ID(call, &information->protocolIdentifier);
    ooHandleDisplayIE(call, q931Msg);
    /* Handle fast-start */
    if(OO_TESTFLAG (call->flags, OO_M_FASTSTART))