From 35be16d7cc331631174e422fd332e1c8902e464a Mon Sep 17 00:00:00 2001 From: Michel Normand Date: Wed, 7 Oct 2009 16:06:08 +0200 Subject: [PATCH] ttyclient_handler is only cleanup on disconnect this is only a code split to show the real functionality of this function that is not expecting any received data on the connection Signed-off-by: Michel Normand Signed-off-by: Daniel Lezcano --- src/lxc/start.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/lxc/start.c b/src/lxc/start.c index 8a24c554d..05020e0c8 100644 --- a/src/lxc/start.c +++ b/src/lxc/start.c @@ -175,23 +175,35 @@ static int sigchld_handler(int fd, void *data, return 1; } -static int ttyclient_handler(int fd, void *data, - struct lxc_epoll_descr *descr) +static void ttyinfo_remove_fd(int fd, struct lxc_tty_info *tty_info) { int i; - struct lxc_tty_info *tty_info = data; for (i = 0; i < tty_info->nbtty; i++) { if (tty_info->pty_info[i].busy != fd) continue; - lxc_mainloop_del_handler(descr, fd); tty_info->pty_info[i].busy = 0; - close(fd); } - return 0; + return; +} + +static void command_fd_cleanup(int fd, struct lxc_tty_info *tty_info, + struct lxc_epoll_descr *descr) +{ + ttyinfo_remove_fd(fd, tty_info); + lxc_mainloop_del_handler(descr, fd); + close(fd); +} + +static int ttyclient_handler(int fd, void *data, + struct lxc_epoll_descr *descr) +{ + struct lxc_tty_info *tty_info = data; + + command_fd_cleanup(fd, tty_info, descr); } static int ttyservice_handler(int fd, void *data,