From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 8FEE25A026D for ; Thu, 21 Mar 2024 05:04:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1710993892; bh=78Cifmuy2KpwWNlSmRkq7SjNSRQtWLgrc/9xCgBav7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LqmaZSTP5Nq1GfjN8hpx7OQ6ypc8kwH5XTYt79L9imruO5SD8FeE6ngRkbEK0iY1i WKay8LdVE9ZmrX09OLcdFyKCIv30jBhw19k+yGvybxzSltFSUqwiErkppFeG0+NcJP l6Q149ALA1XDRTz35z5UZL7EnwVpkTN/6pW/VqjgVelkTZM6YqNdNviC9jKE8AsI8k qhbkk2nC8Jx0ybhaRt3gTXcJKwK3Szd9nu5HO7X6rxkaZ4QCW86eBrPy8as+ptWYNd YAE+9kGqOWQ7CJgGQCdfXkJ0Ufs4PN5ItBJNES0XLa41m2EUKNFohwfgGxIaH4hJz3 f9PSt1fQw7vqA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4V0X0h6zpHz4wnv; Thu, 21 Mar 2024 15:04:52 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 1/2] util: Add helper to return name of address family Date: Thu, 21 Mar 2024 15:04:48 +1100 Message-ID: <20240321040449.1889385-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240321040449.1889385-1-david@gibson.dropbear.id.au> References: <20240321040449.1889385-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: SHUURA4MYNLAX3ENSKLEDI5Z2NDXFKT2 X-Message-ID-Hash: SHUURA4MYNLAX3ENSKLEDI5Z2NDXFKT2 X-MailFrom: dgibson@gandalf.ozlabs.org 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: Paul Holzinger , David Gibson 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: We have a few places where we want to include the name of the internet protocol version (IPv4 or IPv6) in a message, which we handle with an open-coded ?: expression. This seems like something that might be more widely useful, so make a trivial helper to return the correct string based on the address family. Signed-off-by: David Gibson --- netlink.c | 6 +++--- util.h | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/netlink.c b/netlink.c index 9b3dba21..b068aef2 100644 --- a/netlink.c +++ b/netlink.c @@ -309,7 +309,7 @@ unsigned int nl_get_ext_if(int s, sa_family_t af) if (defifi) { if (ndef > 1) info("Multiple default %s routes, picked first", - af == AF_INET ? "IPv4" : "IPv6"); + af_name(af)); return defifi; } @@ -318,11 +318,11 @@ unsigned int nl_get_ext_if(int s, sa_family_t af) return anyifi; info("Multiple interfaces with %s routes, use -i to select one", - af == AF_INET ? "IPv4" : "IPv6"); + af_name(af)); } if (!nany) - info("No interfaces with %s routes", af == AF_INET ? "IPv4" : "IPv6"); + info("No interfaces with %s routes", af_name(af)); return 0; } diff --git a/util.h b/util.h index 0069df34..b89e5c93 100644 --- a/util.h +++ b/util.h @@ -159,6 +159,24 @@ int fls(unsigned long x); int write_file(const char *path, const char *buf); int write_remainder(int fd, const struct iovec *iov, int iovcnt, size_t skip); +/** + * af_name() - Return name of an address family + * @af: Address/protocol family (AF_INET or AF_INET6) + * + * Returns: Name of the protocol family as a string + */ +static inline const char *af_name(sa_family_t af) +{ + switch (af) { + case AF_INET: + return "IPv4"; + case AF_INET6: + return "IPv6"; + default: + return ""; + } +} + /** * mod_sub() - Modular arithmetic subtraction * @a: Minued, unsigned value < @m -- 2.44.0