add support for mumctl server list

3 files changed, 22 insertions, 0 deletions

diff --git a/mumlib/src/command.rs b/mumlib/src/command.rs
index e404056..26071ac 100644
--- a/mumlib/src/command.rs
+++ b/mumlib/src/command.rs
@@ -18,6 +18,10 @@ pub enum Command {
     },
     ServerDisconnect,
     Status,
+    ServerStatus {
+        host: String,
+        port: u16,
+    },
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -25,4 +29,10 @@ pub enum CommandResponse {
     ChannelList { channels: Channel },
     ServerConnect { welcome_message: Option<String> },
     Status { server_state: Server },
+    ServerStatus {
+        version: u32,
+        users: u32,
+        max_users: u32,
+        bandwidth: u32,
+    },
 }
diff --git a/mumlib/src/config.rs b/mumlib/src/config.rs
index e6b97fd..e7d107a 100644
--- a/mumlib/src/config.rs
+++ b/mumlib/src/config.rs
@@ -4,6 +4,8 @@ use std::fs;
 use std::path::Path;
 use toml::value::Array;
 use toml::Value;
+use std::net::{SocketAddr, ToSocketAddrs};
+use crate::DEFAULT_PORT;
 
 #[derive(Debug, Deserialize, Serialize)]
 struct TOMLConfig {
@@ -58,6 +60,15 @@ pub struct ServerConfig {
     pub password: Option<String>,
 }
 
+impl ServerConfig {
+    pub fn to_socket_addr(&self) -> Option<SocketAddr> {
+        match (self.host.as_str(), self.port.unwrap_or(DEFAULT_PORT)).to_socket_addrs().map(|mut e| e.next()) {
+            Ok(Some(addr)) => Some(addr),
+            _ => None,
+        }
+    }
+}
+
 pub fn get_cfg_path() -> String {
     if let Ok(var) = std::env::var("XDG_CONFIG_HOME") {
         let path = format!("{}/mumdrc", var);
diff --git a/mumlib/src/lib.rs b/mumlib/src/lib.rs
index a54990e..439efa9 100644
--- a/mumlib/src/lib.rs
+++ b/mumlib/src/lib.rs
@@ -7,6 +7,7 @@ use colored::*;
 use log::*;
 
 pub const SOCKET_PATH: &str = "/var/tmp/mumd";
+pub const DEFAULT_PORT: u16 = 64738;
 
 pub fn setup_logger<T: Into<fern::Output>>(target: T, color: bool) {
     fern::Dispatch::new()