diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-11-07 15:31:26 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 15:31:26 +0900 |
| commit | c6d8bbb66eb5b033fd8809a7d89401d337a5f1c5 (patch) | |
| tree | 1ecee98fceb4a9c10e6a69d71475cdf34294b5f0 /src | |
| parent | 13d8a53aaec29eaacec85bfe008e0212d49b1b7a (diff) | |
| download | systemd-c6d8bbb66eb5b033fd8809a7d89401d337a5f1c5.tar.gz systemd-c6d8bbb66eb5b033fd8809a7d89401d337a5f1c5.tar.bz2 systemd-c6d8bbb66eb5b033fd8809a7d89401d337a5f1c5.zip | |
in-addr-util: make in_addr_default_prefix_from_string() or friend set 0 to prefixlen when family == AF_INET6 (#10665)
Follow-up for a4798d4e6d88c2be2625ce62d8326eaa9b80f2ee.
Fixes #10662.
Diffstat (limited to 'src')
| -rw-r--r-- | src/basic/in-addr-util.c | 22 | ||||
| -rw-r--r-- | src/network/test-networkd-conf.c | 2 | ||||
| -rw-r--r-- | src/test/test-in-addr-util.c | 2 |
3 files changed, 16 insertions, 10 deletions
diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c index 4cf6ab6974..6a00de2ef0 100644 --- a/src/basic/in-addr-util.c +++ b/src/basic/in-addr-util.c @@ -531,10 +531,13 @@ int in_addr_prefix_from_string_internal( r = in_addr_parse_prefixlen(family, e+1, &k); if (r < 0) return r; - } else if (family == AF_INET && use_default_prefixlen) { - r = in4_addr_default_prefixlen(&buffer.in, &k); - if (r < 0) - return r; + } else if (use_default_prefixlen) { + if (family == AF_INET) { + r = in4_addr_default_prefixlen(&buffer.in, &k); + if (r < 0) + return r; + } else + k = 0; } else k = FAMILY_ADDRESS_SIZE(family) * 8; @@ -579,10 +582,13 @@ int in_addr_prefix_from_string_auto_internal( r = in_addr_parse_prefixlen(family, e+1, &k); if (r < 0) return r; - } else if (family == AF_INET && use_default_prefixlen) { - r = in4_addr_default_prefixlen(&buffer.in, &k); - if (r < 0) - return r; + } else if (use_default_prefixlen) { + if (family == AF_INET) { + r = in4_addr_default_prefixlen(&buffer.in, &k); + if (r < 0) + return r; + } else + k = 0; } else k = FAMILY_ADDRESS_SIZE(family) * 8; diff --git a/src/network/test-networkd-conf.c b/src/network/test-networkd-conf.c index a906630b38..abef6e761a 100644 --- a/src/network/test-networkd-conf.c +++ b/src/network/test-networkd-conf.c @@ -199,7 +199,7 @@ static void test_config_parse_address(void) { test_config_parse_address_one("", AF_INET6, 0, NULL, 0); test_config_parse_address_one("/", AF_INET6, 0, NULL, 0); test_config_parse_address_one("/8", AF_INET6, 0, NULL, 0); - test_config_parse_address_one("::1", AF_INET6, 1, &(union in_addr_union) { .in6 = IN6ADDR_LOOPBACK_INIT }, 128); + test_config_parse_address_one("::1", AF_INET6, 1, &(union in_addr_union) { .in6 = IN6ADDR_LOOPBACK_INIT }, 0); test_config_parse_address_one("::1/0", AF_INET6, 1, &(union in_addr_union) { .in6 = IN6ADDR_LOOPBACK_INIT }, 0); test_config_parse_address_one("::1/1", AF_INET6, 1, &(union in_addr_union) { .in6 = IN6ADDR_LOOPBACK_INIT }, 1); test_config_parse_address_one("::1/2", AF_INET6, 1, &(union in_addr_union) { .in6 = IN6ADDR_LOOPBACK_INIT }, 2); diff --git a/src/test/test-in-addr-util.c b/src/test/test-in-addr-util.c index 849166391f..75c3e305c3 100644 --- a/src/test/test-in-addr-util.c +++ b/src/test/test-in-addr-util.c @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) { test_in_addr_prefix_from_string("", AF_INET6, -EINVAL, NULL, 0, true); test_in_addr_prefix_from_string("/", AF_INET6, -EINVAL, NULL, 0, true); test_in_addr_prefix_from_string("/8", AF_INET6, -EINVAL, NULL, 0, true); - test_in_addr_prefix_from_string("::1", AF_INET6, 0, &(union in_addr_union) { .in6 = IN6ADDR_LOOPBACK_INIT }, 128, true); + test_in_addr_prefix_from_string("::1", AF_INET6, 0, &(union in_addr_union) { .in6 = IN6ADDR_LOOPBACK_INIT }, 0, true); test_in_addr_prefix_from_string("::1/0", AF_INET6, 0, &(union in_addr_union) { .in6 = IN6ADDR_LOOPBACK_INIT }, 0, true); test_in_addr_prefix_from_string("::1/1", AF_INET6, 0, &(union in_addr_union) { .in6 = IN6ADDR_LOOPBACK_INIT }, 1, true); test_in_addr_prefix_from_string("::1/2", AF_INET6, 0, &(union in_addr_union) { .in6 = IN6ADDR_LOOPBACK_INIT }, 2, true); |