Skip to content

L
lxc
Unverified Commit 51eccacb by Stéphane Graber
Options

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: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent 8254704d
Showing with 11 additions and 11 deletions
src/lxc/network.c
...@@ -531,7 +531,7 @@ on_error: ...@@ -531,7 +531,7 @@ on_error:
return -1; 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; call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
struct nl_handler nlh; struct nl_handler nlh;
...@@ -540,7 +540,7 @@ static int lxc_ipvlan_create(const char *primary, const char *name, int mode, in ...@@ -540,7 +540,7 @@ static int lxc_ipvlan_create(const char *primary, const char *name, int mode, in
struct ifinfomsg *ifi; struct ifinfomsg *ifi;
struct rtattr *nest, *nest2; struct rtattr *nest, *nest2;
len = strlen(primary); len = strlen(parent);
if (len == 1 || len >= IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
return ret_errno(EINVAL); return ret_errno(EINVAL);
...@@ -548,7 +548,7 @@ static int lxc_ipvlan_create(const char *primary, const char *name, int mode, in ...@@ -548,7 +548,7 @@ static int lxc_ipvlan_create(const char *primary, const char *name, int mode, in
if (len == 1 || len >= IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
return ret_errno(EINVAL); return ret_errno(EINVAL);
index = if_nametoindex(primary); index = if_nametoindex(parent);
if (!index) if (!index)
return ret_errno(EINVAL); return ret_errno(EINVAL);
...@@ -1736,7 +1736,7 @@ int lxc_veth_create(const char *name1, const char *name2, pid_t pid, unsigned in ...@@ -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 */ /* 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; call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
struct nl_handler nlh; struct nl_handler nlh;
...@@ -1749,7 +1749,7 @@ int lxc_vlan_create(const char *primary, const char *name, unsigned short vlanid ...@@ -1749,7 +1749,7 @@ int lxc_vlan_create(const char *primary, const char *name, unsigned short vlanid
if (err) if (err)
return err; return err;
len = strlen(primary); len = strlen(parent);
if (len == 1 || len >= IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
return ret_errno(EINVAL); return ret_errno(EINVAL);
...@@ -1765,7 +1765,7 @@ int lxc_vlan_create(const char *primary, const char *name, unsigned short vlanid ...@@ -1765,7 +1765,7 @@ int lxc_vlan_create(const char *primary, const char *name, unsigned short vlanid
if (!answer) if (!answer)
return ret_errno(ENOMEM); return ret_errno(ENOMEM);
lindex = if_nametoindex(primary); lindex = if_nametoindex(parent);
if (!lindex) if (!lindex)
return ret_errno(EINVAL); return ret_errno(EINVAL);
...@@ -1804,7 +1804,7 @@ int lxc_vlan_create(const char *primary, const char *name, unsigned short vlanid ...@@ -1804,7 +1804,7 @@ int lxc_vlan_create(const char *primary, const char *name, unsigned short vlanid
return netlink_transaction(nlh_ptr, nlmsg, answer); 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; call_cleaner(nlmsg_free) struct nlmsg *answer = NULL, *nlmsg = NULL;
struct nl_handler nlh; struct nl_handler nlh;
...@@ -1817,7 +1817,7 @@ int lxc_macvlan_create(const char *primary, const char *name, int mode) ...@@ -1817,7 +1817,7 @@ int lxc_macvlan_create(const char *primary, const char *name, int mode)
if (err) if (err)
return err; return err;
len = strlen(primary); len = strlen(parent);
if (len == 1 || len >= IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
return ret_errno(EINVAL); return ret_errno(EINVAL);
...@@ -1833,7 +1833,7 @@ int lxc_macvlan_create(const char *primary, const char *name, int mode) ...@@ -1833,7 +1833,7 @@ int lxc_macvlan_create(const char *primary, const char *name, int mode)
if (!answer) if (!answer)
return ret_errno(ENOMEM); return ret_errno(ENOMEM);
index = if_nametoindex(primary); index = if_nametoindex(parent);
if (!index) if (!index)
return ret_errno(EINVAL); return ret_errno(EINVAL);
......
src/lxc/network.h
...@@ -205,8 +205,8 @@ extern int lxc_netdev_set_mtu(const char *name, int mtu); ...@@ -205,8 +205,8 @@ extern int lxc_netdev_set_mtu(const char *name, int mtu);
/* Create a virtual network devices. */ /* Create a virtual network devices. */
extern int lxc_veth_create(const char *name1, const char *name2, pid_t pid, extern int lxc_veth_create(const char *name1, const char *name2, pid_t pid,
unsigned int mtu); unsigned int mtu);
extern int lxc_macvlan_create(const char *primary, const char *name, int mode); extern int lxc_macvlan_create(const char *parent, const char *name, int mode);
extern int lxc_vlan_create(const char *primary, const char *name, extern int lxc_vlan_create(const char *parent, const char *name,
unsigned short vid); unsigned short vid);
/* Set ip address. */ /* Set ip address. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment