Properly handle hangups on agent, improve formatting of sample agents.conf
authorMark Spencer <markster@digium.com>
Sun, 27 Jul 2003 04:27:18 +0000 (04:27 +0000)
committerMark Spencer <markster@digium.com>
Sun, 27 Jul 2003 04:27:18 +0000 (04:27 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1228 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_agent.c
configs/agents.conf.sample

index 86a0149..34ae3dc 100755 (executable)
@@ -225,9 +225,11 @@ static struct ast_frame  *agent_read(struct ast_channel *ast)
        else
                f = &null_frame;
        if (!f) {
-               /* If there's a channel, make it NULL */
-               if (p->chan)
+               /* If there's a channel, hang it up and make it NULL */
+               if (p->chan) {
+                       ast_hangup(p->chan);
                        p->chan = NULL;
+               }
        }
        if (f && (f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_ANSWER)) {
                /* Don't pass answer along */
@@ -384,6 +386,7 @@ static int agent_hangup(struct ast_channel *ast)
                                ast_hangup(p->chan);
                                p->chan = NULL;
                        }
+                       ast_log(LOG_DEBUG, "Hungup, howlong is %d, autologoff is %d\n", howlong, p->autologoff);
                        if (howlong  && p->autologoff && (howlong > p->autologoff)) {
                                ast_log(LOG_NOTICE, "Agent '%s' didn't answer/confirm within %d seconds (waited %d)\n", p->name, p->autologoff, howlong);
                                strcpy(p->loginchan, "");
@@ -880,7 +883,7 @@ static int __login_exec(struct ast_channel *chan, void *data, int callbackmode)
                                                if( options )
                                                        if( strchr( options, 's' ) )
                                                                play_announcement = 0;
-                                               if( play_announcement )
+                                               if( !res && play_announcement )
                                                        res = ast_streamfile(chan, filename, chan->language);
                                                if (!res)
                                                        ast_waitstream(chan, "");
index b12892e..7914405 100755 (executable)
@@ -7,6 +7,7 @@
 ; Define autologoff times if appropriate.  This is how long
 ; the phone has to ring with no answer before the agent is
 ; automatically logged off (in seconds)
+;
 ;autologoff=15
 ;
 ; Define the default musiconhold for agents