summaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
Diffstat (limited to 'server.c')
-rw-r--r--server.c119
1 files changed, 60 insertions, 59 deletions
diff --git a/server.c b/server.c
index edb0551..ea2d370 100644
--- a/server.c
+++ b/server.c
@@ -66,7 +66,7 @@ server_free(struct uring_task *task)
{
struct server *scfg = container_of(task, struct server, task);
- debug(DBG_SRV, "freeing server %s (%p)\n", scfg->name, scfg);
+ debug(DBG_SRV, "freeing server %s (%p)", scfg->name, scfg);
list_del(&scfg->list);
xfree(scfg->pretty_name);
xfree(scfg->start_exec);
@@ -88,7 +88,7 @@ server_delete(struct cfg *cfg, struct server *scfg)
struct saddr *tmp;
struct dns_async *dns, *dtmp;
- verbose("Removing server %s\n", scfg->name);
+ verbose("Removing server %s", scfg->name);
idle_delete(cfg, scfg);
rcon_delete(cfg, scfg);
@@ -140,40 +140,40 @@ server_dump(struct server *scfg)
struct saddr *remote;
struct saddr *rcon;
- verbose("Server %s:\n", scfg->name);
+ verbose("Server %s:", scfg->name);
switch (scfg->type) {
case SERVER_TYPE_ANNOUNCE:
- verbose(" * Type: announce\n");
+ verbose(" * Type: announce");
break;
case SERVER_TYPE_PROXY:
- verbose(" * Type: proxy\n");
+ verbose(" * Type: proxy");
break;
default:
- verbose(" * Type: unknown\n");
+ verbose(" * Type: unknown");
break;
}
- verbose(" * Name: %s\n", scfg->pretty_name ? scfg->pretty_name : "<undefined>");
- verbose(" * Announce port: %" PRIu16 "\n", scfg->announce_port);
+ verbose(" * Name: %s", scfg->pretty_name ? scfg->pretty_name : "<undefined>");
+ verbose(" * Announce port: %" PRIu16, scfg->announce_port);
if (!list_empty(&scfg->locals)) {
- verbose(" * Local:\n");
+ verbose(" * Local:");
list_for_each_entry(local, &scfg->locals, list)
- verbose(" * %s\n", local->local.addrstr);
+ verbose(" * %s", local->local.addrstr);
}
if (!list_empty(&scfg->remotes)) {
- verbose(" * Remote:\n");
+ verbose(" * Remote:");
list_for_each_entry(remote, &scfg->remotes, list)
- verbose(" * %s\n", remote->addrstr);
+ verbose(" * %s", remote->addrstr);
}
if (!list_empty(&scfg->rcons)) {
- verbose(" * RCon:\n");
+ verbose(" * RCon:");
list_for_each_entry(rcon, &scfg->rcons, list)
- verbose(" * %s\n", rcon->addrstr);
+ verbose(" * %s", rcon->addrstr);
}
- verbose("\n");
+ verbose("");
}
static void
@@ -181,7 +181,7 @@ server_local_free(struct uring_task *task)
{
struct server_local *local = container_of(task, struct server_local, task);
- debug(DBG_SRV, "task %p, local %p\n", task, local);
+ debug(DBG_SRV, "task %p, local %p", task, local);
list_del(&local->list);
xfree(local);
}
@@ -193,23 +193,23 @@ server_local_accept(struct cfg *cfg, struct uring_task *task, int res)
struct server *scfg = container_of(task->parent, struct server, task);
struct server_proxy *proxy;
- debug(DBG_SRV, "task %p, res %i, scfg %s\n", task, res, scfg->name);
+ debug(DBG_SRV, "task %p, res %i, scfg %s", task, res, scfg->name);
assert_task_alive(DBG_SRV, task);
if (res < 0) {
- error("result was %i\n", res);
+ error("result was %i", res);
goto out;
}
saddr_set_addrstr(&local->client);
- verbose("%s: incoming proxy connection: %s -> %s\n",
+ verbose("%s: incoming proxy connection: %s -> %s",
scfg->name, local->client.addrstr, local->local.addrstr);
if (list_empty(&scfg->remotes)) {
/* This shouldn't be possible, checked before opening local */
- error("scfg->remotes empty!\n");
+ error("scfg->remotes empty!");
uring_close(cfg, &local->task, res);
goto out;
}
@@ -281,7 +281,7 @@ server_exec_free(struct uring_task *task)
{
//struct server *scfg = container_of(task, struct server, exec_task);
- debug(DBG_SRV, "called\n");
+ debug(DBG_SRV, "called");
}
#ifndef P_PIDFD
@@ -300,7 +300,7 @@ server_exec_done(struct cfg *cfg, struct uring_task *task, int res)
assert_task_alive_or(DBG_SRV, task, goto out);
if (!(res & POLLIN)) {
- error("unexpected result: %i\n", res);
+ error("unexpected result: %i", res);
goto out;
}
@@ -311,9 +311,9 @@ server_exec_done(struct cfg *cfg, struct uring_task *task, int res)
}
if (info.si_status == 0)
- debug(DBG_SRV, "command successfully executed\n");
+ debug(DBG_SRV, "command successfully executed");
else
- error("command failed: %i\n", info.si_status);
+ error("command failed: %i", info.si_status);
out:
uring_task_close_fd(cfg, &scfg->exec_task);
@@ -363,7 +363,7 @@ server_check_running(struct cfg *cfg, struct server *scfg)
{
/* FIXME: other methods, rcon? */
if (scfg->systemd_service) {
- verbose("%s: checking if systemd service is running\n", scfg->name);
+ verbose("%s: checking if systemd service is running", scfg->name);
if (systemd_service_running(cfg, scfg)) {
scfg->state = SERVER_STATE_RUNNING;
return true;
@@ -388,11 +388,11 @@ server_start(struct cfg *cfg, struct server *scfg)
switch (scfg->start_method) {
case SERVER_START_METHOD_EXEC:
- verbose("Starting server %s via external cmd\n", scfg->name);
+ verbose("Starting server %s via external cmd", scfg->name);
return server_exec(cfg, scfg, scfg->start_exec);
case SERVER_START_METHOD_SYSTEMD:
- verbose("Starting server %s via systemd (%s)\n",
+ verbose("Starting server %s via systemd (%s)",
scfg->name, scfg->systemd_service);
if (systemd_service_start(cfg, scfg)) {
@@ -421,11 +421,11 @@ server_stop(struct cfg *cfg, struct server *scfg)
switch (scfg->stop_method) {
case SERVER_STOP_METHOD_EXEC:
- verbose("Stopping server %s via external cmd\n", scfg->name);
+ verbose("Stopping server %s via external cmd", scfg->name);
return server_exec(cfg, scfg, scfg->stop_exec);
case SERVER_STOP_METHOD_SYSTEMD:
- verbose("Stopping server %s via systemd (%s)\n",
+ verbose("Stopping server %s via systemd (%s)",
scfg->name, scfg->systemd_service);
if (systemd_service_stop(cfg, scfg)) {
scfg->state = SERVER_STATE_STOPPED;
@@ -434,7 +434,7 @@ server_stop(struct cfg *cfg, struct server *scfg)
return server_check_running(cfg, scfg);
case SERVER_STOP_METHOD_RCON:
- verbose("Stopping server %s via rcon\n", scfg->name);
+ verbose("Stopping server %s via rcon", scfg->name);
rcon_init(cfg, scfg);
return true;
@@ -453,7 +453,7 @@ server_commit(struct cfg *cfg, struct server *scfg)
uint16_t port;
if (!scfg || !scfg->name) {
- error("called with invalid parameters\n");
+ error("called with invalid parameters");
return false;
}
@@ -461,30 +461,30 @@ server_commit(struct cfg *cfg, struct server *scfg)
return false;
if (scfg->state != SERVER_STATE_INIT) {
- error("called in wrong state\n");
+ error("called in wrong state");
return false;
}
if (!list_empty(&scfg->proxys)) {
- error("%s: proxys not empty?\n", scfg->name);
+ error("%s: proxys not empty?", scfg->name);
return false;
}
if (!list_empty(&scfg->dnslookups)) {
- debug(DBG_SRV, "called with pending DNS requests\n");
+ debug(DBG_SRV, "called with pending DNS requests");
return true;
}
if (scfg->stop_method == SERVER_STOP_METHOD_RCON &&
list_empty(&scfg->rcons)) {
- error("%s: rcon stop method missing rcon address\n",
+ error("%s: rcon stop method missing rcon address",
scfg->name);
return false;
}
if (scfg->stop_method == SERVER_STOP_METHOD_RCON &&
!scfg->rcon_password) {
- error("%s: rcon stop method missing rcon password\n",
+ error("%s: rcon stop method missing rcon password",
scfg->name);
return false;
}
@@ -492,7 +492,7 @@ server_commit(struct cfg *cfg, struct server *scfg)
if ((scfg->start_method == SERVER_START_METHOD_SYSTEMD ||
scfg->stop_method == SERVER_STOP_METHOD_SYSTEMD) &&
!scfg->systemd_service) {
- error("%s: systemd start/stop method missing systemd service\n",
+ error("%s: systemd start/stop method missing systemd service",
scfg->name);
return false;
}
@@ -501,36 +501,37 @@ server_commit(struct cfg *cfg, struct server *scfg)
scfg->systemd_obj = systemd_service_object_path(cfg,
scfg->systemd_service);
if (!scfg->systemd_obj) {
- error("%s: failed to create systemd object path (%s)\n", scfg->name, scfg->systemd_service);
+ error("%s: failed to create systemd object path (%s)",
+ scfg->name, scfg->systemd_service);
return false;
}
}
if (scfg->idle_timeout > 0 &&
scfg->stop_method == SERVER_STOP_METHOD_UNDEFINED) {
- error("%s: idle_timeout set but missing stop method\n", scfg->name);
+ error("%s: idle_timeout set but missing stop method", scfg->name);
return false;
}
switch (scfg->type) {
case SERVER_TYPE_ANNOUNCE:
if (scfg->announce_port < 1) {
- error("%s: missing announce port\n", scfg->name);
+ error("%s: missing announce port", scfg->name);
return false;
}
if (scfg->start_method != SERVER_START_METHOD_UNDEFINED) {
- error("%s: can't set start_method for announce server\n", scfg->name);
+ error("%s: can't set start_method for announce server", scfg->name);
return false;
}
if (!list_empty(&scfg->locals)) {
- error("%s: can't set local addresses for announce server\n", scfg->name);
+ error("%s: can't set local addresses for announce server", scfg->name);
return false;
}
if (!list_empty(&scfg->remotes)) {
- error("%s: can't set remote addresses for announce server\n", scfg->name);
+ error("%s: can't set remote addresses for announce server", scfg->name);
return false;
}
@@ -538,17 +539,17 @@ server_commit(struct cfg *cfg, struct server *scfg)
case SERVER_TYPE_PROXY:
if (scfg->announce_port >= 1) {
- error("%s: can't set announce port for proxy server\n", scfg->name);
+ error("%s: can't set announce port for proxy server", scfg->name);
return false;
}
if (list_empty(&scfg->locals)) {
- error("%s: missing local addresses for proxy server\n", scfg->name);
+ error("%s: missing local addresses for proxy server", scfg->name);
return false;
}
if (list_empty(&scfg->remotes)) {
- error("%s: missing remote addresses for proxy server\n", scfg->name);
+ error("%s: missing remote addresses for proxy server", scfg->name);
return false;
}
@@ -556,7 +557,7 @@ server_commit(struct cfg *cfg, struct server *scfg)
port = saddr_port(&local->local);
if (port == 0) {
- error("%s: invalid local port\n", scfg->name);
+ error("%s: invalid local port", scfg->name);
return false;
}
@@ -564,20 +565,20 @@ server_commit(struct cfg *cfg, struct server *scfg)
scfg->announce_port = port;
if (scfg->announce_port != port) {
- error("%s: multiple local ports\n", scfg->name);
+ error("%s: multiple local ports", scfg->name);
return false;
}
}
if (scfg->announce_port < 1) {
- error("%s: can't determine which port to announce\n", scfg->name);
+ error("%s: can't determine which port to announce", scfg->name);
return false;
}
break;
default:
- error("%s: can't determine server type\n", scfg->name);
+ error("%s: can't determine server type", scfg->name);
return false;
}
@@ -586,13 +587,13 @@ server_commit(struct cfg *cfg, struct server *scfg)
suffix = strrchr(scfg->name, '.');
if (!suffix || suffix == scfg->name) {
- error("%s: invalid server name\n", scfg->name);
+ error("invalid server name: %s", scfg->name);
return false;
}
scfg->pretty_name = xstrndup(scfg->name, suffix - scfg->name);
if (!scfg->pretty_name) {
- error("%s: failed to create display name\n", scfg->name);
+ error("failed to create display name: %s", scfg->name);
return false;
}
}
@@ -609,7 +610,7 @@ server_commit(struct cfg *cfg, struct server *scfg)
server_check_running(cfg, scfg);
- debug(DBG_SRV, "success\n");
+ debug(DBG_SRV, "success");
return true;
}
@@ -622,7 +623,7 @@ server_add_remote(struct cfg *cfg, struct server *scfg, struct saddr *remote)
if (scfg->task.dead)
return false;
- debug(DBG_SRV, "adding remote: %s\n", remote->addrstr);
+ debug(DBG_SRV, "adding remote: %s", remote->addrstr);
list_add(&remote->list, &scfg->remotes);
return true;
}
@@ -633,7 +634,7 @@ server_add_local(struct cfg *cfg, struct server *scfg, struct saddr *saddr)
struct server_local *local;
if (!scfg || !saddr) {
- error("missing arguments\n");
+ error("missing arguments");
return false;
}
@@ -649,7 +650,7 @@ server_add_local(struct cfg *cfg, struct server *scfg, struct saddr *saddr)
local->local = *saddr;
uring_task_init(&local->task, "local", &scfg->task, server_local_free);
- debug(DBG_SRV, "adding local: %s\n", saddr->addrstr);
+ debug(DBG_SRV, "adding local: %s", saddr->addrstr);
list_add(&local->list, &scfg->locals);
xfree(saddr);
return true;
@@ -664,7 +665,7 @@ server_add_rcon(struct cfg *cfg, struct server *scfg, struct saddr *rcon)
if (scfg->task.dead)
return false;
- debug(DBG_SRV, "adding rcon: %s\n", rcon->addrstr);
+ debug(DBG_SRV, "adding rcon: %s", rcon->addrstr);
list_add(&rcon->list, &scfg->rcons);
return true;
}
@@ -793,11 +794,11 @@ server_new(struct cfg *cfg, const char *name)
list_for_each_entry(scfg, &cfg->servers, list) {
if (strcmp(name, scfg->name))
continue;
- error("attempt to add duplicate server: %s\n", name);
+ error("attempt to add duplicate server: %s", name);
return scfg;
}
- verbose("Adding server %s\n", name);
+ verbose("Adding server %s", name);
scfg = zmalloc(sizeof(*scfg));
if (!scfg) {
error("malloc");
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 02:59:00 +0000