start: non-functional changes

This renames the socketpair() variable "ttysock" to "data_sock" since we will
use it to send arbitrary data around, not just ttys anymore.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index d92937ce7ed3103753c075a3728448a18406d825..52ada2ffa397cb7c0d7bcbc149ce116b91c6cc9b 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3010,7 +3010,7 @@ static int lxc_send_ttys_to_parent(struct lxc_handler *handler)
        struct lxc_pty_info *pty_info;
        struct lxc_conf *conf = handler->conf;
        const struct lxc_tty_info *tty_info = &conf->tty_info;
-       int sock = handler->ttysock[0];
+       int sock = handler->data_sock[0];
        int ret = -1;
        size_t num_ttyfds = (2 * conf->tty);
 
@@ -3034,8 +3034,8 @@ static int lxc_send_ttys_to_parent(struct lxc_handler *handler)
        else
                TRACE("sent %d ttys to parent", conf->tty);
 
-       close(handler->ttysock[0]);
-       close(handler->ttysock[1]);
+       close(handler->data_sock[0]);
+       close(handler->data_sock[1]);
 
        for (i = 0; i < num_ttyfds; i++)
                close(ttyfds[i]);

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 327c7cb950168eead187337ebb40cb6e4f622335..529f67c2786f7c8aed7c789c0cce2fe0f618612e 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -532,7 +532,7 @@ struct lxc_handler *lxc_init_handler(const char *name, struct lxc_conf *conf,
 
        memset(handler, 0, sizeof(*handler));
 
-       handler->ttysock[0] = handler->ttysock[1] = -1;
+       handler->data_sock[0] = handler->data_sock[1] = -1;
        handler->conf = conf;
        handler->lxcpath = lxcpath;
        handler->pinfd = -1;
@@ -756,9 +756,9 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
                free(cur);
        }
 
-       if (handler->ttysock[0] != -1) {
-               close(handler->ttysock[0]);
-               close(handler->ttysock[1]);
+       if (handler->data_sock[0] != -1) {
+               close(handler->data_sock[0]);
+               close(handler->data_sock[1]);
        }
 
        if (handler->conf->ephemeral == 1 && handler->conf->reboot != 1)
@@ -1193,7 +1193,7 @@ static int lxc_recv_ttys_from_child(struct lxc_handler *handler)
        int *ttyfds;
        struct lxc_pty_info *pty_info;
        int ret = -1;
-       int sock = handler->ttysock[1];
+       int sock = handler->data_sock[1];
        struct lxc_conf *conf = handler->conf;
        struct lxc_tty_info *tty_info = &conf->tty_info;
        size_t num_ttyfds = (2 * conf->tty);
@@ -1266,7 +1266,7 @@ void resolve_clone_flags(struct lxc_handler *handler)
  */
 static int lxc_spawn(struct lxc_handler *handler)
 {
-       int i, flags, nveths;
+       int i, flags, nveths, ret;
        const char *name = handler->name;
        bool wants_to_map_ids;
        int netpipepair[2], saved_ns_fd[LXC_NS_MAX];
@@ -1285,7 +1285,8 @@ static int lxc_spawn(struct lxc_handler *handler)
        if (lxc_sync_init(handler))
                return -1;
 
-       if (socketpair(AF_UNIX, SOCK_DGRAM, 0, handler->ttysock) < 0) {
+       ret = socketpair(AF_UNIX, SOCK_DGRAM, 0, handler->data_sock);
+       if (ret < 0) {
                lxc_sync_fini(handler);
                return -1;
        }

diff --git a/src/lxc/start.h b/src/lxc/start.h
index d8d06cfbffef972ef8b5551c10fa1a47eee27c35..272abb07648efba996ddd3acf1b3471fa9daf907 100644 (file)
--- a/src/lxc/start.h
+++ b/src/lxc/start.h
@@ -48,13 +48,17 @@ struct lxc_handler {
        int pinfd;
        const char *lxcpath;
        void *cgroup_data;
-       int ttysock[2]; // socketpair for child->parent tty fd passing
-       bool backgrounded; // indicates whether should we close std{in,out,err} on start
+
+       /* Abstract unix domain SOCK_DGRAM socketpair to pass arbitrary data
+        * between child and parent.
+        */
+       int data_sock[2];
+
+       /* indicates whether should we close std{in,out,err} on start */
+       bool backgrounded;
        int nsfd[LXC_NS_MAX];
        int netnsfd;
-       /* The socketpair() fds used to wait on successful daemonized
-        * startup.
-        */
+       /* The socketpair() fds used to wait on successful daemonized startup. */
        int state_socket_pair[2];
        struct lxc_list state_clients;
 };