diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-02-08 00:14:27 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-08 00:14:27 +0900 |
| commit | 73159727ed88a8f739038984c847bb7313336450 (patch) | |
| tree | e96e7fb80b606ed8bb22ab24f04c16aabe95b8a5 /lib | |
| parent | 807dd0479267a067e8208a2053b446fa13a2e66f (diff) | |
Merge ipaddr-1.2.4 (#5526)
[Bug #18570]
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ipaddr.gemspec | 6 | ||||
| -rw-r--r-- | lib/ipaddr.rb | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec index 36e2300002..352570a213 100644 --- a/lib/ipaddr.gemspec +++ b/lib/ipaddr.gemspec @@ -3,9 +3,13 @@ lib = File.expand_path("../lib", __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +version = File.foreach(File.expand_path("ipaddr.rb", lib)).find do |line| + /^\s*VERSION\s*=\s*["'](.*)["']/ =~ line and break $1 +end + Gem::Specification.new do |spec| spec.name = "ipaddr" - spec.version = "1.2.3" + spec.version = version spec.authors = ["Akinori MUSHA", "Hajimu UMEMOTO"] spec.email = ["knu@idaemons.org", "ume@mahoroba.org"] diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb index 5df798f5d7..459b8478a0 100644 --- a/lib/ipaddr.rb +++ b/lib/ipaddr.rb @@ -40,6 +40,7 @@ require 'socket' # p ipaddr3 #=> #<IPAddr: IPv4:192.168.2.0/255.255.255.0> class IPAddr + VERSION = "1.2.4" # 32 bit mask for IPv4 IN4MASK = 0xffffffff @@ -410,7 +411,7 @@ class IPAddr raise AddressFamilyError, "unsupported address family" end - return clone.set(begin_addr, @family)..clone.set(end_addr, @family) + self.class.new(begin_addr, @family)..self.class.new(end_addr, @family) end # Returns the prefix length in bits for the ipaddr. @@ -509,6 +510,9 @@ class IPAddr @addr = addr if family[0] @family = family[0] + if @family == Socket::AF_INET + @mask_addr &= IN4MASK + end end return self end @@ -579,6 +583,7 @@ class IPAddr # those, such as &, |, include? and ==, accept a string, or a packed # in_addr value instead of an IPAddr object. def initialize(addr = '::', family = Socket::AF_UNSPEC) + @mask_addr = nil if !addr.kind_of?(String) case family when Socket::AF_INET, Socket::AF_INET6 |