automerge commit

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

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index c340f84b8b20688bf0f2dec95015a811abcbdfeb..4d29fd33c21e0f151d9719d6b35c163880ab420a 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -2561,7 +2561,7 @@ static struct ast_channel *misdn_request(const char *type, int format, void *dat
        }
 
        if (misdn_cfg_is_group_method(group, METHOD_STANDARD_DEC)) {
-               chan_misdn_log(0, port, " --> STARTING STANDARDDEC...\n");
+               chan_misdn_log(4, port, " --> STARTING STANDARDDEC...\n");
                dec=1;
        }
 
@@ -3877,6 +3877,8 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
                        cb_log(1,bc->port," --> found holded ch\n");
                        misdn_transfer_bc(ch, holded_ch) ;
                }
+
+               bc->need_disconnect=0;
                
                stop_bc_tones(ch);
                hangup_chan(ch);
@@ -3892,6 +3894,9 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
        
        case EVENT_RELEASE:
                {
+                       bc->need_disconnect=0;
+                       bc->need_release=0;
+
                        hangup_chan(ch);
                        release_chan(bc);
                
@@ -3901,6 +3906,10 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
                break;
        case EVENT_RELEASE_COMPLETE:
        {
+               bc->need_disconnect=0;
+               bc->need_release=0;
+               bc->need_release_complete=0;
+
                stop_bc_tones(ch);
                hangup_chan(ch);
                release_chan(bc);

diff --git a/res/res_monitor.c b/res/res_monitor.c
index b64b5c7997921c6dda44beaa9e622210853db2ba..f15c3c286022faa587a1e52ff9d55a8247990f1f 100644 (file)
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -338,6 +338,7 @@ int ast_monitor_change_fname(struct ast_channel *chan, const char *fname_base, i
                }
 
                snprintf(chan->monitor->filename_base, FILENAME_MAX, "%s/%s", directory ? "" : ast_config_AST_MONITOR_DIR, fname_base);
+               chan->monitor->filename_changed = 1;
        } else {
                ast_log(LOG_WARNING, "Cannot change monitor filename of channel %s to %s, monitoring not started\n", chan->name, fname_base);
        }