diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-25 17:17:56 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-25 17:17:56 +0000 |
| commit | 50230b4e6c8629c3b662d9451c98675e7582a290 (patch) | |
| tree | 59ff338fefc4a8e84b36cdbff00276c979b651b9 /channels | |
| parent | a25ad350e7514601f3da8940a797ed7107d70deb (diff) | |
Merged revisions 52208 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r52208 | file | 2007-01-25 12:14:53 -0500 (Thu, 25 Jan 2007) | 2 lines
Decrement onHold count if we are hung up on and still on hold. (issue #8909 reported by alexh42)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@52209 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 3dd98f54d..ca47a3011 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3119,7 +3119,7 @@ static void __sip_destroy(struct sip_pvt *p, int lockowner, int lockdialoglist) static int update_call_counter(struct sip_pvt *fup, int event) { char name[256]; - int *inuse = NULL, *call_limit = NULL, *inringing = NULL; + int *inuse = NULL, *call_limit = NULL, *inringing = NULL, *onhold = NULL; int outgoing = ast_test_flag(&fup->flags[0], SIP_OUTGOING); struct sip_user *u = NULL; struct sip_peer *p = NULL; @@ -3142,6 +3142,7 @@ static int update_call_counter(struct sip_pvt *fup, int event) inuse = &p->inUse; call_limit = &p->call_limit; inringing = &p->inRinging; + onhold = &p->onHold; ast_copy_string(name, fup->peername, sizeof(name)); } if (!p && !u) { @@ -3168,6 +3169,8 @@ static int update_call_counter(struct sip_pvt *fup, int event) ast_clear_flag(&fup->flags[1], SIP_PAGE2_INC_RINGING); } } + if (ast_test_flag(&fup->flags[1], SIP_PAGE2_CALL_ONHOLD) && global_notifyhold) + sip_peer_hold(fup, 0); if (option_debug > 1 || sipdebug) { ast_log(LOG_DEBUG, "Call %s %s '%s' removed from call limit %d\n", outgoing ? "to" : "from", u ? "user":"peer", name, *call_limit); } |