mirror of
https://github.com/asterisk/asterisk.git
synced 2026-07-23 16:05:30 -07:00
- Clean INC_COUNT flag when we decrement call counter
- If it's still set at time of dialog destruction, make sure we decrement the device call counter properly before we destroy the dialog git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
+9
-1
@@ -2885,6 +2885,12 @@ 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)) {
|
||||
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);
|
||||
}
|
||||
|
||||
/* Remove link from peer to subscription of MWI */
|
||||
if (p->relatedpeer && p->relatedpeer->mwipvt)
|
||||
p->relatedpeer->mwipvt = NULL;
|
||||
@@ -3020,8 +3026,10 @@ static int update_call_counter(struct sip_pvt *fup, int event)
|
||||
/* incoming and outgoing affects the inUse counter */
|
||||
case DEC_CALL_LIMIT:
|
||||
if ( *inuse > 0 ) {
|
||||
if (ast_test_flag(&fup->flags[0], SIP_INC_COUNT))
|
||||
if (ast_test_flag(&fup->flags[0], SIP_INC_COUNT)) {
|
||||
(*inuse)--;
|
||||
ast_clear_flag(&fup->flags[0], SIP_INC_COUNT);
|
||||
}
|
||||
} else {
|
||||
*inuse = 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user