Major DISA improvements (bug #2284)
[asterisk/asterisk.git] / apps / app_disa.c
index 9783369..11c9766 100755 (executable)
@@ -7,6 +7,8 @@
  *
  * Jim Dixon <jim@lambdatel.com>
  *
+ * Made only slightly more sane by Mark Spencer <markster@digium.com>
+ *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
@@ -15,6 +17,7 @@
 #include <asterisk/file.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
+#include <asterisk/indications.h>
 #include <asterisk/pbx.h>
 #include <asterisk/module.h>
 #include <asterisk/translate.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
-#include <pthread.h>
 #include <sys/time.h>
 
-/*
-#define        TONE_BLOCK_SIZE 320
-*/
 
 static char *tdesc = "DISA (Direct Inward System Access) Application";
 
@@ -81,26 +80,8 @@ STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
-static float loudness=4096.0;
-
-int firstdigittimeout = 20000; /* 20 seconds first digit timeout */
-int digittimeout = 10000; /* 10 seconds subsequent digit timeout */
-
-static void make_tone_block(unsigned char *data, float f1, float f2, int len, int *x)
-{
-int    i;
-float  val;
-
-       for(i = 0; i < len; i++)
-       {
-               val = loudness * sin((f1 * 2.0 * M_PI * (*x))/8000.0);
-               val += loudness * sin((f2 * 2.0 * M_PI * (*x)++)/8000.0);
-               data[i] = AST_LIN2MU((int)val);
-        }              
-         /* wrap back around from 8000 */
-       if (*x >= 8000) *x = 0;
-       return;
-}
+static int firstdigittimeout = 20000; /* 20 seconds first digit timeout */
+static int digittimeout = 10000; /* 10 seconds subsequent digit timeout */
 
 static int ms_diff(struct timeval *tv1, struct timeval *tv2)
 {
@@ -115,12 +96,12 @@ static int disa_exec(struct ast_channel *chan, void *data)
 {
        int i,j,k,x;
        struct localuser *u;
-       char tmp[256],arg2[256],exten[AST_MAX_EXTENSION],acctcode[20];
-       unsigned char tone_block[640];
+       char tmp[256],arg2[256]="",exten[AST_MAX_EXTENSION],acctcode[20]="";
        char *ourcontext,*ourcallerid;
-       struct ast_frame *f,wf;
+       struct ast_frame *f;
        struct timeval lastout, now, lastdigittime;
        int res;
+       time_t rstart;
        FILE *fp;
        char *stringp=NULL;
 
@@ -145,7 +126,7 @@ static int disa_exec(struct ast_channel *chan, void *data)
        ourcontext = strsep(&stringp, "|");
        /* if context specified, save 2nd arg and parse third */
        if (ourcontext) {
-               strcpy(arg2,ourcontext);
+               strncpy(arg2,ourcontext, sizeof(arg2) - 1);
                ourcallerid = strsep(&stringp,"|");
        }
          /* if context not specified, use "disa" */
@@ -164,12 +145,18 @@ static int disa_exec(struct ast_channel *chan, void *data)
        exten[0] = 0;
        acctcode[0] = 0;
        /* can we access DISA without password? */ 
+
+       ast_log(LOG_DEBUG, "Context: %s\n",ourcontext);
+
        if (!strcasecmp(tmp, "no-password"))
-       {
+       {;
                k = 1;
                ast_log(LOG_DEBUG, "DISA no-password login success\n");
        }
        gettimeofday(&lastdigittime,NULL);
+
+       ast_tonepair_start(chan, 350, 440, 0, 0);
+
        for(;;)
        {
                gettimeofday(&now,NULL);
@@ -179,7 +166,7 @@ static int disa_exec(struct ast_channel *chan, void *data)
                {
                        ast_log(LOG_DEBUG,"DISA %s entry timeout on chan %s\n",
                                ((k) ? "extension" : "password"),chan->name);
-                       goto reorder;
+                       break;
                }
                if ((res = ast_waitfor(chan, -1) < 0)) {
                        ast_log(LOG_DEBUG, "Waitfor returned %d\n", res);
@@ -200,24 +187,7 @@ static int disa_exec(struct ast_channel *chan, void *data)
                        return -1;
                }
                if (f->frametype == AST_FRAME_VOICE) {
-                       if (!i || (ast_ignore_pattern(ourcontext, exten) && k)) {
-                               wf.frametype = AST_FRAME_VOICE;
-                               wf.subclass = AST_FORMAT_ULAW;
-                               wf.offset = AST_FRIENDLY_OFFSET;
-                               wf.mallocd = 0;
-                               wf.data = tone_block;
-                               wf.datalen = f->datalen;
-                               make_tone_block(tone_block, 350, 440, f->datalen, &x);
-                               wf.samples = wf.datalen;
-                               ast_frfree(f);
-                           if (ast_write(chan, &wf)) 
-                               {
-                               ast_log(LOG_WARNING, "DISA Failed to write frame on %s\n",chan->name);
-                                       LOCAL_USER_REMOVE(u);
-                                       return -1;
-                               }
-                       } else
-                               ast_frfree(f);
+                       ast_frfree(f);
                        continue;
                }
                  /* if not DTMF, just do it again */
@@ -229,7 +199,9 @@ static int disa_exec(struct ast_channel *chan, void *data)
 
                j = f->subclass;  /* save digit */
                ast_frfree(f);
-               
+               if (i == 0) 
+                       ast_playtones_stop(chan);
+
                gettimeofday(&lastdigittime,NULL);
                  /* got a DTMF tone */
                if (i < AST_MAX_EXTENSION) /* if still valid number of digits */
@@ -282,11 +254,13 @@ static int disa_exec(struct ast_channel *chan, void *data)
 
                                        }
                                         /* password good, set to dial state */
-                                               ast_log(LOG_WARNING,"DISA on chan %s password is good\n",chan->name);
+                                       ast_log(LOG_DEBUG,"DISA on chan %s password is good\n",chan->name);
+                                       ast_tonepair_start(chan, 350, 440, 0, 0);
+
                                        k = 1;
                                        i = 0;  /* re-set buffer pointer */
                                        exten[sizeof(acctcode)] = 0;
-                                       strcpy(acctcode,exten);
+                                       strncpy(acctcode,exten, sizeof(acctcode) - 1);
                                        exten[0] = 0;
                                        ast_log(LOG_DEBUG,"Successful DISA log-in on chan %s\n",chan->name);
                                        continue;
@@ -296,66 +270,49 @@ static int disa_exec(struct ast_channel *chan, void *data)
                        exten[i] = 0;
                        if (!k) continue; /* if getting password, continue doing it */
                          /* if this exists */
-                       if (ast_exists_extension(chan,ourcontext,exten,1, chan->callerid))
-                       {
-                               if (ourcallerid && *ourcallerid)
-                               {
-                                       if (chan->callerid) free(chan->callerid);
-                                       chan->callerid = strdup(ourcallerid);
-                               }
-                               strcpy(chan->exten,exten);
-                               strcpy(chan->context,ourcontext);
-                               strcpy(chan->accountcode,acctcode);
-                               chan->priority = 0;
-                               ast_cdr_init(chan->cdr,chan);
-                               LOCAL_USER_REMOVE(u);
-                               return 0;
-                       }
+
                          /* if can do some more, do it */
-                       if (ast_canmatch_extension(chan,ourcontext,exten,1, chan->callerid)) continue;
-               }
-reorder:
-               
-               /* something is invalid, give em reorder forever */
-               x = 0;
-               k = 0;  /* k = 0 means busy tone, k = 1 means silence) */
-               i = 0;  /* Number of samples we've done */
-               for(;;)
-               {
-                       if (ast_waitfor(chan, -1) < 0)
-                               break;
-                       f = ast_read(chan);
-                       if (!f)
+                       if (!ast_matchmore_extension(chan,ourcontext,exten,1, chan->callerid)) {
                                break;
-                       if (f->frametype == AST_FRAME_VOICE) {
-                               wf.frametype = AST_FRAME_VOICE;
-                               wf.subclass = AST_FORMAT_ULAW;
-                               wf.offset = AST_FRIENDLY_OFFSET;
-                               wf.mallocd = 0;
-                               wf.data = tone_block;
-                               wf.datalen = f->datalen;
-                               wf.samples = wf.datalen;
-                               if (k) 
-                                       memset(tone_block, 0x7f, wf.datalen);
-                               else
-                                       make_tone_block(tone_block,480.0, 620.0,wf.datalen, &x);
-                               i += wf.datalen / 8;
-                               if (i > 250) {
-                                       i = 0;
-                                       k = !k;
-                               }
-                           if (ast_write(chan, &wf)) 
-                               {
-                               ast_log(LOG_WARNING, "DISA Failed to write frame on %s\n",chan->name);
-                                       LOCAL_USER_REMOVE(u);
-                                       return -1;
-                               }
                        }
-                       ast_frfree(f);
                }
+       }
+
+       if (k && ast_exists_extension(chan,ourcontext,exten,1, chan->callerid))
+       {
+               ast_playtones_stop(chan);
+               /* We're authenticated and have a valid extension */
+               if (ourcallerid && *ourcallerid)
+               {
+                       if (chan->callerid) free(chan->callerid);
+                       chan->callerid = strdup(ourcallerid);
+               }
+               strncpy(chan->exten, exten, sizeof(chan->exten) - 1);
+               strncpy(chan->context, ourcontext, sizeof(chan->context) - 1);
+               strncpy(chan->accountcode, acctcode, sizeof(chan->accountcode) - 1);
+               chan->priority = 0;
+               ast_cdr_init(chan->cdr,chan);
                LOCAL_USER_REMOVE(u);
-               return -1;
+               return 0;
+       }
+
+reorder:
+
+       ast_indicate(chan,AST_CONTROL_CONGESTION);
+       /* something is invalid, give em reorder for several seconds */
+       time(&rstart);
+       while(time(NULL) < rstart + 10)
+       {
+               if (ast_waitfor(chan, -1) < 0)
+                       break;
+               f = ast_read(chan);
+               if (!f)
+                       break;
+               ast_frfree(f);
        }
+       ast_playtones_stop(chan);
+       LOCAL_USER_REMOVE(u);
+       return -1;
 }
 
 int unload_module(void)
@@ -381,7 +338,7 @@ int usecount(void)
        return res;
 }
 
-char *key()
+char *key(void)
 {
        return ASTERISK_GPL_KEY;
 }