From patchwork Mon May 10 13:07:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 18306 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id AB96883EE8; Mon, 10 May 2021 15:15:23 +0200 (CEST) Received: from dvalin.narfation.org (dvalin.narfation.org [IPv6:2a00:17d8:100::8b1]) by diktynna.open-mesh.org (Postfix) with ESMTPS id C84BC83E68 for ; Mon, 10 May 2021 15:15:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=narfation.org; s=20121; t=1620652072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kQkx43KxA4d+1FIGI7hfjNvvWtSnp9coinGS9U9qgD8=; b=BEDTal13th2GadSMwGoxsWKU25cfrYJ7nLPM7E1jsfKlQKZN4LooRaWBQFVsgqU8FMSkcs fSrKi7d1XcQcSHZF2YSpd/IJ29QwxZUoaerTL+OGEwkUnZo9QS9ddEb5ltXfAKILDiNAn0 Ioi3Jwy96CE9PUOkkmb/jtWbbiDx9Lk= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Cc: Sven Eckelmann Subject: [PATCH 4/4] batctl: event: Get ifname from netlink message Date: Mon, 10 May 2021 15:07:34 +0200 Message-Id: <20210510130734.41080-4-sven@narfation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210510130734.41080-1-sven@narfation.org> References: <20210510130734.41080-1-sven@narfation.org> MIME-Version: 1.0 ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1620652501; a=rsa-sha256; cv=none; b=nDPXxJTjwjA4izT3R87nx7hSW4BmSiL3Qj9XrPd7vldet13WLwGxohv6RReTDGQe3K/BX/ 2AqUtYM6/3/LQQ7Y/bjV62aOcN1cZaTooO+z6etSLieo75IlKDmb8yd6z5g5H4v6bTG8fX t15tvDUG5CAxbl1f3Nu6FA3x2IySZHc= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=pass header.d=narfation.org header.s=20121 header.b=BEDTal13; spf=pass (diktynna.open-mesh.org: domain of sven@narfation.org designates 2a00:17d8:100::8b1 as permitted sender) smtp.mailfrom=sven@narfation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1620652501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kQkx43KxA4d+1FIGI7hfjNvvWtSnp9coinGS9U9qgD8=; b=WRj3iYtdqCIcu3BROq3d+ZwQdvmYTeGXmb4oJ3tn5yaBYbblk0G0dk1ZbxZMRcwLUC9Jdm uTc5aA86/rsF3urtWdUZfJdnA+ZPkwn+07+eyt46veN8YvhLrnjpS4eeLXcYTSTXVaPXy1 c9rc+clRaJyUCpbodFCh/c98RXDWl/4= Message-ID-Hash: BIB6XU3WMNBJMTRUOO74XLSPGWUQWSHB X-Message-ID-Hash: BIB6XU3WMNBJMTRUOO74XLSPGWUQWSHB X-MailFrom: sven@narfation.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: There is no need to gather the interface name for an interface via a different syscall(s) when the kernel directly provides this information in the netlink message for this event. batman-adv provides this functionality with Linux 5.14/batman-adv 2021.2. Signed-off-by: Sven Eckelmann --- event.c | 52 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/event.c b/event.c index 955fe11..274f99f 100644 --- a/event.c +++ b/event.c @@ -174,10 +174,15 @@ static void event_parse_set_mesh(struct nlattr **attrs) ARRAY_SIZE(mesh_mandatory))) return; - mesh_ifindex = nla_get_u32(attrs[BATADV_ATTR_MESH_IFINDEX]); - meshif_name = if_indextoname(mesh_ifindex, meshif_buf); - if (!meshif_name) - return; + if (attrs[BATADV_ATTR_MESH_IFNAME]) { + meshif_name = nla_get_string(attrs[BATADV_ATTR_MESH_IFNAME]); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + mesh_ifindex = nla_get_u32(attrs[BATADV_ATTR_MESH_IFINDEX]); + meshif_name = if_indextoname(mesh_ifindex, meshif_buf); + if (!meshif_name) + return; + } printf("%s: set mesh:\n", meshif_name); @@ -305,15 +310,25 @@ static void event_parse_set_hardif(struct nlattr **attrs) ARRAY_SIZE(hardif_mandatory))) return; - mesh_ifindex = nla_get_u32(attrs[BATADV_ATTR_MESH_IFINDEX]); - meshif_name = if_indextoname(mesh_ifindex, meshif_buf); - if (!meshif_name) - return; + if (attrs[BATADV_ATTR_MESH_IFNAME]) { + meshif_name = nla_get_string(attrs[BATADV_ATTR_MESH_IFNAME]); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + mesh_ifindex = nla_get_u32(attrs[BATADV_ATTR_MESH_IFINDEX]); + meshif_name = if_indextoname(mesh_ifindex, meshif_buf); + if (!meshif_name) + return; + } - hardif_ifindex = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]); - hardif_name = if_indextoname(hardif_ifindex, hardif_buf); - if (!hardif_name) - return; + if (attrs[BATADV_ATTR_MESH_IFNAME]) { + hardif_name = nla_get_string(attrs[BATADV_ATTR_HARD_IFNAME]); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + hardif_ifindex = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]); + hardif_name = if_indextoname(hardif_ifindex, hardif_buf); + if (!hardif_name) + return; + } printf("%s (%s): set hardif:\n", meshif_name, hardif_name); @@ -350,10 +365,15 @@ static void event_parse_set_vlan(struct nlattr **attrs) ARRAY_SIZE(vlan_mandatory))) return; - mesh_ifindex = nla_get_u32(attrs[BATADV_ATTR_MESH_IFINDEX]); - meshif_name = if_indextoname(mesh_ifindex, meshif_buf); - if (!meshif_name) - return; + if (attrs[BATADV_ATTR_MESH_IFNAME]) { + meshif_name = nla_get_string(attrs[BATADV_ATTR_MESH_IFNAME]); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + mesh_ifindex = nla_get_u32(attrs[BATADV_ATTR_MESH_IFINDEX]); + meshif_name = if_indextoname(mesh_ifindex, meshif_buf); + if (!meshif_name) + return; + } vid = nla_get_u16(attrs[BATADV_ATTR_VLANID]);