diff --git a/src/ffi/pseudo_socket_api.rs b/src/ffi/pseudo_socket_api.rs index 27feccc7abb2692bb6a46910014cf4633ce43039..8adbbcb85fc32d9c0b0a8996dc525e544d374f28 100644 --- a/src/ffi/pseudo_socket_api.rs +++ b/src/ffi/pseudo_socket_api.rs @@ -81,7 +81,7 @@ impl ConnectorComplex { #[no_mangle] pub extern "C" fn rw_socket(_domain: c_int, _type: c_int, _protocol: c_int) -> c_int { // get writer lock - let mut w = if let Ok(w) = CC_MAP.write() { w } else { return LOCK_POISONED }; + let mut w = if let Ok(w) = CC_MAP.write() { w } else { return RW_LOCK_POISONED }; let fd = w.fd_allocator.alloc(); let cc = ConnectorComplex { connector: Connector::new( @@ -98,12 +98,12 @@ pub extern "C" fn rw_socket(_domain: c_int, _type: c_int, _protocol: c_int) -> c pub extern "C" fn rw_close(fd: c_int, _how: c_int) -> c_int { // ignoring HOW // get writer lock - let mut w = if let Ok(w) = CC_MAP.write() { w } else { return LOCK_POISONED }; + let mut w = if let Ok(w) = CC_MAP.write() { w } else { return RW_LOCK_POISONED }; if w.fd_to_cc.remove(&fd).is_some() { w.fd_allocator.free(fd); - ERR_OK + RW_OK } else { - CLOSE_FAIL + RW_CLOSE_FAIL } } #[no_mangle] @@ -111,18 +111,18 @@ pub unsafe extern "C" fn rw_bind(fd: c_int, addr: *const sockaddr, addr_len: soc // assuming _domain is AF_INET and _type is SOCK_DGRAM let addr = match libc_to_std_sockaddr(addr, addr_len) { Some(addr) => addr, - _ => return BAD_SOCKADDR, + _ => return RW_BAD_SOCKADDR, }; // get outer reader, inner writer locks - let r = if let Ok(r) = CC_MAP.read() { r } else { return LOCK_POISONED }; - let cc = if let Some(cc) = r.fd_to_cc.get(&fd) { cc } else { return BAD_FD }; - let mut cc = if let Ok(cc) = cc.lock() { cc } else { return LOCK_POISONED }; + let r = if let Ok(r) = CC_MAP.read() { r } else { return RW_LOCK_POISONED }; + let cc = if let Some(cc) = r.fd_to_cc.get(&fd) { cc } else { return RW_BAD_FD }; + let mut cc = if let Ok(cc) = cc.lock() { cc } else { return RW_LOCK_POISONED }; match &mut cc.phased { - ConnectorComplexPhased::Communication { .. } => WRONG_STATE, + ConnectorComplexPhased::Communication { .. } => RW_WRONG_STATE, ConnectorComplexPhased::Setup { local, .. } => { *local = Some(addr); cc.try_become_connected(); - ERR_OK + RW_OK } } } @@ -134,19 +134,19 @@ pub unsafe extern "C" fn rw_connect( ) -> c_int { let addr = match libc_to_std_sockaddr(addr, addr_len) { Some(addr) => addr, - _ => return BAD_SOCKADDR, + _ => return RW_BAD_SOCKADDR, }; // assuming _domain is AF_INET and _type is SOCK_DGRAM // get outer reader, inner writer locks - let r = if let Ok(r) = CC_MAP.read() { r } else { return LOCK_POISONED }; - let cc = if let Some(cc) = r.fd_to_cc.get(&fd) { cc } else { return BAD_FD }; - let mut cc = if let Ok(cc) = cc.lock() { cc } else { return LOCK_POISONED }; + let r = if let Ok(r) = CC_MAP.read() { r } else { return RW_LOCK_POISONED }; + let cc = if let Some(cc) = r.fd_to_cc.get(&fd) { cc } else { return RW_BAD_FD }; + let mut cc = if let Ok(cc) = cc.lock() { cc } else { return RW_LOCK_POISONED }; match &mut cc.phased { - ConnectorComplexPhased::Communication { .. } => WRONG_STATE, + ConnectorComplexPhased::Communication { .. } => RW_WRONG_STATE, ConnectorComplexPhased::Setup { peer, .. } => { *peer = Some(addr); cc.try_become_connected(); - ERR_OK + RW_OK } } } @@ -159,12 +159,12 @@ pub unsafe extern "C" fn rw_send( ) -> isize { // ignoring flags // get outer reader, inner writer locks - let r = if let Ok(r) = CC_MAP.read() { r } else { return LOCK_POISONED as isize }; - let cc = if let Some(cc) = r.fd_to_cc.get(&fd) { cc } else { return BAD_FD as isize }; - let mut cc = if let Ok(cc) = cc.lock() { cc } else { return LOCK_POISONED as isize }; + let r = if let Ok(r) = CC_MAP.read() { r } else { return RW_LOCK_POISONED as isize }; + let cc = if let Some(cc) = r.fd_to_cc.get(&fd) { cc } else { return RW_BAD_FD as isize }; + let mut cc = if let Ok(cc) = cc.lock() { cc } else { return RW_LOCK_POISONED as isize }; let ConnectorComplex { connector, phased } = cc.deref_mut(); match phased { - ConnectorComplexPhased::Setup { .. } => WRONG_STATE as isize, + ConnectorComplexPhased::Setup { .. } => RW_WRONG_STATE as isize, ConnectorComplexPhased::Communication { putter, .. } => { let payload = payload_from_raw(bytes_ptr, bytes_len); connector.put(*putter, payload).unwrap(); @@ -182,12 +182,12 @@ pub unsafe extern "C" fn rw_recv( ) -> isize { // ignoring flags // get outer reader, inner writer locks - let r = if let Ok(r) = CC_MAP.read() { r } else { return LOCK_POISONED as isize }; - let cc = if let Some(cc) = r.fd_to_cc.get(&fd) { cc } else { return BAD_FD as isize }; - let mut cc = if let Ok(cc) = cc.lock() { cc } else { return LOCK_POISONED as isize }; + let r = if let Ok(r) = CC_MAP.read() { r } else { return RW_LOCK_POISONED as isize }; + let cc = if let Some(cc) = r.fd_to_cc.get(&fd) { cc } else { return RW_BAD_FD as isize }; + let mut cc = if let Ok(cc) = cc.lock() { cc } else { return RW_LOCK_POISONED as isize }; let ConnectorComplex { connector, phased } = cc.deref_mut(); match phased { - ConnectorComplexPhased::Setup { .. } => WRONG_STATE as isize, + ConnectorComplexPhased::Setup { .. } => RW_WRONG_STATE as isize, ConnectorComplexPhased::Communication { getter, .. } => { connector.get(*getter).unwrap(); connector.sync(None).unwrap();