From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 4 Sep 2020 06:27:53 +0000 (+0900)
Subject: util: drop unused socket_addr_port_from_string_auto()
X-Git-Tag: v247-rc1~292^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc7676e31397002a56e96387d031f7691da19ac4;p=thirdparty%2Fsystemd.git

util: drop unused socket_addr_port_from_string_auto()
---

diff --git a/src/shared/socket-netlink.c b/src/shared/socket-netlink.c
index dc1b27f1655..6c121a4c9aa 100644
--- a/src/shared/socket-netlink.c
+++ b/src/shared/socket-netlink.c
@@ -235,33 +235,6 @@ int socket_address_parse_and_warn(SocketAddress *a, const char *s) {
         return 0;
 }
 
-int socket_addr_port_from_string_auto(const char *s, uint16_t default_port, SocketAddress *a) {
-        union in_addr_union address;
-        uint16_t port = 0;
-        int family, r;
-
-        assert(a);
-        assert(s);
-
-        r = in_addr_port_ifindex_name_from_string_auto(s, &family, &address, &port, NULL, NULL);
-        if (r < 0)
-                return r;
-
-        if (family == AF_INET) {
-                memcpy(&a->sockaddr.in.sin_addr, &address.in.s_addr, sizeof(a->sockaddr.in.sin_addr));
-                a->sockaddr.in.sin_family = AF_INET;
-                a->size = sizeof(struct sockaddr_in);
-                a->sockaddr.in.sin_port = port ? htobe16(port) : htobe16(default_port);
-        } else {
-                memcpy(&a->sockaddr.in6.sin6_addr, &address.in6, sizeof(a->sockaddr.in6.sin6_addr));
-                a->sockaddr.in6.sin6_family = AF_INET6;
-                a->sockaddr.in6.sin6_port = port ? htobe16(port) : htobe16(default_port);
-                a->size = sizeof(struct sockaddr_in6);
-        }
-
-        return 0;
-}
-
 int socket_address_parse_netlink(SocketAddress *a, const char *s) {
         _cleanup_free_ char *word = NULL;
         unsigned group = 0;
diff --git a/src/shared/socket-netlink.h b/src/shared/socket-netlink.h
index 7fa831a8804..d019bb31c63 100644
--- a/src/shared/socket-netlink.h
+++ b/src/shared/socket-netlink.h
@@ -16,7 +16,6 @@ int make_socket_fd(int log_level, const char* address, int type, int flags);
 int socket_address_parse(SocketAddress *a, const char *s);
 int socket_address_parse_and_warn(SocketAddress *a, const char *s);
 int socket_address_parse_netlink(SocketAddress *a, const char *s);
-int socket_addr_port_from_string_auto(const char *s, uint16_t default_port, SocketAddress *a);
 
 bool socket_address_is(const SocketAddress *a, const char *s, int type);
 bool socket_address_is_netlink(const SocketAddress *a, const char *s);
diff --git a/src/test/test-socket-netlink.c b/src/test/test-socket-netlink.c
index faebbfd1382..f86f1237827 100644
--- a/src/test/test-socket-netlink.c
+++ b/src/test/test-socket-netlink.c
@@ -214,41 +214,6 @@ static void test_socket_address_is_netlink(void) {
         assert_se(!socket_address_is_netlink(&a, "route 1"));
 }
 
-static void test_socket_addr_port_from_string_auto_one(const char *in, uint16_t port, int ret, int family, const char *expected) {
-        _cleanup_free_ char *out = NULL;
-        SocketAddress a;
-        int r;
-
-        r = socket_addr_port_from_string_auto(in, port, &a);
-        if (r >= 0)
-                assert_se(sockaddr_pretty(&a.sockaddr.sa, a.size, false, true, &out) >= 0);
-
-        log_info("\"%s\" → %s → \"%s\" (expect \"%s\")", in,
-                 r >= 0 ? "✓" : "✗", empty_to_dash(out), r >= 0 ? expected ?: in : "-");
-        assert_se(r == ret);
-        if (r >= 0) {
-                assert_se(a.sockaddr.sa.sa_family == family);
-                assert_se(streq(out, expected ?: in));
-        }
-}
-
-static void test_socket_addr_port_from_string_auto(void) {
-        log_info("/* %s */", __func__);
-
-        test_socket_addr_port_from_string_auto_one("junk", 51, -EINVAL, 0, NULL);
-        test_socket_addr_port_from_string_auto_one("192.168.1.1", 53, 0, AF_INET, "192.168.1.1:53");
-        test_socket_addr_port_from_string_auto_one(".168.1.1", 53, -EINVAL, 0, NULL);
-        test_socket_addr_port_from_string_auto_one("989.168.1.1", 53, -EINVAL, 0, NULL);
-
-        test_socket_addr_port_from_string_auto_one("[::1]", 53, -EINVAL, 0, NULL);
-        test_socket_addr_port_from_string_auto_one("[::1]8888", 53, -EINVAL, 0, NULL);
-        test_socket_addr_port_from_string_auto_one("2001:db8:3c4d:15::1a2f:1a2b", 53, 0, AF_INET6, "[2001:db8:3c4d:15::1a2f:1a2b]:53");
-        test_socket_addr_port_from_string_auto_one("[2001:db8:3c4d:15::1a2f:1a2b]:2001", 53, 0, AF_INET6, "[2001:db8:3c4d:15::1a2f:1a2b]:2001");
-        test_socket_addr_port_from_string_auto_one("[::1]:0", 53, -EINVAL, 0, NULL);
-        test_socket_addr_port_from_string_auto_one("[::1]:65536", 53, -ERANGE, 0, NULL);
-        test_socket_addr_port_from_string_auto_one("[a:b:1]:8888", 53, -EINVAL, 0, NULL);
-}
-
 static void test_in_addr_ifindex_to_string_one(int f, const char *a, int ifindex, const char *b) {
         _cleanup_free_ char *r = NULL;
         union in_addr_union ua, uuaa;
@@ -390,7 +355,6 @@ int main(int argc, char *argv[]) {
         test_socket_address_get_path();
         test_socket_address_is();
         test_socket_address_is_netlink();
-        test_socket_addr_port_from_string_auto();
 
         test_in_addr_ifindex_to_string();
         test_in_addr_ifindex_from_string_auto();