mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 04:11:08 +00:00
Few more places that needs to check for onhold state.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@75623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -3344,7 +3344,7 @@ static int sip_hangup(struct ast_channel *ast)
|
||||
}
|
||||
|
||||
if (ast_test_flag(&p->flags[0], SIP_DEFER_BYE_ON_TRANSFER)) {
|
||||
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)) {
|
||||
if (option_debug && sipdebug)
|
||||
ast_log(LOG_DEBUG, "update_call_counter(%s) - decrement call limit counter on hangup\n", p->username);
|
||||
update_call_counter(p, DEC_CALL_LIMIT);
|
||||
@@ -3372,7 +3372,7 @@ static int sip_hangup(struct ast_channel *ast)
|
||||
ast_log(LOG_DEBUG, "Hanging up zombie call. Be scared.\n");
|
||||
|
||||
ast_mutex_lock(&p->lock);
|
||||
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)) {
|
||||
if (option_debug && sipdebug)
|
||||
ast_log(LOG_DEBUG, "update_call_counter(%s) - decrement call limit counter on hangup\n", p->username);
|
||||
update_call_counter(p, DEC_CALL_LIMIT);
|
||||
@@ -14250,7 +14250,7 @@ static int handle_request_cancel(struct sip_pvt *p, struct sip_request *req)
|
||||
return 0;
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */
|
||||
|
Reference in New Issue
Block a user