summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorMatthew Fredrickson <creslin@digium.com>2007-10-11 21:57:26 +0000
committerMatthew Fredrickson <creslin@digium.com>2007-10-11 21:57:26 +0000
commitb01a87c3dbcb5e30a5b8e42854354be1e7a88391 (patch)
tree2136a4f7b1db20cbf6c4c5bf914c3952824c2f60 /channels
parent58598f733a5c51393bf6395b21738776af93c950 (diff)
Add SS7 ANI2 support tx and rx. #10916
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85485 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_zap.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index ad36fb4ad..887225433 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -586,6 +586,7 @@ static struct zt_pvt {
#if defined(PRI_ANI) || defined(HAVE_SS7)
char cid_ani[AST_MAX_EXTENSION];
#endif
+ int cid_ani2;
char cid_num[AST_MAX_EXTENSION];
int cid_ton; /*!< Type Of Number (TON) */
char cid_name[AST_MAX_EXTENSION];
@@ -2301,6 +2302,7 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
p->use_callingpres ? cid_pres2ss7pres(ast->cid.cid_pres) : (l ? SS7_PRESENTATION_ALLOWED : SS7_PRESENTATION_RESTRICTED),
p->use_callingpres ? cid_pres2ss7screen(ast->cid.cid_pres) : SS7_SCREENING_USER_PROVIDED );
+ isup_set_oli(p->ss7call, ast->cid.cid_ani2);
isup_init_call(p->ss7->ss7, p->ss7call, p->cic, p->dpc);
isup_iam(p->ss7->ss7, p->ss7call);
@@ -5649,6 +5651,7 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
#endif
tmp->cid.cid_pres = i->callingpres;
tmp->cid.cid_ton = i->cid_ton;
+ tmp->cid.cid_ani2 = i->cid_ani2;
#if defined(HAVE_PRI) || defined(HAVE_SS7)
tmp->transfercapability = transfercapability;
pbx_builtin_setvar_helper(tmp, "TRANSFERCAPABILITY", ast_transfercapability2str(transfercapability));
@@ -8764,6 +8767,7 @@ static void *ss7_linkset(void *data)
/* Need to fill these fields */
p->cid_ani[0] = '\0';
p->cid_name[0] = '\0';
+ p->cid_ani2 = e->iam.oli_ani2;
p->cid_ton = 0;
/* Set DNID */
if (!ast_strlen_zero(e->iam.called_party_num))