From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 18 Jun 2020 08:06:55 +0000 (+0200)
Subject: tree-wide: use "primary" in networking code
X-Git-Tag: lxc-5.0.0~414
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2410ff119c49c31c8ef709d68e9a22e2c9607695;p=thirdparty%2Flxc.git

tree-wide: use "primary" in networking code

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

diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index a3cb538d1..6f52aeb2f 100644
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -389,7 +389,7 @@ extern int __build_bug_on_failed;
 #endif
 
 #ifndef BRIDGE_FLAGS_MASTER
-#define BRIDGE_FLAGS_MASTER 1 /* Bridge command to/from master */
+#define BRIDGE_FLAGS_MASTER 1 /* Bridge command to/from primary */
 #endif
 
 #ifndef BRIDGE_VLAN_INFO_PVID
diff --git a/src/lxc/network.c b/src/lxc/network.c
index b64c62d49..08a643c86 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -847,7 +847,7 @@ on_error:
 	return -1;
 }
 
-static int lxc_ipvlan_create(const char *master, const char *name, int mode, int isolation)
+static int lxc_ipvlan_create(const char *primary, const char *name, int mode, int isolation)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
 	struct nl_handler nlh;
@@ -856,7 +856,7 @@ static int lxc_ipvlan_create(const char *master, const char *name, int mode, int
 	struct ifinfomsg *ifi;
 	struct rtattr *nest, *nest2;
 
-	len = strlen(master);
+	len = strlen(primary);
 	if (len == 1 || len >= IFNAMSIZ)
 		return ret_errno(EINVAL);
 
@@ -864,7 +864,7 @@ static int lxc_ipvlan_create(const char *master, const char *name, int mode, int
 	if (len == 1 || len >= IFNAMSIZ)
 		return ret_errno(EINVAL);
 
-	index = if_nametoindex(master);
+	index = if_nametoindex(primary);
 	if (!index)
 		return ret_errno(EINVAL);
 
@@ -2052,7 +2052,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 *master, const char *name, unsigned short vlanid)
+int lxc_vlan_create(const char *primary, const char *name, unsigned short vlanid)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
 	struct nl_handler nlh;
@@ -2065,7 +2065,7 @@ int lxc_vlan_create(const char *master, const char *name, unsigned short vlanid)
 	if (err)
 		return err;
 
-	len = strlen(master);
+	len = strlen(primary);
 	if (len == 1 || len >= IFNAMSIZ)
 		return ret_errno(EINVAL);
 
@@ -2081,7 +2081,7 @@ int lxc_vlan_create(const char *master, const char *name, unsigned short vlanid)
 	if (!answer)
 		return ret_errno(ENOMEM);
 
-	lindex = if_nametoindex(master);
+	lindex = if_nametoindex(primary);
 	if (!lindex)
 		return ret_errno(EINVAL);
 
@@ -2120,7 +2120,7 @@ int lxc_vlan_create(const char *master, const char *name, unsigned short vlanid)
 	return netlink_transaction(nlh_ptr, nlmsg, answer);
 }
 
-int lxc_macvlan_create(const char *master, const char *name, int mode)
+int lxc_macvlan_create(const char *primary, const char *name, int mode)
 {
 	call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
 	struct nl_handler nlh;
@@ -2133,7 +2133,7 @@ int lxc_macvlan_create(const char *master, const char *name, int mode)
 	if (err)
 		return err;
 
-	len = strlen(master);
+	len = strlen(primary);
 	if (len == 1 || len >= IFNAMSIZ)
 		return ret_errno(EINVAL);
 
@@ -2149,7 +2149,7 @@ int lxc_macvlan_create(const char *master, const char *name, int mode)
 	if (!answer)
 		return ret_errno(ENOMEM);
 
-	index = if_nametoindex(master);
+	index = if_nametoindex(primary);
 	if (!index)
 		return ret_errno(EINVAL);
 
diff --git a/src/lxc/network.h b/src/lxc/network.h
index cd4fde323..6633432cb 100644
--- a/src/lxc/network.h
+++ b/src/lxc/network.h
@@ -208,8 +208,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 *master, const char *name, int mode);
-extern int lxc_vlan_create(const char *master, const char *name,
+extern int lxc_macvlan_create(const char *primary, const char *name, int mode);
+extern int lxc_vlan_create(const char *primary, const char *name,
 			   unsigned short vid);
 
 /* Set ip address. */