diff options
| -rw-r--r-- | channels/chan_zap.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 7863dfaa7..1c06a7ca1 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -765,8 +765,6 @@ static struct zt_ring_cadence cadences[NUM_CADENCE_MAX] = { { { 1000, 500, 2500, 5000 } }, /*!< Long ring */ }; -int receivedRingT; /*!< Used to find out what ringtone we are on */ - /*! \brief cidrings says in which pause to transmit the cid information, where the first pause * is 1, the second pause is 2 and so on. */ @@ -6135,9 +6133,8 @@ static void *ss_thread(void *data) len = 0; distMatches = 0; /* Clear the current ring data array so we dont have old data in it. */ - for (receivedRingT = 0; receivedRingT < 3; receivedRingT++) { + for (receivedRingT = 0; receivedRingT < (sizeof(curRingData) / sizeof(curRingData[0])); receivedRingT++) curRingData[receivedRingT] = 0; - } receivedRingT = 0; counter = 0; counter1 = 0; @@ -6165,8 +6162,10 @@ static void *ss_thread(void *data) if (p->ringt < p->ringt_base/2) break; - ++receivedRingT; /* Increment the ringT counter so we can match it against - values in zapata.conf for distinctive ring */ + /* 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) { @@ -6237,9 +6236,8 @@ static void *ss_thread(void *data) len = 0; distMatches = 0; /* Clear the current ring data array so we dont have old data in it. */ - for (receivedRingT = 0; receivedRingT < 3; receivedRingT++) { + for (receivedRingT = 0; receivedRingT < (sizeof(curRingData) / sizeof(curRingData[0])); receivedRingT++) curRingData[receivedRingT] = 0; - } receivedRingT = 0; counter = 0; counter1 = 0; @@ -6269,8 +6267,10 @@ static void *ss_thread(void *data) if (p->ringt < p->ringt_base/2) break; - ++receivedRingT; /* Increment the ringT counter so we can match it against - values in zapata.conf for distinctive ring */ + /* 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) { |