diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-18 15:45:18 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-18 15:45:18 +0000 |
| commit | 456bbb0886f91afc09e3277b48ecc8e589dde3c0 (patch) | |
| tree | 5e4d05d90856e0c34bedbffaef9d4eb1eec21cfc /channels/chan_sip.c | |
| parent | e9af4467cd7a89eeaba7db32cae5de8a0923649f (diff) | |
Merged revisions 75623 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75623 | file | 2007-07-18 12:44:02 -0300 (Wed, 18 Jul 2007) | 2 lines
Few more places that needs to check for onhold state.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@75624 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 615349235..83c6e7b36 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3683,7 +3683,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 (sipdebug) ast_debug(1, "update_call_counter(%s) - decrement call limit counter on hangup\n", p->username); update_call_counter(p, DEC_CALL_LIMIT); @@ -3707,7 +3707,7 @@ static int sip_hangup(struct ast_channel *ast) ast_debug(1, "Hanging up zombie call. Be scared.\n"); sip_pvt_lock(p); - 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 (sipdebug) ast_debug(1, "update_call_counter(%s) - decrement call limit counter on hangup\n", p->username); update_call_counter(p, DEC_CALL_LIMIT); @@ -15011,7 +15011,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 */ |