From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by passt.top (Postfix, from userid 1000) id 24C645A0277; Thu, 15 Aug 2024 10:36:49 +0200 (CEST) From: Stefano Brivio To: passt-dev@passt.top Subject: [PATCH v2 3/7] netlink, pasta: Turn nl_link_up() into a generic function to set link flags Date: Thu, 15 Aug 2024 10:36:45 +0200 Message-ID: <20240815083649.4188007-4-sbrivio@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240815083649.4188007-1-sbrivio@redhat.com> References: <20240815083649.4188007-1-sbrivio@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: MLYKHYHBN7BVFNZVDC4O7I33VN7G4DWY X-Message-ID-Hash: MLYKHYHBN7BVFNZVDC4O7I33VN7G4DWY X-MailFrom: sbrivio@passt.top X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson , Paul Holzinger X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: In the next patches, we'll reuse it to set flags other than IFF_UP. Signed-off-by: Stefano Brivio Reviewed-by: David Gibson --- netlink.c | 11 +++++++---- netlink.h | 3 ++- pasta.c | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/netlink.c b/netlink.c index e33765e..873e6c7 100644 --- a/netlink.c +++ b/netlink.c @@ -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 * @ifi: Interface index + * @set: Device flags to set + * @change: Mask of device flag changes * * 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 nlmsghdr nlh; @@ -982,8 +985,8 @@ int nl_link_up(int s, unsigned int ifi) } req = { .ifm.ifi_family = AF_UNSPEC, .ifm.ifi_index = ifi, - .ifm.ifi_flags = IFF_UP, - .ifm.ifi_change = IFF_UP, + .ifm.ifi_flags = set, + .ifm.ifi_change = change, }; return nl_do(s, &req, RTM_NEWLINK, 0, sizeof(req)); diff --git a/netlink.h b/netlink.h index 87d27ae..178f8ae 100644 --- a/netlink.h +++ b/netlink.h @@ -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_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_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 */ diff --git a/pasta.c b/pasta.c index 3a0652e..96545b1 100644 --- a/pasta.c +++ b/pasta.c @@ -288,7 +288,7 @@ void pasta_ns_conf(struct ctx *c) { 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) die("Couldn't bring up loopback interface in namespace: %s", strerror(-rc)); @@ -306,7 +306,7 @@ void pasta_ns_conf(struct ctx *c) if (c->mtu != -1) 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->ip4.no_copy_addrs) { -- 2.43.0