Skip to content

Respect explicit families for bracketed and scoped IPv6 addresses #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ac1982 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Respect explicit families for bracketed and scoped IPv6 addresses #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/ipaddr.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,7 @@ def initialize(addr = '::', family = Socket::AF_UNSPEC)
raise AddressFamilyError, "unsupported address family: #{family}"
end
end
requested_family = family
prefix, prefixlen = addr.split('/', 2)
if prefix =~ /\A\[(.*)\]\z/i
prefix = $1
Expand All @@ -722,6 +723,9 @@ def initialize(addr = '::', family = Socket::AF_UNSPEC)
zone_id = $2
family = Socket::AF_INET6
end
if requested_family != Socket::AF_UNSPEC && family != requested_family
raise AddressFamilyError, "address family mismatch"
end
# It seems AI_NUMERICHOST doesn't do the job.
#Socket.getaddrinfo(left, nil, Socket::AF_INET6, Socket::SOCK_STREAM, nil,
# Socket::AI_NUMERICHOST)
Expand Down
12 changes: 12 additions & 0 deletions test/test_ipaddr.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
require 'ipaddr'

class TC_IPAddr < Test::Unit::TestCase
def test_ipv6_literals_respect_explicit_family
['[::]', '::%eth0', '[::%eth0]', '[fe80::1%eth0]/64'].each do |literal|
assert_raise(IPAddr::AddressFamilyError, literal) do
IPAddr.new(literal, Socket::AF_INET)
end
assert_raise(IPAddr::AddressFamilyError, literal) do
IPAddr.new(literal, Socket::AF_UNIX)
end
assert_equal(IPAddr.new(literal), IPAddr.new(literal, Socket::AF_INET6))
end
end

def test_s_new
[
["3FFE:505:ffff::/48"],
Expand Down