dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Uhm, that should be 0! 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3556 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2004-08-01 02:39:32 +00:00
parent bca09ec25b
commit c1413a658d
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
channels/chan_agent.c
View File

@ -515,6 +515,17 @@ static int agent_hangup(struct ast_channel *ast)
if (p->chan) {
/* If they're dead, go ahead and hang up on the agent now */
if (!ast_strlen_zero(p->loginchan)) {
/* Store last disconnect time */
if (p->wrapuptime) {
gettimeofday(&p->lastdisc, NULL);
p->lastdisc.tv_usec += (p->wrapuptime % 1000) * 1000;
if (p->lastdisc.tv_usec >= 1000000) {
p->lastdisc.tv_usec -= 1000000;
p->lastdisc.tv_sec++;
}
p->lastdisc.tv_sec += (p->wrapuptime / 1000);
} else
memset(&p->lastdisc, 0, sizeof(p->lastdisc));
if (p->chan) {
/* Recognize the hangup and pass it along immediately */
ast_hangup(p->chan);
@ -1023,7 +1034,8 @@ static struct ast_channel *agent_request(char *type, int format, void *data)
if (!p->pending && ((groupmatch && (p->group & groupmatch)) || !strcmp(data, p->agent))) {
if (p->chan || !ast_strlen_zero(p->loginchan))
hasagent++;
if (!p->lastdisc.tv_sec) {
if (!p->lastdisc.tv_sec || (time(NULL) > p->lastdisc.tv_sec)) {
memset(&p->lastdisc, 0, sizeof(p->lastdisc));
/* Agent must be registered, but not have any active call, and not be in a waiting state */
if (!p->owner && p->chan) {
/* Could still get a fixed agent */

1
channels/chan_zap.c
View File

@ -1131,6 +1131,7 @@ static int isslavenative(struct zt_pvt *p, struct zt_pvt **out)
static int reset_conf(struct zt_pvt *p)
{
ZT_CONFINFO zi;
memset(&zi, 0, sizeof(zi));
p->confno = -1;
if (p->subs[SUB_REAL].zfd > -1) {
if (ioctl(p->subs[SUB_REAL].zfd, ZT_SETCONF, &zi))