From db17b2883bd4f6d9e202388548f59f6867064027 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Thu, 10 Mar 2022 23:59:04 +0100 Subject: [PATCH] net: Make is_valid_ipv{4,6}_address() local to net.c. These inline functions are only used in net.c, so they do not need to be declared in net.h. De-doxyfy their documentation because static functions don't need doxygen comments. --- net.c | 14 ++++++++++++++ net.h | 29 ----------------------------- 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/net.c b/net.c index 23cd8032..c4f0312a 100644 --- a/net.c +++ b/net.c @@ -18,6 +18,13 @@ #include "list.h" #include "fd.h" +/* Whether the given address conforms to the IPv4 address format. */ +static inline bool is_valid_ipv4_address(const char *address) +{ + struct in_addr test_it; + return inet_pton(AF_INET, address, &test_it) != 0; +} + /** * Parse and validate IPv4 address/netmask string. * @@ -77,6 +84,13 @@ static bool is_v4_dot_quad(const char *address) return result; } +/* Whether a string conforms to IPv6 address format (RFC 4291). */ +static inline bool is_valid_ipv6_address(const char *address) +{ + struct in6_addr test_it; + return inet_pton(AF_INET6, address, &test_it) != 0; +} + /** * Perform basic syntax checking on the host-part of an URL: * diff --git a/net.h b/net.h index 8292240f..d19ceb9e 100644 --- a/net.h +++ b/net.h @@ -28,35 +28,6 @@ char *parse_url(const char *url, char *format_url(const char *url, int default_port); const char *stringify_port(int port, const char *transport); -/** - * Ensure that string conforms to the IPv4 address format. - * - * \param address The address string to check. - * - * \return 1 if \a address conforms to the IPv4 address format, else 0. - */ -_static_inline_ bool is_valid_ipv4_address(const char *address) -{ - struct in_addr test_it; - - return inet_pton(AF_INET, address, &test_it) != 0; -} - -/** - * Ensure that string conforms to IPv6 address format. - * - * \param address The address string to check. - * - * \return 1 if string has a valid IPv6 address syntax, 0 if not. - * \sa RFC 4291. - */ -_static_inline_ bool is_valid_ipv6_address(const char *address) -{ - struct in6_addr test_it; - - return inet_pton(AF_INET6, address, &test_it) != 0; -} - int lookup_address(unsigned l4type, bool passive, const char *host, int port_number, struct addrinfo **result); -- 2.39.5