From 917af8bfb75514f24cb37b443562bc08b3f6c85d Mon Sep 17 00:00:00 2001 From: Devdutt Shenoi Date: Thu, 6 Oct 2022 11:10:50 +0530 Subject: [PATCH 1/3] fix: missing accept bug --- rumqttd/src/server/tls.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rumqttd/src/server/tls.rs b/rumqttd/src/server/tls.rs index 156482d5..e3b160f2 100644 --- a/rumqttd/src/server/tls.rs +++ b/rumqttd/src/server/tls.rs @@ -124,7 +124,7 @@ impl TLSAcceptor { } #[cfg(feature = "use-native-tls")] TLSAcceptor::NativeTLS { acceptor } => { - // let stream = acceptor.accept(stream).await?; + let stream = acceptor.accept(stream).await?; // let session = stream.get_ref(); // let peer_certificate = session // .peer_certificate()? From c81a702c736cf663a580464fb9c75bca6b0dc531 Mon Sep 17 00:00:00 2001 From: Devdutt Shenoi Date: Thu, 6 Oct 2022 11:12:11 +0530 Subject: [PATCH 2/3] fix: adapt to breaking change in shadow link --- rumqttd/src/link/shadow.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/rumqttd/src/link/shadow.rs b/rumqttd/src/link/shadow.rs index 688e19a5..94b62448 100644 --- a/rumqttd/src/link/shadow.rs +++ b/rumqttd/src/link/shadow.rs @@ -72,7 +72,6 @@ impl ShadowLink { let client_id = connect.client_id.clone(); let (link_tx, link_rx, _ack) = Link::new( - None, &client_id, router_tx, true, From d6b467d8be0725c3d20b546b0ad813a328aacebc Mon Sep 17 00:00:00 2001 From: Devdutt Shenoi Date: Thu, 6 Oct 2022 11:19:00 +0530 Subject: [PATCH 3/3] cleanup and restore as comment --- rumqttd/src/link/console.rs | 3 ++- rumqttd/src/link/shadow.rs | 9 ++------- rumqttd/src/server/broker.rs | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/rumqttd/src/link/console.rs b/rumqttd/src/link/console.rs index d9b5bd47..40e345f4 100644 --- a/rumqttd/src/link/console.rs +++ b/rumqttd/src/link/console.rs @@ -15,7 +15,8 @@ impl ConsoleLink { /// Requires the corresponding Router to be running to complete pub fn new(config: ConsoleSettings, router_tx: Sender<(ConnectionId, Event)>) -> ConsoleLink { let tx = router_tx.clone(); - let (link_tx, link_rx, _ack) = Link::new(/*None,*/ "console", tx, true, None, true).unwrap(); + let (link_tx, link_rx, _ack) = + Link::new(/*None,*/ "console", tx, true, None, true).unwrap(); let connection_id = link_tx.connection_id; ConsoleLink { config, diff --git a/rumqttd/src/link/shadow.rs b/rumqttd/src/link/shadow.rs index 94b62448..e65ccd52 100644 --- a/rumqttd/src/link/shadow.rs +++ b/rumqttd/src/link/shadow.rs @@ -71,13 +71,8 @@ impl ShadowLink { let subscriptions = HashSet::new(); let client_id = connect.client_id.clone(); - let (link_tx, link_rx, _ack) = Link::new( - &client_id, - router_tx, - true, - None, - config.dynamic_filters, - )?; + let (link_tx, link_rx, _ack) = + Link::new(/*None,*/ &client_id, router_tx, true, None, config.dynamic_filters)?; let connection_id = link_rx.id(); // Send connection acknowledgement back to the client diff --git a/rumqttd/src/server/broker.rs b/rumqttd/src/server/broker.rs index d6aaa22c..51959d36 100644 --- a/rumqttd/src/server/broker.rs +++ b/rumqttd/src/server/broker.rs @@ -262,7 +262,7 @@ impl Server

{ None => Ok(/*(*/ Box::new(stream) /*, None)*/), } #[cfg(not(any(feature = "use-rustls", feature = "use-native-tls")))] - Ok(/*(*/Box::new(stream)/*, None)*/) + Ok(/*(*/ Box::new(stream) /*, None)*/) } async fn start(&self, shadow: bool) -> Result<(), Error> {