From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 5 Sep 2020 15:12:06 +0000 (+0200)
Subject: Get rid of in_addr_port_from_string_auto() again
X-Git-Tag: v247-rc1~261^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=222eaaf937d3d39beaea1878e04f20b1689834ec;p=thirdparty%2Fsystemd.git

Get rid of in_addr_port_from_string_auto() again

With the commit "shared/socket-netlink: only allow ifindex if explicitly supported"
this helper is not necessary anymore.
---

diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c
index 184df0337f5..08655e115de 100644
--- a/src/resolve/resolved-conf.c
+++ b/src/resolve/resolved-conf.c
@@ -423,7 +423,7 @@ int config_parse_dns_stub_listener_extra(
                 }
         }
 
-        r = in_addr_port_from_string_auto(p, &stub->family, &stub->address, &stub->port);
+        r = in_addr_port_ifindex_name_from_string_auto(p, &stub->family, &stub->address, &stub->port, NULL, NULL);
         if (r < 0) {
                 log_syntax(unit, LOG_WARNING, filename, line, r,
                            "Failed to parse address in %s=%s, ignoring assignment: %m",
diff --git a/src/shared/socket-netlink.c b/src/shared/socket-netlink.c
index 61db2697915..444aae271ac 100644
--- a/src/shared/socket-netlink.c
+++ b/src/shared/socket-netlink.c
@@ -463,36 +463,6 @@ int in_addr_port_ifindex_name_from_string_auto(
         return r;
 }
 
-int in_addr_port_from_string_auto(
-                const char *s,
-                int *ret_family,
-                union in_addr_union *ret_address,
-                uint16_t *ret_port) {
-
-        union in_addr_union addr;
-        int family, ifindex, r;
-        uint16_t port;
-
-        assert(s);
-
-        r = in_addr_port_ifindex_name_from_string_auto(s, &family, &addr, &port, &ifindex, NULL);
-        if (r < 0)
-                return r;
-
-        /* This does not accept interface specified. */
-        if (ifindex != 0)
-                return -EINVAL;
-
-        if (ret_family)
-                *ret_family = family;
-        if (ret_address)
-                *ret_address = addr;
-        if (ret_port)
-                *ret_port = port;
-
-        return r;
-}
-
 struct in_addr_full *in_addr_full_free(struct in_addr_full *a) {
         if (!a)
                 return NULL;
diff --git a/src/shared/socket-netlink.h b/src/shared/socket-netlink.h
index d019bb31c63..e6cd7d9bf19 100644
--- a/src/shared/socket-netlink.h
+++ b/src/shared/socket-netlink.h
@@ -33,7 +33,6 @@ static inline int in_addr_ifindex_name_from_string_auto(const char *s, int *fami
 static inline int in_addr_ifindex_from_string_auto(const char *s, int *family, union in_addr_union *ret, int *ifindex) {
         return in_addr_ifindex_name_from_string_auto(s, family, ret, ifindex, NULL);
 }
-int in_addr_port_from_string_auto(const char *s, int *ret_family, union in_addr_union *ret_address, uint16_t *ret_port);
 
 struct in_addr_full {
         int family;
diff --git a/src/test/test-socket-netlink.c b/src/test/test-socket-netlink.c
index 200af19a456..06a08cd9d79 100644
--- a/src/test/test-socket-netlink.c
+++ b/src/test/test-socket-netlink.c
@@ -365,36 +365,6 @@ static void test_in_addr_port_ifindex_name_from_string_auto(void) {
         test_in_addr_port_ifindex_name_from_string_auto_one("[fe80::18]:53%19#hoge.com", AF_INET6, 53, 19, "hoge.com");
 }
 
-static void test_in_addr_port_from_string_auto_one(const char *str, int family, const char *address_string, uint16_t port) {
-        union in_addr_union a, b;
-        uint16_t p;
-        int f;
-
-        assert_se(in_addr_port_from_string_auto(str, &f, &a, &p) >= 0);
-        assert_se(family == f);
-        assert_se(port == p);
-        assert_se(in_addr_from_string(family, address_string, &b) >= 0);
-        assert_se(in_addr_equal(family, &a, &b) == 1);
-}
-
-static void test_in_addr_port_from_string_auto(void) {
-        log_info("/* %s */", __func__);
-
-        assert_se(in_addr_port_from_string_auto("192.168.0.1#test.com", NULL, NULL, NULL) < 0);
-        assert_se(in_addr_port_from_string_auto("192.168.0.1:53#example.com", NULL, NULL, NULL) < 0);
-        assert_se(in_addr_port_from_string_auto("fe80::18#hoge.com", NULL, NULL, NULL) < 0);
-        assert_se(in_addr_port_from_string_auto("fe80::18%19", NULL, NULL, NULL) < 0);
-        assert_se(in_addr_port_from_string_auto("fe80::18%19#hoge.com", NULL, NULL, NULL) < 0);
-        assert_se(in_addr_port_from_string_auto("[fe80::18]:53#hoge.com", NULL, NULL, NULL) < 0);
-        assert_se(in_addr_port_from_string_auto("[fe80::18]:53%19", NULL, NULL, NULL) < 0);
-        assert_se(in_addr_port_from_string_auto("[fe80::18]:53%19#hoge.com", NULL, NULL, NULL) < 0);
-
-        test_in_addr_port_from_string_auto_one("192.168.0.1", AF_INET, "192.168.0.1", 0);
-        test_in_addr_port_from_string_auto_one("192.168.0.1:53", AF_INET, "192.168.0.1", 53);
-        test_in_addr_port_from_string_auto_one("fe80::18", AF_INET6, "fe80::18", 0);
-        test_in_addr_port_from_string_auto_one("[fe80::18]:53", AF_INET6, "fe80::18", 53);
-}
-
 int main(int argc, char *argv[]) {
         test_setup_logging(LOG_DEBUG);
 
@@ -409,7 +379,6 @@ int main(int argc, char *argv[]) {
         test_in_addr_ifindex_from_string_auto();
         test_in_addr_ifindex_name_from_string_auto();
         test_in_addr_port_ifindex_name_from_string_auto();
-        test_in_addr_port_from_string_auto();
 
         return 0;
 }