Merge pull request #1 from CvX/unmasked-string

Handle unmasked address in non-string cases
ruby · Sep 14, 2020 · b06488d · b06488d
2 parents 537a09c + 445c765
commit b06488d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
@@ -587,6 +587,7 @@ def initialize(addr = '::', family = Socket::AF_UNSPEC)
       when Socket::AF_INET, Socket::AF_INET6
         set(addr.to_i, family)
         @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
+        @unmasked_addr = @addr
         return
       when Socket::AF_UNSPEC
         raise AddressFamilyError, "address family must be specified"

diff --git a/test/test_ipaddr.rb b/test/test_ipaddr.rb
@@ -428,5 +428,6 @@ def test_unmasked
     assert_equal("1.2.3.4", IPAddr.new("1.2.3.4/8").to_unmasked_string)
     assert_equal("0001:0002:0000:0000:0000:0000:0000:0003", IPAddr.new("1:2::3").to_unmasked_string)
     assert_equal("0001:0002:0000:0000:0000:0000:0000:0003", IPAddr.new("1:2::3/16").to_unmasked_string)
+    assert_equal("1.2.3.4", IPAddr.new(IPAddr.new("1.2.3.4").to_i, Socket::AF_INET).to_unmasked_string)
   end
 end