Refactoring - make the option parsing code generic

diff --git a/src/lxc/arguments.h b/src/lxc/arguments.h
index 1befc8da02762d3bb17eca24cb14c7e50bbe5016..021f552e21667add03258383cd0abce189317b54 100644 (file)
--- a/src/lxc/arguments.h
+++ b/src/lxc/arguments.h
@@ -54,8 +54,7 @@ struct lxc_arguments {
        int lxcpath_additional;
 
        /* for lxc-start */
-       const char *share_net;
-       const char *share_ipc;
+       const char *share_ns[32]; // size must be greater than LXC_NS_MAX
 
        /* for lxc-checkpoint/restart */
        const char *statefile;

diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index 79186ade3e4799c64d97c28acf6ac6ba4447f3da..a7976eafbde6fcda67b300f9963e9bff65291356 100644 (file)
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -151,8 +151,8 @@ static int my_parser(struct lxc_arguments* args, int c, char* arg)
        case 'C': args->close_all_fds = 1; break;
        case 's': return lxc_config_define_add(&defines, arg);
        case 'p': args->pidfile = arg; break;
-       case OPT_SHARE_NET: args->share_net = arg; break;
-       case OPT_SHARE_IPC: args->share_ipc = arg; break;
+       case OPT_SHARE_NET: args->share_ns[LXC_NS_NET] = arg; break;
+       case OPT_SHARE_IPC: args->share_ns[LXC_NS_IPC] = arg; break;
        }
        return 0;
 }
@@ -306,26 +306,19 @@ int main(int argc, char *argv[])
                }
        }
 
-       if (my_args.share_net != NULL) {
-               int pid = pid_from_lxcname(my_args.share_net, lxcpath);
-               if (pid < 1)
-                       goto out;
-
-               int fd = open_ns(pid, "net");
-               if (fd < 0)
-                       goto out;
-               conf->inherit_ns_fd[LXC_NS_NET] = fd;
-       }
+       int i;
+       for (i = 0; i < LXC_NS_MAX; i++) {
+               if (my_args.share_ns[i] == NULL)
+                       continue;
 
-       if (my_args.share_ipc != NULL) {
-               int pid = pid_from_lxcname(my_args.share_ipc, lxcpath);
+               int pid = pid_from_lxcname(my_args.share_ns[i], lxcpath);
                if (pid < 1)
                        goto out;
 
-               int fd = open_ns(pid, "ipc");
+               int fd = open_ns(pid, ns_info[i].proc_name);
                if (fd < 0)
                        goto out;
-               conf->inherit_ns_fd[LXC_NS_IPC] = fd;
+               conf->inherit_ns_fd[i] = fd;
        }
 
        if (my_args.daemonize) {