Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0d24ff8

Browse files
authored
Merge pull request#326 from bittcrafter/dev/0.18.0
fix(net): fix conditional compilation and code organization
2 parents2faf00a +76109e1 commit0d24ff8

File tree

6 files changed

+13
-7
lines changed

6 files changed

+13
-7
lines changed

‎rmqtt-conf/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name ="rmqtt-conf"
3-
version ="0.3.0"
3+
version ="0.3.1"
44
description ="Centralized configuration management system for RMQTT MQTT broker"
55
edition.workspace =true
66
license.workspace =true

‎rmqtt-net/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name ="rmqtt-net"
3-
version ="0.3.0"
3+
version ="0.3.1"
44
description ="Basic Implementation of MQTT Server"
55
repository ="https://github.com/rmqtt/rmqtt/tree/master/rmqtt-net"
66
edition.workspace =true

‎rmqtt-net/src/builder.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ use crate::quic::QuinnBiStream;
6666
usecrate::stream::Dispatcher;
6767
#[cfg(feature ="ws")]
6868
usecrate::ws::WsStream;
69-
usecrate::{CertInfo,Error,Result,TlsCertExtractor};
69+
#[cfg(feature ="tls")]
70+
usecrate::{CertInfo,TlsCertExtractor};
71+
usecrate::{Error,Result};
7072

7173
/// Configuration builder for MQTT server instances
7274
#[derive(Clone,Debug)]

‎rmqtt-net/src/cert.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ impl TlsCertExtractor for WsStream<tokio::net::TcpStream> {
8080
}
8181

8282
#[cfg(feature ="ws")]
83+
#[cfg(feature ="tls")]
8384
implTlsCertExtractorforWsStream<tokio_rustls::server::TlsStream<tokio::net::TcpStream>>{
8485
fnextract_cert_info(&self) ->Option<CertInfo>{
8586
self.get_inner().get_ref().extract_cert_info()

‎rmqtt-net/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
//! ```
2828
2929
mod builder;
30+
mod cert;
3031
mod error;
3132
#[cfg(feature ="quic")]
3233
mod quic;
@@ -40,16 +41,15 @@ pub use quic::QuinnBiStream;
4041
/// Server configuration and listener management
4142
pubuse builder::{Builder,Listener,ListenerType};
4243

44+
pubuse cert::{CertInfo,TlsCertExtractor};
45+
4346
/// Error types for MQTT operations
4447
pubuse error::MqttError;
4548

4649
/// TLS implementation providers
4750
#[cfg(feature ="tls")]
4851
pubuse rustls;
4952

50-
pubmod cert;
51-
pubuse cert::{CertInfo,TlsCertExtractor};
52-
5353
/// AWS-LC based TLS provider (non-Windows platforms)
5454
#[cfg(not(target_os ="windows"))]
5555
#[cfg(feature ="tls")]

‎rmqtt-net/src/stream.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ pub mod v3 {
274274
#[inline]
275275
pubasyncfnrecv_connect(&mutself,tm:Duration) ->Result<Box<Connect>>{
276276
let connect =matchself.recv(tm).await{
277+
#[allow(unused_mut)]
277278
Ok(Some(Packet::Connect(mut connect))) =>{
278279
#[cfg(feature ="tls")]
279280
{
@@ -333,7 +334,9 @@ pub mod v5 {
333334
use rmqtt_codec::{MqttCodec,MqttPacket};
334335

335336
usecrate::error::MqttError;
336-
usecrate::{Builder,CertInfo,Error,Result};
337+
#[cfg(feature ="tls")]
338+
usecrate::CertInfo;
339+
usecrate::{Builder,Error,Result};
337340

338341
/// MQTT v5.0 protocol stream implementation
339342
pubstructMqttStream<Io>{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp