Make correct mask when converting IPv4 <=> IPv6

ruby · Jul 11, 2019 · 8e0d7ec · 8e0d7ec
1 parent 5dec357
commit 8e0d7ec
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
@@ -478,17 +478,26 @@ def set(addr, *family)
       if addr < 0 || addr > IN4MASK
         raise InvalidAddressError, "invalid address: #{@addr}"
       end
+      if @family == Socket::AF_INET6
+        mask = @mask_addr & IN4MASK
+      end
     when Socket::AF_INET6
       if addr < 0 || addr > IN6MASK
         raise InvalidAddressError, "invalid address: #{@addr}"
       end
+      if @family == Socket::AF_INET
+        mask = (IN6MASK ^ IN4MASK) | @mask_addr
+      end
     else
       raise AddressFamilyError, "unsupported address family"
     end
     @addr = addr
     if family[0]
       @family = family[0]
     end
+    if mask
+      @mask_addr = mask
+    end
     return self
   end
 

diff --git a/test/test_ipaddr.rb b/test/test_ipaddr.rb
@@ -129,11 +129,25 @@ def test_ipv4_compat
     assert_equal("192.168.1.2", b.to_s)
     assert_equal(Socket::AF_INET, b.family)
     assert_equal(false, b.ipv4_compat?)
+    assert_equal(32, b.prefix)
+
+    a = IPAddr.new("::192.168.0.0/112")
+    b = a.native
+    assert_equal("192.168.0.0", b.to_s)
+    assert_equal(Socket::AF_INET, b.family)
+    assert_equal(16, b.prefix)
 
     a = IPAddr.new("192.168.1.2")
     b = a.ipv4_compat
     assert_equal("::192.168.1.2", b.to_s)
     assert_equal(Socket::AF_INET6, b.family)
+    assert_equal(128, b.prefix)
+
+    a = IPAddr.new("192.168.0.0/16")
+    b = a.ipv4_compat
+    assert_equal("::192.168.0.0", b.to_s)
+    assert_equal(Socket::AF_INET6, b.family)
+    assert_equal(112, b.prefix)
   end
 
   def test_ipv4_mapped
@@ -146,11 +160,25 @@ def test_ipv4_mapped
     assert_equal("192.168.1.2", b.to_s)
     assert_equal(Socket::AF_INET, b.family)
     assert_equal(false, b.ipv4_mapped?)
+    assert_equal(32, b.prefix)
+
+    a = IPAddr.new("::ffff:192.168.0.0/112")
+    b = a.native
+    assert_equal("192.168.0.0", b.to_s)
+    assert_equal(Socket::AF_INET, b.family)
+    assert_equal(16, b.prefix)
 
     a = IPAddr.new("192.168.1.2")
     b = a.ipv4_mapped
     assert_equal("::ffff:192.168.1.2", b.to_s)
     assert_equal(Socket::AF_INET6, b.family)
+    assert_equal(128, b.prefix)
+
+    a = IPAddr.new("192.168.0.0/16")
+    b = a.ipv4_mapped
+    assert_equal("::ffff:192.168.0.0", b.to_s)
+    assert_equal(Socket::AF_INET6, b.family)
+    assert_equal(112, b.prefix)
   end
 
   def test_reverse