Merge remote-tracking branch 'origin/tokio-1.18.x' into fix-named-pip…

…es-1.20

.github/workflows/ci.yml

@@ -41,7 +41,6 @@ jobs:
  - features
  - minrust
  - fmt
- - clippy
  - docs
  - valgrind
  - loom-compile
@@ -352,22 +351,6 @@ jobs:
  exit 1
  fi
 
- clippy:
- name: clippy
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
- - name: Install Rust ${{ env.rust_clippy }}
- uses: actions-rs/toolchain@v1
- with:
- toolchain: ${{ env.rust_clippy }}
- override: true
- components: clippy
- - uses: Swatinem/rust-cache@v1
- # Run clippy
- - name: "clippy --all"
- run: cargo clippy --all --tests --all-features
-
  docs:
  name: docs
  runs-on: ubuntu-latest

tokio/CHANGELOG.md

@@ -123,6 +123,15 @@ This release fixes a bug in `Notified::enable`. ([#4747])
 [#4729]: https://github.com/tokio-rs/tokio/pull/4729
 [#4739]: https://github.com/tokio-rs/tokio/pull/4739
 
+# 1.18.4 (January 3, 2022)
+
+### Fixed
+
+- net: fix Windows named pipe server builder to maintain option when toggling
+ pipe mode ([#5336]).
+
+[#5336]: https://github.com/tokio-rs/tokio/pull/5336
+
 # 1.18.3 (September 27, 2022)
 
 This release removes the dependency on the `once_cell` crate to restore the MSRV

tokio/src/net/windows/named_pipe.rs

@@ -1681,11 +1681,10 @@ impl ServerOptions {
  ///
  /// [`dwPipeMode`]: https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-createnamedpipea
  pub fn pipe_mode(&mut self, pipe_mode: PipeMode) -> &mut Self {
- self.pipe_mode = match pipe_mode {
- PipeMode::Byte => winbase::PIPE_TYPE_BYTE,
- PipeMode::Message => winbase::PIPE_TYPE_MESSAGE,
- };
-
+ let is_msg = matches!(pipe_mode, PipeMode::Message);
+ // Pipe mode is implemented as a bit flag 0x4. Set is message and unset
+ // is byte.
+ bool_flag!(self.pipe_mode, is_msg, winbase::PIPE_TYPE_MESSAGE);
  self
  }
 
@@ -2412,3 +2411,48 @@ unsafe fn named_pipe_info(handle: RawHandle) -> io::Result<PipeInfo> {
  max_instances,
  })
 }
+
+#[cfg(test)]
+mod test {
+ use self::winbase::{PIPE_REJECT_REMOTE_CLIENTS, PIPE_TYPE_BYTE, PIPE_TYPE_MESSAGE};
+ use super::*;
+
+ #[test]
+ fn opts_default_pipe_mode() {
+ let opts = ServerOptions::new();
+ assert_eq!(opts.pipe_mode, PIPE_TYPE_BYTE | PIPE_REJECT_REMOTE_CLIENTS);
+ }
+
+ #[test]
+ fn opts_unset_reject_remote() {
+ let mut opts = ServerOptions::new();
+ opts.reject_remote_clients(false);
+ assert_eq!(opts.pipe_mode & PIPE_REJECT_REMOTE_CLIENTS, 0);
+ }
+
+ #[test]
+ fn opts_set_pipe_mode_maintains_reject_remote_clients() {
+ let mut opts = ServerOptions::new();
+ opts.pipe_mode(PipeMode::Byte);
+ assert_eq!(opts.pipe_mode, PIPE_TYPE_BYTE | PIPE_REJECT_REMOTE_CLIENTS);
+
+ opts.reject_remote_clients(false);
+ opts.pipe_mode(PipeMode::Byte);
+ assert_eq!(opts.pipe_mode, PIPE_TYPE_BYTE);
+
+ opts.reject_remote_clients(true);
+ opts.pipe_mode(PipeMode::Byte);
+ assert_eq!(opts.pipe_mode, PIPE_TYPE_BYTE | PIPE_REJECT_REMOTE_CLIENTS);
+
+ opts.reject_remote_clients(false);
+ opts.pipe_mode(PipeMode::Message);
+ assert_eq!(opts.pipe_mode, PIPE_TYPE_MESSAGE);
+
+ opts.reject_remote_clients(true);
+ opts.pipe_mode(PipeMode::Message);
+ assert_eq!(
+ opts.pipe_mode,
+ PIPE_TYPE_MESSAGE | PIPE_REJECT_REMOTE_CLIENTS
+ );
+ }
+}