OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

std: mapping additional libuv ip string helpers.. add test for sockaddr_in6

Browse Source 
.. but the test is kind of broken.. it appears that rust pads structs for
alignment purposes? I can't get the struct to == 28.. that appears to
be the native size of sockaddr_in6.. so we have a size 32 struct, for now.
This commit is contained in:
Jeff Olson 2012-06-12 08:41:06 -07:00 committed by Brian Anderson
parent 511873afe3
commit c027292846
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/libstd/uv_ll.rs
View File

@ -223,10 +223,10 @@ type sockaddr_in = {
mut sin_zero: (u8, u8, u8, u8, u8, u8, u8, u8)
};
// unix size: 28 .. make due w/ 32
// unix size: 28 .. FIXME: stuck with 32 becuse of rust padding structs?
type sockaddr_in6 = {
a0: *u8, a1: *u8,
a2: *u8, a3: (u8, u8, u8, u8)
a2: *u8, a3: *u8
};
mod uv_ll_struct_stubgen {
@ -500,6 +500,12 @@ native mod rustrt {
fn rust_uv_err_name(err: *uv_err_t) -> *libc::c_char;
fn rust_uv_ip4_addr(ip: *u8, port: libc::c_int)
-> sockaddr_in;
fn rust_uv_ip6_addr(ip: *u8, port: libc::c_int)
-> sockaddr_in6;
fn rust_uv_ip4_name(src: *sockaddr_in, dst: *u8, size: libc::size_t)
-> libc::c_int;
fn rust_uv_ip6_name(src: *sockaddr_in6, dst: *u8, size: libc::size_t)
-> libc::c_int;
// FIXME ref #2064
fn rust_uv_tcp_connect(connect_ptr: *uv_connect_t,
tcp_handle_ptr: *uv_tcp_t,
@ -558,6 +564,7 @@ native mod rustrt {
fn rust_uv_helper_uv_write_t_size() -> libc::c_uint;
fn rust_uv_helper_uv_err_t_size() -> libc::c_uint;
fn rust_uv_helper_sockaddr_in_size() -> libc::c_uint;
fn rust_uv_helper_sockaddr_in6_size() -> libc::c_uint;
fn rust_uv_helper_uv_async_t_size() -> libc::c_uint;
fn rust_uv_helper_uv_timer_t_size() -> libc::c_uint;
}
@ -686,6 +693,17 @@ unsafe fn ip4_addr(ip: str, port: int)
ret rustrt::rust_uv_ip4_addr(addr_vec_ptr,
port as libc::c_int);
}
unsafe fn ip6_addr(ip: str, port: int)
-> sockaddr_in6 {
let mut addr_vec = str::bytes(ip);
addr_vec += [0u8]; // add null terminator
let addr_vec_ptr = vec::unsafe::to_ptr(addr_vec);
let ip_back = str::from_bytes(addr_vec);
log(debug, #fmt("vec val: '%s' length: %u",
ip_back, vec::len(addr_vec)));
ret rustrt::rust_uv_ip6_addr(addr_vec_ptr,
port as libc::c_int);
}
unsafe fn timer_init(loop_ptr: *libc::c_void,
timer_ptr: *uv_timer_t) -> libc::c_int {
@ -1366,6 +1384,21 @@ mod test {
log(debug, output);
assert foreign_handle_size as uint == rust_handle_size;
}
#[test]
#[ignore(cfg(target_os = "freebsd"))]
fn test_uv_ll_struct_size_sockaddr_in6() {
let native_handle_size =
rustrt::rust_uv_helper_sockaddr_in6_size();
let rust_handle_size = sys::size_of::<sockaddr_in6>();
let output = #fmt("sockaddr_in -- native: %u rust: %u",
native_handle_size as uint, rust_handle_size);
log(debug, output);
// FIXME .. rust appears to pack structs to the nearest byte..?
// .. can't get the uv::ll::sockaddr_in6 to == 28 :/
// .. so the type always appears to be 32 in size.. which is
// good, i guess.. better too big than too little
assert (4u+native_handle_size as uint) == rust_handle_size;
}
#[test]
#[ignore(cfg(target_os = "freebsd"))]