[asterisk-commits] mattf: trunk r85526 - in /trunk: channels/ doc/tex/

[SVN commits to the Asterisk project]

Author: mattf
Date: Fri Oct 12 14:41:39 2007
New Revision: 85526

URL: http://svn.digium.com/view/asterisk?view=rev&rev=85526
Log:
Trying to finish the last of the charge_number patch up #10916

Modified:
    trunk/channels/chan_zap.c
    trunk/doc/tex/channelvariables.tex

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=85526&r1=85525&r2=85526
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Fri Oct 12 14:41:39 2007
@@ -2243,6 +2243,7 @@
 		int called_nai_strip;
 		char ss7_calling_nai;
 		int calling_nai_strip;
+		const char *charge_str = NULL;
 
 		c = strchr(dest, '/');
 		if (c)
@@ -2305,6 +2306,12 @@
 
 		isup_set_oli(p->ss7call, ast->cid.cid_ani2);
 		isup_init_call(p->ss7->ss7, p->ss7call, p->cic, p->dpc);
+
+		/* Set the charge number if it is set */
+		charge_str = pbx_builtin_getvar_helper(ast, "SS7_CHARGE_NUMBER");
+		if (charge_str)
+			isup_set_charge(p->ss7call, charge_str, SS7_ANI_CALLING_PARTY_SUB_NUMBER, 0x10);
+
 
 		isup_iam(p->ss7->ss7, p->ss7call);
 		ast_setstate(ast, AST_STATE_DIALING);

Modified: trunk/doc/tex/channelvariables.tex
URL: http://svn.digium.com/view/asterisk/trunk/doc/tex/channelvariables.tex?view=diff&rev=85526&r1=85525&r2=85526
==============================================================================
--- trunk/doc/tex/channelvariables.tex (original)
+++ trunk/doc/tex/channelvariables.tex Fri Oct 12 14:41:39 2007
@@ -693,6 +693,7 @@
 ${BLINDTRANSFER}         The name of the channel on the other side of a blind transfer
 ${BRIDGEPEER}            Bridged peer
 ${CALLERID(ani)}       * Caller ANI (PRI channels)
+${CALLERID(ani2)}      * ANI2 (Info digits) also called Originating line information or OLI
 ${CALLERID(all)}       * Caller ID
 ${CALLERID(dnid)}      * Dialed Number Identifier
 ${CALLERID(name)}      * Caller ID Name only