diff options
| author | bors <bors@rust-lang.org> | 2016-07-08 05:24:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 05:24:43 -0700 |
| commit | e7751e436ba4ff05dd844e330ee50afb7123e1fa (patch) | |
| tree | 56d348d5842edcb8ae3d528b512a17e481d847c8 /src/libstd/sys | |
| parent | 3fa1cdf23cd28b8dc5c8ba1f626c5256713cc991 (diff) | |
| parent | 5389ccc0c198298fbc3f81915791788688012466 (diff) | |
| download | rust-e7751e436ba4ff05dd844e330ee50afb7123e1fa.tar.gz rust-e7751e436ba4ff05dd844e330ee50afb7123e1fa.zip | |
Auto merge of #34720 - Manishearth:rollup, r=Manishearth
Rollup of 9 pull requests - Successful merges: #34097, #34456, #34610, #34612, #34659, #34688, #34691, #34699, #34700 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/net.rs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys/common/net.rs index 274e495d70e..26925b12f93 100644 --- a/src/libstd/sys/common/net.rs +++ b/src/libstd/sys/common/net.rs @@ -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 }) } |