rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

std/rt: cleanup and adding sockaddr_in6 mapping for win32

Browse Source
This commit is contained in:
Jeff Olson
2012-06-27 15:28:03 -07:00
committed by Brian Anderson
parent b074774232
commit cfcd3e683b
4 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libstd/net_ip.rs
View File

@@ -332,6 +332,7 @@ mod test {
}
}
#[test]
#[ignore(target_os="win32")]
fn test_ip_ipv6_bad_parse() {
alt v6::try_parse_addr("::,~2234k;") {
result::err(err_info) {

3
src/libstd/net_tcp.rs
View File

@@ -823,7 +823,8 @@ Implementation of `io::reader` iface for a buffered `net::tcp::tcp_socket`
"]
impl tcp_socket_buf of io::writer for @tcp_socket_buf {
fn write(data: [const u8]/&) unsafe {
let socket_data_ptr = ptr::addr_of(*((*(self.data)).sock).socket_data);
let socket_data_ptr =
ptr::addr_of(*((*(self.data)).sock).socket_data);
let w_result = write_common_impl(socket_data_ptr,
vec::slice(data, 0, vec::len(data)));
if w_result.is_err() {

37
src/libstd/uv_ll.rs
View File

@@ -225,10 +225,18 @@ type sockaddr_in = {
// unix size: 28 .. FIXME #1645
// stuck with 32 becuse of rust padding structs?
#[cfg(unix)]
type sockaddr_in6 = {
a0: *u8, a1: *u8,
a2: *u8, a3: *u8
};
#[cfg(windows)]
type sockaddr_in6 = {
a0: *u8, a1: *u8,
a2: *u8, a3: *u8,
a4: *u8, a5: *u8,
a6: *u8, a7: *u8
};
// unix size: 28 .. FIXME #1645
// stuck with 32 becuse of rust padding structs?
@@ -753,25 +761,17 @@ unsafe fn buf_init(++input: *u8, len: uint) -> uv_buf_t {
}
unsafe fn ip4_addr(ip: str, port: int)
-> sockaddr_in {
let mut addr_vec = str::bytes(ip);
vec::push(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_ip4_addr(addr_vec_ptr,
port as libc::c_int);
str::as_c_str(ip) {|ip_buf|
rustrt::rust_uv_ip4_addr(ip_buf as *u8,
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,
str::as_c_str(ip) {|ip_buf|
rustrt::rust_uv_ip6_addr(ip_buf as *u8,
port as libc::c_int);
}
}
unsafe fn ip4_name(src: &sockaddr_in) -> str {
// ipv4 addr max size: 15 + 1 trailing null byte
@@ -800,7 +800,10 @@ unsafe fn ip6_name(src: &sockaddr_in6) -> str {
0u8,0u8,0u8,0u8,0u8,0u8]/~;
let size = 46 as libc::size_t;
vec::as_buf(dst) {|dst_buf|
let result = rustrt::rust_uv_ip6_name(src as *sockaddr_in6,
let src_unsafe_ptr = src as *sockaddr_in6;
log(debug, #fmt("val of src *sockaddr_in6: %? sockaddr_in6: %?",
src_unsafe_ptr, src));
let result = rustrt::rust_uv_ip6_name(src_unsafe_ptr,
dst_buf, size);
alt result {
0i32 {
@@ -1536,7 +1539,7 @@ mod test {
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",
let output = #fmt("sockaddr_in6 -- native: %u rust: %u",
native_handle_size as uint, rust_handle_size);
log(debug, output);
// FIXME #1645 .. rust appears to pad structs to the nearest byte..?

12
src/rt/rust_uv.cpp
View File

@@ -459,7 +459,7 @@ extern "C" struct sockaddr_in
rust_uv_ip4_addr(const char* ip, int port) {
rust_task* task = rust_get_current_task();
LOG(task, stdlib, "before creating addr_ptr.. ip %s" \
"port %d", ip, port);
" port %d\n", ip, port);
struct sockaddr_in addr = uv_ip4_addr(ip, port);
LOG(task, stdlib, "after creating .. port: %d", addr.sin_port);
return addr;
@@ -468,9 +468,8 @@ extern "C" struct sockaddr_in6
rust_uv_ip6_addr(const char* ip, int port) {
rust_task* task = rust_get_current_task();
LOG(task, stdlib, "before creating addr_ptr.. ip %s" \
"port %d", ip, port);
struct sockaddr_in6 addr = uv_ip6_addr(ip, port);
return addr;
" port %d\n", ip, port);
return uv_ip6_addr(ip, port);
}
extern "C" int
rust_uv_ip4_name(struct sockaddr_in* src, char* dst, size_t size) {
@@ -478,7 +477,10 @@ rust_uv_ip4_name(struct sockaddr_in* src, char* dst, size_t size) {
}
extern "C" int
rust_uv_ip6_name(struct sockaddr_in6* src, char* dst, size_t size) {
return uv_ip6_name(src, dst, size);
int result = uv_ip6_name(src, dst, size);
printf("rust_uv_ip6_name: src ptr: %lu dst result: '%s'\n",
(unsigned long int)src, dst);
return result;
}
extern "C" uintptr_t*