[asterisk-commits] file: trunk r52209 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Thu Jan 25 11:17:56 2007
New Revision: 52209

URL: http://svn.digium.com/view/asterisk?view=rev&rev=52209
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=52209&r1=52208&r2=52209
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Jan 25 11:17:56 2007
@@ -3119,7 +3119,7 @@
 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 @@
 		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 @@
 				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);
 		}