diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c index bdedfc967a..0c1e749e8f 100644 --- a/src/basic/in-addr-util.c +++ b/src/basic/in-addr-util.c @@ -264,15 +264,6 @@ int in_addr_prefix_intersect( return -EAFNOSUPPORT; } -int in_addr_prefix_next(int family, union in_addr_union *u, unsigned prefixlen) { - assert(u); - - /* Increases the network part of an address by one. Returns 0 if that succeeds, or -ERANGE if - * this overflows. */ - - return in_addr_prefix_nth(family, u, prefixlen, 1); -} - /* * Calculates the nth prefix of size prefixlen starting from the address denoted by u. * diff --git a/src/basic/in-addr-util.h b/src/basic/in-addr-util.h index cb76ef221c..cf561fd605 100644 --- a/src/basic/in-addr-util.h +++ b/src/basic/in-addr-util.h @@ -73,7 +73,6 @@ int in_addr_prefix_intersect( unsigned aprefixlen, const union in_addr_union *b, unsigned bprefixlen) _pure_; -int in_addr_prefix_next(int family, union in_addr_union *u, unsigned prefixlen); int in_addr_prefix_nth(int family, union in_addr_union *u, unsigned prefixlen, uint64_t nth); int in_addr_random_prefix(int family, union in_addr_union *u, unsigned prefixlen_fixed_part, unsigned prefixlen); int in_addr_prefix_range( diff --git a/src/test/test-in-addr-util.c b/src/test/test-in-addr-util.c index 769cb8f083..3ddce2874a 100644 --- a/src/test/test-in-addr-util.c +++ b/src/test/test-in-addr-util.c @@ -213,44 +213,6 @@ TEST(in_addr_prefix_intersect) { test_in_addr_prefix_intersect_one(AF_INET6, "1::1", 121, "1::00ff", 121, 0); } -static void test_in_addr_prefix_next_one(unsigned f, const char *before, unsigned pl, const char *after) { - union in_addr_union ubefore, uafter, t; - - log_debug("/* %s(%s, prefixlen=%u) */", __func__, before, pl); - - assert_se(in_addr_from_string(f, before, &ubefore) >= 0); - - t = ubefore; - assert_se((in_addr_prefix_next(f, &t, pl) >= 0) == !!after); - - if (after) { - assert_se(in_addr_from_string(f, after, &uafter) >= 0); - assert_se(in_addr_equal(f, &t, &uafter) > 0); - } -} - -TEST(in_addr_prefix_next) { - test_in_addr_prefix_next_one(AF_INET, "192.168.0.0", 24, "192.168.1.0"); - test_in_addr_prefix_next_one(AF_INET, "192.168.0.0", 16, "192.169.0.0"); - test_in_addr_prefix_next_one(AF_INET, "192.168.0.0", 20, "192.168.16.0"); - - test_in_addr_prefix_next_one(AF_INET, "0.0.0.0", 32, "0.0.0.1"); - test_in_addr_prefix_next_one(AF_INET, "255.255.255.254", 32, "255.255.255.255"); - test_in_addr_prefix_next_one(AF_INET, "255.255.255.255", 32, NULL); - test_in_addr_prefix_next_one(AF_INET, "255.255.255.0", 24, NULL); - - test_in_addr_prefix_next_one(AF_INET6, "4400::", 128, "4400::0001"); - test_in_addr_prefix_next_one(AF_INET6, "4400::", 120, "4400::0100"); - test_in_addr_prefix_next_one(AF_INET6, "4400::", 127, "4400::0002"); - test_in_addr_prefix_next_one(AF_INET6, "4400::", 8, "4500::"); - test_in_addr_prefix_next_one(AF_INET6, "4400::", 7, "4600::"); - - test_in_addr_prefix_next_one(AF_INET6, "::", 128, "::1"); - - test_in_addr_prefix_next_one(AF_INET6, "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", 128, NULL); - test_in_addr_prefix_next_one(AF_INET6, "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ff00", 120, NULL); -} - static void test_in_addr_prefix_nth_one(unsigned f, const char *before, unsigned pl, uint64_t nth, const char *after) { union in_addr_union ubefore, uafter, t;