mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netlink, pasta: Turn nl_link_up() into a generic function to set link flags

Browse source 
In the next patches, we'll reuse it to set flags other than IFF_UP.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Stefano Brivio 2024-08-15 00:09:43 +02:00
parent 8231ce54c3
commit 0c74068f56
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
netlink.c
View file

@ -968,13 +968,16 @@ int nl_link_set_mtu(int s, unsigned int ifi, int mtu)
} }
/** /**
* nl_link_up() - Bring link up * nl_link_set_flags() - Set link flags
* @s: Netlink socket * @s: Netlink socket
* @ifi: Interface index * @ifi: Interface index
* @set: Device flags to set
* @change: Mask of device flag changes
* *
* Return: 0 on success, negative error code on failure * Return: 0 on success, negative error code on failure
*/ */
int nl_link_up(int s, unsigned int ifi) int nl_link_set_flags(int s, unsigned int ifi,
unsigned int set, unsigned int change)
{ {
struct req_t { struct req_t {
struct nlmsghdr nlh; struct nlmsghdr nlh;
@ -982,8 +985,8 @@ int nl_link_up(int s, unsigned int ifi)
} req = { } req = {
.ifm.ifi_family = AF_UNSPEC, .ifm.ifi_family = AF_UNSPEC,
.ifm.ifi_index = ifi, .ifm.ifi_index = ifi,
.ifm.ifi_flags = IFF_UP, .ifm.ifi_flags = set,
.ifm.ifi_change = IFF_UP, .ifm.ifi_change = change,
}; };
return nl_do(s, &req, RTM_NEWLINK, 0, sizeof(req)); return nl_do(s, &req, RTM_NEWLINK, 0, sizeof(req));

3
netlink.h
View file

@ -24,6 +24,7 @@ int nl_addr_dup(int s_src, unsigned int ifi_src,
int nl_link_get_mac(int s, unsigned int ifi, void *mac); int nl_link_get_mac(int s, unsigned int ifi, void *mac);
int nl_link_set_mac(int s, unsigned int ifi, const void *mac); int nl_link_set_mac(int s, unsigned int ifi, const void *mac);
int nl_link_set_mtu(int s, unsigned int ifi, int mtu); int nl_link_set_mtu(int s, unsigned int ifi, int mtu);
int nl_link_up(int s, unsigned int ifi); int nl_link_set_flags(int s, unsigned int ifi,
unsigned int set, unsigned int change);
#endif /* NETLINK_H */ #endif /* NETLINK_H */

4
pasta.c
View file

@ -288,7 +288,7 @@ void pasta_ns_conf(struct ctx *c)
{ {
int rc = 0; int rc = 0;
rc = nl_link_up(nl_sock_ns, 1 /* lo */); rc = nl_link_set_flags(nl_sock_ns, 1 /* lo */, IFF_UP, IFF_UP);
if (rc < 0) if (rc < 0)
die("Couldn't bring up loopback interface in namespace: %s", die("Couldn't bring up loopback interface in namespace: %s",
strerror(-rc)); strerror(-rc));
@ -306,7 +306,7 @@ void pasta_ns_conf(struct ctx *c)
if (c->mtu != -1) if (c->mtu != -1)
nl_link_set_mtu(nl_sock_ns, c->pasta_ifi, c->mtu); nl_link_set_mtu(nl_sock_ns, c->pasta_ifi, c->mtu);
nl_link_up(nl_sock_ns, c->pasta_ifi); nl_link_set_flags(nl_sock_ns, c->pasta_ifi, IFF_UP, IFF_UP);
if (c->ifi4) { if (c->ifi4) {
if (c->ip4.no_copy_addrs) { if (c->ip4.no_copy_addrs) {