network: Rename primary to master

The previous change made things confusing by impliying there may be a
secondary when VLAN/IPVLAN/bridge members can only have a single parent
device.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/src/lxc/network.c b/src/lxc/network.c
index a7ba8b8032d976cd39ff8570735939ddd7925c7c..bca0440597af35416cc59fe8aaef79cb10d23bb5 100644 (file)
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -531,7 +531,7 @@ on_error:
        return -1;
 }
 
-static int lxc_ipvlan_create(const char *primary, const char *name, int mode, int isolation)
+static int lxc_ipvlan_create(const char *parent, const char *name, int mode, int isolation)
 {
        call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
        struct nl_handler nlh;
@@ -540,7 +540,7 @@ static int lxc_ipvlan_create(const char *primary, const char *name, int mode, in
        struct ifinfomsg *ifi;
        struct rtattr *nest, *nest2;
 
-       len = strlen(primary);
+       len = strlen(parent);
        if (len == 1 || len >= IFNAMSIZ)
                return ret_errno(EINVAL);
 
@@ -548,7 +548,7 @@ static int lxc_ipvlan_create(const char *primary, const char *name, int mode, in
        if (len == 1 || len >= IFNAMSIZ)
                return ret_errno(EINVAL);
 
-       index = if_nametoindex(primary);
+       index = if_nametoindex(parent);
        if (!index)
                return ret_errno(EINVAL);
 
@@ -1736,7 +1736,7 @@ int lxc_veth_create(const char *name1, const char *name2, pid_t pid, unsigned in
 }
 
 /* TODO: merge with lxc_macvlan_create */
-int lxc_vlan_create(const char *primary, const char *name, unsigned short vlanid)
+int lxc_vlan_create(const char *parent, const char *name, unsigned short vlanid)
 {
        call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
        struct nl_handler nlh;
@@ -1749,7 +1749,7 @@ int lxc_vlan_create(const char *primary, const char *name, unsigned short vlanid
        if (err)
                return err;
 
-       len = strlen(primary);
+       len = strlen(parent);
        if (len == 1 || len >= IFNAMSIZ)
                return ret_errno(EINVAL);
 
@@ -1765,7 +1765,7 @@ int lxc_vlan_create(const char *primary, const char *name, unsigned short vlanid
        if (!answer)
                return ret_errno(ENOMEM);
 
-       lindex = if_nametoindex(primary);
+       lindex = if_nametoindex(parent);
        if (!lindex)
                return ret_errno(EINVAL);
 
@@ -1804,7 +1804,7 @@ int lxc_vlan_create(const char *primary, const char *name, unsigned short vlanid
        return netlink_transaction(nlh_ptr, nlmsg, answer);
 }
 
-int lxc_macvlan_create(const char *primary, const char *name, int mode)
+int lxc_macvlan_create(const char *parent, const char *name, int mode)
 {
        call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
        struct nl_handler nlh;
@@ -1817,7 +1817,7 @@ int lxc_macvlan_create(const char *primary, const char *name, int mode)
        if (err)
                return err;
 
-       len = strlen(primary);
+       len = strlen(parent);
        if (len == 1 || len >= IFNAMSIZ)
                return ret_errno(EINVAL);
 
@@ -1833,7 +1833,7 @@ int lxc_macvlan_create(const char *primary, const char *name, int mode)
        if (!answer)
                return ret_errno(ENOMEM);
 
-       index = if_nametoindex(primary);
+       index = if_nametoindex(parent);
        if (!index)
                return ret_errno(EINVAL);
 

diff --git a/src/lxc/network.h b/src/lxc/network.h
index db3c6c7fa448226cf18b301a7aed31c59889e5b1..ba35c12537403a810bae52571bb06b1c26addcf4 100644 (file)
--- a/src/lxc/network.h
+++ b/src/lxc/network.h
@@ -205,8 +205,8 @@ extern int lxc_netdev_set_mtu(const char *name, int mtu);
 /* Create a virtual network devices. */
 extern int lxc_veth_create(const char *name1, const char *name2, pid_t pid,
                           unsigned int mtu);
-extern int lxc_macvlan_create(const char *primary, const char *name, int mode);
-extern int lxc_vlan_create(const char *primary, const char *name,
+extern int lxc_macvlan_create(const char *parent, const char *name, int mode);
+extern int lxc_vlan_create(const char *parent, const char *name,
                           unsigned short vid);
 
 /* Set ip address. */