Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-09 22:49:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Check WSAE* errors on windows

Browse Source
This commit is contained in:
Noah
2021-05-03 11:22:11 -05:00
parent 3dbbc068fb
commit 8ac4a8fa7a
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
vm/src/stdlib/socket.rs
View File

@@ -29,6 +29,19 @@ type RawSocket = std::os::unix::io::RawFd;
#[cfg(windows)]
type RawSocket = std::os::windows::raw::SOCKET;
#[cfg(unix)]
macro_rules! errcode {
($e:ident) => {
c::$e
};
}
#[cfg(windows)]
macro_rules! errcode {
($e:ident) => {
paste::paste!(c::[<WSA $e>])
};
}
#[cfg(unix)]
mod c {
pub use libc::*;
@@ -135,7 +148,10 @@ impl PySocket {
Ok(addr) if family == -1 => family = addr.family() as i32,
Err(e)
if family == -1
|| matches!(e.raw_os_error(), Some(libc::ENOTSOCK) | Some(libc::EBADF)) =>
|| matches!(
e.raw_os_error(),
Some(errcode!(ENOTSOCK)) | Some(errcode!(EBADF))
) =>
{
return Err(e.into_pyexception(vm))
}
@@ -356,7 +372,12 @@ impl PySocket {
vm.check_signals()?;
self.timeout.load() != 0.0
} else {
self.timeout.load() > 0.0 && err.raw_os_error() == Some(libc::EINPROGRESS)
#[cfg(unix)]
use c::EINPROGRESS;
#[cfg(windows)]
use c::WSAEWOULDBLOCK as EINPROGRESS;
self.timeout.load() > 0.0 && err.raw_os_error() == Some(EINPROGRESS)
};
if wait_connect {
@@ -1303,13 +1324,13 @@ fn _socket_dup(x: RawSocket, vm: &VirtualMachine) -> PyResult<RawSocket> {
fn _socket_close(x: RawSocket, vm: &VirtualMachine) -> PyResult<()> {
#[cfg(unix)]
use libc::{close, ECONNRESET};
use libc::close;
#[cfg(windows)]
use winapi::um::winsock2::{closesocket as close, WSAECONNRESET as ECONNRESET};
use winapi::um::winsock2::closesocket as close;
let ret = unsafe { close(x as _) };
if ret < 0 {
let err = super::os::errno();
if err.raw_os_error() != Some(ECONNRESET) {
if err.raw_os_error() != Some(errcode!(ECONNRESET)) {
return Err(err.into_pyexception(vm));
}
}