diff --git a/Cargo.toml b/Cargo.toml index 5f1e68510393469cb1371289729c829c99d8052f..258a30287cfdafbbc1e850669b231fda1cbb8fe4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ lazy_static = "1.4.0" # socket ffi libc = { version = "^0.2", optional = true } -os_socketaddr = { verion = "0.1.0", optional = true } +os_socketaddr = { version = "0.1.0", optional = true } [dev-dependencies] # test-generator = "0.3.0" diff --git a/src/ffi/mod.rs b/src/ffi/mod.rs index 653b6e4a0a28adb7def9dae7cac31834ba841ead..a75c2cf7b8a1c74542532e11c553a9f0e7f47b85 100644 --- a/src/ffi/mod.rs +++ b/src/ffi/mod.rs @@ -75,21 +75,6 @@ impl StoredError { thread_local! { static STORED_ERROR: RefCell = RefCell::new(StoredError::default()); } -unsafe fn tl_socketaddr_from_raw( - bytes_ptr: *const u8, - bytes_len: usize, -) -> Result { - std::str::from_utf8(&*slice_from_raw_parts(bytes_ptr, bytes_len)) - .map_err(|err| { - StoredError::tl_debug_store(&err); - ERR_REOWOLF - })? - .parse() - .map_err(|err| { - StoredError::tl_debug_store(&err); - ERR_REOWOLF - }) -} pub const ERR_OK: c_int = 0; pub const ERR_REOWOLF: c_int = -1; diff --git a/src/ffi/pseudo_socket_api.rs b/src/ffi/pseudo_socket_api.rs index 3a1e794848d59b518b93df3560831cc92bea545a..0dcb756cd0e5a6abcd144859e6afb77a9ac2acb0 100644 --- a/src/ffi/pseudo_socket_api.rs +++ b/src/ffi/pseudo_socket_api.rs @@ -16,7 +16,6 @@ struct FdAllocator { } struct ConnectorBound { connector: Connector, - is_nonblocking: bool, putter: PortId, getter: PortId, } @@ -155,7 +154,7 @@ pub unsafe extern "C" fn rw_bind(fd: c_int, addr: *const sockaddr, addr_len: soc Connector::random_id(), ); let [putter, getter] = connector.new_udp_mediator_component(addr, cc.peer_addr).unwrap(); - Some(ConnectorBound { connector, putter, getter, is_nonblocking: false }) + Some(ConnectorBound { connector, putter, getter }) }; ERR_OK }