added pmp_l1_check option, to avoid l1 checking for group calls on PMP ports

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

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 606c4cebf508470e7c2ef478fa2aef6393f35d0b..68adc5e74885febdd6d99f1fb771f79595acb444 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -2306,8 +2306,9 @@ static struct ast_channel *misdn_request(const char *type, int format, void *dat
                                        
                                        if (!strcasecmp(cfg_group, group)) {
                                                int port_up;
-                                       
-                                               port_up = misdn_lib_port_up(port);
+                                               int check;
+                                               misdn_cfg_get(port, MISDN_CFG_PMP_L1_CHECK, &check, sizeof(int));
+                                               port_up = misdn_lib_port_up(port, check);
                                                
                                                if ( port_up )  {
                                                        newbc = misdn_lib_get_free_bc(port, robin_channel);
@@ -2333,12 +2334,14 @@ static struct ast_channel *misdn_request(const char *type, int format, void *dat
                                 port=misdn_cfg_get_next_port(port)) {
                                
                                misdn_cfg_get( port, MISDN_CFG_GROUPNAME, cfg_group, BUFFERSIZE);
-                               
+
+                               chan_misdn_log(3,port, "Group [%s] Port [%d]\n", group, port);
                                if (!strcasecmp(cfg_group, group)) {
                                        int port_up;
+                                       int check;
+                                       misdn_cfg_get(port, MISDN_CFG_PMP_L1_CHECK, &check, sizeof(int));
+                                       port_up = misdn_lib_port_up(port, check);
                                        
-                                       port_up = misdn_lib_port_up(port);
-
                                        chan_misdn_log(4, port, "portup:%d\n", port_up);
                                        
                                        if ( port_up )  {

diff --git a/channels/misdn/chan_misdn_config.h b/channels/misdn/chan_misdn_config.h
index 8e2b2609f709cf168fe3671b70187e3524afe6e8..84f346a943644eccefb412b86331e162cb66fb42 100644 (file)
--- a/channels/misdn/chan_misdn_config.h
+++ b/channels/misdn/chan_misdn_config.h
@@ -26,6 +26,7 @@ enum misdn_cfg_elements {
        MISDN_CFG_RXGAIN,              /* int */
        MISDN_CFG_TXGAIN,              /* int */
        MISDN_CFG_TE_CHOOSE_CHANNEL,   /* int (bool) */
+       MISDN_CFG_PMP_L1_CHECK,        /* int (bool) */
        MISDN_CFG_CONTEXT,             /* char[] */
        MISDN_CFG_LANGUAGE,            /* char[] */
        MISDN_CFG_MUSICCLASS,            /* char[] */

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index 8605bff9040a022309d79a08d861749c1092d186..ee0e988de7b408d47fa1343fae9cf1b1f71f6a60 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -1460,27 +1460,25 @@ int misdn_lib_send_facility(struct misdn_bchannel *bc, enum facility_type fac, v
 }
 
 
-int misdn_lib_port_up(int port)
+int misdn_lib_port_up(int port, int check)
 {
        struct misdn_stack *stack;
-       
+
+
        for (stack=glob_mgr->stack_list;
             stack;
             stack=stack->next) {
                
+               if ( !stack->ptp && !check) return 1;
+               
                if (stack->port == port) {
-                       if (stack->nt) {
-                               if (stack->l1link)
-                                       return 1;
-                               else
-                                       return 0;
-                       } else {
-                               if (stack->l1link)
-                                       return 1;
-                               else
-                                       return 0;
+                       if (stack->l1link)
+                               return 1;
+                       else {
+                               cb_log(-1,port, "Port down [%s]\n",
+                                      stack->ptp?"PP":"PMP");
+                               return 0;
                        }
-
                }
        }
   

diff --git a/channels/misdn/isdn_lib.h b/channels/misdn/isdn_lib.h
index 77804241d5e77f297076cf3c9e3460153085d932..7590b3eeeb6abca5aaf70bec2e813ccb357eca80 100644 (file)
--- a/channels/misdn/isdn_lib.h
+++ b/channels/misdn/isdn_lib.h
@@ -335,7 +335,7 @@ void manager_ph_control(struct misdn_bchannel *bc, int c1, int c2);
 int misdn_lib_port_restart(int port);
 int misdn_lib_get_port_info(int port);
 
-int misdn_lib_port_up(int port);
+int misdn_lib_port_up(int port, int notcheck);
 
 int misdn_lib_get_port_up (int port) ;
      

diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index c3a884fb3753033695a2d87d2becb53f436118ce..7716ce39e97647c8dbee456f4f1c484bbf490421 100644 (file)
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -87,6 +87,7 @@ static const struct misdn_cfg_spec port_spec[] = {
        { "rxgain", MISDN_CFG_RXGAIN, MISDN_CTYPE_INT, "0", NONE },
        { "txgain", MISDN_CFG_TXGAIN, MISDN_CTYPE_INT, "0", NONE },
        { "te_choose_channel", MISDN_CFG_TE_CHOOSE_CHANNEL, MISDN_CTYPE_BOOL, "no", NONE },
+       { "pmp_l1_check", MISDN_CFG_PMP_L1_CHECK, MISDN_CTYPE_BOOL, "yes", NONE },
        { "context", MISDN_CFG_CONTEXT, MISDN_CTYPE_STR, "default", NONE },
        { "language", MISDN_CFG_LANGUAGE, MISDN_CTYPE_STR, "en", NONE },
        { "musicclass", MISDN_CFG_MUSICCLASS, MISDN_CTYPE_STR, "default", NONE },

diff --git a/configs/misdn.conf.sample b/configs/misdn.conf.sample
index 0dba62195bfe426102fdf00714887b9ef2b3bba8..09ade12cd61db740926bf9a0b084ed5913fe81aa 100644 (file)
--- a/configs/misdn.conf.sample
+++ b/configs/misdn.conf.sample
@@ -142,6 +142,19 @@ txgain=0
 te_choose_channel=no
 
 
+
+;
+; This option defines, if chan_misdn should check the L1 on  a PMP 
+; before makeing a group call on it. The L1 may go down for PMP Ports
+; so we might need this.
+; But be aware! a broken or plugged off cable might be used for a group call
+; as well, since chan_misdn has no chance to distinguish if the L1 is down
+; because of a lost Link or because the Provider shut it down...
+;
+; default: yes
+;
+pmp_l1_check=yes
+
 ;
 ; Send Setup_Acknowledge on incoming calls anyway (instead of PROCEEDING), 
 ; this requests additional Infos, so we can waitfordigits