added even more statefulness for sending out disconnect/release/release_complete...

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

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 4b47252cee28a0c0a0c5d311a467c65d8382217e..e76e28f43bc5b4f5149c58f553ad8a5b77ef028d 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -2296,7 +2296,8 @@ static int misdn_hangup(struct ast_channel *ast)
                        hanguptone_indicate(p);
                
                        if (bc->nt) {
-                               misdn_lib_send_event( bc, EVENT_DISCONNECT);
+                               if (bc->need_disconnect)
+                                       misdn_lib_send_event( bc, EVENT_DISCONNECT);
                        } else {
                                misdn_lib_send_event( bc, EVENT_RELEASE_COMPLETE);
                                p->state=MISDN_CLEANING;
@@ -2307,7 +2308,8 @@ static int misdn_hangup(struct ast_channel *ast)
                        start_bc_tones(p);
                        hanguptone_indicate(p);
                
-                       misdn_lib_send_event( bc, EVENT_DISCONNECT);
+                       if (bc->need_disconnect)
+                               misdn_lib_send_event( bc, EVENT_DISCONNECT);
                        break;
       
                case MISDN_ALERTING:
@@ -2317,7 +2319,8 @@ static int misdn_hangup(struct ast_channel *ast)
                                hanguptone_indicate(p);
       
                        /*p->state=MISDN_CLEANING;*/
-                       misdn_lib_send_event( bc, EVENT_DISCONNECT);
+                       if (bc->need_disconnect)
+                               misdn_lib_send_event( bc, EVENT_DISCONNECT);
                        break;
                case MISDN_CONNECTED:
                        /*  Alerting or Disconect */
@@ -2326,7 +2329,8 @@ static int misdn_hangup(struct ast_channel *ast)
                                hanguptone_indicate(p);
                                p->bc->progress_indicator=8;
                        }
-                       misdn_lib_send_event( bc, EVENT_DISCONNECT);
+                       if (bc->need_disconnect)
+                               misdn_lib_send_event( bc, EVENT_DISCONNECT);
 
                        /*p->state=MISDN_CLEANING;*/
                        break;
@@ -2358,7 +2362,8 @@ static int misdn_hangup(struct ast_channel *ast)
                                misdn_lib_send_event(bc, EVENT_RELEASE);
                                p->state=MISDN_CLEANING; 
                        } else {
-                               misdn_lib_send_event(bc, EVENT_DISCONNECT);
+                               if (bc->need_disconnect)
+                                       misdn_lib_send_event(bc, EVENT_DISCONNECT);
                        }
                }
 
@@ -2674,6 +2679,16 @@ static int dialtone_indicate(struct chan_list *cl)
 {
        const struct tone_zone_sound *ts= NULL;
        struct ast_channel *ast=cl->ast;
+
+
+       int nd=0;
+       misdn_cfg_get( cl->bc->port, MISDN_CFG_NODIALTONE, &nd, sizeof(nd));
+
+       if (nd) {
+               chan_misdn_log(1,cl->bc->port,"Not sending Dialtone, because config wants it\n");
+               return 0;
+       }
+       
        chan_misdn_log(3,cl->bc->port," --> Dial\n");
        ts=ast_get_indication_tone(ast->zone,"dial");
        cl->ts=ts;      
@@ -2692,7 +2707,6 @@ static int dialtone_indicate(struct chan_list *cl)
 static int hanguptone_indicate(struct chan_list *cl)
 {
        misdn_lib_send_tone(cl->bc,TONE_HANGUP);
-       misdn_lib_tone_generator_start(cl->bc);
        return 0;
 }
 
@@ -3707,12 +3721,38 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
                ch->ast->rings=1;
                ast_setstate(ch->ast, AST_STATE_RINGING);
 
-               if ( bc->pres ) {
-                       chan->cid.cid_pres=AST_PRES_ALLOWED_USER_NUMBER_NOT_SCREENED;
-               }  else {
-                       chan->cid.cid_pres=AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN;
+               int pres,screen;
+
+               switch (bc->pres) {
+                       case 1:
+                       pres=AST_PRES_RESTRICTED; chan_misdn_log(2,bc->port," --> PRES: Restricted (1)\n");
+                       break;
+                       case 2:
+                       pres=AST_PRES_UNAVAILABLE; chan_misdn_log(2,bc->port," --> PRES: Restricted (2)\n");
+                       break;
+                       default:
+                       pres=AST_PRES_ALLOWED; chan_misdn_log(2,bc->port," --> PRES: Restricted (%d)\n", bc->pres);
+               }
+
+               switch (bc->screen) {
+                       case 0:
+                       screen=AST_PRES_USER_NUMBER_UNSCREENED;  chan_misdn_log(2,bc->port," --> SCREEN: Unscreened (0)\n");
+                       break;
+                       case 1:
+                       screen=AST_PRES_USER_NUMBER_PASSED_SCREEN; chan_misdn_log(2,bc->port," --> SCREEN: Passed screen (1)\n");
+                       break;
+                       case 2:
+                       screen=AST_PRES_USER_NUMBER_FAILED_SCREEN; chan_misdn_log(2,bc->port," --> SCREEN: failed screen (2)\n");
+                       break;
+                       case 3:
+                       screen=AST_PRES_NETWORK_NUMBER; chan_misdn_log(2,bc->port," --> SCREEN: Network Number (3)\n");
+                       break;
+                       default:
+                       screen=AST_PRES_USER_NUMBER_UNSCREENED; chan_misdn_log(2,bc->port," --> SCREEN: Unscreened (%d)\n",bc->screen);
                }
-      
+
+               chan->cid.cid_pres=pres+screen;
+
                pbx_builtin_setvar_helper(chan, "TRANSFERCAPABILITY", ast_transfercapability2str(bc->capability));
                chan->transfercapability=bc->capability;
                

diff --git a/channels/misdn/chan_misdn_config.h b/channels/misdn/chan_misdn_config.h
index 8e01404718ce17214bb7defd9ae4a2942a722d3d..8866df853c5585fca2d311cd64b5d1ee99027f36 100644 (file)
--- a/channels/misdn/chan_misdn_config.h
+++ b/channels/misdn/chan_misdn_config.h
@@ -44,6 +44,7 @@ enum misdn_cfg_elements {
        MISDN_CFG_PRES,                /* int */
        MISDN_CFG_SCREEN,              /* int */
        MISDN_CFG_ALWAYS_IMMEDIATE,    /* int (bool) */
+       MISDN_CFG_NODIALTONE,    /* int (bool) */
        MISDN_CFG_IMMEDIATE,           /* int (bool) */
        MISDN_CFG_SENDDTMF,           /* int (bool) */
        MISDN_CFG_HOLD_ALLOWED,        /* int (bool) */

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index ae8283cb3e72ed75944f7f395707ee879be1839e..de3e5cd1a4d0103961680c19dee2fb0e535cdc33 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -3195,6 +3195,7 @@ int misdn_lib_send_event(struct misdn_bchannel *bc, enum event_e event )
                        cb_log(-1,bc->port," --> we have already send Release\n");
                        return -1;
                }
+               bc->need_disconnect=0;
                bc->need_release=0;
                break;
        case EVENT_RELEASE_COMPLETE:
@@ -3202,6 +3203,8 @@ int misdn_lib_send_event(struct misdn_bchannel *bc, enum event_e event )
                        cb_log(-1,bc->port," --> we have already send Release_complete\n");
                        return -1;
                }
+               bc->need_disconnect=0;
+               bc->need_release=0;
                bc->need_release_complete=0;
                break;
     

diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index d97faf113c3e877345aea22cd8aff3982ca92eb6..2556ae2123123d1ca76a005195c04fb269e461af 100644 (file)
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -210,6 +210,10 @@ static const struct misdn_cfg_spec port_spec[] = {
                "\tThere you can use DigitTimeout if you can't or don't want to use\n"
                "\tisdn overlap dial.\n"
                "\tNOTE: This will jump into the s extension for every exten!" },
+       { "nodialtone", MISDN_CFG_NODIALTONE, MISDN_CTYPE_BOOL, "no", NONE,
+               "Enable this to prevent chan_misdn to generate the dialtone\n"
+               "\tThis makes only sense together with the always_immediate=yes option\n"
+               "\tto generate your own dialtone with Playtones or so.\n"},
        { "immediate", MISDN_CFG_IMMEDIATE, MISDN_CTYPE_BOOL, "no", NONE,
                "Enable this if you want callers which called exactly the base\n"
                "\tnumber (so no extension is set) to jump into the s extension.\n"

diff --git a/configs/misdn.conf.sample b/configs/misdn.conf.sample
index 2c86b4337ebf3cd4fcac977808752f093435ef1f..21335b0c0054a52e06afcb5b1167c521b471b400 100644 (file)
--- a/configs/misdn.conf.sample
+++ b/configs/misdn.conf.sample
@@ -272,6 +272,15 @@ incoming_early_audio=no
 ;
 ;always_immediate=no
 
+;
+; set this to yes if you want to generate your own dialtone 
+; with always_immediate=yes, else chan_misdn generates the dialtone
+;
+; default value: no
+;
+nodialtone=no
+
+
 ; uncomment the following if you want callers which called exactly the 
 ; base number (so no extension is set) jump to the s extension.
 ; if the user dials something more it jumps to the correct extension