finn/matrix-meshtastic-bridge
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages 1 Wiki Activity Actions

rename meshtastic hostname config to address
All checks were successful
/ build-container (push) Successful in 6m23s
Details

Browse source
This commit is contained in:
Finn 2024-10-17 22:46:29 -07:00
parent 853da3974c
commit 4f5b878606
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bridge.rs
View file

@ -23,7 +23,7 @@ impl Bridge {
// setup meshtastic connection // setup meshtastic connection
let stream_api = StreamApi::new(); let stream_api = StreamApi::new();
let tcp_stream = utils::stream::build_tcp_stream(config.meshtastic.hostname).await?; let tcp_stream = utils::stream::build_tcp_stream(config.meshtastic.address).await?;
let (meshtastic_listener, meshtastic_stream_api) = stream_api.connect(tcp_stream).await; let (meshtastic_listener, meshtastic_stream_api) = stream_api.connect(tcp_stream).await;
// setup matrix client // setup matrix client

8
src/config.rs
View file

@ -20,8 +20,8 @@ pub(crate) struct MatrixConfig {
#[derive(serde::Deserialize, Debug)] #[derive(serde::Deserialize, Debug)]
pub(crate) struct MeshtasticConfig { pub(crate) struct MeshtasticConfig {
#[serde(default = "get_meshtastic_hostname")] #[serde(default = "get_meshtastic_address")]
pub(crate) hostname: String, pub(crate) address: String, // expected format is host:port
} }
fn get_device_name() -> String { fn get_device_name() -> String {
@ -39,8 +39,8 @@ fn get_matrix_password() -> String {
} }
} }
fn get_meshtastic_hostname() -> String { fn get_meshtastic_address() -> String {
match std::env::var("MESHTASTIC_HOSTNAME") { match std::env::var("MESHTASTIC_ADDRESS") {
Ok(p) => p, Ok(p) => p,
Err(_) => "meshtastic.local".to_string(), Err(_) => "meshtastic.local".to_string(),
} }

2
src/meshtastic.rs
View file

@ -19,7 +19,7 @@ pub(crate) async fn build(
) -> Result<MeshtasticClient, Box<dyn std::error::Error>> { ) -> Result<MeshtasticClient, Box<dyn std::error::Error>> {
let stream_api = StreamApi::new(); let stream_api = StreamApi::new();
let tcp_stream = utils::stream::build_tcp_stream(config.hostname).await?; let tcp_stream = utils::stream::build_tcp_stream(config.address).await?;
let (decoded_listener, stream_api) = stream_api.connect(tcp_stream).await; let (decoded_listener, stream_api) = stream_api.connect(tcp_stream).await;
log::info!("connected to meshtastic device"); log::info!("connected to meshtastic device");