Merged revisions 75621 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75621 | file | 2007-07-18 12:41:06 -0300 (Wed, 18 Jul 2007) | 5 lines

(closes issue #10165)
Reported by: elandivar

It is possible for hold status to exist without call limits set, so we need to ensure update_call_counter is executed regardless.

........

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4a8ea43..6153492 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3287,7 +3287,7 @@ static void __sip_destroy(struct sip_pvt *p, int lockowner, int lockdialoglist)
        if (sip_debug_test_pvt(p))
                ast_verbose("Really destroying SIP dialog '%s' Method: %s\n", p->callid, sip_methods[p->method].text);
 
-       if (ast_test_flag(&p->flags[0], SIP_INC_COUNT)) {
+       if (ast_test_flag(&p->flags[0], SIP_INC_COUNT) || ast_test_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD)) {
                update_call_counter(p, DEC_CALL_LIMIT);
                ast_debug(2, "This call did not properly clean up call limits. Call ID %s\n", p->callid);
        }
@@ -3405,9 +3405,10 @@ static int update_call_counter(struct sip_pvt *fup, int event)
 
        ast_debug(3, "Updating call counter for %s call\n", outgoing ? "outgoing" : "incoming");
 
+
        /* Test if we need to check call limits, in order to avoid 
           realtime lookups if we do not need it */
-       if (!ast_test_flag(&fup->flags[0], SIP_CALL_LIMIT))
+       if (!ast_test_flag(&fup->flags[0], SIP_CALL_LIMIT) && !ast_test_flag(&fup->flags[1], SIP_PAGE2_CALL_ONHOLD))
                return 0;
 
        ast_copy_string(name, fup->username, sizeof(name));