fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 06:15:33 +00:00
Code Issues Projects Releases Wiki Activity

Fixed accept socket call

Browse Source
This commit is contained in:
Syrus Akbary 2018-12-05 16:16:17 -08:00
parent d2d8a0c039
commit e09205a391
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/apis/emscripten/syscalls.rs
View File

@ -61,7 +61,8 @@ use libc::{
sockaddr_in, sockaddr_in,
FIOCLEX, FIOCLEX,
SOL_SOCKET, SOL_SOCKET,
TIOCGWINSZ TIOCGWINSZ,
c_char
}; };
// use std::sys::fd::FileDesc; // use std::sys::fd::FileDesc;
@ -249,6 +250,11 @@ pub extern "C" fn ___syscall102(
// debug!("GuestSockaddrIn = {}", size_of::<GuestSockaddrIn>()); // debug!("GuestSockaddrIn = {}", size_of::<GuestSockaddrIn>());
pub struct LinuxSockAddr {
pub sa_family: u16,
pub sa_data: [c_char; 14],
}
match call { match call {
1 => { 1 => {
debug!("socket: socket"); debug!("socket: socket");
@ -336,9 +342,9 @@ pub extern "C" fn ___syscall102(
debug!("socket: accept"); debug!("socket: accept");
// accept (socket: c_int, address: *mut sockaddr, address_len: *mut socklen_t) -> c_int // accept (socket: c_int, address: *mut sockaddr, address_len: *mut socklen_t) -> c_int
let socket: i32 = socket_varargs.get(instance); let socket: i32 = socket_varargs.get(instance);
let address: u32 = socket_varargs.get(instance); let address_addr: u32 = socket_varargs.get(instance);
let address_len: u32 = socket_varargs.get(instance); let address_len: u32 = socket_varargs.get(instance);
let address = instance.memory_offset_addr(0, address as usize) as *mut sockaddr; let address = instance.memory_offset_addr(0, address_addr as usize) as *mut sockaddr;
debug!("=> socket: {}, address: {:?}, address_len: {}", socket, address, address_len); debug!("=> socket: {}, address: {:?}, address_len: {}", socket, address, address_len);
@ -349,14 +355,23 @@ pub extern "C" fn ___syscall102(
let fd = unsafe { accept(socket, address, address_len_addr) }; let fd = unsafe { accept(socket, address, address_len_addr) };
// Debug received address unsafe {
unsafe { let address_linux = instance.memory_offset_addr(0, address_addr as usize) as *mut LinuxSockAddr;
let proper_address = address as *const GuestSockaddrIn; (*address_linux).sa_family = (*address).sa_family as u16;
debug!( (*address_linux).sa_data = (*address).sa_data;
"=> address.sin_family: {:?}, address.sin_port: {:?}, address.sin_addr.s_addr: {:?}", };
(*proper_address).sin_family, (*proper_address).sin_port, (*proper_address).sin_addr.s_addr // // Debug received address
); // unsafe {
} // let proper_address = address as *const GuestSockaddrIn;
// debug!(
// "=> address.sin_family: {:?}, address.sin_port: {:?}, address.sin_addr.s_addr: {:?}",
// (*proper_address).sin_family, (*proper_address).sin_port, (*proper_address).sin_addr.s_addr
// );
// debug!(
// "=> address.sa_family: {:?}",
// (*address).sa_family
// );
// }
// set_cloexec // set_cloexec
unsafe { unsafe {
ioctl(fd, FIOCLEX); ioctl(fd, FIOCLEX);