]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 71106 via svnmerge from
authorChristian Richter <christian.richter@beronet.com>
Mon, 25 Jun 2007 08:57:06 +0000 (08:57 +0000)
committerChristian Richter <christian.richter@beronet.com>
Mon, 25 Jun 2007 08:57:06 +0000 (08:57 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r71106 | crichter | 2007-06-22 17:22:06 +0200 (Fr, 22 Jun 2007) | 9 lines

Merged revisions 68887 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r68887 | crichter | 2007-06-12 10:35:22 +0200 (Di, 12 Jun 2007) | 1 line

if the bridged partner is mISDN too we should not send dtmf tones, they are transmitted inband always
........

................

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

channels/chan_misdn.c

index b6417497cf6506020d412d192950d710462a77f1..a9a43b760593b48c77a3526e31a2e857be2a8041 100644 (file)
@@ -2146,10 +2146,14 @@ static int misdn_digit_end(struct ast_channel *ast, char digit, unsigned int dur
                ast_copy_string(p->ast->exten, bc->dad, sizeof(p->ast->exten));
                misdn_lib_send_event( bc, EVENT_INFORMATION);
                break;
-       default:
-               if (bc->send_dtmf) {
-                       send_digit_to_chan(p, digit);
-               }
+       default:        
+                       /* Do not send Digits in CONNECTED State, when
+                        * the other side is too mISDN. */
+                       if (p->other_ch ) 
+                               return 0;
+
+                       if ( bc->send_dtmf ) 
+                               send_digit_to_chan(p,digit);
                break;
        }