From 06a2edfc72a894054ed710d338504242f15d6071 Mon Sep 17 00:00:00 2001
From: David Härdeman <david@hardeman.nu>
Date: Fri, 26 Jun 2020 03:23:41 +0200
Subject: Make the server handling in minecctl saner

---
 minecctl/minecctl.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'minecctl/minecctl.h')

diff --git a/minecctl/minecctl.h b/minecctl/minecctl.h
index 405a217..7146a08 100644
--- a/minecctl/minecctl.h
+++ b/minecctl/minecctl.h
@@ -2,30 +2,30 @@
 #define foominecctlhfoo
 
 struct server {
+	bool file_read;
 	char *filename;
 	char *shortname;
+	char *rcon_password;
+	struct list_head rcon_addrs;
+	struct list_head mc_addrs;
 	struct list_head list;
 };
 
 struct cfg {
-	char *password;
+	/* command line arguments */
 	char *cfgdir;
+	char *password;
 	char *addrstr;
 	char *mcaddrstr;
 	char *cmdstr;
-	struct server *server;
-	void (*cmd)(struct cfg *cfg);
 	bool force_stop;
-	struct list_head addrs;
-	struct list_head mcaddrs;
-	struct list_head known_servers;
-};
 
-extern bool use_colors;
-
-char *ask_password();
+	/* bookkeeping */
+	void (*cmd)(struct cfg *cfg);
+	struct list_head servers;
+};
 
-int connect_any(struct list_head *addrs, bool may_fail);
+void read_server_config(struct server *server);
 
 #endif
 
-- 
cgit v1.2.3