[Asterisk-cvs] asterisk/channels chan_agent.c,1.81,1.81.2.1

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv26817/channels

Modified Files:
      Tag: v1-0
	chan_agent.c 
Log Message:
Fix hangup handling with chansiavail with agent (bug #2658)


Index: chan_agent.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_agent.c,v
retrieving revision 1.81
retrieving revision 1.81.2.1
diff -u -d -r1.81 -r1.81.2.1
--- chan_agent.c	11 Aug 2004 19:02:46 -0000	1.81
+++ chan_agent.c	16 Oct 2004 15:35:23 -0000	1.81.2.1
@@ -519,9 +519,22 @@
 	ast->pvt->pvt = NULL;
 	p->app_sleep_cond = 1;
 	p->acknowledged = 0;
-	if (p->start && (ast->_state != AST_STATE_UP))
+
+	/* if they really are hung up then set start to 0 so the test
+	 * later if we're called on an already downed channel
+	 * doesn't cause an agent to be logged out like when
+	 * agent_request() is followed immediately by agent_hangup()
+	 * as in apps/app_chanisavail.c:chanavail_exec()
+	 */
+
+	ast_log(LOG_DEBUG, "Hangup called for state %s\n", ast_state2str(ast->_state));
+	if (p->start && (ast->_state != AST_STATE_UP)) {
 		howlong = time(NULL) - p->start;
-	time(&p->start);
+		p->start = 0;
+	} else if (ast->_state == AST_STATE_RESERVED) {
+		howlong = 0;
+	} else
+		p->start = 0; 
 	if (p->chan) {
 		/* If they're dead, go ahead and hang up on the agent now */
 		if (!ast_strlen_zero(p->loginchan)) {