Minor cleanup

pmeunier

Apr 24, 2023, 7:53 AM

DLPZJCIAWYHXUB5GG3O7KMYXRECSTVR7NWEAOBHEXYMTIFVJIYWQC

Dependencies

• [2] 2WEO7OZL Version updates: getting rid of anyhow + moving to Tokio 1.0
• [3] BRDS7STA Adding method `send_channel_msg` to client::Session, to make it easier to write handlers
• [4] NHOSLQGG Thrussh: making OpenSSL optional
• [5] 7FRJYUI6 Reboot because of a bad change
• [6] EXXUR33Q Fixing queues when sending a vector
• [7] YSLHJU3I Add a Close construct to ChannelMsg in the server
• [8] XEKZBXNI Fixing a bug with tokio::select

Change contents

• edit in thrussh/src/session.rs at line 39
  [3.172964]→[3.172964:172991](∅→∅)
  − pub wants_reply: bool,
• edit in thrussh/src/session.rs at line 84
  [3.174493]→[3.174493:174525](∅→∅)
  − wants_reply: false,
• replacement in thrussh/src/session.rs at line 304
  [3.181981]→[3.181981:181997](∅→∅)
  − ) -> bool {
  [3.181981]

  [3.181997]
  + ) -> Result<bool, crate::Error> {
• replacement in thrussh/src/session.rs at line 315
  [3.182541]→[3.182541:182594](∅→∅)
  − )

  − .unwrap();
  [3.182541]

  [3.182594]
  + )?;
• replacement in thrussh/src/session.rs at line 327
  [3.182999]→[3.182999:183088](∅→∅)
  − write_buffer.bytes >= limits.rekey_write_limit || dur >= limits.rekey_time_limit
  [3.182999]

  [3.183088]
  + Ok(write_buffer.bytes >= limits.rekey_write_limit || dur >= limits.rekey_time_limit)
• replacement in thrussh/src/server/session.rs at line 176
  [3.192816]→[3.192816:192832](∅→∅)
  − ) {
  [3.192816]

  [3.192832]
  + )? {
• replacement in thrussh/src/lib.rs at line 592
  [3.297190]→[3.297190:297246](∅→∅)
  − fn from_u32(x: u32) -> Option<ChannelOpenFailure> {
  [3.297190]

  [3.297246]
  + fn from_u32(x: u32) -> Result<ChannelOpenFailure, Error> {
• replacement in thrussh/src/lib.rs at line 594
  [3.297264]→[3.297264:297540](∅→∅)
  − 1 => Some(ChannelOpenFailure::AdministrativelyProhibited),

  − 2 => Some(ChannelOpenFailure::ConnectFailed),

  − 3 => Some(ChannelOpenFailure::UnknownChannelType),

  − 4 => Some(ChannelOpenFailure::ResourceShortage),

  − _ => None,
  [3.297264]

  [3.297540]
  + 1 => Ok(ChannelOpenFailure::AdministrativelyProhibited),

  + 2 => Ok(ChannelOpenFailure::ConnectFailed),

  + 3 => Ok(ChannelOpenFailure::UnknownChannelType),

  + 4 => Ok(ChannelOpenFailure::ResourceShortage),

  + _ => Err(Error::Inconsistent),
• replacement in thrussh/src/client/mod.rs at line 1019
  [3.366529]→[3.366529:366545](∅→∅)
  − ) {
  [3.366529]

  [3.366545]
  + )? {
• replacement in thrussh/src/client/encrypted.rs at line 341
  [2.20298]→[2.20298:20425](∅→∅)
  − ChannelOpenFailure::from_u32(r.read_u32().map_err(crate::Error::from)?)

  − .unwrap();
  [2.20298]

  [2.20425]
  + ChannelOpenFailure::from_u32(r.read_u32().map_err(crate::Error::from)?)?;

  +