diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-07-29 15:38:22 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-07-29 15:38:22 +0000 |
commit | d8b16d3050ccdb54c8756d65accc37c3c4877c1c (patch) | |
tree | 890beb4214316881a3f5db50a1e5e132b61a98ca /cli.c | |
parent | 272f6528dd70898bb512f75e90e737f88e50f750 (diff) |
Version 0.2.0 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@492 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cli.c')
-rwxr-xr-x | cli.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -18,6 +18,7 @@ #include <asterisk/cli.h> #include <asterisk/module.h> #include <asterisk/channel.h> +#include <asterisk/channel_pvt.h> #include <sys/signal.h> #include <stdio.h> #include <signal.h> @@ -202,7 +203,7 @@ static int handle_chanlist(int fd, int argc, char *argv[]) c = ast_channel_walk(NULL); ast_cli(fd, FORMAT_STRING2, "Channel", "Context", "Extension", "Pri", "State", "Appl.", "Data"); while(c) { - ast_cli(fd, FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->state), + ast_cli(fd, FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state), c->appl ? c->appl : "(None)", c->data ? ( strlen(c->data) ? c->data : "(Empty)" ): "(None)"); c = ast_channel_walk(c); } @@ -227,7 +228,7 @@ static int handle_softhangup(int fd, int argc, char *argv[]) while(c) { if (!strcasecmp(c->name, argv[2])) { ast_cli(fd, "Requested Hangup on channel '%s'\n", c->name); - c->softhangup = 1; + ast_softhangup(c, AST_SOFTHANGUP_EXPLICIT); break; } c = ast_channel_walk(c); @@ -289,7 +290,7 @@ static int handle_showchan(int fd, int argc, char *argv[]) " Blocking in: %s\n", 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->dnid ? c->dnid : "(N/A)" ), ast_state2str(c->_state), c->_state, c->rings, c->nativeformats, c->writeformat, c->readformat, c->fds[0], 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)")); @@ -463,7 +464,7 @@ int ast_cli_unregister(struct ast_cli_entry *e) int ast_cli_register(struct ast_cli_entry *e) { struct ast_cli_entry *cur, *l=NULL; - char fulle[80], fulltst[80]; + char fulle[80] ="", fulltst[80] =""; static int len; ast_pthread_mutex_lock(&clilock); join2(fulle, sizeof(fulle), e->cmda); |