diff options
-rw-r--r-- | cloudmqtt-bin/src/bin/client.rs | 2 | ||||
-rw-r--r-- | src/client/builder.rs | 6 | ||||
-rw-r--r-- | src/client/send.rs | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/cloudmqtt-bin/src/bin/client.rs b/cloudmqtt-bin/src/bin/client.rs index 0c8ebf0..8b044fe 100644 --- a/cloudmqtt-bin/src/bin/client.rs +++ b/cloudmqtt-bin/src/bin/client.rs @@ -57,7 +57,7 @@ async fn main() { .with_on_packet_recv(Box::new(|packet| { tracing::trace!(?packet, "Received packet") })) - .with_handle_acknowledge(Box::new(|packet| { + .with_handle_qos1_acknowledge(Box::new(|packet| { async move { tracing::trace!(?packet, "Acknowledging packet"); cloudmqtt::client::send::Acknowledge::Yes diff --git a/src/client/builder.rs b/src/client/builder.rs index e981e2e..e8629eb 100644 --- a/src/client/builder.rs +++ b/src/client/builder.rs @@ -10,7 +10,7 @@ use futures::lock::Mutex; use super::send::Callbacks; use super::send::ClientHandlers; -use super::send::HandleAcknowledgeFn; +use super::send::HandleQos1AcknowledgeFn; use super::send::OnPacketRecvFn; use super::InnerClient; use super::MqttClient; @@ -31,8 +31,8 @@ impl MqttClientBuilder { self } - pub fn with_handle_acknowledge(mut self, f: HandleAcknowledgeFn) -> Self { - self.handlers.handle_acknowledge = f; + pub fn with_handle_qos1_acknowledge(mut self, f: HandleQos1AcknowledgeFn) -> Self { + self.handlers.handle_qos1_acknowledge = f; self } diff --git a/src/client/send.rs b/src/client/send.rs index 319412b..161e130 100644 --- a/src/client/send.rs +++ b/src/client/send.rs @@ -215,13 +215,13 @@ pub struct PacketIdentifierExhausted; pub(crate) struct ClientHandlers { pub(crate) on_packet_recv: OnPacketRecvFn, - pub(crate) handle_acknowledge: HandleAcknowledgeFn, - // on_receive: Box<dyn Fn(&crate::packets::MqttPacket) + Send>, - // on_complete: Box<dyn Fn(&crate::packets::MqttPacket)+ Send>, + pub(crate) handle_qos1_acknowledge: HandleQos1AcknowledgeFn, + // handle_qos2_receive: Box<dyn Fn(&crate::packets::MqttPacket) + Send>, + // handle_qos2_complete: Box<dyn Fn(&crate::packets::MqttPacket) + Send>, } pub type OnPacketRecvFn = Box<dyn Fn(&crate::packets::MqttPacket) + Send>; -pub type HandleAcknowledgeFn = Box< +pub type HandleQos1AcknowledgeFn = Box< dyn for<'p> Fn(&'p crate::packets::MqttPacket) -> futures::future::BoxFuture<'p, Acknowledge> + Send, >; @@ -230,7 +230,7 @@ impl Default for ClientHandlers { fn default() -> Self { Self { on_packet_recv: Box::new(|_| ()), - handle_acknowledge: Box::new(|_| async move { Acknowledge::Yes }.boxed()), + handle_qos1_acknowledge: Box::new(|_| async move { Acknowledge::Yes }.boxed()), } } } |