diff --git a/Cargo.lock b/Cargo.lock index 63402eae..b66a2c20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1698,7 +1698,7 @@ dependencies = [ "libwish", "md5", "mime_guess", - "netmqtt", + "net4mqtt", "prometheus", "reqwest", "rust-embed", @@ -1731,7 +1731,7 @@ dependencies = [ "hyper-util", "liveion", "mime_guess", - "netmqtt", + "net4mqtt", "reqwest", "rust-embed", "serde", @@ -1992,7 +1992,7 @@ dependencies = [ ] [[package]] -name = "netmqtt" +name = "net4mqtt" version = "0.5.1" dependencies = [ "anyhow", @@ -3782,9 +3782,9 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" diff --git a/Cargo.toml b/Cargo.toml index c0b600d9..733c0b32 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,7 @@ members = [ "libs/http-log", "libs/libwish", "libs/signal", + "libs/net4mqtt", "tools/whepfrom", "tools/whipinto", "liveion", diff --git a/libs/netmqtt/Cargo.toml b/libs/net4mqtt/Cargo.toml similarity index 97% rename from libs/netmqtt/Cargo.toml rename to libs/net4mqtt/Cargo.toml index e1b2b42f..b58364ca 100644 --- a/libs/netmqtt/Cargo.toml +++ b/libs/net4mqtt/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "netmqtt" +name = "net4mqtt" description = "net (TCP/UDP) over mqtt tool" version.workspace = true edition.workspace = true diff --git a/libs/netmqtt/README.md b/libs/net4mqtt/README.md similarity index 100% rename from libs/netmqtt/README.md rename to libs/net4mqtt/README.md diff --git a/libs/netmqtt/bin/main.rs b/libs/net4mqtt/bin/main.rs similarity index 99% rename from libs/netmqtt/bin/main.rs rename to libs/net4mqtt/bin/main.rs index d5dc5f6a..f760a200 100644 --- a/libs/netmqtt/bin/main.rs +++ b/libs/net4mqtt/bin/main.rs @@ -3,7 +3,7 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use clap::{ArgAction, Parser, Subcommand}; use tracing::{debug, info, trace, Level}; -use netmqtt::proxy; +use net4mqtt::proxy; #[derive(Parser, Debug)] #[command(version, about, long_about = None)] diff --git a/libs/netmqtt/src/broker.rs b/libs/net4mqtt/src/broker.rs similarity index 100% rename from libs/netmqtt/src/broker.rs rename to libs/net4mqtt/src/broker.rs diff --git a/libs/netmqtt/src/kxdns.rs b/libs/net4mqtt/src/kxdns.rs similarity index 100% rename from libs/netmqtt/src/kxdns.rs rename to libs/net4mqtt/src/kxdns.rs diff --git a/libs/netmqtt/src/lib.rs b/libs/net4mqtt/src/lib.rs similarity index 100% rename from libs/netmqtt/src/lib.rs rename to libs/net4mqtt/src/lib.rs diff --git a/libs/netmqtt/src/proxy.rs b/libs/net4mqtt/src/proxy.rs similarity index 100% rename from libs/netmqtt/src/proxy.rs rename to libs/net4mqtt/src/proxy.rs diff --git a/libs/netmqtt/src/socks.rs b/libs/net4mqtt/src/socks.rs similarity index 100% rename from libs/netmqtt/src/socks.rs rename to libs/net4mqtt/src/socks.rs diff --git a/libs/netmqtt/src/tests.rs b/libs/net4mqtt/src/tests.rs similarity index 100% rename from libs/netmqtt/src/tests.rs rename to libs/net4mqtt/src/tests.rs diff --git a/libs/netmqtt/src/topic.rs b/libs/net4mqtt/src/topic.rs similarity index 100% rename from libs/netmqtt/src/topic.rs rename to libs/net4mqtt/src/topic.rs diff --git a/libs/netmqtt/src/utils.rs b/libs/net4mqtt/src/utils.rs similarity index 100% rename from libs/netmqtt/src/utils.rs rename to libs/net4mqtt/src/utils.rs diff --git a/liveion/Cargo.toml b/liveion/Cargo.toml index 79196c06..9d0ba8bf 100644 --- a/liveion/Cargo.toml +++ b/liveion/Cargo.toml @@ -17,7 +17,7 @@ libwish = { path = "../libs/libwish" } signal = { path = "../libs/signal" } utils = { path = "../libs/utils" } -netmqtt = { path = "../libs/netmqtt", optional = true } +net4mqtt = { path = "../libs/net4mqtt", optional = true } anyhow = { workspace = true, features = ["backtrace"] } clap = { workspace = true, features = ["derive"] } @@ -51,4 +51,4 @@ reqwest = { version = "0.12", optional = true, features = [ [features] default = ["net4mqtt"] webhook = ["dep:reqwest"] -net4mqtt = ["dep:netmqtt"] +net4mqtt = ["dep:net4mqtt"] diff --git a/liveion/src/lib.rs b/liveion/src/lib.rs index 33c418c7..74bba10a 100644 --- a/liveion/src/lib.rs +++ b/liveion/src/lib.rs @@ -95,7 +95,7 @@ where tokio::runtime::Runtime::new() .unwrap() .block_on(async move { - netmqtt::proxy::agent( + net4mqtt::proxy::agent( &c.mqtt_url, cfg.http.listen, &c.alias.clone(), diff --git a/liveman/Cargo.toml b/liveman/Cargo.toml index cdfc7bdb..6f49fe56 100644 --- a/liveman/Cargo.toml +++ b/liveman/Cargo.toml @@ -8,7 +8,7 @@ repository.workspace = true [dependencies] liveion = { path = "../liveion", optional = true } -netmqtt = { path = "../libs/netmqtt", optional = true } +net4mqtt = { path = "../libs/net4mqtt", optional = true } api = { path = "../libs/api" } auth = { path = "../libs/auth" } @@ -42,5 +42,5 @@ url = "2.5" [features] default = ["net4mqtt"] liveion = ["dep:liveion"] -net4mqtt = ["dep:netmqtt"] +net4mqtt = ["dep:net4mqtt"] diff --git a/liveman/src/main.rs b/liveman/src/main.rs index 42aaaf47..60149a12 100644 --- a/liveman/src/main.rs +++ b/liveman/src/main.rs @@ -144,7 +144,7 @@ where tokio::runtime::Runtime::new() .unwrap() .block_on(async move { - netmqtt::proxy::local_socks( + net4mqtt::proxy::local_socks( &c.mqtt_url, c.listen, "-", @@ -161,7 +161,7 @@ where std::thread::spawn(move || { let suffix = "net4mqtt.local"; - let dns = netmqtt::kxdns::Kxdns::new(suffix); + let dns = net4mqtt::kxdns::Kxdns::new(suffix); tokio::runtime::Runtime::new() .unwrap() .block_on(async move {