Strip terminal escape sequences from CLI command output that is going to be

sent out over the manager interface.
(issue #9659, reported by pari, fixed by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@63804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Russell Bryant 18 years ago
parent a75d0f5329
commit 2465ea2cfa

@ -68,6 +68,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/http.h" #include "asterisk/http.h"
#include "asterisk/threadstorage.h" #include "asterisk/threadstorage.h"
#include "asterisk/linkedlists.h" #include "asterisk/linkedlists.h"
#include "asterisk/term.h"
struct fast_originate_helper { struct fast_originate_helper {
char tech[AST_MAX_EXTENSION]; char tech[AST_MAX_EXTENSION];
@ -1612,7 +1613,7 @@ static int action_command(struct mansession *s, const struct message *m)
{ {
const char *cmd = astman_get_header(m, "Command"); const char *cmd = astman_get_header(m, "Command");
const char *id = astman_get_header(m, "ActionID"); const char *id = astman_get_header(m, "ActionID");
char *buf; char *buf, *final_buf;
char template[] = "/tmp/ast-ami-XXXXXX"; /* template for temporary file */ char template[] = "/tmp/ast-ami-XXXXXX"; /* template for temporary file */
int fd = mkstemp(template); int fd = mkstemp(template);
off_t l; off_t l;
@ -1623,13 +1624,16 @@ static int action_command(struct mansession *s, const struct message *m)
/* FIXME: Wedge a ActionID response in here, waiting for later changes */ /* FIXME: Wedge a ActionID response in here, waiting for later changes */
ast_cli_command(fd, cmd); /* XXX need to change this to use a FILE * */ ast_cli_command(fd, cmd); /* XXX need to change this to use a FILE * */
l = lseek(fd, 0, SEEK_END); /* how many chars available */ l = lseek(fd, 0, SEEK_END); /* how many chars available */
buf = alloca(l+1); buf = alloca(l + 1);
final_buf = alloca(l + 1);
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
read(fd, buf, l); read(fd, buf, l);
buf[l] = '\0'; buf[l] = '\0';
close(fd); close(fd);
unlink(template); unlink(template);
astman_append(s, buf); term_strip(final_buf, buf, l);
final_buf[l] = '\0';
astman_append(s, final_buf);
astman_append(s, "--END COMMAND--\r\n\r\n"); astman_append(s, "--END COMMAND--\r\n\r\n");
return 0; return 0;
} }

Loading…
Cancel
Save