automerge commit

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

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 97ec2caab7b676f01ad1fd44c1f2d5f7338a9183..3181a1a53b096fba9d0003f2b707f858eee1dbb4 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -2068,10 +2068,14 @@ static int misdn_digit(struct ast_channel *ast, char digit )
                }
                break;
                
-               default:
-                       if ( bc->send_dtmf ) {
+               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;
        }