Really include renamed console files. :-)

Signed-off-by: Keir Fraser <keir@xensource.com>

1 files changed, 228 insertions, 0 deletions

diff --git a/tools/console/client/main.c b/tools/console/client/main.c
new file mode 100644
index 0000000000..dab250baa8
--- /dev/null
+++ b/tools/console/client/main.c
@@ -0,0 +1,228 @@
+/*\
+ *  Copyright (C) International Business Machines  Corp., 2005
+ *  Author(s): Anthony Liguori <aliguori@us.ibm.com>
+ *
+ *  Xen Console Daemon
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; under version 2 of the License.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+\*/
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <time.h>
+#include <fcntl.h>
+#include <sys/wait.h>
+#include <termios.h>
+#include <signal.h>
+#include <getopt.h>
+#include <sys/select.h>
+#include <err.h>
+#include <errno.h>
+#include <pty.h>
+
+#include "xc.h"
+#include "xs.h"
+
+#define ESCAPE_CHARACTER 0x1d
+
+static volatile sig_atomic_t received_signal = 0;
+
+static void sighandler(int signum)
+{
+	received_signal = 1;
+}
+
+static bool write_sync(int fd, const void *data, size_t size)
+{
+	size_t offset = 0;
+	ssize_t len;
+
+	while (offset < size) {
+		len = write(fd, data + offset, size - offset);
+		if (len < 1) {
+			return false;
+		}
+		offset += len;
+	}
+
+	return true;
+}
+
+static void usage(const char *program) {
+	printf("Usage: %s [OPTION] DOMID\n"
+	       "Attaches to a virtual domain console\n"
+	       "\n"
+	       "  -h, --help       display this help and exit\n"
+	       , program);
+}
+
+/* don't worry too much if setting terminal attributes fail */
+static void init_term(int fd, struct termios *old)
+{
+	struct termios new_term;
+
+	if (tcgetattr(fd, old) == -1) {
+		return;
+	}
+
+	new_term = *old;
+	cfmakeraw(&new_term);
+
+	tcsetattr(fd, TCSAFLUSH, &new_term);
+}
+
+static void restore_term(int fd, struct termios *old)
+{
+	tcsetattr(fd, TCSAFLUSH, old);
+}
+
+static int console_loop(int xc_handle, domid_t domid, int fd)
+{
+	int ret;
+
+	do {
+		fd_set fds;
+
+		FD_ZERO(&fds);
+		FD_SET(STDIN_FILENO, &fds);
+		FD_SET(fd, &fds);
+
+		ret = select(fd + 1, &fds, NULL, NULL, NULL);
+		if (ret == -1) {
+			if (errno == EINTR || errno == EAGAIN) {
+				continue;
+			}
+			return -1;
+		}
+
+		if (FD_ISSET(STDIN_FILENO, &fds)) {
+			ssize_t len;
+			char msg[60];
+
+			len = read(STDIN_FILENO, msg, sizeof(msg));
+			if (len == 1 && msg[0] == ESCAPE_CHARACTER) {
+				return 0;
+			} 
+
+			if (len == 0 || len == -1) {
+				if (len == -1 &&
+				    (errno == EINTR || errno == EAGAIN)) {
+					continue;
+				}
+				return -1;
+			}
+
+			if (!write_sync(fd, msg, len)) {
+				perror("write() failed");
+				return -1;
+			}
+		}
+
+		if (FD_ISSET(fd, &fds)) {
+			ssize_t len;
+			char msg[512];
+
+			len = read(fd, msg, sizeof(msg));
+			if (len == 0 || len == -1) {
+				if (len == -1 &&
+				    (errno == EINTR || errno == EAGAIN)) {
+					continue;
+				}
+				return -1;
+			}
+
+			if (!write_sync(STDOUT_FILENO, msg, len)) {
+				perror("write() failed");
+				return -1;
+			}
+		}
+	} while (received_signal == 0);
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	struct termios attr;
+	int domid;
+	int xc_handle;
+	char *sopt = "hf:pc";
+	int ch;
+	int opt_ind=0;
+	struct option lopt[] = {
+		{ "help",    0, 0, 'h' },
+		{ "file",    1, 0, 'f' },
+		{ "pty",     0, 0, 'p' },
+		{ "ctty",    0, 0, 'c' },
+		{ 0 },
+
+	};
+	char *str_pty;
+	char path[1024];
+	int spty;
+	unsigned int len = 0;
+	struct xs_handle *xs;
+
+	while((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) {
+		switch(ch) {
+		case 'h':
+			usage(argv[0]);
+			exit(0);
+			break;
+		}
+	}
+	
+	if ((argc - optind) != 1) {
+		fprintf(stderr, "Invalid number of arguments\n");
+		fprintf(stderr, "Try `%s --help' for more information.\n", 
+			argv[0]);
+		exit(EINVAL);
+	}
+	
+	domid = atoi(argv[optind]);
+
+	xs = xs_daemon_open();
+	if (xs == NULL) {
+		err(errno, "Could not contact XenStore");
+	}
+
+	xc_handle = xc_interface_open();
+	if (xc_handle == -1) {
+		err(errno, "xc_interface_open()");
+	}
+	
+	signal(SIGTERM, sighandler);
+
+	snprintf(path, sizeof(path), "/console/%d/tty", domid);
+	str_pty = xs_read(xs, path, &len);
+	if (str_pty == NULL) {
+		err(errno, "Could not read tty from store");
+	}
+	spty = open(str_pty, O_RDWR | O_NOCTTY);
+	if (spty == -1) {
+		err(errno, "Could not open tty `%s'", str_pty);
+	}
+	free(str_pty);
+
+	init_term(STDIN_FILENO, &attr);
+	console_loop(xc_handle, domid, spty);
+	restore_term(STDIN_FILENO, &attr);
+
+	return 0;
+ }