Decrement onHold count if we are hung up on and still on hold. (issue #8909 reported...

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index cb85dba6bfd620603d997c10b6cb704387f4a6df..5e4affb5a407bb80a49d0e390cf119d4c128a6c9 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2985,7 +2985,7 @@ static void __sip_destroy(struct sip_pvt *p, int lockowner)
 static int update_call_counter(struct sip_pvt *fup, int event)
 {
        char name[256];
-       int *inuse = NULL, *call_limit = NULL, *inringing = NULL;
+       int *inuse = NULL, *call_limit = NULL, *inringing = NULL, *onhold = NULL;
        int outgoing = ast_test_flag(&fup->flags[0], SIP_OUTGOING);
        struct sip_user *u = NULL;
        struct sip_peer *p = NULL;
@@ -3008,6 +3008,7 @@ static int update_call_counter(struct sip_pvt *fup, int event)
                inuse = &p->inUse;
                call_limit = &p->call_limit;
                inringing = &p->inRinging;
+               onhold = &p->onHold;
                ast_copy_string(name, fup->peername, sizeof(name));
        } 
        if (!p && !u) {
@@ -3034,6 +3035,8 @@ static int update_call_counter(struct sip_pvt *fup, int event)
                                ast_clear_flag(&fup->flags[1], SIP_PAGE2_INC_RINGING);
                        }
                }
+               if (ast_test_flag(&fup->flags[1], SIP_PAGE2_CALL_ONHOLD) && global_notifyhold)
+                       sip_peer_hold(fup, 0);
                if (option_debug > 1 || sipdebug) {
                        ast_log(LOG_DEBUG, "Call %s %s '%s' removed from call limit %d\n", outgoing ? "to" : "from", u ? "user":"peer", name, *call_limit);
                }