diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-18 15:41:06 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-18 15:41:06 +0000 |
| commit | effe824bde10494b607131f35072e31939cc26bf (patch) | |
| tree | 2cf097f71e67ac82029a20effc7d3d57cfda6957 | |
| parent | bfeff154048e93937876dac3757b23edbf0860e3 (diff) | |
(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: http://svn.digium.com/svn/asterisk/branches/1.4@75621 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8523888cf..9f7f41238 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2943,7 +2943,7 @@ static void __sip_destroy(struct sip_pvt *p, int lockowner) if (sip_debug_test_pvt(p) || option_debug > 2) 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); if (option_debug > 1) ast_log(LOG_DEBUG, "This call did not properly clean up call limits. Call ID %s\n", p->callid); @@ -3056,9 +3056,10 @@ static int update_call_counter(struct sip_pvt *fup, int event) if (option_debug > 2) ast_log(LOG_DEBUG, "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)); |