Trying to finish the last of the charge_number patch up #10916

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85526 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index fd54b8eeb3c759ee374c6a383c78f29c21dde900..d805745c1df12b775c1387d74484836c5bfa2349 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -2243,6 +2243,7 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
                int called_nai_strip;
                char ss7_calling_nai;
                int calling_nai_strip;
+               const char *charge_str = NULL;
 
                c = strchr(dest, '/');
                if (c)
@@ -2306,6 +2307,12 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
                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);
                ss7_rel(p->ss7);

diff --git a/doc/tex/channelvariables.tex b/doc/tex/channelvariables.tex
index 1dfcfc2f7c11d9d5bed427a795a275de795ab597..3bdfd991075d481f44fec0b117565f0eb6d96082 100644 (file)
--- a/doc/tex/channelvariables.tex
+++ b/doc/tex/channelvariables.tex
@@ -693,6 +693,7 @@ ${CDR(accountcode)}    * Account code (if specified)
 ${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