rexport hala_qtun in hala_rs crate

HalaOS · Feb 19, 2024 · a89e7eb · a89e7eb
1 parent f970810
commit a89e7eb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -71,7 +71,7 @@ hala-lockfree = {path = "crates/lockfree", version = "^0.1"}
 hala-ops = {path = "crates/ops", version = "^0.1"}
 hala-pprof = {path = "crates/pprof", version = "^0.1"}
 hala-pprof-derive = {path = "crates/pprof/derive", version = "^0.1"}
-hala-qtun = {path = "crates/rproxy/qtun", version = "^0.1"}
+hala-qtun = {path = "crates/rproxy/qtun", default-features = false, version = "^0.1"}
 hala-quic = {path = "crates/net/quic", version = "^0.1"}
 hala-rproxy = {path = "crates/rproxy/rproxy", version = "^0.1"}
 hala-sync = {path = "crates/sync", version = "^0.1"}

diff --git a/crates/rproxy/qtun/src/app.rs b/crates/rproxy/qtun/src/app.rs
@@ -136,7 +136,7 @@ pub struct QuicTunnelConfig {
     #[arg(long, default_value_t = 100)]
     pub mux: u64,
 
-    /// Quic connection max idle timeout.
+    /// Quic connection max idle timeout, e.g., `10s`,`1m`
     #[arg(long, value_parser = clap_parse_duration, default_value="5s")]
     pub timeout: Duration,
 

diff --git a/hala/Cargo.toml b/hala/Cargo.toml
@@ -13,6 +13,7 @@ hala-io = {workspace = true}
 hala-lockfree = {workspace = true}
 hala-ops = {workspace = true}
 hala-pprof = {workspace = true}
+hala-qtun = {workspace = true}
 hala-quic = {workspace = true}
 hala-sync = {workspace = true}
 hala-tcp = {workspace = true}
@@ -30,6 +31,9 @@ pretty_env_logger = {workspace = true}
 default = ["mio-driver", "futures-executor"]
 futures-executor = ["hala-future/futures-executor"]
 mio-driver = ["hala-io/mio-driver"]
+qtun-app = ["hala-qtun/app"]
+qtun-client = ["hala-qtun/client"]
+qtun-server = ["hala-qtun/server"]
 
 [[bench]]
 harness = false

diff --git a/hala/src/lib.rs b/hala/src/lib.rs
@@ -13,3 +13,5 @@ pub mod net {
 pub use hala_sync as sync;
 
 pub use hala_pprof as pprof;
+
+pub use hala_qtun as qtun;