[svn-commits] rizzo: trunk r45330 - /trunk/main/manager.c

Tue Oct 17 10:42:00 MST 2006

Author: rizzo
Date: Tue Oct 17 12:41:59 2006
New Revision: 45330

URL: http://svn.digium.com/view/asterisk?rev=45330&view=rev
Log:
open a temporary file to receive the output from cli commands
invoked through the http interface.

It is not terribly efficient but better than no output at all.
Todo: use a configurable /tmp directory instead of a hardwired one.


Modified:
    trunk/main/manager.c

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?rev=45330&r1=45329&r2=45330&view=diff
==============================================================================

--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Tue Oct 17 12:41:59 2006
@@ -1172,7 +1172,7 @@
 		ast_mutex_unlock(&s->__lock);
 		if (needexit)
 			break;
-		if (s->fd > 0) {
+		if (!s->inuse && s->fd > 0) {
 			if (ast_wait_for_input(s->fd, 1000))
 				break;
 		} else {
@@ -2445,6 +2445,11 @@
 			ast_build_string(&c, &len, "<body bgcolor=\"#ffffff\"><table align=center bgcolor=\"#f1f1f1\" width=\"500\">\r\n");
 			ast_build_string(&c, &len, "<tr><td colspan=\"2\" bgcolor=\"#f1f1ff\"><h1>&nbsp;&nbsp;Manager Tester</h1></td></tr>\r\n");
 		}
+		{
+			char template[32];
+			ast_copy_string(template, "/tmp/ast-http-XXXXXX", sizeof(template));
+			s->fd = mkstemp(template);
+		}
 		if (process_message(s, &m)) {
 			if (s->authenticated) {
 				if (option_verbose > 1) {
@@ -2461,6 +2466,25 @@
 			}
 			s->needdestroy = 1;
 		}
+		if (s->fd > -1) {	/* have temporary output */
+			char *buf;
+			off_t len = lseek(s->fd, 0, SEEK_END);	/* how many chars available */
+
+			if (len > 0 && (buf = ast_calloc(1, len+1))) {
+				if (!s->outputstr)
+					s->outputstr = ast_calloc(1, sizeof(*s->outputstr));
+				if (s->outputstr) {
+					lseek(s->fd, 0, SEEK_SET);
+					read(s->fd, buf, len);
+					ast_verbose("--- fd %d has %d bytes ---\n%s\n---\n", s->fd, (int)len, buf);
+					ast_dynamic_str_append(&s->outputstr, 0, "%s", buf);
+				}
+				free(buf);
+			}
+			close(s->fd);
+			s->fd = -1;
+		}
+
 		if (s->outputstr) {
 			char *tmp;
 			if (format == FORMAT_XML)

