diff --git a/Cargo.lock b/Cargo.lock index b81dd58..77f50c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1035,8 +1035,6 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reticulum" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d838809ab28f9bfa5354b3397bcfc2b4a7a7258e98d9ed2b18a6e39437b00202" dependencies = [ "aes", "cbc", diff --git a/Cargo.toml b/Cargo.toml index f6f3f9a..7b67e79 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,10 @@ tokio-util = "0.7.15" # Logging log = "0.4.27" env_logger = "0.10" -reticulum = { path = "../Reticulum-rs", version="0.1.0" } + +reticulum = { path = "../Reticulum-rs" } +#reticulum = { version="0.1.0" } + clap = { version = "4.5.53", features = ["derive"] } serde = { version = "1.0.228", features = ["derive"] } bincode = { version = "2.0.1", features = ["serde"] } diff --git a/src/main.rs b/src/main.rs index 28c775e..2351819 100644 --- a/src/main.rs +++ b/src/main.rs @@ -21,8 +21,8 @@ struct TcpClientConfig { #[derive(Serialize, Deserialize, Debug, Clone)] struct UdpConfig { - bind_addr: std::net::SocketAddrV4, - forward_addr: Option, + bind_addr: String, + forward_addr: Option, } #[derive(Serialize, Deserialize, Debug, Clone)] diff --git a/udp.toml b/udp.toml new file mode 100644 index 0000000..b6ce637 --- /dev/null +++ b/udp.toml @@ -0,0 +1,6 @@ +[[interfaces]] +TcpServer = { bind_addr="0.0.0.0:4242" } + +[[interfaces]] +# Udp = { bind_addr="0.0.0.0:4242", forward_addr="10.0.101.92:4242" } +Udp = { bind_addr="0.0.0.0:4242", forward_addr="239.0.0.69:12340" }