Skip to content
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

RFC: Activate IPv6 getaddrinfo, and return all addresses #10335

Closed
wants to merge 3 commits into from
Closed

RFC: Activate IPv6 getaddrinfo, and return all addresses #10335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9da63eb
Use explicit lo address instead of localhost, ref #9892
ihnorton Feb 25, 2015
f43bc83
Activate IPv6 getaddrinfo, and return all addresses
ihnorton Feb 26, 2015
ffedd73
net: make getaddrinfo IPv6 optional; change connect! to try all addre…
ihnorton Mar 4, 2015
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
51 changes: 32 additions & 19 deletions base/socket.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,20 +554,20 @@ function _uv_hook_getaddrinfo(cb::Function, addrinfo::Ptr{Void}, status::Int32)
cb(UVError("getaddrinfo callback",status))
return
end
addresses = IPAddr[]
freeaddrinfo = addrinfo
while addrinfo != C_NULL
sockaddr = ccall(:jl_sockaddr_from_addrinfo,Ptr{Void},(Ptr{Void},),addrinfo)
if ccall(:jl_sockaddr_is_ip4,Int32,(Ptr{Void},),sockaddr) == 1
cb(IPv4(ntoh(ccall(:jl_sockaddr_host4,UInt32,(Ptr{Void},),sockaddr))))
break
#elseif ccall(:jl_sockaddr_is_ip6,Int32,(Ptr{Void},),sockaddr) == 1
# host = Array(UInt128,1)
# scope_id = ccall(:jl_sockaddr_host6,UInt32,(Ptr{Void},Ptr{UInt128}),sockaddr,host)
# cb(IPv6(ntoh(host[1])))
# break
push!(addresses, IPv4(ntoh(ccall(:jl_sockaddr_host4,UInt32,(Ptr{Void},),sockaddr))))
elseif ccall(:jl_sockaddr_is_ip6,Int32,(Ptr{Void},),sockaddr) == 1
host = Array(UInt128,1)
scope_id = ccall(:jl_sockaddr_host6,UInt32,(Ptr{Void},Ptr{UInt128}),sockaddr,pointer(host))
push!(addresses, IPv6(ntoh(host[1])))
end
addrinfo = ccall(:jl_next_from_addrinfo,Ptr{Void},(Ptr{Void},),addrinfo)
end
cb(addresses)
ccall(:uv_freeaddrinfo,Void,(Ptr{Void},),freeaddrinfo)
end

Expand All @@ -578,16 +578,16 @@ function getaddrinfo(cb::Function, host::ASCIIString)
end
getaddrinfo(cb::Function, host::AbstractString) = getaddrinfo(cb,ascii(host))

function getaddrinfo(host::ASCIIString)
function getaddrinfo(host::ASCIIString; addrtype::Type=IPv4)
c = Condition()
getaddrinfo(host) do IP
notify(c,IP)
end
ip = wait(c)
isa(ip,UVError) && throw(ip)
return ip::IPAddr
ipaddresses = wait(c)
isa(ipaddresses,UVError) && throw(ipaddresses)
return filter(x -> isa(x, addrtype), ipaddresses)::Vector{IPAddr}
end
getaddrinfo(host::AbstractString) = getaddrinfo(ascii(host))
getaddrinfo(host::AbstractString; addrtype::Type=IPv4) = getaddrinfo(ascii(host); addrtype=addrtype)

const _sizeof_uv_interface_address = ccall(:jl_uv_sizeof_interface_address,Int32,())

Expand All @@ -609,12 +609,13 @@ function getipaddr()
end
sockaddr = ccall(:jl_uv_interface_address_sockaddr,Ptr{Void},(Ptr{UInt8},),current_addr)
if ccall(:jl_sockaddr_in_is_ip4,Int32,(Ptr{Void},),sockaddr) == 1
ccall(:uv_free_interface_addresses,Void,(Ptr{UInt8},Int32),addr,count)
return IPv4(ntoh(ccall(:jl_sockaddr_host4,UInt32,(Ptr{Void},),sockaddr)))
# Uncomment to enbable IPv6
#elseif ccall(:jl_sockaddr_in_is_ip6,Int32,(Ptr{Void},),sockaddr) == 1
# host = Array(UInt128,1)
# ccall(:jl_sockaddr_host6,UInt32,(Ptr{Void},Ptr{UInt128}),sockaddrr,host)
# return IPv6(ntoh(host[1]))
elseif ccall(:jl_sockaddr_in_is_ip6,Int32,(Ptr{Void},),sockaddr) == 1
host = Array(UInt128,1)
ccall(:jl_sockaddr_host6,UInt32,(Ptr{Void},Ptr{UInt128}),sockaddr,host)
ccall(:uv_free_interface_addresses,Void,(Ptr{UInt8},Int32),addr,count)
return IPv6(ntoh(host[1]))
end
end
ccall(:uv_free_interface_addresses,Void,(Ptr{UInt8},Int32),addr,count)
Expand Down Expand Up @@ -662,9 +663,21 @@ function connect!(sock::TCPSocket, host::AbstractString, port::Integer)
if sock.status != StatusInit
error("TCPSocket is not initialized")
end
ipaddr = getaddrinfo(host)
ipaddresses = getaddrinfo(host)
sock.status = StatusInit
connect!(sock,ipaddr,port)
lasterr = None
for ipaddr in ipaddresses
try
connect!(sock,ipaddr,port)
break
catch err
lasterr = err
continue
end
end
if lasterr != None
throw(lasterr)
end
sock.status = StatusConnecting
sock
end
Expand Down
4 changes: 2 additions & 2 deletions test/socket.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ for T in (ASCIIString, UTF8String, UTF16String) # test for issue #9435
end

@test_throws Base.UVError getaddrinfo(".invalid")
@test_throws Base.UVError connect("localhost", 21452)
@test_throws Base.UVError connect("127.0.0.1", 21452)

# test invalid port
@test_throws ArgumentError connect(ip"127.0.0.1",-1)
Expand All @@ -108,7 +108,7 @@ close(server)
wait(tsk)

port, server = listenany(defaultport)
@async connect("localhost",port)
@async connect("127.0.0.1",port)
s1 = accept(server)
@test_throws ErrorException accept(server,s1)
@test_throws Base.UVError listen(port)
Expand Down