Stefano correctly noted that the fact a socket is dual-stack doesn't
necessarily imply that it is bound to a wildcard address. While that's the
only case we use for dual-stack sockets, there may be others. Therefore
rename this function to make it clearer that it always uses a wildcard
bind.
Suggested-by: Stefano Brivio
Signed-off-by: David Gibson
---
pif.c | 2 +-
util.c | 6 +++---
util.h | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pif.c b/pif.c
index db447b4f..3d7a90e5 100644
--- a/pif.c
+++ b/pif.c
@@ -82,7 +82,7 @@ int pif_sock_l4(const struct ctx *c, enum epoll_type type, uint8_t pif,
ASSERT(pif_is_socket(pif));
if (!addr) {
- ref.fd = sock_l4_dualstack(c, type, port, ifname);
+ ref.fd = sock_l4_dualstack_any(c, type, port, ifname);
} else {
union sockaddr_inany sa;
diff --git a/util.c b/util.c
index 853c35a3..fb1945c1 100644
--- a/util.c
+++ b/util.c
@@ -198,7 +198,7 @@ int sock_l4(const struct ctx *c, enum epoll_type type,
}
/**
- * sock_l4_dualstack() - Create a dual stack socket bound with wildcard address
+ * sock_l4_dualstack_any() - Create dualstack socket bound to :: and 0.0.0.0
* @c: Execution context
* @type: epoll type
* @port Port to bind to (:: and 0.0.0.0)
@@ -208,8 +208,8 @@ int sock_l4(const struct ctx *c, enum epoll_type type,
*
* A dual stack socket is effectively bound to both :: and 0.0.0.0.
*/
-int sock_l4_dualstack(const struct ctx *c, enum epoll_type type,
- in_port_t port, const char *ifname)
+int sock_l4_dualstack_any(const struct ctx *c, enum epoll_type type,
+ in_port_t port, const char *ifname)
{
union sockaddr_inany sa = {
.sa6.sin6_family = AF_INET6,
diff --git a/util.h b/util.h
index ebc14138..21acc05f 100644
--- a/util.h
+++ b/util.h
@@ -210,8 +210,8 @@ union sockaddr_inany;
int sock_l4(const struct ctx *c, enum epoll_type type,
const union sockaddr_inany *sa, const char *ifname);
-int sock_l4_dualstack(const struct ctx *c, enum epoll_type type,
- in_port_t port, const char *ifname);
+int sock_l4_dualstack_any(const struct ctx *c, enum epoll_type type,
+ in_port_t port, const char *ifname);
int sock_unix(char *sock_path);
void sock_probe_features(struct ctx *c);
long timespec_diff_ms(const struct timespec *a, const struct timespec *b);
--
2.52.0