diff --git a/sshproto/src/conn.rs b/sshproto/src/conn.rs index 0f28f708dcffda790b710f55287e7cf0688501ea..6999aea86ebda2fa03c03e7ebacda24a8ee6af4f 100644 --- a/sshproto/src/conn.rs +++ b/sshproto/src/conn.rs @@ -123,7 +123,7 @@ impl<'a> Conn<'a> { } /// Updates `ConnState` and sends any packets required to progress the connection state. - pub(crate) async fn progress<'b>( + pub(crate) async fn progress( &mut self, s: &mut TrafSend<'_, '_>, b: &mut Behaviour<'_>, @@ -174,8 +174,8 @@ impl<'a> Conn<'a> { /// Consumes an input payload which is a view into [`traffic::Traffic::rxbuf`]. /// We queue response packets that can be sent (written into the same buffer) /// after `handle_payload()` runs. - pub(crate) async fn handle_payload<'p>( - &mut self, payload: &'p [u8], seq: u32, + pub(crate) async fn handle_payload( + &mut self, payload: &[u8], seq: u32, s: &mut TrafSend<'_, '_>, b: &mut Behaviour<'_>, ) -> Result<Dispatched, Error> { @@ -229,8 +229,8 @@ impl<'a> Conn<'a> { r } - async fn dispatch_packet<'p>( - &mut self, packet: Packet<'p>, s: &mut TrafSend<'_, '_>, b: &mut Behaviour<'_>, + async fn dispatch_packet( + &mut self, packet: Packet<'_>, s: &mut TrafSend<'_, '_>, b: &mut Behaviour<'_>, ) -> Result<Dispatched, Error> { // TODO: perhaps could consolidate packet client vs server checks trace!("Incoming {packet:#?}"); @@ -405,27 +405,6 @@ impl<'a> Conn<'a> { }; Ok(disp) } - - /// creates an `Event` that borrows data from the payload. Some `Event` variants don't - /// require payload data, the payload is not required in that case. - /// Those variants are allowed to return `resp` packets from `dispatch()` - pub(crate) fn make_event<'p>(&mut self, payload: Option<&'p [u8]>, ev: EventMaker) - -> Result<Option<Event<'p>>> { - let p = payload.map(|pl| sshwire::packet_from_bytes(pl, &self.parse_ctx)).transpose()?; - let r = match ev { - EventMaker::Channel(ChanEventMaker::DataIn(_)) => { - // caller should have handled it instead - return Err(Error::bug()) - } - EventMaker::Channel(cev) => { - let c = cev.make(p.trap()?); - c.map(|c| Event::Channel(c)) - } - EventMaker::CliAuthed => Some(Event::CliAuthed), - }; - Ok(r) - } - } #[cfg(test)]