From 31afd2aaaeb76a12e232eab0fb6a550b73948737 Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Mon, 22 Jun 2020 10:50:15 +0200 Subject: Make struct cfg global and make the corresponding changes throughout --- server.h | 53 ++++++++++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 31 deletions(-) (limited to 'server.h') diff --git a/server.h b/server.h index b104ef1..e5913ae 100644 --- a/server.h +++ b/server.h @@ -39,7 +39,6 @@ struct server { struct list_head rcons; struct list_head dnslookups; enum server_state state; - struct cfg *cfg; enum server_stop_method stop_method; enum server_start_method start_method; @@ -77,59 +76,51 @@ struct server { void server_refdump(struct server *server); -void server_delete(struct cfg *cfg, struct server *server); +void server_delete(struct server *server); -void server_delete_by_name(struct cfg *cfg, const char *name); +void server_delete_by_name(const char *name); -bool server_start(struct cfg *cfg, struct server *server); +bool server_start(struct server *server); -bool server_stop(struct cfg *cfg, struct server *server); +bool server_stop(struct server *server); -void server_set_active_players(struct cfg *cfg, struct server *server, - int count); +void server_set_active_players(struct server *server, int count); -bool server_idle_check(struct cfg *cfg, struct server *server); +bool server_idle_check(struct server *server); -bool server_announce(struct cfg *cfg, struct server *server, int fd); +bool server_announce(struct server *server, int fd); -bool server_commit(struct cfg *cfg, struct server *server); +bool server_commit(struct server *server); -bool server_add_remote(struct cfg *cfg, struct server *server, - struct saddr *remote); +bool server_add_remote(struct server *server, struct saddr *remote); -bool server_add_local(struct cfg *cfg, struct server *server, - struct saddr *saddr); +bool server_add_local(struct server *server, struct saddr *saddr); -bool server_add_rcon(struct cfg *cfg, struct server *server, - struct saddr *rcon); +bool server_add_rcon(struct server *server, struct saddr *rcon); -bool server_set_rcon_password(struct cfg *cfg, struct server *server, - const char *password); +bool server_set_rcon_password(struct server *server, const char *password); -bool server_set_systemd_service(struct cfg *cfg, struct server *server, - const char *service); +bool server_set_systemd_service(struct server *server, const char *service); -bool server_set_stop_method(struct cfg *cfg, struct server *server, +bool server_set_stop_method(struct server *server, enum server_stop_method stop_method); -bool server_set_start_method(struct cfg *cfg, struct server *server, +bool server_set_start_method(struct server *server, enum server_start_method start_method); -bool server_set_stop_exec(struct cfg *cfg, struct server *server, const char *cmd); +bool server_set_stop_exec(struct server *server, const char *cmd); -bool server_set_start_exec(struct cfg *cfg, struct server *server, const char *cmd); +bool server_set_start_exec(struct server *server, const char *cmd); -bool server_set_idle_timeout(struct cfg *cfg, struct server *server, uint16_t timeout); +bool server_set_idle_timeout(struct server *server, uint16_t timeout); -bool server_set_port(struct cfg *cfg, struct server *server, uint16_t port); +bool server_set_port(struct server *server, uint16_t port); -bool server_set_type(struct cfg *cfg, struct server *server, - enum server_type type); +bool server_set_type(struct server *server, enum server_type type); -bool server_set_pretty_name(struct cfg *cfg, struct server *server, - const char *pretty_name); +bool server_set_pretty_name(struct server *server, const char *pretty_name); -struct server *server_new(struct cfg *cfg, const char *name); +struct server *server_new(const char *name); #endif -- cgit v1.2.3