From 431638f6bb5a3627fc2db070dac5b38e2c9ab0eb Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Thu, 31 Oct 2019 10:06:13 -0700
Subject: [PATCH] Make IPAddr#include? consider range of argument

Simplify code using Range#cover?

Fixes [Bug #14119]
---
 lib/ipaddr.rb       | 29 ++++-------------------------
 test/test_ipaddr.rb |  2 ++
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index 7fff54b9d0..2b34d36fe4 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -168,34 +168,13 @@ def mask(prefixlen)
   #   net1 = IPAddr.new("192.168.2.0/24")
   #   net2 = IPAddr.new("192.168.2.100")
   #   net3 = IPAddr.new("192.168.3.0")
+  #   net4 = IPAddr.new("192.168.2.0/16")
   #   p net1.include?(net2)     #=> true
   #   p net1.include?(net3)     #=> false
+  #   p net1.include?(net4)     #=> false
+  #   p net4.include?(net1)     #=> true
   def include?(other)
-    other = coerce_other(other)
-    if ipv4_mapped?
-      if (@mask_addr >> 32) != 0xffffffffffffffffffffffff
-        return false
-      end
-      mask_addr = (@mask_addr & IN4MASK)
-      addr = (@addr & IN4MASK)
-      family = Socket::AF_INET
-    else
-      mask_addr = @mask_addr
-      addr = @addr
-      family = @family
-    end
-    if other.ipv4_mapped?
-      other_addr = (other.to_i & IN4MASK)
-      other_family = Socket::AF_INET
-    else
-      other_addr = other.to_i
-      other_family = other.family
-    end
-
-    if family != other_family
-      return false
-    end
-    return ((addr & mask_addr) == (other_addr & mask_addr))
+    to_range.cover?(coerce_other(other).to_range)
   end
   alias === include?
 
diff --git a/test/test_ipaddr.rb b/test/test_ipaddr.rb
index 7b3a199bf3..1e3575dc02 100644
--- a/test/test_ipaddr.rb
+++ b/test/test_ipaddr.rb
@@ -295,6 +295,8 @@ def test_include?
     assert_equal(true, net1.include?(IPAddr.new("192.168.2.0")))
     assert_equal(true, net1.include?(IPAddr.new("192.168.2.255")))
     assert_equal(false, net1.include?(IPAddr.new("192.168.3.0")))
+    assert_equal(true, net1.include?(IPAddr.new("192.168.2.0/28")))
+    assert_equal(false, net1.include?(IPAddr.new("192.168.2.0/16")))
     # test with integer parameter
     int = (192 << 24) + (168 << 16) + (2 << 8) + 13
 
-- 
2.23.0