From 9da3a20a0b58374618d8723d7c961dd45491ba13 Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Sat, 20 Jun 2020 15:12:13 +0200 Subject: Rename scfg to server throughout for consistency --- cfgdir.c | 114 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) (limited to 'cfgdir.c') diff --git a/cfgdir.c b/cfgdir.c index 2e73719..494ff81 100644 --- a/cfgdir.c +++ b/cfgdir.c @@ -19,7 +19,7 @@ static void scfg_dns_cb(struct dns_async *dns, bool (*server_cb)(struct cfg *, struct server *, struct saddr *)) { - struct server *scfg; + struct server *server; struct cfg *cfg; struct sockaddr_in *in4; struct sockaddr_in6 *in6; @@ -32,11 +32,11 @@ scfg_dns_cb(struct dns_async *dns, bool (*server_cb)(struct cfg *, struct server return; } - scfg = dns->priv; - cfg = scfg->cfg; + server = dns->priv; + cfg = server->cfg; - debug(DBG_DNS, "called, dns: %p, name: %s, scfg: %p, scfg->name: %s", - dns, dns->name, scfg, scfg->name); + debug(DBG_DNS, "called, dns: %p, name: %s, server: %p, server->name: %s", + dns, dns->name, server, server->name); r = gai_error(&dns->gcb); if (r == EAI_INPROGRESS) { @@ -65,13 +65,13 @@ scfg_dns_cb(struct dns_async *dns, bool (*server_cb)(struct cfg *, struct server case AF_INET: in4 = (struct sockaddr_in *)ai->ai_addr; saddr_set_ipv4(saddr, in4->sin_addr.s_addr, in4->sin_port); - server_cb(cfg, scfg, saddr); + server_cb(cfg, server, saddr); break; case AF_INET6: in6 = (struct sockaddr_in6 *)ai->ai_addr; saddr_set_ipv6(saddr, &in6->sin6_addr, in6->sin6_port); - server_cb(cfg, scfg, saddr); + server_cb(cfg, server, saddr); break; default: @@ -86,8 +86,8 @@ out: freeaddrinfo(results); list_del(&dns->list); xfree(dns); - uring_task_put(cfg, &scfg->task); - server_commit(cfg, scfg); + uring_task_put(cfg, &server->task); + server_commit(cfg, server); } static void @@ -186,7 +186,7 @@ struct cfg_key_value_map scfg_key_map[] = { }; static bool -handle_dns(struct cfg *cfg, struct server *scfg, const char *type, +handle_dns(struct cfg *cfg, struct server *server, const char *type, struct cfg_value *value, dns_cb_t *async_cb, bool (*sync_cb)(struct cfg *, struct server *, struct saddr *)) { @@ -199,7 +199,7 @@ handle_dns(struct cfg *cfg, struct server *scfg, const char *type, list_for_each_entry_safe(saddr, tmp, &value->saddrs, list) { list_del(&saddr->list); - sync_cb(cfg, scfg, saddr); + sync_cb(cfg, server, saddr); } return true; @@ -209,9 +209,9 @@ handle_dns(struct cfg *cfg, struct server *scfg, const char *type, dns = value->dns_async; dns->cb = async_cb; - dns->priv = scfg; - list_add(&dns->list, &scfg->dnslookups); - uring_task_get(cfg, &scfg->task); + dns->priv = server; + list_add(&dns->list, &server->dnslookups); + uring_task_get(cfg, &server->task); return true; default: @@ -220,11 +220,11 @@ handle_dns(struct cfg *cfg, struct server *scfg, const char *type, } static void -scfg_parse(struct cfg *cfg, struct server *scfg) +scfg_parse(struct cfg *cfg, struct server *server) { - char *pos = &scfg->tbuf.buf[0]; + char *pos = &server->tbuf.buf[0]; - if (!config_parse_header(cfg, scfg->name, "server", &pos)) + if (!config_parse_header(cfg, server->name, "server", &pos)) return; while (true) { @@ -232,100 +232,100 @@ scfg_parse(struct cfg *cfg, struct server *scfg) const char *keyname; struct cfg_value value; - if (!config_parse_line(cfg, scfg->name, &pos, scfg_key_map, + if (!config_parse_line(cfg, server->name, &pos, scfg_key_map, &key, &keyname, &value)) break; if (key == SCFG_KEY_INVALID) break; - debug(DBG_CFG, "%s: key %s", scfg->name, keyname); + debug(DBG_CFG, "%s: key %s", server->name, keyname); switch (key) { case SCFG_KEY_TYPE: if (!strcmp(value.str, "proxy")) { - if (!server_set_type(cfg, scfg, SERVER_TYPE_PROXY)) + if (!server_set_type(cfg, server, SERVER_TYPE_PROXY)) return; } else if (!strcmp(value.str, "announce")) { - if (!server_set_type(cfg, scfg, SERVER_TYPE_ANNOUNCE)) + if (!server_set_type(cfg, server, SERVER_TYPE_ANNOUNCE)) return; } break; case SCFG_KEY_NAME: - if (!server_set_pretty_name(cfg, scfg, value.str)) + if (!server_set_pretty_name(cfg, server, value.str)) return; break; case SCFG_KEY_PORT: - if (!server_set_port(cfg, scfg, value.uint16)) + if (!server_set_port(cfg, server, value.uint16)) return; break; case SCFG_KEY_LOCAL: - if (!handle_dns(cfg, scfg, "local", &value, + if (!handle_dns(cfg, server, "local", &value, scfg_local_dns_cb, server_add_local)) return; break; case SCFG_KEY_REMOTE: - if (!handle_dns(cfg, scfg, "remote", &value, + if (!handle_dns(cfg, server, "remote", &value, scfg_remote_dns_cb, server_add_remote)) return; break; case SCFG_KEY_IDLE_TIMEOUT: - if (!server_set_idle_timeout(cfg, scfg, value.uint16)) + if (!server_set_idle_timeout(cfg, server, value.uint16)) return; break; case SCFG_KEY_STOP_METHOD: if (!strcmp(value.str, "exec")) { - if (server_set_stop_method(cfg, scfg, SERVER_STOP_METHOD_EXEC)) + if (server_set_stop_method(cfg, server, SERVER_STOP_METHOD_EXEC)) break; } else if (!strcmp(value.str, "rcon")) { - if (server_set_stop_method(cfg, scfg, SERVER_STOP_METHOD_RCON)) + if (server_set_stop_method(cfg, server, SERVER_STOP_METHOD_RCON)) break; } else if (!strcmp(value.str, "systemd")) { - if (server_set_stop_method(cfg, scfg, SERVER_STOP_METHOD_SYSTEMD)) + if (server_set_stop_method(cfg, server, SERVER_STOP_METHOD_SYSTEMD)) break; } return; case SCFG_KEY_START_METHOD: if (!strcmp(value.str, "exec")) { - if (server_set_start_method(cfg, scfg, SERVER_START_METHOD_EXEC)) + if (server_set_start_method(cfg, server, SERVER_START_METHOD_EXEC)) break; } else if (!strcmp(value.str, "systemd")) { - if (server_set_start_method(cfg, scfg, SERVER_START_METHOD_SYSTEMD)) + if (server_set_start_method(cfg, server, SERVER_START_METHOD_SYSTEMD)) break; } return; case SCFG_KEY_STOP_EXEC: - if (!server_set_stop_exec(cfg, scfg, value.str)) + if (!server_set_stop_exec(cfg, server, value.str)) return; break; case SCFG_KEY_START_EXEC: - if (!server_set_start_exec(cfg, scfg, value.str)) + if (!server_set_start_exec(cfg, server, value.str)) return; break; case SCFG_KEY_RCON: - if (!handle_dns(cfg, scfg, "rcon", &value, + if (!handle_dns(cfg, server, "rcon", &value, scfg_rcon_dns_cb, server_add_rcon)) return; break; case SCFG_KEY_RCON_PASSWORD: - if (!server_set_rcon_password(cfg, scfg, value.str)) + if (!server_set_rcon_password(cfg, server, value.str)) return; break; case SCFG_KEY_SYSTEMD_SERVICE: - if (!server_set_systemd_service(cfg, scfg, value.str)) + if (!server_set_systemd_service(cfg, server, value.str)) return; break; @@ -339,38 +339,38 @@ scfg_parse(struct cfg *cfg, struct server *scfg) static void scfg_read_cb(struct cfg *cfg, struct uring_task *task, int res) { - struct server *scfg = container_of(task, struct server, task); + struct server *server = container_of(task, struct server, task); assert_task_alive(DBG_CFG, task); if (res <= 0) { error("error reading config file for %s: %s", - scfg->name, strerror(-res)); - server_delete(cfg, scfg); + server->name, strerror(-res)); + server_delete(cfg, server); } - debug(DBG_CFG, "%s: parsing cfg (%i bytes)", scfg->name, res); - uring_task_close_fd(cfg, &scfg->task); - scfg_parse(cfg, scfg); - server_commit(cfg, scfg); + debug(DBG_CFG, "%s: parsing cfg (%i bytes)", server->name, res); + uring_task_close_fd(cfg, &server->task); + scfg_parse(cfg, server); + server_commit(cfg, server); } static void scfg_open_cb(struct cfg *cfg, struct uring_task *task, int res) { - struct server *scfg = container_of(task, struct server, task); + struct server *server = container_of(task, struct server, task); assert_task_alive(DBG_CFG, task); if (res < 0) { - error("open(%s) failed: %s", scfg->name, strerror(-res)); - server_delete(cfg, scfg); + error("open(%s) failed: %s", server->name, strerror(-res)); + server_delete(cfg, server); return; } - debug(DBG_CFG, "reading server cfg %s (fd %i)", scfg->name, res); - uring_task_set_fd(&scfg->task, res); - uring_tbuf_read_until_eof(cfg, &scfg->task, scfg_read_cb); + debug(DBG_CFG, "reading server cfg %s (fd %i)", server->name, res); + uring_task_set_fd(&server->task, res); + uring_tbuf_read_until_eof(cfg, &server->task, scfg_read_cb); } static bool @@ -457,7 +457,7 @@ inotify_cb(struct cfg *cfg, struct uring_task *task, int res) struct inotify_ev *iev = container_of(task, struct inotify_ev, task); const struct inotify_event *event; char *ptr; - struct server *scfg; + struct server *server; assert_task_alive(DBG_CFG, task); @@ -486,9 +486,9 @@ inotify_cb(struct cfg *cfg, struct uring_task *task, int res) if (event->mask & (IN_MOVED_FROM | IN_DELETE)) server_delete_by_name(cfg, event->name); else if (event->mask & (IN_MOVED_TO | IN_CREATE | IN_CLOSE_WRITE)) { - scfg = server_new(cfg, event->name); - verbose("New server config file detected: %s", scfg->name); - uring_openat(cfg, &scfg->task, scfg->name, scfg_open_cb); + server = server_new(cfg, event->name); + verbose("New server config file detected: %s", server->name); + uring_openat(cfg, &server->task, server->name, scfg_open_cb); } else error("inotify: unknown event: 0x%08x", event->mask); } @@ -523,7 +523,7 @@ cfgdir_init(struct cfg *cfg) struct inotify_ev *iev; DIR *dir; struct dirent *dent; - struct server *scfg; + struct server *server; iev = zmalloc(sizeof(*iev)); if (!iev) @@ -557,9 +557,9 @@ cfgdir_init(struct cfg *cfg) if (!scfg_valid_filename(dent->d_name)) continue; - scfg = server_new(cfg, dent->d_name); - if (scfg) - uring_openat(cfg, &scfg->task, scfg->name, scfg_open_cb); + server = server_new(cfg, dent->d_name); + if (server) + uring_openat(cfg, &server->task, server->name, scfg_open_cb); } closedir(dir); -- cgit v1.2.3