Fixed so that dial from a Zap channel to a Zap channel in 'dataquality' mode actually...

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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index ac9953bc3e9ad3d5e70aed4d03127510e42301fe..e68f5137e72743373792d001c551a0dd75ee024e 100755 (executable)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -545,12 +545,16 @@ static int dial_exec(struct ast_channel *chan, void *data)
                        int x = 2;
                        if (tmp->dataquality) x = 0;
                        ast_channel_setoption(chan,AST_OPTION_TONE_VERIFY,&x,sizeof(char),0);
+                       x = 0;
+                       ast_channel_setoption(chan,AST_OPTION_AUDIO_MODE,&x,sizeof(char),0);
                }                       
                if (!strcmp(peer->type,"Zap"))
                {
                        int x = 2;
                        if (tmp->dataquality) x = 0;
                        ast_channel_setoption(peer,AST_OPTION_TONE_VERIFY,&x,sizeof(char),0);
+                       x = 0;
+                       ast_channel_setoption(chan,AST_OPTION_AUDIO_MODE,&x,sizeof(char),0);
                }                       
                hanguptree(outgoing, peer);
                outgoing = NULL;
@@ -573,7 +577,7 @@ static int dial_exec(struct ast_channel *chan, void *data)
                        ast_log(LOG_DEBUG, "app_dial: sendurl=%s.\n", url);
                        ast_channel_sendurl( peer, url );
                } /* /JDG */
-               res = ast_bridge_call(chan, peer, allowredir, allowdisconnect);
+               res = ast_bridge_call(chan, peer, allowredir, allowdisconnect | tmp->dataquality);
                ast_hangup(peer);
        }       
 out:

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index d762d87cdef72a6be60de28b7524d136bb64923d..a6a49f3bdaf966d4f789fb604d25d121ecba55fe 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -1617,6 +1617,8 @@ static int zt_hangup(struct ast_channel *ast)
                x = 0;
                ast_channel_setoption(ast,AST_OPTION_TONE_VERIFY,&x,sizeof(char),0);
                ast_channel_setoption(ast,AST_OPTION_TDD,&x,sizeof(char),0);
+               x = 1;
+               ast_channel_setoption(ast,AST_OPTION_AUDIO_MODE,&x,sizeof(char),0);
                p->didtdd = 0;
                p->cidspill = NULL;
                p->callwaitcas = 0;
@@ -1743,7 +1745,7 @@ int       x;
        struct zt_pvt *p = chan->pvt->pvt;
 
        
-       if ((option != AST_OPTION_TONE_VERIFY) &&
+       if ((option != AST_OPTION_TONE_VERIFY) && (option != AST_OPTION_AUDIO_MODE) &&
                (option != AST_OPTION_TDD) && (option != AST_OPTION_RELAXDTMF))
           {
                errno = ENOSYS;
@@ -1857,6 +1859,20 @@ int      x;
                }
                ast_dsp_digitmode(p->dsp,x ? DSP_DIGITMODE_RELAXDTMF : DSP_DIGITMODE_DTMF | p->dtmfrelax);
                break;
+           case AST_OPTION_AUDIO_MODE:  /* Set AUDIO mode (or not) */
+               if (!*cp)
+               {               
+                       ast_log(LOG_DEBUG, "Set option AUDIO MODE, value: OFF(0) on %s\n",chan->name);
+                       x = 0;
+               }
+               else
+               {               
+                       ast_log(LOG_DEBUG, "Set option AUDIO MODE, value: ON(1) on %s\n",chan->name);
+                       x = 1;
+               }
+               if (ioctl(p->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &x) == -1)
+                       ast_log(LOG_WARNING, "Unable to set audio mode on channel %d\n", p->channel);
+               break;
        }
        errno = 0;
        return 0;

diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index e971a6d034488dae463107f92c64db44c0038c98..2dbcccf086b6951dfd78b315a80bd1637987ee6f 100755 (executable)
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -188,6 +188,9 @@ struct ast_frame_chain {
 /* Relax the parameters for DTMF reception (mainly for radio use) */
 #define        AST_OPTION_RELAXDTMF            3
 
+/* Set (or clear) Audio (Not-Clear) Mode */
+#define        AST_OPTION_AUDIO_MODE           4
+
 struct ast_option_header {
        /* Always keep in network byte order */
 #if __BYTE_ORDER == __BIG_ENDIAN