diff options
author | Ben Fritsch <[email protected]> | 2020-04-03 16:48:15 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <[email protected]> | 2024-04-18 10:27:19 +0900 |
commit | 6ac8f6a10eb011147a6cdaf4cf4154c41a7d9080 (patch) | |
tree | 5232d2c12492623905e6f1a999522beaec8ff4f9 | |
parent | 07771c7657e65e8da6cd11eacbb105bdf46d0f10 (diff) |
[ruby/ipaddr] Add IPAddr.cidr to return ip address in cidr notation
https://github.com/ruby/ipaddr/commit/f5b006741f
-rw-r--r-- | lib/ipaddr.rb | 6 | ||||
-rw-r--r-- | test/test_ipaddr.rb | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb index c1073ecd2b..dbb213c90a 100644 --- a/lib/ipaddr.rb +++ b/lib/ipaddr.rb @@ -227,6 +227,12 @@ class IPAddr return str end + # Returns a string containing the IP address representation in + # cidr notation + def cidr + format("%s/%s", to_s, prefix) + end + # Returns a network byte ordered string form of the IP address. def hton case @family diff --git a/test/test_ipaddr.rb b/test/test_ipaddr.rb index e95b0d2d7a..3e5c3d2aa4 100644 --- a/test/test_ipaddr.rb +++ b/test/test_ipaddr.rb @@ -20,18 +20,21 @@ class TC_IPAddr < Test::Unit::TestCase a = IPAddr.new assert_equal("::", a.to_s) assert_equal("0000:0000:0000:0000:0000:0000:0000:0000", a.to_string) + assert_equal("::/128", a.cidr) assert_equal(Socket::AF_INET6, a.family) assert_equal(128, a.prefix) a = IPAddr.new("0123:4567:89ab:cdef:0ABC:DEF0:1234:5678") assert_equal("123:4567:89ab:cdef:abc:def0:1234:5678", a.to_s) assert_equal("0123:4567:89ab:cdef:0abc:def0:1234:5678", a.to_string) + assert_equal("123:4567:89ab:cdef:abc:def0:1234:5678/128", a.cidr) assert_equal(Socket::AF_INET6, a.family) assert_equal(128, a.prefix) a = IPAddr.new("3ffe:505:2::/48") assert_equal("3ffe:505:2::", a.to_s) assert_equal("3ffe:0505:0002:0000:0000:0000:0000:0000", a.to_string) + assert_equal("3ffe:505:2::/48", a.cidr) assert_equal(Socket::AF_INET6, a.family) assert_equal(false, a.ipv4?) assert_equal(true, a.ipv6?) @@ -41,6 +44,7 @@ class TC_IPAddr < Test::Unit::TestCase a = IPAddr.new("3ffe:505:2::/ffff:ffff:ffff::") assert_equal("3ffe:505:2::", a.to_s) assert_equal("3ffe:0505:0002:0000:0000:0000:0000:0000", a.to_string) + assert_equal("3ffe:505:2::/48", a.cidr) assert_equal(Socket::AF_INET6, a.family) assert_equal(48, a.prefix) assert_nil(a.zone_id) @@ -58,12 +62,14 @@ class TC_IPAddr < Test::Unit::TestCase a = IPAddr.new("0.0.0.0") assert_equal("0.0.0.0", a.to_s) assert_equal("0.0.0.0", a.to_string) + assert_equal("0.0.0.0/32", a.cidr) assert_equal(Socket::AF_INET, a.family) assert_equal(32, a.prefix) a = IPAddr.new("192.168.1.2") assert_equal("192.168.1.2", a.to_s) assert_equal("192.168.1.2", a.to_string) + assert_equal("192.168.1.2/32", a.cidr) assert_equal(Socket::AF_INET, a.family) assert_equal(true, a.ipv4?) assert_equal(false, a.ipv6?) @@ -72,6 +78,7 @@ class TC_IPAddr < Test::Unit::TestCase a = IPAddr.new("192.168.1.2/26") assert_equal("192.168.1.0", a.to_s) assert_equal("192.168.1.0", a.to_string) + assert_equal("192.168.1.0/26", a.cidr) assert_equal(Socket::AF_INET, a.family) assert_equal("#<IPAddr: IPv4:192.168.1.0/255.255.255.192>", a.inspect) assert_equal(26, a.prefix) @@ -79,6 +86,7 @@ class TC_IPAddr < Test::Unit::TestCase a = IPAddr.new("192.168.1.2/255.255.255.0") assert_equal("192.168.1.0", a.to_s) assert_equal("192.168.1.0", a.to_string) + assert_equal("192.168.1.0/24", a.cidr) assert_equal(Socket::AF_INET, a.family) assert_equal(24, a.prefix) |