don't allow call waiting during the initial ringing (issue #5188)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@6569 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index ed2e926a8d3384e6bdc4d6f76258c111a7f41914..381d6837110fb80ad9cefee5ffc5a45857b9486e 100755 (executable)
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,9 @@
        only, not requiring authentication on incoming invites, or both. Before,
        to not require authentication on incoming invites also required matching
        peers based on IP only.
+ -- chan_zap
+    -- Before, call waiting could occur during the initial ringing on the line.
+       This has now been fixed.
  -- app_disa
     -- We will now not set the accountcode if one is not supplied. 
  -- app_meetme

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index a90dab2d870a612b7136cb078fd029f4a8c0b39b..943d488c66169eaa681b332826475a621bf67875 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6710,7 +6710,7 @@ static inline int available(struct zt_pvt *p, int channelmatch, int groupmatch,
        }
        
        if ((p->owner->_state != AST_STATE_UP) &&
-               (p->owner->_state != AST_STATE_RINGING)) {
+               ((p->owner->_state != AST_STATE_RINGING) || p->outgoing)) {
                /* If the current call is not up, then don't allow the call */
                return 0;
        }