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: https://origsvn.digium.com/svn/asterisk/trunk@52209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-01-25 17:17:56 +00:00
parent 48e707b6aa
commit afb9151e19
+4 -1
View File
@@ -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);
}