Index: channels/chan_agent.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_agent.c,v
retrieving revision 1.72
diff -u -r1.72 chan_agent.c
--- channels/chan_agent.c	9 May 2004 07:51:44 -0000	1.72
+++ channels/chan_agent.c	3 Jun 2004 16:21:16 -0000
@@ -113,6 +113,7 @@
 	int abouttograb;					/* About to grab */
 	int autologoff;					/* Auto timeout time */
 	int ackcall;					/* ackcall */
+	time_t loginstart;					/* When agent first logged in (0 when logged off) */
 	time_t start;						/* When call started */
 	struct timeval lastdisc;			/* When last disconnected */
 	int wrapuptime;						/* Wrapup time in ms */
@@ -518,7 +519,19 @@
 			}
 			ast_log(LOG_DEBUG, "Hungup, howlong is %d, autologoff is %d\n", howlong, p->autologoff);
 			if (howlong  && p->autologoff && (howlong > p->autologoff)) {
+				char agent[AST_MAX_AGENT] = "";
+				long logintime = time(NULL) - p->loginstart;
+				p->loginstart = 0;
 				ast_log(LOG_NOTICE, "Agent '%s' didn't answer/confirm within %d seconds (waited %d)\n", p->name, p->autologoff, howlong);
+				manager_event(EVENT_FLAG_AGENT, "Agentcallbacklogoff",
+					"Agent: %s\r\n"
+					"Loginchan: %s\r\n"
+					"Logintime: %ld\r\n"
+					"Reason: Autologoff\r\n"
+					"Uniqueid: %s\r\n",
+					p->agent, p->loginchan, logintime, ast->uniqueid);
+				snprintf(agent, sizeof(agent), "Agent/%s", p->agent);
+				ast_queue_log("NONE", ast->uniqueid, agent, "AGENTCALLBACKLOGOFF", "%s|%ld|%s", p->loginchan, logintime, "Autologoff");
 				strcpy(p->loginchan, "");
 			}
 		} else if (p->dead) {
@@ -1120,7 +1133,6 @@
 	struct agent_pvt *p;
 	struct localuser *u;
 	struct timeval tv;
-	time_t start;
 	char user[AST_MAX_AGENT];
 	char pass[AST_MAX_AGENT];
 	char agent[AST_MAX_AGENT] = "";
@@ -1196,6 +1208,10 @@
 			if (!strcmp(p->agent, user) &&
 				!strcmp(p->password, pass) && !p->pending) {
 					if (!p->chan) {
+						char last_loginchan[80] = "";
+						long logintime;
+						snprintf(agent, sizeof(agent), "Agent/%s", p->agent);
+
 						if (callbackmode) {
 							char tmpchan[AST_MAX_BUF] = "";
 							int pos = 0;
@@ -1230,8 +1246,10 @@
 							if (!res) {
 								if (context && !ast_strlen_zero(context) && !ast_strlen_zero(tmpchan))
 									snprintf(p->loginchan, sizeof(p->loginchan), "%s@%s", tmpchan, context);
-								else
+								else {
+	                                                                strncpy(last_loginchan, p->loginchan, sizeof(last_loginchan) - 1);
 									strncpy(p->loginchan, tmpchan, sizeof(p->loginchan) - 1);
+								}
 								if (ast_strlen_zero(p->loginchan))
 									filename = "agent-loggedoff";
 								p->acknowledged = 0;
@@ -1279,6 +1297,30 @@
 							res = -1;
 						if (callbackmode && !res) {
 							/* Just say goodbye and be done with it */
+							if (!ast_strlen_zero(p->loginchan)) {
+								if (p->loginstart == 0)
+									time(&p->loginstart);
+								manager_event(EVENT_FLAG_AGENT, "Agentcallbacklogin",
+									"Agent: %s\r\n"
+									"Loginchan: %s\r\n"
+									"Uniqueid: %s\r\n",
+									p->agent, p->loginchan, chan->uniqueid);
+								ast_queue_log("NONE", chan->uniqueid, agent, "AGENTCALLBACKLOGIN", "%s", p->loginchan);
+								if (option_verbose > 2)
+									ast_verbose(VERBOSE_PREFIX_3 "Callback Agent '%s' logged in on %s\n", p->agent, p->loginchan);
+							} else {
+								logintime = time(NULL) - p->loginstart;
+								p->loginstart = 0;
+								manager_event(EVENT_FLAG_AGENT, "Agentcallbacklogoff",
+									"Agent: %s\r\n"
+									"Loginchan: %s\r\n"
+									"Logintime: %ld\r\n"
+									"Uniqueid: %s\r\n",
+									p->agent, last_loginchan, logintime, chan->uniqueid);
+								ast_queue_log("NONE", chan->uniqueid, agent, "AGENTCALLBACKLOGOFF", "%s|%ld|", last_loginchan, logintime);
+								if (option_verbose > 2)
+									ast_verbose(VERBOSE_PREFIX_3 "Callback Agent '%s' logged out\n", p->agent);
+							}
 							ast_mutex_unlock(&agentlock);
 							if (!res)
 								res = ast_safe_sleep(chan, 500);
@@ -1295,12 +1337,13 @@
 								strncpy(p->moh, chan->musicclass, sizeof(p->moh) - 1);
 #endif								
 							ast_moh_start(chan, p->moh);
+							if (p->loginstart == 0)
+								time(&p->loginstart);
 							manager_event(EVENT_FLAG_AGENT, "Agentlogin",
 								"Agent: %s\r\n"
-								"Channel: %s\r\n",
-								p->agent, chan->name);
-							time(&start);
-							snprintf(agent, sizeof(agent), "Agent/%s", p->agent);
+								"Channel: %s\r\n"
+								"Uniqueid: %s\r\n",
+								p->agent, chan->name, chan->uniqueid);
 							if (updatecdr && chan->cdr)
 								snprintf(chan->cdr->channel, sizeof(chan->cdr->channel), "Agent/%s", p->agent);
 							ast_queue_log("NONE", chan->uniqueid, agent, "AGENTLOGIN", "%s", chan->name);
@@ -1370,13 +1413,17 @@
 							if (p->chan == chan)
 								p->chan = NULL;
 							p->acknowledged = 0;
+							logintime = time(NULL) - p->loginstart;
+							p->loginstart = 0;
 							ast_mutex_unlock(&p->lock);
+							manager_event(EVENT_FLAG_AGENT, "Agentlogoff",
+								"Agent: %s\r\n"
+								"Logintime: %ld\r\n"
+								"Uniqueid: %s\r\n",
+								p->agent, logintime, chan->uniqueid);
+							ast_queue_log("NONE", chan->uniqueid, agent, "AGENTLOGOFF", "%s|%ld", chan->name, logintime);
 							if (option_verbose > 2)
 								ast_verbose(VERBOSE_PREFIX_3 "Agent '%s' logged out\n", p->agent);
-							ast_queue_log("NONE", chan->uniqueid, agent, "AGENTLOGOFF", "%s|%ld", chan->name, (long)(time(NULL) - start));
-							manager_event(EVENT_FLAG_AGENT, "Agentlogoff",
-								"Agent: %s\r\n",
-								p->agent);
 							/* If there is no owner, go ahead and kill it now */
 							if (p->dead && !p->owner)
 								free(p);
Index: doc/queuelog.txt
===================================================================
RCS file: /usr/cvsroot/asterisk/doc/queuelog.txt,v
retrieving revision 1.2
diff -u -r1.2 queuelog.txt
--- doc/queuelog.txt	14 Feb 2004 04:54:39 -0000	1.2
+++ doc/queuelog.txt	3 Jun 2004 16:21:16 -0000
@@ -22,10 +22,18 @@
 AGENTLOGIN(channel)
 The agent logged in.  The channel is recorded.
 
+AGENTCALLBACKLOGIN(exten@context)
+The callback agent logged in.  The login extension and context is recorded.
+
 AGENTLOGOFF(channel|logintime)
 The agent logged off.  The channel is recorded, along with the total time
 the agent was logged in.
 
+AGENTCALLBACKLOGOFF(exten@context|logintime|reason)
+The callback agent logged off.  The last login extension and context is
+recorded, along with the total time the agent was logged in, and the
+reason for the logoff if it was not a normal logoff (e.g., Autologoff)
+
 COMPLETEAGENT(holdtime|calltime|origposition)
 The caller was connected to an agent, and the call was terminated normally
 by the *agent*.  The caller's hold time and the length of the call are both