forked from sigil-03/number-station
wip
This commit is contained in:
Sebastian Kuzminsky
parent
54188e177a
commit
8324af0844
3 changed files with 190 additions and 33 deletions
119
Cargo.lock
generated
119
Cargo.lock
generated
|
|
@ -227,6 +227,12 @@ version = "1.0.4"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
|
||||
|
||||
[[package]]
|
||||
name = "cfg_aliases"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
|
||||
|
||||
[[package]]
|
||||
name = "cipher"
|
||||
version = "0.4.4"
|
||||
|
|
@ -534,9 +540,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.16.0"
|
||||
version = "0.16.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
|
||||
checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
|
|
@ -570,12 +576,11 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "http"
|
||||
version = "1.3.1"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
|
||||
checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"fnv",
|
||||
"itoa",
|
||||
]
|
||||
|
||||
|
|
@ -679,9 +684,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.12.0"
|
||||
version = "2.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
|
||||
checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown",
|
||||
|
|
@ -768,6 +773,15 @@ version = "2.7.6"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mime"
|
||||
version = "0.3.17"
|
||||
|
|
@ -791,6 +805,19 @@ version = "0.10.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
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]]
|
||||
name = "num-traits"
|
||||
version = "0.2.19"
|
||||
|
|
@ -814,6 +841,7 @@ dependencies = [
|
|||
"tokio",
|
||||
"tokio-stream",
|
||||
"tokio-util",
|
||||
"toml",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1051,8 +1079,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",
|
||||
|
|
@ -1062,6 +1088,7 @@ dependencies = [
|
|||
"hkdf",
|
||||
"hmac",
|
||||
"log",
|
||||
"nix",
|
||||
"prost",
|
||||
"rand_core",
|
||||
"rmp",
|
||||
|
|
@ -1150,6 +1177,15 @@ dependencies = [
|
|||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_spanned"
|
||||
version = "1.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
|
||||
dependencies = [
|
||||
"serde_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sha2"
|
||||
version = "0.10.9"
|
||||
|
|
@ -1163,9 +1199,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "signal-hook-registry"
|
||||
version = "1.4.6"
|
||||
version = "1.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
|
||||
checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
|
@ -1235,9 +1271,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
|
|||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.110"
|
||||
version = "2.0.111"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
|
||||
checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1324,6 +1360,45 @@ dependencies = [
|
|||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.9.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"serde_core",
|
||||
"serde_spanned",
|
||||
"toml_datetime",
|
||||
"toml_parser",
|
||||
"toml_writer",
|
||||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_datetime"
|
||||
version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
|
||||
dependencies = [
|
||||
"serde_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_parser"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
|
||||
dependencies = [
|
||||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_writer"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
|
||||
|
||||
[[package]]
|
||||
name = "tonic"
|
||||
version = "0.13.1"
|
||||
|
|
@ -1400,9 +1475,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
|
|||
|
||||
[[package]]
|
||||
name = "tracing"
|
||||
version = "0.1.41"
|
||||
version = "0.1.43"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
|
||||
checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
|
||||
dependencies = [
|
||||
"pin-project-lite",
|
||||
"tracing-attributes",
|
||||
|
|
@ -1411,9 +1486,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "tracing-attributes"
|
||||
version = "0.1.30"
|
||||
version = "0.1.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
|
||||
checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1422,9 +1497,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "tracing-core"
|
||||
version = "0.1.34"
|
||||
version = "0.1.35"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
|
||||
checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
]
|
||||
|
|
@ -1666,6 +1741,12 @@ version = "0.53.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.7.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
|
||||
|
||||
[[package]]
|
||||
name = "wit-bindgen"
|
||||
version = "0.46.0"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,9 @@ tokio-util = "0.7.15"
|
|||
# Logging
|
||||
log = "0.4.27"
|
||||
env_logger = "0.10"
|
||||
reticulum = "0.1.0"
|
||||
# reticulum = "0.1.0"
|
||||
reticulum = { path="../Reticulum-rs" }
|
||||
clap = { version = "4.5.53", features = ["derive"] }
|
||||
serde = { version = "1.0.228", features = ["derive"] }
|
||||
bincode = { version = "2.0.1", features = ["serde"] }
|
||||
toml = { version = "0.9.8", features = ["display", "serde"] }
|
||||
|
|
|
|||
100
src/main.rs
100
src/main.rs
|
|
@ -1,3 +1,5 @@
|
|||
use std::fmt::Display;
|
||||
use std::str::FromStr;
|
||||
use std::time::Duration;
|
||||
|
||||
use clap::{Parser, Subcommand};
|
||||
|
|
@ -10,7 +12,6 @@ use reticulum::destination::link::{Link, LinkEvent, LinkStatus};
|
|||
use reticulum::destination::{DestinationName, SingleInputDestination};
|
||||
use reticulum::hash::AddressHash;
|
||||
use reticulum::identity::PrivateIdentity;
|
||||
use reticulum::iface::tcp_client::TcpClient;
|
||||
use reticulum::transport::{Transport, TransportConfig};
|
||||
|
||||
use tokio::time::interval;
|
||||
|
|
@ -51,24 +52,64 @@ mod number_station {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Subcommand)]
|
||||
#[derive(Subcommand, Debug)]
|
||||
enum Mode {
|
||||
Receiver,
|
||||
Generator,
|
||||
}
|
||||
|
||||
enum ReticulumLink {
|
||||
TcpClient { socket_addr: std::net::SocketAddr },
|
||||
#[derive(clap::Parser, serde::Deserialize, serde::Serialize, Clone, Debug)]
|
||||
enum ReticulumInterface {
|
||||
TcpClient {
|
||||
server_addr: std::net::SocketAddr,
|
||||
},
|
||||
Udp {
|
||||
bind_addr: std::net::SocketAddr,
|
||||
forward_addr: std::net::SocketAddr,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Parser)]
|
||||
// impl std::fmt::Display for ReticulumInterface {
|
||||
// fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
// write!(f, "{}", self.to_string())
|
||||
// }
|
||||
// }
|
||||
|
||||
impl FromStr for ReticulumInterface {
|
||||
type Err = toml::de::Error;
|
||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||
toml::from_str(s)
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for ReticulumInterface {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
|
||||
let mut value = String::new();
|
||||
serde::Serialize::serialize(self, toml::ser::ValueSerializer::new(&mut value))
|
||||
.map_err(|_| std::fmt::Error)?;
|
||||
|
||||
write!(f, "{value}")
|
||||
|
||||
// write!(
|
||||
// f,
|
||||
// "{}",
|
||||
// toml::to_string_pretty(self).map_err(|_| std::fmt::Error)?
|
||||
// )
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
struct Cli {
|
||||
#[command(subcommand)]
|
||||
mode: Mode,
|
||||
|
||||
/// Connect to Reticulum Network by making a TCP Client interface to this host:port.
|
||||
#[arg(short, long, default_value_t = String::from("127.0.0.1:4242"))]
|
||||
tcp_client: String,
|
||||
/// Connect to Reticulum Network via this specified interface.
|
||||
/// Accepted formats:
|
||||
/// TcpClient={server_addr="HOST:PORT"}
|
||||
/// Udp={bind_addr="HOST:PORT", forward_addr="HOST:PORT"}
|
||||
///
|
||||
#[arg(short = 'l', long, default_value_t = ReticulumInterface::from_str("TcpClient = { server_addr=\"127.0.0.1:4242\" }").unwrap(), verbatim_doc_comment)]
|
||||
reticulum_interface: ReticulumInterface,
|
||||
}
|
||||
|
||||
async fn run_client(transport: &mut reticulum::transport::Transport) {
|
||||
|
|
@ -176,13 +217,46 @@ async fn main() {
|
|||
|
||||
let cli = Cli::parse();
|
||||
|
||||
//println!("{cli:?}");
|
||||
println!("{}", cli.reticulum_interface);
|
||||
println!("{:?}", cli.reticulum_interface);
|
||||
println!(
|
||||
"to_string: {}",
|
||||
toml::ser::to_string(&cli.reticulum_interface).unwrap()
|
||||
);
|
||||
println!(
|
||||
"to_string_pretty: {}",
|
||||
toml::ser::to_string_pretty(&cli.reticulum_interface).unwrap()
|
||||
);
|
||||
|
||||
let mut value = String::new();
|
||||
serde::Serialize::serialize(
|
||||
&cli.reticulum_interface,
|
||||
toml::ser::ValueSerializer::new(&mut value),
|
||||
)
|
||||
.unwrap();
|
||||
println!("ValueSerializer: {}", value);
|
||||
|
||||
let mut transport = Transport::new(TransportConfig::default());
|
||||
|
||||
let client_addr = transport
|
||||
.iface_manager()
|
||||
.lock()
|
||||
.await
|
||||
.spawn(TcpClient::new(cli.tcp_client), TcpClient::spawn);
|
||||
let client_addr = match cli.reticulum_interface {
|
||||
ReticulumInterface::TcpClient { server_addr } => {
|
||||
transport.iface_manager().lock().await.spawn(
|
||||
reticulum::iface::tcp_client::TcpClient::new(server_addr.to_string()),
|
||||
reticulum::iface::tcp_client::TcpClient::spawn,
|
||||
)
|
||||
}
|
||||
ReticulumInterface::Udp {
|
||||
bind_addr,
|
||||
forward_addr,
|
||||
} => transport.iface_manager().lock().await.spawn(
|
||||
reticulum::iface::udp::UdpInterface::new(
|
||||
bind_addr.to_string(),
|
||||
Some(forward_addr.to_string()),
|
||||
),
|
||||
reticulum::iface::udp::UdpInterface::spawn,
|
||||
),
|
||||
};
|
||||
|
||||
log::info!("client ID: {}", client_addr);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue