mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib: Convert tabs to spaces for ruby files per
http://redmine.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style Patch by Steve Klabnik [Ruby 1.9 - Bug #4730] Patch by Jason Dew [Ruby 1.9 - Feature #4718] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain
parent
34276148c4
commit
7bbf2f3085
67 changed files with 3823 additions and 3814 deletions
|
|
@ -72,17 +72,17 @@ end
|
|||
#
|
||||
# ipaddr1 = IPAddr.new "3ffe:505:2::1"
|
||||
#
|
||||
# p ipaddr1 #=> #<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0001/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff>
|
||||
# p ipaddr1 #=> #<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0001/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff>
|
||||
#
|
||||
# p ipaddr1.to_s #=> "3ffe:505:2::1"
|
||||
# p ipaddr1.to_s #=> "3ffe:505:2::1"
|
||||
#
|
||||
# ipaddr2 = ipaddr1.mask(48) #=> #<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0000/ffff:ffff:ffff:0000:0000:0000:0000:0000>
|
||||
# ipaddr2 = ipaddr1.mask(48) #=> #<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0000/ffff:ffff:ffff:0000:0000:0000:0000:0000>
|
||||
#
|
||||
# p ipaddr2.to_s #=> "3ffe:505:2::"
|
||||
# p ipaddr2.to_s #=> "3ffe:505:2::"
|
||||
#
|
||||
# ipaddr3 = IPAddr.new "192.168.2.0/24"
|
||||
#
|
||||
# p ipaddr3 #=> #<IPAddr: IPv4:192.168.2.0/255.255.255.0>
|
||||
# p ipaddr3 #=> #<IPAddr: IPv4:192.168.2.0/255.255.255.0>
|
||||
|
||||
class IPAddr
|
||||
|
||||
|
|
@ -157,13 +157,13 @@ class IPAddr
|
|||
# net1 = IPAddr.new("192.168.2.0/24")
|
||||
# net2 = IPAddr.new("192.168.2.100")
|
||||
# net3 = IPAddr.new("192.168.3.0")
|
||||
# p net1.include?(net2) #=> true
|
||||
# p net1.include?(net3) #=> false
|
||||
# p net1.include?(net2) #=> true
|
||||
# p net1.include?(net3) #=> false
|
||||
def include?(other)
|
||||
other = coerce_other(other)
|
||||
if ipv4_mapped?
|
||||
if (@mask_addr >> 32) != 0xffffffffffffffffffffffff
|
||||
return false
|
||||
return false
|
||||
end
|
||||
mask_addr = (@mask_addr & IN4MASK)
|
||||
addr = (@addr & IN4MASK)
|
||||
|
|
@ -231,7 +231,7 @@ class IPAddr
|
|||
return [@addr].pack('N')
|
||||
when Socket::AF_INET6
|
||||
return (0..7).map { |i|
|
||||
(@addr >> (112 - 16 * i)) & 0xffff
|
||||
(@addr >> (112 - 16 * i)) & 0xffff
|
||||
}.pack('n8')
|
||||
else
|
||||
raise "unsupported address family"
|
||||
|
|
@ -372,7 +372,7 @@ class IPAddr
|
|||
raise "unsupported address family"
|
||||
end
|
||||
return sprintf("#<%s: %s:%s/%s>", self.class.name,
|
||||
af, _to_string(@addr), _to_string(@mask_addr))
|
||||
af, _to_string(@addr), _to_string(@mask_addr))
|
||||
end
|
||||
|
||||
protected
|
||||
|
|
@ -381,11 +381,11 @@ class IPAddr
|
|||
case family[0] ? family[0] : @family
|
||||
when Socket::AF_INET
|
||||
if addr < 0 || addr > IN4MASK
|
||||
raise ArgumentError, "invalid address"
|
||||
raise ArgumentError, "invalid address"
|
||||
end
|
||||
when Socket::AF_INET6
|
||||
if addr < 0 || addr > IN6MASK
|
||||
raise ArgumentError, "invalid address"
|
||||
raise ArgumentError, "invalid address"
|
||||
end
|
||||
else
|
||||
raise ArgumentError, "unsupported address family"
|
||||
|
|
@ -400,15 +400,15 @@ class IPAddr
|
|||
def mask!(mask)
|
||||
if mask.kind_of?(String)
|
||||
if mask =~ /^\d+$/
|
||||
prefixlen = mask.to_i
|
||||
prefixlen = mask.to_i
|
||||
else
|
||||
m = IPAddr.new(mask)
|
||||
if m.family != @family
|
||||
raise ArgumentError, "address family is not same"
|
||||
end
|
||||
@mask_addr = m.to_i
|
||||
@addr &= @mask_addr
|
||||
return self
|
||||
m = IPAddr.new(mask)
|
||||
if m.family != @family
|
||||
raise ArgumentError, "address family is not same"
|
||||
end
|
||||
@mask_addr = m.to_i
|
||||
@addr &= @mask_addr
|
||||
return self
|
||||
end
|
||||
else
|
||||
prefixlen = mask
|
||||
|
|
@ -416,13 +416,13 @@ class IPAddr
|
|||
case @family
|
||||
when Socket::AF_INET
|
||||
if prefixlen < 0 || prefixlen > 32
|
||||
raise ArgumentError, "invalid length"
|
||||
raise ArgumentError, "invalid length"
|
||||
end
|
||||
masklen = 32 - prefixlen
|
||||
@mask_addr = ((IN4MASK >> masklen) << masklen)
|
||||
when Socket::AF_INET6
|
||||
if prefixlen < 0 || prefixlen > 128
|
||||
raise ArgumentError, "invalid length"
|
||||
raise ArgumentError, "invalid length"
|
||||
end
|
||||
masklen = 128 - prefixlen
|
||||
@mask_addr = ((IN6MASK >> masklen) << masklen)
|
||||
|
|
@ -461,9 +461,9 @@ class IPAddr
|
|||
@mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
|
||||
return
|
||||
when Socket::AF_UNSPEC
|
||||
raise ArgumentError, "address family must be specified"
|
||||
raise ArgumentError, "address family must be specified"
|
||||
else
|
||||
raise ArgumentError, "unsupported address family: #{family}"
|
||||
raise ArgumentError, "unsupported address family: #{family}"
|
||||
end
|
||||
end
|
||||
prefix, prefixlen = addr.split('/')
|
||||
|
|
@ -473,9 +473,9 @@ class IPAddr
|
|||
end
|
||||
# It seems AI_NUMERICHOST doesn't do the job.
|
||||
#Socket.getaddrinfo(left, nil, Socket::AF_INET6, Socket::SOCK_STREAM, nil,
|
||||
# Socket::AI_NUMERICHOST)
|
||||
# Socket::AI_NUMERICHOST)
|
||||
begin
|
||||
IPSocket.getaddress(prefix) # test if address is valid
|
||||
IPSocket.getaddress(prefix) # test if address is valid
|
||||
rescue
|
||||
raise ArgumentError, "invalid address"
|
||||
end
|
||||
|
|
@ -483,7 +483,7 @@ class IPAddr
|
|||
if family == Socket::AF_UNSPEC || family == Socket::AF_INET
|
||||
@addr = in_addr(prefix)
|
||||
if @addr
|
||||
@family = Socket::AF_INET
|
||||
@family = Socket::AF_INET
|
||||
end
|
||||
end
|
||||
if !@addr && (family == Socket::AF_UNSPEC || family == Socket::AF_INET6)
|
||||
|
|
@ -514,8 +514,8 @@ class IPAddr
|
|||
def in_addr(addr)
|
||||
if addr =~ /^\d+\.\d+\.\d+\.\d+$/
|
||||
return addr.split('.').inject(0) { |i, s|
|
||||
i << 8 | s.to_i
|
||||
}
|
||||
i << 8 | s.to_i
|
||||
}
|
||||
end
|
||||
return nil
|
||||
end
|
||||
|
|
@ -559,7 +559,7 @@ class IPAddr
|
|||
case @family
|
||||
when Socket::AF_INET
|
||||
return (0..3).map { |i|
|
||||
(@addr >> (8 * i)) & 0xff
|
||||
(@addr >> (8 * i)) & 0xff
|
||||
}.join('.')
|
||||
when Socket::AF_INET6
|
||||
return ("%.32x" % @addr).reverse!.gsub!(/.(?!$)/, '\&.')
|
||||
|
|
@ -572,7 +572,7 @@ class IPAddr
|
|||
case @family
|
||||
when Socket::AF_INET
|
||||
return (0..3).map { |i|
|
||||
(addr >> (24 - 8 * i)) & 0xff
|
||||
(addr >> (24 - 8 * i)) & 0xff
|
||||
}.join('.')
|
||||
when Socket::AF_INET6
|
||||
return (("%.32x" % addr).gsub!(/.{4}(?!$)/, '\&:'))
|
||||
|
|
@ -659,7 +659,7 @@ class TC_IPAddr < Test::Unit::TestCase
|
|||
["[192.168.1.2]/120"],
|
||||
].each { |args|
|
||||
assert_raises(ArgumentError) {
|
||||
IPAddr.new(*args)
|
||||
IPAddr.new(*args)
|
||||
}
|
||||
}
|
||||
end
|
||||
|
|
@ -760,7 +760,7 @@ class TC_Operator < Test::Unit::TestCase
|
|||
assert_equal("3ffe:505:2:1::", a.to_s)
|
||||
assert_equal("3ffe:505:2::", @a.to_s)
|
||||
assert_equal("3ffe:505:2:1::",
|
||||
(@a | 0x00000000000000010000000000000000).to_s)
|
||||
(@a | 0x00000000000000010000000000000000).to_s)
|
||||
end
|
||||
|
||||
def test_and
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue