commands: lxc_cmd_terimal_winch()

parent dad4a039
...@@ -82,7 +82,7 @@ static const char *lxc_cmd_str(lxc_cmd_t cmd) ...@@ -82,7 +82,7 @@ static const char *lxc_cmd_str(lxc_cmd_t cmd)
{ {
static const char *const cmdname[LXC_CMD_MAX] = { static const char *const cmdname[LXC_CMD_MAX] = {
[LXC_CMD_CONSOLE] = "console", [LXC_CMD_CONSOLE] = "console",
[LXC_CMD_CONSOLE_WINCH] = "console_winch", [LXC_CMD_TERMINAL_WINCH] = "terminal_winch",
[LXC_CMD_STOP] = "stop", [LXC_CMD_STOP] = "stop",
[LXC_CMD_GET_STATE] = "get_state", [LXC_CMD_GET_STATE] = "get_state",
[LXC_CMD_GET_INIT_PID] = "get_init_pid", [LXC_CMD_GET_INIT_PID] = "get_init_pid",
...@@ -659,18 +659,18 @@ static int lxc_cmd_stop_callback(int fd, struct lxc_cmd_req *req, ...@@ -659,18 +659,18 @@ static int lxc_cmd_stop_callback(int fd, struct lxc_cmd_req *req,
} }
/* /*
* lxc_cmd_console_winch: To process as if a SIGWINCH were received * lxc_cmd_terminal_winch: To process as if a SIGWINCH were received
* *
* @name : name of container to connect to * @name : name of container to connect to
* @lxcpath : the lxcpath in which the container is running * @lxcpath : the lxcpath in which the container is running
* *
* Returns 0 on success, < 0 on failure * Returns 0 on success, < 0 on failure
*/ */
int lxc_cmd_console_winch(const char *name, const char *lxcpath) int lxc_cmd_terminal_winch(const char *name, const char *lxcpath)
{ {
int ret, stopped; int ret, stopped;
struct lxc_cmd_rr cmd = { struct lxc_cmd_rr cmd = {
.req = { .cmd = LXC_CMD_CONSOLE_WINCH }, .req = { .cmd = LXC_CMD_TERMINAL_WINCH },
}; };
ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL); ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
...@@ -680,8 +680,8 @@ int lxc_cmd_console_winch(const char *name, const char *lxcpath) ...@@ -680,8 +680,8 @@ int lxc_cmd_console_winch(const char *name, const char *lxcpath)
return 0; return 0;
} }
static int lxc_cmd_console_winch_callback(int fd, struct lxc_cmd_req *req, static int lxc_cmd_terminal_winch_callback(int fd, struct lxc_cmd_req *req,
struct lxc_handler *handler) struct lxc_handler *handler)
{ {
struct lxc_cmd_rsp rsp = { .data = 0 }; struct lxc_cmd_rsp rsp = { .data = 0 };
...@@ -1052,7 +1052,7 @@ static int lxc_cmd_process(int fd, struct lxc_cmd_req *req, ...@@ -1052,7 +1052,7 @@ static int lxc_cmd_process(int fd, struct lxc_cmd_req *req,
callback cb[LXC_CMD_MAX] = { callback cb[LXC_CMD_MAX] = {
[LXC_CMD_CONSOLE] = lxc_cmd_console_callback, [LXC_CMD_CONSOLE] = lxc_cmd_console_callback,
[LXC_CMD_CONSOLE_WINCH] = lxc_cmd_console_winch_callback, [LXC_CMD_TERMINAL_WINCH] = lxc_cmd_terminal_winch_callback,
[LXC_CMD_STOP] = lxc_cmd_stop_callback, [LXC_CMD_STOP] = lxc_cmd_stop_callback,
[LXC_CMD_GET_STATE] = lxc_cmd_get_state_callback, [LXC_CMD_GET_STATE] = lxc_cmd_get_state_callback,
[LXC_CMD_GET_INIT_PID] = lxc_cmd_get_init_pid_callback, [LXC_CMD_GET_INIT_PID] = lxc_cmd_get_init_pid_callback,
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
typedef enum { typedef enum {
LXC_CMD_CONSOLE, LXC_CMD_CONSOLE,
LXC_CMD_CONSOLE_WINCH, LXC_CMD_TERMINAL_WINCH,
LXC_CMD_STOP, LXC_CMD_STOP,
LXC_CMD_GET_STATE, LXC_CMD_GET_STATE,
LXC_CMD_GET_INIT_PID, LXC_CMD_GET_INIT_PID,
...@@ -84,7 +84,7 @@ struct lxc_cmd_console_log { ...@@ -84,7 +84,7 @@ struct lxc_cmd_console_log {
}; };
extern int lxc_cmd_console_winch(const char *name, const char *lxcpath); extern int lxc_cmd_terminal_winch(const char *name, const char *lxcpath);
extern int lxc_cmd_console(const char *name, int *ttynum, int *fd, extern int lxc_cmd_console(const char *name, int *ttynum, int *fd,
const char *lxcpath); const char *lxcpath);
/* /*
......
...@@ -93,7 +93,7 @@ static void lxc_terminal_winch(struct lxc_tty_state *ts) ...@@ -93,7 +93,7 @@ static void lxc_terminal_winch(struct lxc_tty_state *ts)
lxc_terminal_winsz(ts->stdinfd, ts->masterfd); lxc_terminal_winsz(ts->stdinfd, ts->masterfd);
if (ts->winch_proxy) if (ts->winch_proxy)
lxc_cmd_console_winch(ts->winch_proxy, ts->winch_proxy_lxcpath); lxc_cmd_terminal_winch(ts->winch_proxy, ts->winch_proxy_lxcpath);
} }
void lxc_terminal_sigwinch(int sig) void lxc_terminal_sigwinch(int sig)
...@@ -1023,7 +1023,7 @@ int lxc_console(struct lxc_container *c, int ttynum, ...@@ -1023,7 +1023,7 @@ int lxc_console(struct lxc_container *c, int ttynum,
istty = isatty(stdinfd); istty = isatty(stdinfd);
if (istty) { if (istty) {
lxc_terminal_winsz(stdinfd, masterfd); lxc_terminal_winsz(stdinfd, masterfd);
lxc_cmd_console_winch(ts->winch_proxy, ts->winch_proxy_lxcpath); lxc_cmd_terminal_winch(ts->winch_proxy, ts->winch_proxy_lxcpath);
} else { } else {
INFO("File descriptor %d does not refer to a tty device", stdinfd); INFO("File descriptor %d does not refer to a tty device", stdinfd);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment