Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/mqtt_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,7 @@ impl<'buf, TcpStack: TcpClientStack, Clock: embedded_time::Clock, Broker: crate:

fn update(&mut self) -> Result<(), Error<TcpStack::Error>> {
if self.network.socket_was_closed() {
self.network.reset();
info!("Handling closed socket");
self.sm.process_event(Events::TcpDisconnect).unwrap();
self.network.allocate_socket()?;
Expand Down Expand Up @@ -780,13 +781,15 @@ impl<'buf, TcpStack: TcpClientStack, Clock: embedded_time::Clock, Broker: crate:
if received > 0 {
debug!("Received {} bytes", received);
} else {
self.client.update()?;
return Ok(None);
}
}

let packet = self.packet_reader.received_packet()?;
info!("Received {:?}", packet);
if let Some(result) = self.client.handle_packet(packet, &mut f)? {
self.client.update()?;
return Ok(Some(result));
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/network_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ where
}
}

pub fn socket_was_closed(&mut self) -> bool {
let was_closed = self.connection_died;
if was_closed {
self.pending_write.take();
}
pub fn socket_was_closed(&self) -> bool {
self.connection_died
}

pub fn reset(&mut self) {
self.pending_write.take();
self.connection_died = false;
was_closed
}

/// Determine if there is a pending packet write that needs to be completed.
Expand Down
Loading