mer feb 26 20:41:00 CET 2003

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

agi/eagi-sphinx-test.c

@@ -1,7 +1,9 @@
 /*
  * Extended AGI test application
  *
- * Copyright (C) 2003, Digium, Inc.
+ * This code is released into public domain
+ * without any warranty of any kind.
+ *
  */
 
 #include <stdio.h>

agi/eagi-test.c

@@ -1,7 +1,8 @@
 /*
  * Extended AGI test application
  *
- * Copyright (C) 2003, Digium, Inc.
+ * This code is released into the public domain
+ * with no warranty of any kind
  */
 
 #include <stdio.h>

channels/chan_zap.c

@@ -2375,6 +2375,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
 			break;
 		case ZT_EVENT_ALARM:
 			p->inalarm = 1;
+			ast_log(LOG_WARNING, "Detected alarm on channel %d\n", p->channel);
 			/* fall through intentionally */
 		case ZT_EVENT_ONHOOK:
 			if (p->radio)
@@ -4075,9 +4076,11 @@ static int handle_init_event(struct zt_pvt *i, int event)
 		break;
 	case ZT_EVENT_NOALARM:
 		i->inalarm = 0;
+		ast_log(LOG_NOTICE, "Alarm cleared on channel %d\n", i->channel);
 		break;
 	case ZT_EVENT_ALARM:
 		i->inalarm = 1;
+		ast_log(LOG_WARNING, "Alarm detected on channel %d\n", i->channel);
 		/* fall thru intentionally */
 	case ZT_EVENT_ONHOOK:
 		/* Back on hook.  Hang up. */
@@ -4106,6 +4109,10 @@ static int handle_init_event(struct zt_pvt *i, int event)
 			res = tone_zone_play_tone(i->subs[SUB_REAL].zfd, -1);
 			zt_set_hook(i->subs[SUB_REAL].zfd, ZT_ONHOOK);
 			break;
+		case SIG_PRI:
+			zt_disable_ec(i);
+			res = tone_zone_play_tone(i->subs[SUB_REAL].zfd, -1);
+			break;
 		default:
 			ast_log(LOG_WARNING, "Don't know how to handle on hook with signalling %s on channel %d\n", sig2str(i->sig), i->channel);
 			res = tone_zone_play_tone(i->subs[SUB_REAL].zfd, -1);

cli.c

@@ -345,6 +345,7 @@ static int handle_showchan(int fd, int argc, char *argv[])
 	"1st File Descriptor: %d\n"
 	"      Frames in: %d\n"
 	"     Frames out: %d\n"
+	" Time to Hangup: %d\n"
 	" --   PBX   --\n"
 	"        Context: %s\n"
 	"      Extension: %s\n"
@@ -356,7 +357,8 @@ static int handle_showchan(int fd, int argc, char *argv[])
 	c->name, c->type, 
 	(c->callerid ? c->callerid : "(N/A)"),
 	(c->dnid ? c->dnid : "(N/A)" ), ast_state2str(c->_state), c->_state, c->rings, c->nativeformats, c->writeformat, c->readformat,
-	c->fds[0], c->fin, c->fout, c->context, c->exten, c->priority, ( c->appl ? c->appl : "(N/A)" ),
+	c->fds[0], c->fin, c->fout, c->whentohangup,
+	c->context, c->exten, c->priority, ( c->appl ? c->appl : "(N/A)" ),
 	( c-> data ? (strlen(c->data) ? c->data : "(Empty)") : "(None)"),
 	c->stack, (c->blocking ? c->blockproc : "(Not Blocking)"));