aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-18 15:44:02 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-18 15:44:02 +0000
commit5cd98330d0fc1d8ae00918c9f6f5b87fcd50b063 (patch)
tree97bbaaa12a02f9cc3257652518fd51fc0588c8f5
parenteffe824bde10494b607131f35072e31939cc26bf (diff)
Few more places that needs to check for onhold state.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@75623 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9f7f41238..adf9f74d0 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -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 */