automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@49144 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 65c15a16672a2cfc5a9f2df08cf6937a156ec379..bd4f9e6e5cd074948c6d01f0eb8d714eadd0a7dd 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -578,6 +578,20 @@ static int misdn_restart_port (int fd, int argc, char *argv[])
        return 0;
 }
 
+static int misdn_restart_pid (int fd, int argc, char *argv[])
+{
+       int pid;
+  
+       if (argc != 4)
+               return RESULT_SHOWUSAGE;
+  
+       pid = atoi(argv[3]);
+
+       misdn_lib_pid_restart(pid);
+
+       return 0;
+}
+
 static int misdn_port_up (int fd, int argc, char *argv[])
 {
        int port;
@@ -1155,6 +1169,13 @@ static struct ast_cli_entry cli_restart_port =
   "Usage: misdn restart port\n"
 };
 
+static struct ast_cli_entry cli_restart_pid =
+{ {"misdn","restart","pid", NULL},
+  misdn_restart_pid,
+  "Restarts the given pid", 
+  "Usage: misdn restart pid\n"
+};
+
 static struct ast_cli_entry cli_port_up =
 { {"misdn","port","up", NULL},
   misdn_port_up,
@@ -4215,6 +4236,7 @@ int load_module(void)
        ast_cli_register(&cli_port_block);
        ast_cli_register(&cli_port_unblock);
        ast_cli_register(&cli_restart_port);
+       ast_cli_register(&cli_restart_pid);
        ast_cli_register(&cli_port_up);
        ast_cli_register(&cli_port_down);
        ast_cli_register(&cli_set_debug);
@@ -4280,7 +4302,7 @@ int unload_module(void)
        ast_cli_unregister(&cli_show_stacks);
        ast_cli_unregister(&cli_port_block);
        ast_cli_unregister(&cli_port_unblock);
-       ast_cli_unregister(&cli_restart_port);
+       ast_cli_unregister(&cli_restart_pid);
        ast_cli_unregister(&cli_port_up);
        ast_cli_unregister(&cli_port_down);
        ast_cli_unregister(&cli_set_debug);

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index 54a47753cb1338a40604f9db0a0c78becf97ff87..84a7cca0f7c82985ea98cb98e117d23c8314e8fe 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -174,6 +174,7 @@ int setup_bc(struct misdn_bchannel *bc);
 int manager_isdn_handler(iframe_t *frm ,msg_t *msg);
 
 int misdn_lib_port_restart(int port);
+int misdn_lib_pid_restart(int pid);
 
 extern struct isdn_msg msgs_g[]; 
 
@@ -446,7 +447,7 @@ static int find_free_chan_in_stack(struct misdn_stack *stack, int channel)
 
 int empty_chan_in_stack(struct misdn_stack *stack, int channel)
 {
-       if (channel<=0) {
+       if (channel<=0 || channel>=MAX_BCHANS) {
                cb_log(0,stack?stack->port:0, "empty_chan_inst_stack: cannot empty channel %d\n",channel);
                return -1;
        }
@@ -666,7 +667,7 @@ int set_chan_in_stack(struct misdn_stack *stack, int channel)
 
        cb_log(4,stack->port,"set_chan_in_stack: %d\n",channel);
        dump_chan_list(stack);
-       if (channel >=1 ) {
+       if (channel >=1 && channel <= MAX_BCHANS) {
                if (!stack->channels[channel-1])
                        stack->channels[channel-1] = 1;
                else {
@@ -2807,7 +2808,6 @@ int handle_mgmt(msg_t *msg)
                                stack->l1link=0;
 
                        clear_l3(stack);
-                       
                        break;
 
                case SSTATUS_L2_ESTABLISHED:
@@ -3307,6 +3307,16 @@ int misdn_lib_send_event(struct misdn_bchannel *bc, enum event_e event )
                bc->need_disconnect=0;
                bc->need_release=0;
                bc->need_release_complete=0;
+
+               if (!stack->nt) {
+                       /*create clenaup in TE*/
+                       if (bc->channel>0)
+                               empty_chan_in_stack(stack,bc->channel);
+                       int tmpcause=bc->cause; 
+                       empty_bc(bc);
+                       bc->cause=tmpcause;
+                       clean_up_bc(bc);
+               }
                break;
     
        case EVENT_CONNECT_ACKNOWLEDGE:
@@ -3558,6 +3568,15 @@ int queue_cleanup_bc(struct misdn_bchannel *bc)
 
 }
 
+int misdn_lib_pid_restart(int pid) 
+{
+       struct misdn_bchannel *bc=manager_find_bc_by_pid(pid);
+
+       if (bc) {
+               manager_clean_bc(bc);
+       }
+}
+
 int misdn_lib_port_restart(int port)
 {
        struct misdn_stack *stack=find_stack_by_port(port);
@@ -4042,7 +4061,7 @@ void manager_clean_bc(struct misdn_bchannel *bc )
                empty_chan_in_stack(stack, bc->channel);
        empty_bc(bc);
   
-       misdn_lib_send_event(bc,EVENT_RELEASE_COMPLETE);
+       cb_event(EVENT_CLEANUP, bc, NULL); 
 }
 
 

diff --git a/channels/misdn/isdn_lib.h b/channels/misdn/isdn_lib.h
index 0d8ce2d1b08f538c860a8335ee9640b7c644227c..5634865be761361d255c237c492cccbc40e412ca 100644 (file)
--- a/channels/misdn/isdn_lib.h
+++ b/channels/misdn/isdn_lib.h
@@ -413,6 +413,8 @@ void manager_ph_control(struct misdn_bchannel *bc, int c1, int c2);
 
 
 int misdn_lib_port_restart(int port);
+int misdn_lib_pid_restart(int pid);
+
 int misdn_lib_get_port_info(int port);
 
 int misdn_lib_is_port_blocked(int port);

diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index 1d33ac15d49e1df735363adf8bbd583574af7f55..e976be8a17dea6d2ccb9e500f8a16fca2aa0e4b5 100644 (file)
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -89,7 +89,7 @@ static const struct misdn_cfg_spec port_spec[] = {
        { "txgain", MISDN_CFG_TXGAIN, MISDN_CTYPE_INT, "0", NONE },
        { "te_choose_channel", MISDN_CFG_TE_CHOOSE_CHANNEL, MISDN_CTYPE_BOOL, "no", NONE },
        { "far_alerting", MISDN_CFG_FAR_ALERTING, MISDN_CTYPE_BOOL, "no", NONE },
-       { "pmp_l1_check", MISDN_CFG_PMP_L1_CHECK, MISDN_CTYPE_BOOL, "yes", NONE },
+       { "pmp_l1_check", MISDN_CFG_PMP_L1_CHECK, MISDN_CTYPE_BOOL, "no", NONE },
        { "reject_cause", MISDN_CFG_REJECT_CAUSE, MISDN_CTYPE_INT, "21", NONE },
        { "block_on_alarm", MISDN_CFG_ALARM_BLOCK, MISDN_CTYPE_BOOL, "no", NONE },
        { "hdlc", MISDN_CFG_HDLC, MISDN_CTYPE_BOOL, "no", NONE },

diff --git a/configs/misdn.conf.sample b/configs/misdn.conf.sample
index 9f75de697a4c8aa1d3b8fb2426c3140c8fa3409e..ada090eb9193b2c2d94d105df8b27e0a988fcc79 100644 (file)
--- a/configs/misdn.conf.sample
+++ b/configs/misdn.conf.sample
@@ -183,9 +183,9 @@ te_choose_channel=no
 ; 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
+; default: no
 ;
-pmp_l1_check=yes
+pmp_l1_check=no