.titleBar { margin-bottom: 5px!important; }

Bug in Raute-Patch der app_disa.c

Dieses Thema im Forum "Asterisk Allgemein" wurde erstellt von D-Trix, 30 Sep. 2005.

  1. D-Trix

    D-Trix Neuer User

    Registriert seit:
    11 Juli 2005
    Beiträge:
    127
    Zustimmungen:
    0
    Punkte für Erfolge:
    0
    Ich wähle mich über mein Handy per DISA in meine Asterik ein und übermittle dabei automatisch durch ein p angefügt die zu wählende Rufnummer. Es gibt aber eine bestimmte Rufnummer in Thailand, bei der gibt es einen komischen Effekt: Bei der übermittlung von 00661234567 kommt im Asterisk 006661234567 an. Ich hatte auch schon mal 5 mal die Sechs und einmal kam korrekt 2 mal die Sechs an.

    Meine app_DISA.c habe ich gepacht, damit es ein schnelleres Timeout gibt und man die Rufnummerneingabe mit einer # abschliessen kann. Mit der originalen app_disa.c tritt der Fehler nicht auf. (Der Übersichtlichkeit halber sind die geänderten Stellen ROT markiert, alles andere ist original geblieben). Wo ist mein Fehler?




    /*
    * Asterisk -- A telephony toolkit for Linux.
    *
    * DISA -- Direct Inward System Access Application 6/20/2001
    *
    * Copyright (C) 2001 - 2005, Digium, Inc.
    *
    * 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
    */

    #include <string.h>
    #include <stdlib.h>
    #include <stdio.h>
    #include <math.h>
    #include <sys/time.h>

    #include "asterisk.h"

    ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.31 $")

    #include "asterisk/lock.h"
    #include "asterisk/file.h"
    #include "asterisk/logger.h"
    #include "asterisk/channel.h"
    #include "asterisk/app.h"
    #include "asterisk/indications.h"
    #include "asterisk/pbx.h"
    #include "asterisk/module.h"
    #include "asterisk/translate.h"
    #include "asterisk/ulaw.h"
    #include "asterisk/callerid.h"

    static char *tdesc = "DISA (Direct Inward System Access) Application";

    static char *app = "DISA";

    static char *synopsis = "DISA (Direct Inward System Access)";




    STANDARD_LOCAL_USER;

    LOCAL_USER_DECL;

    static void play_dialtone(struct ast_channel *chan, char *mailbox)
    {
    const struct tone_zone_sound *ts = NULL;
    if(ast_app_has_voicemail(mailbox, NULL))
    ts = ast_get_indication_tone(chan->zone, "dialrecall");
    else
    ts = ast_get_indication_tone(chan->zone, "dial");
    if (ts)
    ast_playtones_start(chan, 0, ts->data, 0);
    else
    ast_tonepair_start(chan, 350, 440, 0, 0);
    }

    static int disa_exec(struct ast_channel *chan, void *data)
    {
    int i,j,k,x,did_ignore;
    int firstdigittimeout = 20000;
    int digittimeout = 10000;

    struct localuser *u;
    char tmp[256],arg2[256]="",exten[AST_MAX_EXTENSION],acctcode[20]="";
    char *ourcontext,*ourcallerid,ourcidname[256],ourcidnum[256],*mailbox;
    struct ast_frame *f;
    struct timeval lastdigittime;
    int res;
    time_t rstart;
    FILE *fp;
    char *stringp=NULL;

    if (chan->pbx) {
    firstdigittimeout = chan->pbx->rtimeout*1000;
    digittimeout = chan->pbx->dtimeout*1000;
    }

    if (ast_set_write_format(chan,AST_FORMAT_ULAW))
    {
    ast_log(LOG_WARNING, "Unable to set write format to Mu-law on %s\n",chan->name);
    return -1;
    }
    if (ast_set_read_format(chan,AST_FORMAT_ULAW))
    {
    ast_log(LOG_WARNING, "Unable to set read format to Mu-law on %s\n",chan->name);
    return -1;
    }
    if (!data || !strlen((char *)data)) {
    ast_log(LOG_WARNING, "disa requires an argument (passcode/passcode file)\n");
    return -1;
    }
    ast_log(LOG_DEBUG, "Digittimeout: %d\n", digittimeout);
    ast_log(LOG_DEBUG, "Responsetimeout: %d\n", firstdigittimeout);
    strncpy(tmp, (char *)data, sizeof(tmp)-1);
    stringp=tmp;
    strsep(&stringp, "|");
    ourcontext = strsep(&stringp, "|");
    /* if context specified, save 2nd arg and parse third */
    if (ourcontext) {
    strncpy(arg2,ourcontext, sizeof(arg2) - 1);
    ourcallerid = strsep(&stringp,"|");
    }
    /* if context not specified, use "disa" */
    else {
    arg2[0] = 0;
    ourcallerid = NULL;
    ourcontext = "disa";
    }
    mailbox = strsep(&stringp, "|");
    if (!mailbox)
    mailbox = "";
    ast_log(LOG_DEBUG, "Mailbox: %s\n",mailbox);
    LOCAL_USER_ADD(u);
    if (chan->_state != AST_STATE_UP)
    {
    /* answer */
    ast_answer(chan);
    }
    i = k = x = 0; /* k is 0 for pswd entry, 1 for ext entry */
    did_ignore = 0;
    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; /* We have the password */
    ast_log(LOG_DEBUG, "DISA no-password login success\n");
    }
    lastdigittime = ast_tvnow();

    play_dialtone(chan, mailbox);

    for(;;)
    {
    /* if outa time, give em reorder */
    if (ast_tvdiff_ms(ast_tvnow(), lastdigittime) >
    ((k&2) ? digittimeout : firstdigittimeout))
    {
    ast_log(LOG_DEBUG,"DISA %s entry timeout on chan %s\n",
    ((k&1) ? "extension" : "password"),chan->name);
    break;
    }
    if ((res = ast_waitfor(chan, -1) < 0)) {
    ast_log(LOG_DEBUG, "Waitfor returned %d\n", res);
    continue;
    }

    f = ast_read(chan);
    if (f == NULL)
    {
    LOCAL_USER_REMOVE(u);
    return -1;
    }
    if ((f->frametype == AST_FRAME_CONTROL) &&
    (f->subclass == AST_CONTROL_HANGUP))
    {
    ast_frfree(f);
    LOCAL_USER_REMOVE(u);
    return -1;
    }
    if (f->frametype == AST_FRAME_VOICE) {
    ast_frfree(f);
    continue;
    }
    /* if not DTMF, just do it again */
    if (f->frametype != AST_FRAME_DTMF)
    {
    ast_frfree(f);
    continue;
    }

    j = f->subclass; /* save digit */
    ast_frfree(f);
    if (i == 0)
    {
    k|=2; /* We have the first digit */
    ast_playtones_stop(chan);
    }
    lastdigittime = ast_tvnow();
    /* got a DTMF tone */
    if (i < AST_MAX_EXTENSION) /* if still valid number of digits */
    {
    if (!(k&1)) /* if in password state */
    {
    if (j == '#') /* end of password */
    {
    /* see if this is an integer */
    if (sscanf(tmp,"%d",&j) < 1)
    { /* nope, it must be a filename */
    fp = fopen(tmp,"r");
    if (!fp)
    {
    ast_log(LOG_WARNING,"DISA password file %s not found on chan %s\n",tmp,chan->name);
    LOCAL_USER_REMOVE(u);
    return -1;
    }
    tmp[0] = 0;
    while(fgets(tmp,sizeof(tmp) - 1,fp))
    {
    char *stringp=NULL,*stringp2;
    if (!tmp[0]) continue;
    if (tmp[strlen(tmp) - 1] == '\n')
    tmp[strlen(tmp) - 1] = 0;
    if (!tmp[0]) continue;
    /* skip comments */
    if (tmp[0] == '#') continue;
    if (tmp[0] == ';') continue;
    stringp=tmp;
    strsep(&stringp, "|");
    stringp2=strsep(&stringp, "|");
    if (stringp2) {
    ourcontext=stringp2;
    stringp2=strsep(&stringp, "|");
    if (stringp2) ourcallerid=stringp2;
    }
    mailbox = strsep(&stringp, "|");
    if (!mailbox)
    mailbox = "";
    ast_log(LOG_DEBUG, "Mailbox: %s\n",mailbox);

    /* password must be in valid format (numeric) */
    if (sscanf(tmp,"%d",&j) < 1) continue;
    /* if we got it */
    if (!strcmp(exten,tmp)) break;
    }
    fclose(fp);
    }
    /* compare the two */
    if (strcmp(exten,tmp))
    {
    ast_log(LOG_WARNING,"DISA on chan %s got bad password %s\n",chan->name,exten);
    goto reorder;

    }
    /* password good, set to dial state */
    ast_log(LOG_DEBUG,"DISA on chan %s password is good\n",chan->name);
    play_dialtone(chan, mailbox);

    k|=1; /* In number mode */
    i = 0; /* re-set buffer pointer */
    exten[sizeof(acctcode)] = 0;
    strncpy(acctcode,exten, sizeof(acctcode) - 1);
    exten[0] = 0;
    ast_log(LOG_DEBUG,"Successful DISA log-in on chan %s\n",chan->name);
    continue;
    }
    }

    exten[i++] = j; /* save digit */
    exten = 0;

    if (!k) continue; /* if getting password, continue doing it */
    /* if this exists */

    if (j == '#') { /* user wants end of number, so strip off # */
    i--;
    exten = 0;
    break;
    }

    if (ast_ignore_pattern(ourcontext, exten)) {
    play_dialtone(chan, "");
    did_ignore = 1;

    } else
    if (did_ignore) {
    ast_playtones_stop(chan);
    did_ignore = 0;
    }

    /* if can do some more, do it */
    if (!ast_matchmore_extension(chan,ourcontext,exten,1, chan->cid.cid_num)) {
    break;
    }
    }
    }

    if (k==3 && ast_exists_extension(chan,ourcontext,exten,1, chan->cid.cid_num))
    {
    ast_playtones_stop(chan);
    /* We're authenticated and have a valid extension */
    if (ourcallerid && *ourcallerid)
    {
    ast_callerid_split(ourcallerid, ourcidname, sizeof(ourcidname), ourcidnum, sizeof(ourcidnum));
    ast_set_callerid(chan, ourcidnum, ourcidname, ourcidnum);
    }
    strncpy(chan->exten, exten, sizeof(chan->exten) - 1);
    strncpy(chan->context, ourcontext, sizeof(chan->context) - 1);
    if (!ast_strlen_zero(acctcode)) {
    strncpy(chan->accountcode, acctcode, sizeof(chan->accountcode) - 1);
    }
    chan->priority = 0;
    ast_cdr_reset(chan->cdr,AST_CDR_FLAG_POSTED);
    LOCAL_USER_REMOVE(u);
    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)
    {
    STANDARD_HANGUP_LOCALUSERS;
    return ast_unregister_application(app);
    }

    int load_module(void)
    {
    return ast_register_application(app, disa_exec, synopsis, descrip);
    }

    char *description(void)
    {
    return tdesc;
    }

    int usecount(void)
    {
    int res;
    STANDARD_USECOUNT(res);
    return res;
    }

    char *key(void)
    {
    return ASTERISK_GPL_KEY;
    }

     
  2. hmilz

    hmilz Neuer User

    Registriert seit:
    3 Okt. 2005
    Beiträge:
    25
    Zustimmungen:
    0
    Punkte für Erfolge:
    0
    Hmmm , kann keinen sehen. Den Patch habe ich eben auch eingebaut und es funktioniert zumindest outgoing (von der ISDN-TK über den internen S0, aber das ist eine andere Sache). Ich kann mir bei Dir höchstens vorstellen, dass die Timeouts nicht mehr passen; der # hat damit sicher nichts zu tun. --> zurück auf LOS.

    Den Patch (gegen 1.0.9-BRIstuffed-0.2.0-RC8o) habe ich zur allgemeinen Verwendung hierher gestellt.