Merged revisions 74379 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #10169)
................
r74379 | qwell | 2007-07-10 14:06:24 -0500 (Tue, 10 Jul 2007) | 12 lines

Merged revisions 74376 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r74376 | qwell | 2007-07-10 14:03:45 -0500 (Tue, 10 Jul 2007) | 4 lines

Fix an issue with wrapuptime not working when using AgentLogin.

Issue 10169, patch by makoto, with a minor mod by me to not re-break issue 9618

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74382 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 2bf1841..3a5def1 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -794,7 +794,7 @@ static int agent_hangup(struct ast_channel *ast)
                        /* Not dead -- check availability now */
                        ast_mutex_lock(&p->lock);
                        /* Store last disconnect time */
-                       p->lastdisc = ast_tvnow();
+                       p->lastdisc = ast_tvadd(ast_tvnow(), ast_samp2tv(p->wrapuptime, 1000));
                        ast_mutex_unlock(&p->lock);
                }
                /* Release ownership of the agent to other threads (presumably running the login app). */
@@ -814,7 +814,7 @@ static int agent_cont_sleep( void *data )
        ast_mutex_lock(&p->lock);
        res = p->app_sleep_cond;
        if (p->lastdisc.tv_sec) {
-               if (ast_tvdiff_ms(ast_tvnow(), p->lastdisc) > p->wrapuptime) 
+               if (ast_tvdiff_ms(ast_tvnow(), p->lastdisc) > 0) 
                        res = 1;
        }
        ast_mutex_unlock(&p->lock);
@@ -1260,7 +1260,9 @@ static struct ast_channel *agent_request(const char *type, int format, void *dat
                    ast_strlen_zero(p->loginchan)) {
                        if (p->chan)
                                hasagent++;
-                       if (!p->lastdisc.tv_sec) {
+                       tv = ast_tvnow();
+                       if (!p->lastdisc.tv_sec || (tv.tv_sec >= p->lastdisc.tv_sec)) {
+                               p->lastdisc = ast_tv(0, 0);
                                /* Agent must be registered, but not have any active call, and not be in a waiting state */
                                if (!p->owner && p->chan) {
                                        /* Fixed agent */
@@ -1910,7 +1912,7 @@ static int login_exec(struct ast_channel *chan, void *data)
                                                        AST_LIST_LOCK(&agents);
                                                        ast_mutex_lock(&p->lock);
                                                        if (p->lastdisc.tv_sec) {
-                                                               if (ast_tvdiff_ms(ast_tvnow(), p->lastdisc) > p->wrapuptime) {
+                                                               if (ast_tvdiff_ms(ast_tvnow(), p->lastdisc) > 0) {
                                                                        ast_debug(1, "Wrapup time for %s expired!\n", p->agent);
                                                                        p->lastdisc = ast_tv(0, 0);
                                                                        if (p->ackcall > 1)