From b55013b1a7e7dd7e4e90455703d272b9ffc28b64 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 20 Sep 2024 14:12:44 +1000 Subject: inany: Add inany_pton() helper We already have an inany_ntop() function to format inany addresses into text. Add inany_pton() to parse them from text, and use it in conf_ports(). Signed-off-by: David Gibson --- conf.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'conf.c') diff --git a/conf.c b/conf.c index 9f1cd83..6e62510 100644 --- a/conf.c +++ b/conf.c @@ -215,9 +215,6 @@ static void conf_ports(const struct ctx *c, char optname, const char *optarg, if (ifname == buf + 1) { /* Interface without address */ addr = NULL; } else { - struct in6_addr a6; - struct in_addr a4; - p = buf; /* Allow square brackets for IPv4 too for convenience */ @@ -226,11 +223,7 @@ static void conf_ports(const struct ctx *c, char optname, const char *optarg, p++; } - if (inet_pton(AF_INET, p, &a4)) - inany_from_af(addr, AF_INET, &a4); - else if (inet_pton(AF_INET6, p, &a6)) - inany_from_af(addr, AF_INET6, &a6); - else + if (!inany_pton(p, addr)) goto bad; } } else { -- cgit v1.2.3