From ae7a38d87b5c71cc03ea899322badc2887dfa872 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 2 May 2007 20:55:00 +0000 Subject: [PATCH] Backport the change that only went in to trunk that fixes the command manager action over http. (reported internally by pari and bkruse) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@62739 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/main/manager.c b/main/manager.c index 07458a5068..32a8133a64 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1612,11 +1612,24 @@ static int action_command(struct mansession *s, const struct message *m) { const char *cmd = astman_get_header(m, "Command"); const char *id = astman_get_header(m, "ActionID"); + char *buf; + char template[] = "/tmp/ast-ami-XXXXXX"; /* template for temporary file */ + int fd = mkstemp(template); + off_t l; + astman_append(s, "Response: Follows\r\nPrivilege: Command\r\n"); if (!ast_strlen_zero(id)) astman_append(s, "ActionID: %s\r\n", id); /* FIXME: Wedge a ActionID response in here, waiting for later changes */ - ast_cli_command(s->fd, cmd); + ast_cli_command(fd, cmd); /* XXX need to change this to use a FILE * */ + l = lseek(fd, 0, SEEK_END); /* how many chars available */ + buf = alloca(l+1); + lseek(fd, 0, SEEK_SET); + read(fd, buf, l); + buf[l] = '\0'; + close(fd); + unlink(template); + astman_append(s, buf); astman_append(s, "--END COMMAND--\r\n\r\n"); return 0; }