Thanks to visit codestin.com
Credit goes to github.com

Skip to content

use BOOL for TCP_NODELAY setsockopt value on Windows #94094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 1, 2022
Merged

use BOOL for TCP_NODELAY setsockopt value on Windows #94094

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eb983e
Fix `setsockopt` and `getsockopt` parameter names.
chrisnc Feb 19, 2022
f2ebd0a
Remove assertion on output length for `getsockopt`.
chrisnc Feb 19, 2022
b02698c
use `BOOL` for `TCP_NODELAY` `setsockopt` value on Windows
chrisnc Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
use BOOL for TCP_NODELAY setsockopt value on Windows 
This issue was found by the Wine project and mitigated there [1].

Windows' documented interface for `setsockopt` expects a `BOOL` (a
`typedef` for `int`) for `TCP_NODELAY` [2]. Windows is forgiving and
will accept any positive length and interpret the first byte of
`*option_value` as the value, so this bug does not affect Windows
itself, but does affect systems implementing Windows' interface more
strictly, such as Wine. Wine was previously passing this through to the
host's `setsockopt`, where, e.g., Linux requires that `option_len` be
correct for the chosen option, and `TCP_NODELAY` expects an `int`.

[1]: https://source.winehq.org/git/wine.git/commit/d6ea38f32dfd3edbe107a255c37e9f7f3da06ae7
[2]: https://docs.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-setsockopt
  • Loading branch information
@chrisnc
chrisnc committed Feb 21, 2022
commit b02698c7e6843d6feacc394cb7f83f3fc347c3e2
4 changes: 2 additions & 2 deletions library/std/src/sys/windows/net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,11 +407,11 @@ impl Socket {
}

pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
net::setsockopt(self, c::IPPROTO_TCP, c::TCP_NODELAY, nodelay as c::BYTE)
net::setsockopt(self, c::IPPROTO_TCP, c::TCP_NODELAY, nodelay as c::BOOL)
}

pub fn nodelay(&self) -> io::Result<bool> {
let raw: c::BYTE = net::getsockopt(self, c::IPPROTO_TCP, c::TCP_NODELAY)?;
let raw: c::BOOL = net::getsockopt(self, c::IPPROTO_TCP, c::TCP_NODELAY)?;
Ok(raw != 0)
}

Expand Down