diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/Cargo.toml | 5 | ||||
| -rw-r--r-- | server/src/lib.rs | 2 | ||||
| -rw-r--r-- | server/src/main.rs | 19 | ||||
| -rw-r--r-- | server/src/network/mdns.rs | 61 | ||||
| -rw-r--r-- | server/src/network/mod.rs | 20 | ||||
| -rw-r--r-- | server/src/network/register.rs (renamed from server/src/register.rs) | 0 | ||||
| -rw-r--r-- | server/src/network/upnp.rs | 72 |
7 files changed, 174 insertions, 5 deletions
diff --git a/server/Cargo.toml b/server/Cargo.toml index 520e3d24..ef14fddd 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hurrycurry-server" -version = "0.2.0" +version = "2.1.0" edition = "2021" default-run = "hurrycurry-server" @@ -26,6 +26,9 @@ reqwest = { version = "0.12.7", default-features = false, features = [ pollster = "0.3.0" bincode = "2.0.0-rc.3" xdg = "2.5.2" +igd = { version = "0.12.1", features = ["aio"] } +get_if_addrs = "0.5.3" +mdns-sd = "0.11.4" hurrycurry-protocol = { path = "protocol" } hurrycurry-client-lib = { path = "client-lib" } diff --git a/server/src/lib.rs b/server/src/lib.rs index ea514d5b..c0ed8edb 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -27,10 +27,10 @@ pub mod commands; pub mod data; pub mod entity; pub mod interaction; -pub mod register; pub mod scoreboard; pub mod server; pub mod state; +pub mod network; use hurrycurry_protocol::{glam::Vec2, Message}; diff --git a/server/src/main.rs b/server/src/main.rs index 4db43c64..d0538126 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -21,7 +21,7 @@ use futures_util::{SinkExt, StreamExt}; use hurrycurry_protocol::{PacketC, PacketS, BINCODE_CONFIG, VERSION}; use hurrycurry_server::{ data::DATA_DIR, - register::Register, + network::{mdns::mdns_loop, register::Register, upnp::upnp_loop}, server::{GameServerExt, Server}, trm, ConnectionID, }; @@ -59,9 +59,12 @@ pub(crate) struct Args { /// Enables submissions to the public server registry #[arg(long)] register: bool, - /// Enables mDNS discoverability + /// Enables the mDNS responder for local network discovery #[arg(long)] - discoverable: bool, + mdns: bool, + // Enables automatic gateway port forwarding using UPnP + #[arg(long)] + upnp: bool, /// Server name #[arg(long, short = 'N', default_value = "A Hurry Curry! Server")] server_name: String, @@ -130,6 +133,16 @@ async fn run(args: Args) -> anyhow::Result<()> { ); tokio::task::spawn(r.register_loop()); } + if args.upnp { + tokio::task::spawn(upnp_loop(args.listen.port())); + } + if args.mdns { + tokio::task::spawn(mdns_loop( + args.server_name.clone(), + args.listen.port(), + state.clone(), + )); + } { let state = state.clone(); diff --git a/server/src/network/mdns.rs b/server/src/network/mdns.rs new file mode 100644 index 00000000..870ae7ec --- /dev/null +++ b/server/src/network/mdns.rs @@ -0,0 +1,61 @@ +use crate::server::Server; +use anyhow::Result; +use get_if_addrs::get_if_addrs; +use hurrycurry_protocol::VERSION; +use log::{info, warn}; +use mdns_sd::{ServiceDaemon, ServiceInfo}; +use rand::random; +use std::{collections::HashMap, sync::Arc, time::Duration}; +use tokio::{sync::RwLock, time::interval}; + +pub async fn mdns_loop(name: String, port: u16, state: Arc<RwLock<Server>>) { + let d = match ServiceDaemon::new() { + Ok(d) => d, + Err(e) => { + warn!("mDNS daemon failed to start: {e}"); + return; + } + }; + let mut interval = interval(Duration::from_secs(60)); + let hostname = format!("hks-{}.local.", random::<u64>()); + loop { + interval.tick().await; + if let Err(e) = update_service(&d, &state, &name, &hostname, port).await { + warn!("mDNS service update failed: {e}"); + } + info!("updated mDNS service record"); + } +} + +async fn update_service( + d: &ServiceDaemon, + state: &Arc<RwLock<Server>>, + name: &str, + hostname: &str, + port: u16, +) -> Result<()> { + let addrs = get_if_addrs()? + .into_iter() + .map(|e| e.addr.ip()) + .filter(|a| !a.is_loopback()) + .collect::<Vec<_>>(); + + let players = state.read().await.count_chefs(); + + d.register(ServiceInfo::new( + "_hurrycurry._tcp.local.", + name, + hostname, + &*addrs, + port, + HashMap::from_iter([ + ("players".to_string(), players.to_string()), + ("version".to_string(), env!("CARGO_PKG_VERSION").to_string()), + ( + "protocol".to_string(), + format!("{}.{}", VERSION.0, VERSION.1), + ), + ]), + )?)?; + Ok(()) +} diff --git a/server/src/network/mod.rs b/server/src/network/mod.rs new file mode 100644 index 00000000..b7ffc15e --- /dev/null +++ b/server/src/network/mod.rs @@ -0,0 +1,20 @@ +/* + Hurry Curry! - a game about cooking + Copyright 2024 metamuffin + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, version 3 of the License only. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + +*/ +pub mod register; +pub mod upnp; +pub mod mdns; diff --git a/server/src/register.rs b/server/src/network/register.rs index b26768a2..b26768a2 100644 --- a/server/src/register.rs +++ b/server/src/network/register.rs diff --git a/server/src/network/upnp.rs b/server/src/network/upnp.rs new file mode 100644 index 00000000..a16e9684 --- /dev/null +++ b/server/src/network/upnp.rs @@ -0,0 +1,72 @@ +/* + Hurry Curry! - a game about cooking + Copyright 2024 metamuffin + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, version 3 of the License only. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + +*/ +use anyhow::{bail, Result}; +use get_if_addrs::get_if_addrs; +use igd::{ + aio::{search_gateway, Gateway}, + PortMappingProtocol, SearchOptions, +}; +use log::{error, info}; +use std::{ + net::{IpAddr, Ipv4Addr, SocketAddrV4}, + time::Duration, +}; +use tokio::time::interval; + +pub async fn upnp_loop(port: u16) { + // TODO multiple gateways + let (gateway, local_addr) = match upnp_setup().await { + Ok(g) => g, + Err(e) => { + error!("UPnP gateway not found: {e}"); + return; + } + }; + let mut interval = interval(Duration::from_secs(120)); + loop { + interval.tick().await; + match gateway + .add_port( + PortMappingProtocol::TCP, + 27032, + SocketAddrV4::new(local_addr, port), + 800, + "Hurry Curry! Game Server", + ) + .await + { + Ok(()) => info!("port mapped successfully"), + Err(e) => error!("upnp failed: {e}"), + } + } +} + +async fn upnp_setup() -> Result<(Gateway, Ipv4Addr)> { + let gateway = search_gateway(SearchOptions::default()).await?; + info!("IGD address is {}", gateway.addr); + for i in get_if_addrs()? { + let a = i.addr.ip(); + if !a.is_loopback() { + if let IpAddr::V4(a) = a { + info!("local v4 address is {a}"); + return Ok((gateway, a)); + } + } + } + bail!("no good local address found") +} |