[svn-commits] pcadach: trunk r44686 - in /trunk: ./ channels/ channels/h323/

[svn-commits at lists.digium.com]

Author: pcadach
Date: Sat Oct  7 09:48:32 2006
New Revision: 44686

URL: http://svn.digium.com/view/asterisk?rev=44686&view=rev
Log:
Merged revisions 44684 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44684 | pcadach | 2006-10-07 20:39:34 +0600 (Сбт, 07 Окт 2006) | 1 line

Propagate caller's transfer capability too
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_h323.c
    trunk/channels/h323/ast_h323.cxx
    trunk/channels/h323/ast_h323.h
    trunk/channels/h323/chan_h323.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_h323.c?rev=44686&r1=44685&r2=44686&view=diff
==============================================================================
--- trunk/channels/chan_h323.c (original)
+++ trunk/channels/chan_h323.c Sat Oct  7 09:48:32 2006
@@ -647,9 +647,13 @@
 	} else
 		pvt->options.redirect_reason = -1;
 
+	pvt->options.transfer_capability = c->transfercapability;
+
 	/* indicate that this is an outgoing call */
 	pvt->outgoing = 1;
 
+	if (option_verbose > 2)
+		ast_verbose(VERBOSE_PREFIX_3 "Requested transfer capability: 0x%.2x - %s\n", c->transfercapability, ast_transfercapability2str(c->transfercapability));
 	if (h323debug)
 		ast_log(LOG_DEBUG, "Placing outgoing call to %s, %d/%d\n", called_addr, pvt->options.dtmfcodec[0], pvt->options.dtmfcodec[1]);
 	ast_mutex_unlock(&pvt->lock);
@@ -1083,6 +1087,8 @@
 		if (!ast_strlen_zero(pvt->exten) && strcmp(pvt->exten, "s")) {
 			ch->cid.cid_dnid = strdup(pvt->exten);
 		}
+		if (pvt->cd.transfer_capability >= 0)
+			ch->transfercapability = pvt->cd.transfer_capability;
 		ast_setstate(ch, state);
 		if (state != AST_STATE_DOWN) {
 			if (ast_pbx_start(ch)) {
@@ -1108,6 +1114,7 @@
 	}
 	memset(pvt, 0, sizeof(struct oh323_pvt));
 	pvt->cd.redirect_reason = -1;
+	pvt->cd.transfer_capability = -1;
 	/* Ensure the call token is allocated for outgoing call */
 	if (!callid) {
 		if ((pvt->cd).call_token == NULL) {

Modified: trunk/channels/h323/ast_h323.cxx
URL: http://svn.digium.com/view/asterisk/trunk/channels/h323/ast_h323.cxx?rev=44686&r1=44685&r2=44686&view=diff
==============================================================================
--- trunk/channels/h323/ast_h323.cxx (original)
+++ trunk/channels/h323/ast_h323.cxx Sat Oct  7 09:48:32 2006
@@ -554,6 +554,7 @@
 	dtmfMode = 0;
 	dtmfCodec[0] = dtmfCodec[1] = (RTP_DataFrame::PayloadTypes)0;
 	redirect_reason = -1;
+	transfer_capability = -1;
 #ifdef TUNNELLING
 	tunnelOptions = remoteTunnelOptions = 0;
 #endif
@@ -735,6 +736,9 @@
 		}
 		cid_presentation = opts->presentation;
 		cid_ton = opts->type_of_number;
+		if (opts->transfer_capability >= 0) {
+			transfer_capability = opts->transfer_capability;
+		}
 	}
 	tunnelOptions = opts->tunnelOptions;
 }
@@ -768,6 +772,8 @@
 		PString redirect_number;
 		unsigned redirect_reason;
 		unsigned plan, type, screening, presentation;
+		Q931::InformationTransferCapability capability;
+		unsigned transferRate, codingStandard, userInfoLayer1;
 
 		/* Fetch presentation and type information about calling party's number */
 		if (setupPDU.GetQ931().GetCallingPartyNumber(sourceName, &plan, &type, &presentation, &screening, 0, 0)) {
@@ -795,13 +801,20 @@
 		GetSignallingChannel()->GetRemoteAddress().GetIpAndPort(Ip, sourcePort);
 		cd->sourceIp = strdup((const char *)Ip.AsString());
 
-		if(setupPDU.GetQ931().GetRedirectingNumber(redirect_number, NULL, NULL, NULL, NULL, &redirect_reason, 0, 0, 0)) {
+		if (setupPDU.GetQ931().GetRedirectingNumber(redirect_number, NULL, NULL, NULL, NULL, &redirect_reason, 0, 0, 0)) {
 			cd->redirect_number = strdup((const char *)redirect_number);
 			cd->redirect_reason = redirect_reason;
 		}
 		else
 			cd->redirect_reason = -1;
 
+		/* Fetch Q.931's transfer capability */
+		if (((Q931 &)setupPDU.GetQ931()).GetBearerCapabilities(capability, transferRate, &codingStandard, &userInfoLayer1))
+			cd->transfer_capability = ((unsigned int)capability & 0x1f) | (codingStandard << 5);
+		else
+			cd->transfer_capability = 0x00;	/* ITU coding of Speech */
+
+		/* Don't show local username as called party name */
 		SetDisplayName(cd->call_dest_e164);
 	}
 
@@ -1228,6 +1241,9 @@
 		setupPDU.GetQ931().SetIE(Q931::RedirectingNumberIE, IE);
 	}
 
+	if (transfer_capability)
+		setupPDU.GetQ931().SetBearerCapabilities((Q931::InformationTransferCapability)(transfer_capability & 0x1f), 1, ((transfer_capability >> 5) & 3));
+
 	SetCallDetails(&cd, setupPDU, FALSE);
 
 	int res = on_outgoing_call(&cd);

Modified: trunk/channels/h323/ast_h323.h
URL: http://svn.digium.com/view/asterisk/trunk/channels/h323/ast_h323.h?rev=44686&r1=44685&r2=44686&view=diff
==============================================================================
--- trunk/channels/h323/ast_h323.h (original)
+++ trunk/channels/h323/ast_h323.h Sat Oct  7 09:48:32 2006
@@ -109,6 +109,7 @@
 	int cid_ton;
 	PString rdnis;
 	int redirect_reason;
+	int transfer_capability;
 
 	WORD sessionId;
 	BOOL bridging;

Modified: trunk/channels/h323/chan_h323.h
URL: http://svn.digium.com/view/asterisk/trunk/channels/h323/chan_h323.h?rev=44686&r1=44685&r2=44686&view=diff
==============================================================================
--- trunk/channels/h323/chan_h323.h (original)
+++ trunk/channels/h323/chan_h323.h Sat Oct  7 09:48:32 2006
@@ -52,6 +52,7 @@
 	int				redirect_reason;
 	int				presentation;
 	int				type_of_number;
+	int				transfer_capability;
 	int				fastStart;
 	int				h245Tunneling;
 	int				silenceSuppression;
@@ -118,6 +119,7 @@
 	int redirect_reason;
 	int presentation;
 	int type_of_number;
+	int transfer_capability;
 	char *sourceIp;
 } call_details_t;