seb/transport-node
1
0
Fork 0
forked from sigil-03/transport-node
Code Pull requests Activity

Compare commits

base: seb:udp-garbage
Branches Tags
seb:main
seb:udp-garbage
sigil-03:main
sigil-03:heartbeat-broadcaster
..
compare: seb:main
Branches Tags
seb:udp-garbage
seb:main
sigil-03:main
sigil-03:heartbeat-broadcaster

No commits in common. "udp-garbage" and "main" have entirely different histories.
udp-garbag ... main

5 changed files with 3 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Cargo.lock generated
View file

@ -227,12 +227,6 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
[[package]]
name = "cfg_aliases"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]] [[package]]
name = "cipher" name = "cipher"
version = "0.4.4" version = "0.4.4"
@ -774,15 +768,6 @@ version = "2.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
[[package]]
name = "memoffset"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
dependencies = [
"autocfg",
]
[[package]] [[package]]
name = "mime" name = "mime"
version = "0.3.17" version = "0.3.17"
@ -806,19 +791,6 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084" checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
[[package]]
name = "nix"
version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
dependencies = [
"bitflags",
"cfg-if",
"cfg_aliases",
"libc",
"memoffset",
]
[[package]] [[package]]
name = "num-traits" name = "num-traits"
version = "0.2.19" version = "0.2.19"
@ -1063,7 +1035,8 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
[[package]] [[package]]
name = "reticulum" name = "reticulum"
version = "0.1.0" version = "0.1.0"
source = "git+http://github.com/SebKuzminsky/Reticulum-rs?branch=multicast#4db323aebd2cb4d11c24f7270b5cfd46a7b483d6" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d838809ab28f9bfa5354b3397bcfc2b4a7a7258e98d9ed2b18a6e39437b00202"
dependencies = [ dependencies = [
"aes", "aes",
"cbc", "cbc",
@ -1073,7 +1046,6 @@ dependencies = [
"hkdf", "hkdf",
"hmac", "hmac",
"log", "log",
"nix",
"prost", "prost",
"rand_core", "rand_core",
"rmp", "rmp",

6
Cargo.toml
View file

@ -15,11 +15,7 @@ tokio-util = "0.7.15"
# Logging # Logging
log = "0.4.27" log = "0.4.27"
env_logger = "0.10" env_logger = "0.10"
reticulum = "0.1.0"
reticulum = { git="http://github.com/SebKuzminsky/Reticulum-rs", branch="multicast" }
#reticulum = { path = "../Reticulum-rs" }
#reticulum = { version="0.1.0" }
clap = { version = "4.5.53", features = ["derive"] } clap = { version = "4.5.53", features = ["derive"] }
serde = { version = "1.0.228", features = ["derive"] } serde = { version = "1.0.228", features = ["derive"] }
bincode = { version = "2.0.1", features = ["serde"] } bincode = { version = "2.0.1", features = ["serde"] }

14
src/main.rs
View file

@ -6,7 +6,6 @@ use serde::{Deserialize, Serialize};
// RETICULUM INCLUDES // RETICULUM INCLUDES
use reticulum::iface::tcp_client::TcpClient; use reticulum::iface::tcp_client::TcpClient;
use reticulum::iface::tcp_server::TcpServer; use reticulum::iface::tcp_server::TcpServer;
use reticulum::iface::udp::UdpInterface;
use reticulum::transport::{Transport, TransportConfig}; use reticulum::transport::{Transport, TransportConfig};
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone)]
@ -19,17 +18,10 @@ struct TcpClientConfig {
bind_addr: String, bind_addr: String,
} }
#[derive(Serialize, Deserialize, Debug, Clone)]
struct UdpConfig {
bind_addr: String,
forward_addr: Option<String>,
}
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone)]
enum InterfaceConfig { enum InterfaceConfig {
TcpServer(TcpServerConfig), TcpServer(TcpServerConfig),
TcpClient(TcpClientConfig), TcpClient(TcpClientConfig),
Udp(UdpConfig),
} }
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone)]
@ -78,12 +70,6 @@ async fn main() {
.await .await
.spawn(TcpClient::new(cfg.bind_addr), TcpClient::spawn); .spawn(TcpClient::new(cfg.bind_addr), TcpClient::spawn);
} }
InterfaceConfig::Udp(cfg) => {
let _ = transport.iface_manager().lock().await.spawn(
UdpInterface::new(cfg.bind_addr, cfg.forward_addr),
UdpInterface::spawn,
);
}
} }
} }

5
udp-other.toml
View file

@ -1,5 +0,0 @@
[[interfaces]]
TcpServer = { bind_addr="0.0.0.0:4243" }
[[interfaces]]
Udp = { bind_addr="0.0.0.0:4242", forward_addr="239.0.0.69:4242" }

5
udp.toml
View file

@ -1,5 +0,0 @@
[[interfaces]]
TcpServer = { bind_addr="0.0.0.0:4242" }
[[interfaces]]
Udp = { bind_addr="0.0.0.0:4242", forward_addr="239.0.0.69:4242" }