Index: channels/chan_zap.c
===================================================================
--- channels/chan_zap.c (revision 2044)
+++ channels/chan_zap.c (working copy)
@@ -195,6 +195,7 @@
static char progzone[10]= "";
static int usedistinctiveringdetection = 0;
+static int distinctiveringaftercid = 0;
static int transfertobusy = 1;
@@ -738,8 +739,6 @@
{ { 1000, 500, 2500, 5000 } }, /* Long ring */
};
-int receivedRingT; /* Used to find out what ringtone we are on */
-
/* cidrings says in which pause to transmit the cid information, where the first pause
* is 1, the second pause is 2 and so on.
*/
@@ -5933,6 +5932,59 @@
break;
}
}
+ if (res == 1) {
+ callerid_get(cs, &name, &number, &flags);
+ if (option_debug)
+ opbx_log(LOG_DEBUG, "CallerID number: %s, name: %s, flags=%d\n", number, name, flags);
+ }
+ if (distinctiveringaftercid == 1) {
+ /* Clear the current ring data array so we dont have old data in it. */
+ for (receivedRingT=0; receivedRingT < (sizeof(curRingData) / sizeof(curRingData[0])); receivedRingT++)
+ curRingData[receivedRingT] = 0;
+ receivedRingT = 0;
+ opbx_verbose( VERBOSE_PREFIX_3 "Detecting post-CID distinctive ring\n");
+ for(;;) {
+ i = ZT_IOMUX_READ | ZT_IOMUX_SIGEVENT;
+ if ((res = ioctl(p->subs[index].zfd, ZT_IOMUX, &i))) {
+ opbx_log(LOG_WARNING, "I/O MUX failed: %s\n", strerror(errno));
+ callerid_free(cs);
+ opbx_hangup(chan);
+ return NULL;
+ }
+ if (i & ZT_IOMUX_SIGEVENT) {
+ res = zt_get_event(p->subs[index].zfd);
+ opbx_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res));
+ res = 0;
+ /* Let us detect callerid when the telco uses distinctive ring */
+
+ curRingData[receivedRingT] = p->ringt;
+
+ if (p->ringt < p->ringt_base/2)
+ break;
+ /* Increment the ringT counter so we can match it against
+ values in zapata.conf for distinctive ring */
+ if (++receivedRingT == (sizeof(curRingData) / sizeof(curRingData[0])))
+ break;
+ } else if (i & ZT_IOMUX_READ) {
+ res = read(p->subs[index].zfd, buf, sizeof(buf));
+ if (res < 0) {
+ if (errno != ELAST) {
+ opbx_log(LOG_WARNING, "read returned error: %s\n", strerror(errno));
+ callerid_free(cs);
+ opbx_hangup(chan);
+ return NULL;
+ }
+ break;
+ }
+ if (p->ringt)
+ p->ringt--;
+ if (p->ringt == 1) {
+ res = -1;
+ break;
+ }
+ }
+ }
+ }
if (p->usedistinctiveringdetection == 1) {
if(option_verbose > 2)
/* this only shows up if you have n of the dring patterns filled in */
@@ -5941,6 +5993,12 @@
for (counter=0; counter < 3; counter++) {
/* Check to see if the rings we received match any of the ones in zapata.conf for this
channel */
+ if(option_verbose > 2)
+ /* this only shows up if you have n of the dring patterns filled in */
+ opbx_verbose( VERBOSE_PREFIX_3 "Checking %d,%d,%d\n",
+ p->drings.ringnum[counter].ring[0],
+ p->drings.ringnum[counter].ring[1],
+ p->drings.ringnum[counter].ring[2]);
distMatches = 0;
for (counter1=0; counter1 < 3; counter1++) {
if (curRingData[counter1] <= (p->drings.ringnum[counter].ring[counter1]+10) && curRingData[counter1] >=
@@ -5958,11 +6016,6 @@
}
}
}
- if (res == 1) {
- callerid_get(cs, &name, &number, &flags);
- if (option_debug)
- opbx_log(LOG_DEBUG, "CallerID number: %s, name: %s, flags=%d\n", number, name, flags);
- }
/* Restore linear mode (if appropriate) for Caller*ID processing */
zt_setlinear(p->subs[index].zfd, p->subs[index].linear);
#if 1
@@ -9902,6 +9955,8 @@
} else if (!strcasecmp(v->name, "usedistinctiveringdetection")) {
if (opbx_true(v->value))
usedistinctiveringdetection = 1;
+ } else if (!strcasecmp(v->name, "distinctiveringaftercid")) {
+ if (!strcasecmp(v->value, "yes")) distinctiveringaftercid = 1;
} else if (!strcasecmp(v->name, "dring1context")) {
opbx_copy_string(drings.ringContext[0].contextData,v->value,sizeof(drings.ringContext[0].contextData));
} else if (!strcasecmp(v->name, "dring2context")) {
Index: configs/zapata.conf.sample
===================================================================
--- configs/zapata.conf.sample (revision 2044)
+++ configs/zapata.conf.sample (working copy)
@@ -212,6 +212,8 @@
; Whether or not to do distinctive ring detection on FXO lines
;
;usedistinctiveringdetection=yes
+;distinctiveringaftercid=yes ; enable dring detection after callerid for those countries like Australia
+; where the ring cadence is changed *after* the callerid spill.
;
; Whether or not to use caller ID