summaryrefslogtreecommitdiff
path: root/channels/chan_zap.c
diff options
context:
space:
mode:
authorMalcolm Davenport <malcolmd@digium.com>2004-07-30 18:57:37 +0000
committerMalcolm Davenport <malcolmd@digium.com>2004-07-30 18:57:37 +0000
commita322c6f411aebc8b8ebfafcc3e0fe3857da61267 (patch)
tree03f28017fa9d191d3f643bdc78238515f7f47c48 /channels/chan_zap.c
parent943133953e3650aacbf2d40c99e9b6940d213ddf (diff)
chan_h323 Makefile change for Bug #2064. Also back out changes for Bug #2115..next time read carefully. :)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
-rwxr-xr-xchannels/chan_zap.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index adcf06177..09db2807a 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -443,7 +443,6 @@ static struct zt_pvt {
char language[MAX_LANGUAGE];
char musicclass[MAX_LANGUAGE];
char callerid[AST_MAX_EXTENSION];
- int callerton;
char lastcallerid[AST_MAX_EXTENSION];
char *origcallerid; /* malloced original callerid */
char callwaitcid[AST_MAX_EXTENSION];
@@ -4410,7 +4409,6 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
tmp->callerid = strdup(i->callerid);
tmp->ani = strdup(i->callerid);
}
- tmp->callerton = i->callerton;
tmp->restrictcid = i->restrictcid;
tmp->callingpres = i->callingpres;
#ifdef ZAPATA_PRI
@@ -7238,8 +7236,6 @@ static void *pri_dchannel(void *vpri)
strncpy(pri->pvts[chanpos]->callerid, e->ring.callingnum, sizeof(pri->pvts[chanpos]->callerid)-1);
} else
pri->pvts[chanpos]->callerid[0] = '\0';
- /* Caller Type Of Number - used to distinguise NANPA from International */
- pri->pvts[chanpos]->callerton = ((e->ring.callingplan) >> 4) & 0x7;
strncpy(pri->pvts[chanpos]->rdnis, e->ring.redirectingnum, sizeof(pri->pvts[chanpos]->rdnis) - 1);
/* If immediate=yes go to s|1 */
if (pri->pvts[chanpos]->immediate) {