Pass along proceeding and progress even when overlap mode is not on

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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 17756207102cfb09366e006c4384bb28d84b46e5..07d07aaebd48b1f027d4d84dda95243f2c73703a 100755 (executable)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -486,6 +486,12 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localu
                                                        if (!ast_test_flag(outgoing, DIAL_RINGBACKONLY))
                                                                ast_indicate(in, AST_CONTROL_PROGRESS);
                                                        break;
+                                               case AST_CONTROL_PROCEEDING:
+                                                       if (option_verbose > 2)
+                                                               ast_verbose ( VERBOSE_PREFIX_3 "%s is proceeding passing it to %s\n", o->chan->name,in->name);
+                                                       if (!ast_test_flag(outgoing, DIAL_RINGBACKONLY))
+                                                               ast_indicate(in, AST_CONTROL_PROCEEDING);
+                                                       break;
                                                case AST_CONTROL_HOLD:
                                                        if (option_verbose > 2)
                                                                ast_verbose(VERBOSE_PREFIX_3 "Call on %s placed on hold\n", o->chan->name);

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index f9c5c0f35e7a1a4ec14962a9d7ab4b418eabcede..e3ac80dc4e8e4a5db916bf602d5b9b2153715b4e 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -8295,9 +8295,9 @@ static void *pri_dchannel(void *vpri)
                                chanpos = pri_find_principle(pri, e->proceeding.channel);
                                if (chanpos > -1) {
 #ifdef PRI_PROGRESS_MASK
-                                       if ((pri->overlapdial && !pri->pvts[chanpos]->proceeding) || (e->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE)) {
+                                       if ((!pri->pvts[chanpos]->proceeding) || (e->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE)) {
 #else
-                                       if ((pri->overlapdial && !pri->pvts[chanpos]->proceeding) || (e->proceeding.progress == 8)) {
+                                       if ((!pri->pvts[chanpos]->proceeding) || (e->proceeding.progress == 8)) {
 #endif
                                                struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROGRESS, };
 
@@ -8339,7 +8339,7 @@ static void *pri_dchannel(void *vpri)
                        case PRI_EVENT_PROCEEDING:
                                chanpos = pri_find_principle(pri, e->proceeding.channel);
                                if (chanpos > -1) {
-                                       if (pri->overlapdial && !pri->pvts[chanpos]->proceeding) {
+                                       if (!pri->pvts[chanpos]->proceeding) {
                                                struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROCEEDING, };
                                                
                                                ast_mutex_lock(&pri->pvts[chanpos]->lock);