upgrade rstun and bump version

Author: neevek

.github/workflows/main.yml

@@ -3,7 +3,7 @@ name: Rust
 on:
   push:
     tags:
-      - 'release/*'
+      - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
   linux-gnu-x86_64:

Cargo.lock

@@ -1,14 +1,14 @@
 [package]
 name = "omnip"
-version = "0.7.3"
+version = "0.7.5"
 edition = "2021"
 
 [lib]
 crate-type = ["dylib", "lib"]
 
 [dependencies]
 clap = { version = "4.5", features = ["derive"] }
-tokio = { version = "1.40", features = ["full"] }
+tokio = { version = "1.47", features = ["full"] }
 pretty_env_logger = "0.5"
 log = "0.4"
 chrono = "0.4"
@@ -28,7 +28,7 @@ lazy_static = "1.5"
 async-trait = "0.1"
 byte-pool = { git = "https://github.com/neevek/byte-pool" }
 # rstun = { path = "../rstun" }
-rstun = { git = "https://github.com/neevek/rstun", tag = "release/0.7.1" }
+rstun = { git = "https://github.com/neevek/rstun", tag = "v0.7.4" }
 hyper = { version = "0.14", features = ["full"]}
 http = "0.2"
 http-body = "0.4"

Cargo.toml

@@ -132,6 +132,9 @@ Options:
   -R, --retry-interval-ms <RETRY_INTERVAL_MS>
           Applicable only for quic protocol as upstream
           Max idle timeout for the QUIC connections [default: 5000]
+      --hop-interval-ms <HOP_INTERVAL_MS>
+          Applicable only for quic protocol as upstream
+          Interval between hops in the QUIC connections [default: 180000]
       --tcp-nodelay
           Set TCP_NODELAY
   -w, --watch-proxy-rules-change

README.md

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# npm install -g typescript
+# npm install react react-dom
+# npm install --save-dev @types/react @types/react-dom
+
 pushd src/omnip-web
 npm run build
 popd

build.sh

@@ -27,6 +27,7 @@ pub struct QuicTunnelConfig {
     pub password: String,
     pub idle_timeout: u64,
     pub retry_interval: u64,
+    pub hop_interval: u64,
 }
 
 #[derive(Serialize, Deserialize, Debug)]

src/api.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result};
 use base64::prelude::*;
 use clap::builder::TypedValueParser as _;
 use clap::{builder::PossibleValuesParser, Parser};
@@ -43,6 +43,7 @@ fn main() -> Result<()> {
         tcp_timeout_ms: args.tcp_timeout_ms,
         udp_timeout_ms: args.udp_timeout_ms,
         retry_interval_ms: args.retry_interval_ms,
+        hop_interval_ms: args.hop_interval_ms,
         workers: args.threads,
     };
 
@@ -174,6 +175,11 @@ struct OmnipArgs {
     #[arg(short = 'R', long, verbatim_doc_comment, default_value = "5000")]
     retry_interval_ms: u64,
 
+    /// Applicable only for quic protocol as upstream
+    /// Interval between hops in the QUIC connections
+    #[arg(long, verbatim_doc_comment, default_value = "0")]
+    hop_interval_ms: u64,
+
     /// Set TCP_NODELAY
     #[arg(long, action)]
     tcp_nodelay: bool,

src/bin/omnip.rs

@@ -360,6 +360,7 @@ pub struct CommonQuicConfig {
     pub tcp_timeout_ms: u64,
     pub udp_timeout_ms: u64,
     pub retry_interval_ms: u64,
+    pub hop_interval_ms: u64,
     pub workers: usize,
 }
 
@@ -604,6 +605,7 @@ pub mod android {
         jpassword: JString,
         jquicTimeoutMs: jint,
         jretryIntervalMs: jint,
+        jhopIntervalMs: jint,
         jworkers: jint,
         jtcpNoDelay: jboolean,
         jtcpTimeoutMs: jlong,
@@ -649,6 +651,7 @@ pub mod android {
             cipher,
             quic_timeout_ms: jquicTimeoutMs as u64,
             retry_interval_ms: jretryIntervalMs as u64,
+            hop_interval_ms: jhopIntervalMs as u64,
             workers: jworkers as usize,
             tcp_timeout_ms: jtcpTimeoutMs as u64,
             udp_timeout_ms: judpTimeoutMs as u64,