Fix regression with distinctive ring detection.

The issue here is that passing an array to a function prohibits the ARRAY_LEN
macro from returning the real size. To avoid this the size is now defined and
use of ARRAY_LEN is avoided.

(closes issue #15718)
Reported by: alecdavis
Patches:
      bug15718.patch uploaded by jpeeler (license 325)

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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index f94f93da6141eb10a7e0d1af6bb329889ecbe99c..333da603c5bfa0ce02ab47b4495fec01c6a4e6cc 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -1728,7 +1728,7 @@ static int my_distinctive_ring(struct ast_channel *chan, void *pvt, int idx, int
 {
        unsigned char buf[256];
        int distMatches;
-       int curRingData[3];
+       int curRingData[RING_PATTERNS];
        int receivedRingT;
        int counter1;
        int counter;
@@ -1749,7 +1749,7 @@ static int my_distinctive_ring(struct ast_channel *chan, void *pvt, int idx, int
         * distinctive ringing */
        if ((checkaftercid && distinctiveringaftercid) || !checkaftercid) {
                /* Clear the current ring data array so we don't have old data in it. */
-               for (receivedRingT = 0; receivedRingT < ARRAY_LEN(ringdata); receivedRingT++)
+               for (receivedRingT = 0; receivedRingT < RING_PATTERNS; receivedRingT++)
                        ringdata[receivedRingT] = 0;
                receivedRingT = 0;
                if (checkaftercid && distinctiveringaftercid)
@@ -1783,7 +1783,7 @@ static int my_distinctive_ring(struct ast_channel *chan, void *pvt, int idx, int
                                        break;
                                /* Increment the ringT counter so we can match it against
                                   values in chan_dahdi.conf for distinctive ring */
-                               if (++receivedRingT == ARRAY_LEN(ringdata))
+                               if (++receivedRingT == RING_PATTERNS)
                                        break;
                        } else if (i & DAHDI_IOMUX_READ) {
                                res = read(p->subs[idx].dfd, buf, sizeof(buf));

diff --git a/channels/sig_analog.c b/channels/sig_analog.c
index 6054458cfd650ec74544e78630eef045d9a5c84a..1e84e27b568e63cf292a4c228ff005f4b34cfc2d 100644 (file)
--- a/channels/sig_analog.c
+++ b/channels/sig_analog.c
@@ -2281,7 +2281,7 @@ static void *__analog_ss_thread(void *data)
                        int timeout = 10000;  /* Ten seconds */
                        struct timeval start = ast_tvnow();
                        enum analog_event ev;
-                       int curRingData[3] = { 0 };
+                       int curRingData[RING_PATTERNS] = { 0 };
                        int receivedRingT = 0;
 
                        namebuf[0] = 0;
@@ -2315,7 +2315,7 @@ static void *__analog_ss_thread(void *data)
                                                        }
                                                        /* Increment the ringT counter so we can match it against
                                                           values in chan_dahdi.conf for distinctive ring */
-                                                       if (++receivedRingT == ARRAY_LEN(curRingData)) {
+                                                       if (++receivedRingT == RING_PATTERNS) {
                                                                break;
                                                        }
                                                }

diff --git a/channels/sig_analog.h b/channels/sig_analog.h
index 3f75e5827de2e7cf19d92bc1a6549fd1dfb9e893..e7f1ae2be9b6da38e332fb3af87340d96ea1748e 100644 (file)
--- a/channels/sig_analog.h
+++ b/channels/sig_analog.h
@@ -28,6 +28,10 @@
 #include "asterisk/channel.h"
 #include "asterisk/frame.h"
 
+#define ANALOG_MAX_CID 300
+#define READ_SIZE 160
+#define RING_PATTERNS 3
+
 /* Signalling types supported */
 enum analog_sigtype {
        ANALOG_SIG_NONE = -1,
@@ -110,8 +114,6 @@ enum analog_cid_start {
        ANALOG_CID_START_DTMF_NOALERT,
 };
 
-#define ANALOG_MAX_CID 300
-
 enum dialop {
        ANALOG_DIAL_OP_REPLACE = 2,
 };
@@ -221,8 +223,6 @@ struct analog_callback {
 
 
 
-#define READ_SIZE 160
-
 struct analog_subchannel {
        struct ast_channel *owner;
        struct ast_frame f;             /*!< One frame for each channel.  How did this ever work before? */