From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>, passt-dev@passt.top
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH 11/16] inany: Add inany_ntop() helper
Date: Mon, 29 Jan 2024 15:35:52 +1100 [thread overview]
Message-ID: <20240129043557.823451-12-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20240129043557.823451-1-david@gibson.dropbear.id.au>
Add this helper to format an inany into either IPv4 or IPv6 text format as
appropriate.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
Makefile | 6 +++---
inany.c | 35 +++++++++++++++++++++++++++++++++++
inany.h | 4 ++++
3 files changed, 42 insertions(+), 3 deletions(-)
create mode 100644 inany.c
diff --git a/Makefile b/Makefile
index af4fa87e..1c709229 100644
--- a/Makefile
+++ b/Makefile
@@ -45,9 +45,9 @@ FLAGS += -DVERSION=\"$(VERSION)\"
FLAGS += -DDUAL_STACK_SOCKETS=$(DUAL_STACK_SOCKETS)
PASST_SRCS = arch.c arp.c checksum.c conf.c dhcp.c dhcpv6.c flow.c icmp.c \
- igmp.c isolation.c lineread.c log.c mld.c ndp.c netlink.c packet.c \
- passt.c pasta.c pcap.c pif.c port_fwd.c tap.c tcp.c tcp_splice.c udp.c \
- util.c
+ igmp.c inany.c isolation.c lineread.c log.c mld.c ndp.c netlink.c \
+ packet.c passt.c pasta.c pcap.c pif.c port_fwd.c tap.c tcp.c \
+ tcp_splice.c udp.c util.c
QRAP_SRCS = qrap.c
SRCS = $(PASST_SRCS) $(QRAP_SRCS)
diff --git a/inany.c b/inany.c
new file mode 100644
index 00000000..edf0b055
--- /dev/null
+++ b/inany.c
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright Red Hat
+ * Author: David Gibson <david@gibson.dropbear.id.au>
+ *
+ * inany.c - Types and helpers for handling addresses which could be
+ * IPv6 or IPv4 (encoded as IPv4-mapped IPv6 addresses)
+ */
+
+#include <stdlib.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include "util.h"
+#include "siphash.h"
+#include "inany.h"
+
+/** inany_ntop - Convert an IPv[46] address to text format
+ * @src: IPv[46] address
+ * @dst: output buffer, minimum INANY_ADDRSTRLEN bytes
+ * @size: size of buffer at @dst
+ *
+ * Return: On success, a non-null pointer to @dst, NULL on failure
+ */
+/* cppcheck-suppress unusedFunction */
+const char *inany_ntop(const union inany_addr *src, char *dst, socklen_t size)
+{
+ const struct in_addr *v4 = inany_v4(src);
+
+ if (v4)
+ return inet_ntop(AF_INET, v4, dst, size);
+
+ return inet_ntop(AF_INET6, &src->a6, dst, size);
+}
diff --git a/inany.h b/inany.h
index d758f7ba..d08d1f33 100644
--- a/inany.h
+++ b/inany.h
@@ -125,4 +125,8 @@ static inline void inany_siphash_feed(struct siphash_state *state,
siphash_feed(state, (uint64_t)aa->u32[2] << 32 | aa->u32[3]);
}
+#define INANY_ADDRSTRLEN MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN)
+
+const char *inany_ntop(const union inany_addr *src, char *dst, socklen_t size);
+
#endif /* INANY_H */
--
@@ -125,4 +125,8 @@ static inline void inany_siphash_feed(struct siphash_state *state,
siphash_feed(state, (uint64_t)aa->u32[2] << 32 | aa->u32[3]);
}
+#define INANY_ADDRSTRLEN MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN)
+
+const char *inany_ntop(const union inany_addr *src, char *dst, socklen_t size);
+
#endif /* INANY_H */
--
2.43.0
next prev parent reply other threads:[~2024-01-29 4:36 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-29 4:35 [PATCH 00/16] More flow table preliminaries: address handling improvements David Gibson
2024-01-29 4:35 ` [PATCH 01/16] treewide: Use sa_family_t for address family variables David Gibson
2024-01-29 4:35 ` [PATCH 02/16] tcp, udp: Don't precompute port remappings in epoll references David Gibson
2024-01-29 4:35 ` [PATCH 03/16] flow: Add helper to determine a flow's protocol David Gibson
2024-01-29 4:35 ` [PATCH 04/16] tcp_splice: Simplify clean up logic David Gibson
2024-01-29 4:35 ` [PATCH 05/16] inany: Helper to test for IPv4 or IPv6 loopback address David Gibson
2024-01-29 4:35 ` [PATCH 06/16] tcp, tcp_splice: Helpers for getting sockets from the pools David Gibson
2024-01-29 4:35 ` [PATCH 07/16] tcp_splice: More specific variable names in new splice path David Gibson
2024-01-29 4:35 ` [PATCH 08/16] tcp_splice: Fix incorrect parameter comment for tcp_splice_connect() David Gibson
2024-01-29 4:35 ` [PATCH 09/16] tcp_splice: Merge tcp_splice_new() into its caller David Gibson
2024-01-29 4:35 ` [PATCH 10/16] tcp_splice: Improve error reporting on connect path David Gibson
2024-01-29 4:35 ` David Gibson [this message]
2024-01-29 4:35 ` [PATCH 12/16] tcp_splice: Improve logic deciding when to splice David Gibson
2024-01-29 4:35 ` [PATCH 13/16] util: Provide global constants for IPv4 loopback and unspecified address David Gibson
2024-01-29 4:35 ` [PATCH 14/16] inany: Introduce union sockaddr_inany David Gibson
2024-01-29 4:35 ` [PATCH 15/16] tcp, tcp_splice: Better construction of IPv4 or IPv6 sockaddrs David Gibson
2024-01-29 4:35 ` [PATCH 16/16] inany: Extend inany_from_af to easily set unspecified addresses David Gibson
2024-01-29 9:02 ` [PATCH 00/16] More flow table preliminaries: address handling improvements David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240129043557.823451-12-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).