From f06ff46151c38b2259c5ee4ae83d38c6f6fc0c8c Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Sun, 12 Jul 2020 02:30:31 +0200 Subject: Teach minecctl to create proper mcserver files, auto-generate systemd service names as necessary --- minecproxy/server-proxy.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'minecproxy/server-proxy.c') diff --git a/minecproxy/server-proxy.c b/minecproxy/server-proxy.c index 9d7b59e..e486a73 100644 --- a/minecproxy/server-proxy.c +++ b/minecproxy/server-proxy.c @@ -70,7 +70,7 @@ static void proxy_free(struct uring_task *task) assert_return(task); - debug(DBG_PROXY, "server: %s, src: %s, dst: %s", proxy->server->name, + debug(DBG_PROXY, "server: %s, src: %s, dst: %s", proxy->server->scfg.name, proxy->client_conn.remote.addrstr, proxy->server_conn.remote.addrstr); @@ -82,7 +82,7 @@ static void proxy_free(struct uring_task *task) info("%s: proxy connection %s -> %s closed " "(CtS: %s, StC: %s), duration %s", - proxy->server->name, proxy->client_conn.remote.addrstr, + proxy->server->scfg.name, proxy->client_conn.remote.addrstr, proxy->server_conn.remote.addrstr, cts, stc, duration); } @@ -97,7 +97,7 @@ static void proxy_client_free(struct uring_task *task) assert_return(task); - debug(DBG_PROXY, "%s: client connection closed", proxy->server->name); + debug(DBG_PROXY, "%s: client connection closed", proxy->server->scfg.name); } static void proxy_server_free(struct uring_task *task) @@ -107,12 +107,12 @@ static void proxy_server_free(struct uring_task *task) assert_return(task); - debug(DBG_PROXY, "%s: server connection closed", proxy->server->name); + debug(DBG_PROXY, "%s: server connection closed", proxy->server->scfg.name); } void proxy_delete(struct server_proxy *proxy) { - debug(DBG_PROXY, "%s: shutting down proxy %p", proxy->server->name, + debug(DBG_PROXY, "%s: shutting down proxy %p", proxy->server->scfg.name, proxy); assert_return(proxy); @@ -147,7 +147,7 @@ static void proxy_client_written_out(struct uring_task *task, int res) assert_task_alive(DBG_PROXY, task); if (res <= 0) { - debug(DBG_PROXY, "%s: res: %i", proxy->server->name, res); + debug(DBG_PROXY, "%s: res: %i", proxy->server->scfg.name, res); proxy_delete(proxy); return; } @@ -166,7 +166,7 @@ static void proxy_client_read_in(struct uring_task *task, int res) assert_task_alive(DBG_PROXY, task); if (res <= 0) { - debug(DBG_PROXY, "%s: res: %i", proxy->server->name, res); + debug(DBG_PROXY, "%s: res: %i", proxy->server->scfg.name, res); proxy_delete(proxy); return; } @@ -186,7 +186,7 @@ static void proxy_server_written_out(struct uring_task *task, int res) assert_task_alive(DBG_PROXY, task); if (res <= 0) { - debug(DBG_PROXY, "%s: res: %i", proxy->server->name, res); + debug(DBG_PROXY, "%s: res: %i", proxy->server->scfg.name, res); proxy_delete(proxy); return; } @@ -205,7 +205,7 @@ static void proxy_server_read_in(struct uring_task *task, int res) assert_task_alive(DBG_PROXY, task); if (res <= 0) { - debug(DBG_PROXY, "%s: res: %i", proxy->server->name, res); + debug(DBG_PROXY, "%s: res: %i", proxy->server->scfg.name, res); proxy_delete(proxy); return; } @@ -228,7 +228,7 @@ static void proxy_client_spliced_out(struct uring_task *task, int res) assert_task_alive(DBG_PROXY, task); if (res <= 0) { - debug(DBG_PROXY, "%s: res: %i", proxy->server->name, res); + debug(DBG_PROXY, "%s: res: %i", proxy->server->scfg.name, res); proxy_delete(proxy); return; } @@ -247,7 +247,7 @@ static void proxy_client_spliced_in(struct uring_task *task, int res) assert_task_alive(DBG_PROXY, task); if (res <= 0) { - debug(DBG_PROXY, "%s: res: %i", proxy->server->name, res); + debug(DBG_PROXY, "%s: res: %i", proxy->server->scfg.name, res); proxy_delete(proxy); return; } @@ -267,7 +267,7 @@ static void proxy_server_spliced_out(struct uring_task *task, int res) assert_task_alive(DBG_PROXY, task); if (res <= 0) { - debug(DBG_PROXY, "%s: res: %i", proxy->server->name, res); + debug(DBG_PROXY, "%s: res: %i", proxy->server->scfg.name, res); proxy_delete(proxy); return; } @@ -286,7 +286,7 @@ static void proxy_server_spliced_in(struct uring_task *task, int res) assert_task_alive(DBG_PROXY, task); if (res <= 0) { - debug(DBG_PROXY, "%s: res: %i", proxy->server->name, res); + debug(DBG_PROXY, "%s: res: %i", proxy->server->scfg.name, res); proxy_delete(proxy); return; } @@ -307,7 +307,7 @@ static void proxy_connected_cb(struct connection *conn, bool connected) proxy->connecting = false; if (!connected) { error("%s: proxy connection to remote server failed", - proxy->server->name); + proxy->server->scfg.name); if (!proxy->ptask.active) proxy_delete(proxy); return; @@ -316,7 +316,7 @@ static void proxy_connected_cb(struct connection *conn, bool connected) ptimer_del_task(&proxy->ptask); proxy->sfd = proxy->servertask.fd; - verbose("%s: proxy connection %s -> %s opened", proxy->server->name, + verbose("%s: proxy connection %s -> %s opened", proxy->server->scfg.name, proxy->client_conn.remote.addrstr, proxy->server_conn.remote.addrstr); proxy->begin = time(NULL); @@ -439,7 +439,7 @@ static void local_accept(struct uring_task *task, int res) assert_return(task); assert_task_alive(DBG_PROXY, task); - debug(DBG_PROXY, "task %p, res %i, server %s", task, res, server->name); + debug(DBG_PROXY, "task %p, res %i, server %s", task, res, server->scfg.name); if (res < 0) { error("res: %i", res); @@ -448,7 +448,7 @@ static void local_accept(struct uring_task *task, int res) saddr_set_addrstr(&local->client); - verbose("%s: incoming proxy connection: %s -> %s", server->name, + verbose("%s: incoming proxy connection: %s -> %s", server->scfg.name, local->client.addrstr, local->local.addrstr); if (list_empty(&server->scfg.remotes)) { @@ -571,7 +571,7 @@ struct server_local *local_new(struct server *server, struct saddr *saddr) return NULL; } - debug(DBG_PROXY, "%s adding local: %s", server->name, saddr->addrstr); + debug(DBG_PROXY, "%s adding local: %s", server->scfg.name, saddr->addrstr); local->local = *saddr; local->server = server; uring_task_init(&local->task, "local", &server->task, local_free); -- cgit v1.2.3