confile: move lxc_list_net()

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

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 6f863e5dacaf0accfec2a83ef46a988fc55b1e72..032051555f9ccf3e712aa9570ae6d80e6bfacaea 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -3621,66 +3621,6 @@ on_error:
        return NULL;
 }
 
-int lxc_list_net(struct lxc_conf *c, const char *key, char *retv, int inlen)
-{
-       int len;
-       const char *idxstring;
-       struct lxc_config_t *config;
-       struct lxc_netdev *netdev;
-       int fulllen = 0;
-       ssize_t idx = -1;
-       char *deindexed_key = NULL;
-
-       idxstring = key + 8;
-       if (!isdigit(*idxstring))
-               return -1;
-
-       config = get_network_config_ops(key, c, &idx, &deindexed_key);
-       if (!config || idx < 0)
-               return -1;
-
-       netdev = lxc_get_netdev_by_idx(c, (unsigned int)idx, false);
-       free(deindexed_key);
-       if (!netdev)
-               return -1;
-
-       if (!retv)
-               inlen = 0;
-       else
-               memset(retv, 0, inlen);
-
-       strprint(retv, inlen, "type\n");
-       strprint(retv, inlen, "script.up\n");
-       strprint(retv, inlen, "script.down\n");
-       if (netdev->type != LXC_NET_EMPTY) {
-               strprint(retv, inlen, "flags\n");
-               strprint(retv, inlen, "link\n");
-               strprint(retv, inlen, "name\n");
-               strprint(retv, inlen, "hwaddr\n");
-               strprint(retv, inlen, "mtu\n");
-               strprint(retv, inlen, "ipv6.address\n");
-               strprint(retv, inlen, "ipv6.gateway\n");
-               strprint(retv, inlen, "ipv4.address\n");
-               strprint(retv, inlen, "ipv4.gateway\n");
-       }
-
-       switch (netdev->type) {
-       case LXC_NET_VETH:
-               strprint(retv, inlen, "veth.pair\n");
-               break;
-       case LXC_NET_MACVLAN:
-               strprint(retv, inlen, "macvlan.mode\n");
-               break;
-       case LXC_NET_VLAN:
-               strprint(retv, inlen, "vlan.id\n");
-               break;
-       case LXC_NET_PHYS:
-               break;
-       }
-
-       return fulllen;
-}
-
 /*
  * Config entry is something like "lxc.net.0.ipv4" the key 'lxc.net.'
  * was found.  So we make sure next comes an integer, find the right callback
@@ -4506,3 +4446,63 @@ int lxc_list_config_items(char *retv, int inlen)
 
        return fulllen;
 }
+
+int lxc_list_net(struct lxc_conf *c, const char *key, char *retv, int inlen)
+{
+       int len;
+       const char *idxstring;
+       struct lxc_config_t *config;
+       struct lxc_netdev *netdev;
+       int fulllen = 0;
+       ssize_t idx = -1;
+       char *deindexed_key = NULL;
+
+       idxstring = key + 8;
+       if (!isdigit(*idxstring))
+               return -1;
+
+       config = get_network_config_ops(key, c, &idx, &deindexed_key);
+       if (!config || idx < 0)
+               return -1;
+
+       netdev = lxc_get_netdev_by_idx(c, (unsigned int)idx, false);
+       free(deindexed_key);
+       if (!netdev)
+               return -1;
+
+       if (!retv)
+               inlen = 0;
+       else
+               memset(retv, 0, inlen);
+
+       strprint(retv, inlen, "type\n");
+       strprint(retv, inlen, "script.up\n");
+       strprint(retv, inlen, "script.down\n");
+       if (netdev->type != LXC_NET_EMPTY) {
+               strprint(retv, inlen, "flags\n");
+               strprint(retv, inlen, "link\n");
+               strprint(retv, inlen, "name\n");
+               strprint(retv, inlen, "hwaddr\n");
+               strprint(retv, inlen, "mtu\n");
+               strprint(retv, inlen, "ipv6.address\n");
+               strprint(retv, inlen, "ipv6.gateway\n");
+               strprint(retv, inlen, "ipv4.address\n");
+               strprint(retv, inlen, "ipv4.gateway\n");
+       }
+
+       switch (netdev->type) {
+       case LXC_NET_VETH:
+               strprint(retv, inlen, "veth.pair\n");
+               break;
+       case LXC_NET_MACVLAN:
+               strprint(retv, inlen, "macvlan.mode\n");
+               break;
+       case LXC_NET_VLAN:
+               strprint(retv, inlen, "vlan.id\n");
+               break;
+       case LXC_NET_PHYS:
+               break;
+       }
+
+       return fulllen;
+}

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index a02e93e77940a4abaef88f41613ce231fcc9eae8..34696069c0e1cfc4c5159aad81f7528e8e8f4f26 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2260,7 +2260,7 @@ static int do_lxcapi_get_keys(struct lxc_container *c, const char *key, char *re
        if (container_mem_lock(c))
                return -1;
        int ret = -1;
-       if (strncmp(key, "lxc.net.", 8) == 0)
+       if (!strncmp(key, "lxc.net.", 8))
                ret = lxc_list_net(c->lxc_conf, key, retv, inlen);
        else if (strncmp(key, "lxc.network.", 12) == 0)
                ret = lxc_list_nicconfigs_legacy(c->lxc_conf, key, retv, inlen);