diff --git a/Cargo.lock b/Cargo.lock index 8fe2e10..e5020bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -227,12 +227,6 @@ 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" @@ -540,9 +534,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" [[package]] name = "heck" @@ -576,11 +570,12 @@ dependencies = [ [[package]] name = "http" -version = "1.4.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ "bytes", + "fnv", "itoa", ] @@ -684,9 +679,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", "hashbrown", @@ -773,15 +768,6 @@ 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" @@ -805,19 +791,6 @@ 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" @@ -841,7 +814,6 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util", - "toml", ] [[package]] @@ -1079,6 +1051,8 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reticulum" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d838809ab28f9bfa5354b3397bcfc2b4a7a7258e98d9ed2b18a6e39437b00202" dependencies = [ "aes", "cbc", @@ -1088,7 +1062,6 @@ dependencies = [ "hkdf", "hmac", "log", - "nix", "prost", "rand_core", "rmp", @@ -1177,15 +1150,6 @@ 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" @@ -1199,9 +1163,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.7" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" +checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" dependencies = [ "libc", ] @@ -1271,9 +1235,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.111" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -1360,45 +1324,6 @@ 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" @@ -1475,9 +1400,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.43" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -1486,9 +1411,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.31" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", @@ -1497,9 +1422,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.35" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", ] @@ -1741,12 +1666,6 @@ 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" diff --git a/Cargo.toml b/Cargo.toml index 2681a6a..074cf8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,9 +15,7 @@ tokio-util = "0.7.15" # Logging log = "0.4.27" env_logger = "0.10" -# reticulum = "0.1.0" -reticulum = { path="../Reticulum-rs" } +reticulum = "0.1.0" 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"] } diff --git a/src/main.rs b/src/main.rs index c6bc093..dc1b1ad 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,128 +1,89 @@ -use std::fmt::Display; -use std::str::FromStr; use std::time::Duration; use clap::{Parser, Subcommand}; -use std::collections::HashMap; use std::sync::Arc; +use std::collections::HashMap; use rand_core::OsRng; -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 reticulum::destination::link::{Link, LinkEvent, LinkStatus}; + use tokio::time::interval; use crate::number_station::NumberStationPacket; mod number_station { - use bincode::{BorrowDecode, Decode, Encode}; use reticulum::hash::AddressHash; - use serde::{Deserialize, Serialize}; + use serde::{Serialize, Deserialize}; + use bincode::{Encode, Decode, BorrowDecode}; - pub struct NumberStation { - id: AddressHash, - current_number: usize, - } +pub struct NumberStation { + id: AddressHash, + current_number: usize, +} - impl NumberStation { - pub fn new(id: AddressHash) -> Self { - Self { - id, - current_number: 0, - } - } - // generate / return the next number in the station - pub fn next(&mut self) -> NumberStationPacket { - self.current_number = self.current_number.wrapping_add(1); - NumberStationPacket { - // id: self.id, - number: self.current_number, - } +impl NumberStation { + pub fn new(id: AddressHash) -> Self { + Self { + id, + current_number: 0, } } - - #[derive(Encode, BorrowDecode, Debug)] - pub struct NumberStationPacket { - // id: AddressHash, - number: usize, + // generate / return the next number in the station + pub fn next(&mut self) -> NumberStationPacket { + self.current_number = self.current_number.wrapping_add(1); + NumberStationPacket { + // id: self.id, + number: self.current_number, + } } } -#[derive(Subcommand, Debug)] +#[derive(Encode, BorrowDecode, Debug)] +pub struct NumberStationPacket { + // id: AddressHash, + number: usize, +} +} + +#[derive(Subcommand)] enum Mode { Receiver, Generator, } -#[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, - }, -} - -// 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 { - 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)] +#[derive(Parser)] struct Cli { #[command(subcommand)] mode: Mode, - - /// 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) { +async fn run_client() { log::info!(">>> NUMBER STATION CLIENT <<<"); + let mut transport = Transport::new(TransportConfig::default()); + + + + let client_addr = transport + .iface_manager() + .lock() + .await + .spawn(TcpClient::new("127.0.0.1:4242"), TcpClient::spawn); + + log::info!("client ID: {}", client_addr); // let id = PrivateIdentity::new_from_rand(OsRng); let id = PrivateIdentity::new_from_name("test-name"); log::info!("private ID: {}", id.address_hash()); // let destination = SingleInputDestination::new(id, DestinationName::new("generator", "number_station.generator")); - let destination = transport - .add_destination(id, DestinationName::new("receiver", "generator.numbers")) - .await; + let destination = transport.add_destination(id, DestinationName::new("receiver", "generator.numbers")).await; log::info!("dest ID: {}", destination.lock().await.desc.address_hash); let mut announce_recv = transport.recv_announces().await; @@ -141,7 +102,7 @@ async fn run_client(transport: &mut reticulum::transport::Transport) { }; }, - + Ok(link_event) = out_link_events.recv() => { match link_event.event { LinkEvent::Activated => log::info!("link {} activated", link_event.id), @@ -149,25 +110,34 @@ async fn run_client(transport: &mut reticulum::transport::Transport) { LinkEvent::Data(payload) => { let payload: NumberStationPacket = bincode::borrow_decode_from_slice(payload.as_slice(), bincode::config::standard()).unwrap().0; log::info!("link {} data payload: {:?}", link_event.id, payload); - } + } } } } - } + } } -async fn run_server(transport: &mut reticulum::transport::Transport) { +async fn run_server() { log::info!(">>> NUMBER STATION SERVER <<<"); + let mut transport = Transport::new(TransportConfig::default()); + + + + let client_addr = transport + .iface_manager() + .lock() + .await + .spawn(TcpClient::new("127.0.0.1:4242"), TcpClient::spawn); + + log::info!("client ID: {}", client_addr); let id = PrivateIdentity::new_from_rand(OsRng); // let id = PrivateIdentity::new_from_name("test-name"); log::info!("private ID: {}", id.address_hash()); // let destination = SingleInputDestination::new(id, DestinationName::new("generator", "number_station.generator")); - let destination = transport - .add_destination(id, DestinationName::new("generator", "generator.numbers")) - .await; + let destination = transport.add_destination(id, DestinationName::new("generator", "generator.numbers")).await; log::info!("dest ID: {}", destination.lock().await.desc.address_hash); // let mut announce_recv = transport.recv_announces().await; @@ -176,8 +146,7 @@ async fn run_server(transport: &mut reticulum::transport::Transport) { let mut links = HashMap::>>::new(); - let mut number_generator = - number_station::NumberStation::new(destination.lock().await.desc.address_hash); + let mut number_generator = number_station::NumberStation::new(destination.lock().await.desc.address_hash); // let timer_fut = tokio::time::sleep(Duration::from_secs(1)); let mut announce_interval = interval(Duration::from_secs(5)); @@ -186,7 +155,7 @@ async fn run_server(transport: &mut reticulum::transport::Transport) { loop { tokio::select! { _ = announce_interval.tick() => { - log::info!("announce tick"); + log::info!("announce tick"); transport .send_announce(&destination, None) .await; @@ -204,7 +173,7 @@ async fn run_server(transport: &mut reticulum::transport::Transport) { } _ = number_transmit_interval.tick() => { let payload = number_generator.next(); - log::info!("transmit payload: {:?}", payload); + log::info!("transmit payload: {:?}", payload); transport.send_to_in_links(&destination.lock().await.desc.address_hash, &bincode::encode_to_vec(payload, bincode::config::standard()).unwrap()).await; } } @@ -217,51 +186,8 @@ 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 = 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); - match cli.mode { - Mode::Receiver => run_client(&mut transport).await, - Mode::Generator => run_server(&mut transport).await, + Mode::Receiver => run_client().await, + Mode::Generator => run_server().await, } }