kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/ipaddr.rb (in_addr, in6_addr, addr_mask): Make some minor

Browse source 
code optimization.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2007-10-04 19:03:56 +00:00
parent 2a3528a051
commit 228bb8ea4c
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Oct 5 04:02:39 2007 Akinori MUSHA <knu@iDaemons.org>
* lib/ipaddr.rb (in_addr, in6_addr, addr_mask): Make some minor
code optimization.
Fri Oct 5 03:25:51 2007 Akinori MUSHA <knu@iDaemons.org> Fri Oct 5 03:25:51 2007 Akinori MUSHA <knu@iDaemons.org>
* lib/ipaddr.rb (<=>): Implement IPAddr#<=> and make IPAddr * lib/ipaddr.rb (<=>): Implement IPAddr#<=> and make IPAddr

20
lib/ipaddr.rb
View file

@ -496,12 +496,9 @@ class IPAddr
def in_addr(addr) def in_addr(addr)
if addr =~ /^\d+\.\d+\.\d+\.\d+$/ if addr =~ /^\d+\.\d+\.\d+\.\d+$/
n = 0 return addr.split('.').inject(0) { |i, s|
addr.split('.').each { |i| i << 8 | s.to_i
n <<= 8
n += i.to_i
} }
return n
end end
return nil return nil
end end
@ -525,25 +522,20 @@ class IPAddr
if rest < 0 if rest < 0
return nil return nil
end end
a = [l, Array.new(rest, '0'), r].flatten! return (l + Array.new(rest, '0') + r).inject(0) { |i, s|
n = 0 i << 16 | s.hex
a.each { |i|
n <<= 16
n += i.hex
} }
return n
end end
def addr_mask(addr) def addr_mask(addr)
case @family case @family
when Socket::AF_INET when Socket::AF_INET
addr &= IN4MASK return addr & IN4MASK
when Socket::AF_INET6 when Socket::AF_INET6
addr &= IN6MASK return addr & IN6MASK
else else
raise "unsupported address family" raise "unsupported address family"
end end
return addr
end end
def _reverse def _reverse