Skip to content

Commit

Permalink
[ruby/ipaddr] Fix regressions in exception messages
Browse files Browse the repository at this point in the history
Changes introduced by 09edfd4 have broken some exception
messages, and added the address as an unnecessary
suffix in others.

ruby/ipaddr@74a043109c
  • Loading branch information
lrandall-godaddy authored and hsbt committed Dec 25, 2023
1 parent eb53131 commit da77c79
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions lib/ipaddr.rb
Expand Up @@ -437,7 +437,7 @@ def prefix=(prefix)
when Integer
mask!(prefix)
else
raise InvalidPrefixError, "prefix must be an integer: #{@addr}"
raise InvalidPrefixError, "prefix must be an integer"
end
end

Expand Down Expand Up @@ -511,11 +511,11 @@ def set(addr, *family)
case family[0] ? family[0] : @family
when Socket::AF_INET
if addr < 0 || addr > IN4MASK
raise InvalidAddressError, "invalid address: #{@addr}"
raise InvalidAddressError, "invalid address: #{addr}"
end
when Socket::AF_INET6
if addr < 0 || addr > IN6MASK
raise InvalidAddressError, "invalid address: #{@addr}"
raise InvalidAddressError, "invalid address: #{addr}"
end
else
raise AddressFamilyError, "unsupported address family"
Expand All @@ -542,12 +542,12 @@ def mask!(mask)
else
m = IPAddr.new(mask)
if m.family != @family
raise InvalidPrefixError, "address family is not same: #{@addr}"
raise InvalidPrefixError, "address family is not same"
end
@mask_addr = m.to_i
n = @mask_addr ^ m.instance_variable_get(:@mask_addr)
unless ((n + 1) & n).zero?
raise InvalidPrefixError, "invalid mask #{mask}: #{@addr}"
raise InvalidPrefixError, "invalid mask #{mask}"
end
@addr &= @mask_addr
return self
Expand All @@ -558,13 +558,13 @@ def mask!(mask)
case @family
when Socket::AF_INET
if prefixlen < 0 || prefixlen > 32
raise InvalidPrefixError, "invalid length: #{@addr}"
raise InvalidPrefixError, "invalid length"
end
masklen = 32 - prefixlen
@mask_addr = ((IN4MASK >> masklen) << masklen)
when Socket::AF_INET6
if prefixlen < 0 || prefixlen > 128
raise InvalidPrefixError, "invalid length: #{@addr}"
raise InvalidPrefixError, "invalid length"
end
masklen = 128 - prefixlen
@mask_addr = ((IN6MASK >> masklen) << masklen)
Expand Down

0 comments on commit da77c79

Please sign in to comment.