Skip to content

Use hints with getaddrinfo() in std::net::lookup_host() #34700

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

Merged
merged 2 commits into from
Jul 9, 2016
Merged

Use hints with getaddrinfo() in std::net::lookup_host() #34700

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0314d17
Use hints with getaddrinfo() in std::net::lokup_host()
inejge Jul 7, 2016
66bf109
Add test for std::net::lookup_host() duplicates
inejge Jul 8, 2016
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
31 changes: 30 additions & 1 deletion src/libstd/sys/common/net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,19 @@ pub fn lookup_host(host: &str) -> io::Result<LookupHost> {
init();

let c_host = CString::new(host)?;
let hints = c::addrinfo {
ai_flags: 0,
ai_family: 0,
ai_socktype: c::SOCK_STREAM,
ai_protocol: 0,
ai_addrlen: 0,
ai_addr: ptr::null_mut(),
ai_canonname: ptr::null_mut(),
ai_next: ptr::null_mut()
};
let mut res = ptr::null_mut();
unsafe {
cvt_gai(c::getaddrinfo(c_host.as_ptr(), ptr::null(), ptr::null(),
cvt_gai(c::getaddrinfo(c_host.as_ptr(), ptr::null(), &hints,
&mut res))?;
Ok(LookupHost { original: res, cur: res })
}
Expand Down Expand Up @@ -591,3 +601,22 @@ impl fmt::Debug for UdpSocket {
.finish()
}
}

#[cfg(test)]
mod tests {
use prelude::v1::*;

use super::*;
use collections::HashMap;

#[test]
fn no_lookup_host_duplicates() {
let mut addrs = HashMap::new();
let lh = match lookup_host("localhost") {
Ok(lh) => lh,
Err(e) => panic!("couldn't resolve `localhost': {}", e)
};
let _na = lh.map(|sa| *addrs.entry(sa).or_insert(0) += 1).count();
assert!(addrs.values().filter(|&&v| v > 1).count() == 0);
}
}