aboutsummaryrefslogtreecommitdiffstats
path: root/main/asterisk.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-21 22:52:20 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-21 22:52:20 +0000
commit9cac9bf42ac6584290aabeaa5e531179092d94b2 (patch)
tree1979125b53990fa10f37ea4099e66c4931554805 /main/asterisk.c
parentb9476db2f96d5e832b2ffe400e8cec10ac7e3faa (diff)
Merged revisions 85532 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r85532 | russell | 2007-10-13 00:24:33 -0500 (Sat, 13 Oct 2007) | 8 lines Properly handle the case where read() may return the text for more than one CLI command at once for a remote console. (closes issue #10888) Reported by: jamesgolovich Patches: asterisk-climultiple.diff.txt uploaded by jamesgolovich (license 176) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@86585 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
-rw-r--r--main/asterisk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index 913859d56..1f7d91f55 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -963,7 +963,7 @@ static void *netconsole(void *vconsole)
break;
}
tmp[res] = 0;
- ast_cli_command(con->fd, tmp);
+ ast_cli_command_multiple(con->fd, res, tmp);
}
if (fds[1].revents) {
res = read(con->p[0], tmp, sizeof(tmp));