From d3352b997ca59a336a40fe6660c6e5b7079864aa Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Sun, 28 Jun 2020 14:58:32 +0200 Subject: Run clang-format on source tree (excl igmp.c) --- minecproxy/main.c | 105 +++++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 52 deletions(-) (limited to 'minecproxy/main.c') diff --git a/minecproxy/main.c b/minecproxy/main.c index f5e6c88..b5a195b 100644 --- a/minecproxy/main.c +++ b/minecproxy/main.c @@ -38,8 +38,7 @@ static bool daemonize = false; static FILE *log_file = NULL; static const char *log_file_path = NULL; -static void -msg(enum debug_lvl lvl, const char *fmt, va_list ap) +static void msg(enum debug_lvl lvl, const char *fmt, va_list ap) { static bool first = true; static bool use_colors = false; @@ -136,8 +135,7 @@ msg(enum debug_lvl lvl, const char *fmt, va_list ap) fprintf(stderr, ANSI_NORMAL); } -void -__debug(enum debug_lvl lvl, const char *fmt, ...) +void __debug(enum debug_lvl lvl, const char *fmt, ...) { va_list ap; @@ -148,8 +146,7 @@ __debug(enum debug_lvl lvl, const char *fmt, ...) va_end(ap); } -_noreturn_ void -__die(const char *fmt, ...) +_noreturn_ void __die(const char *fmt, ...) { va_list ap; @@ -164,8 +161,7 @@ __die(const char *fmt, ...) exit(EXIT_FAILURE); } -static void -cfg_free(struct uring_task *task) +static void cfg_free(struct uring_task *task) { struct cfg *xcfg = container_of(task, struct cfg, task); @@ -198,51 +194,60 @@ struct cfg_key_value_map mcfg_key_map[] = { .key_name = "igmp", .key_value = MCFG_KEY_IGMP, .value_type = CFG_VAL_TYPE_BOOL, - }, { + }, + { .key_name = "igmp_iface", .key_value = MCFG_KEY_IGMP_IFACE, .value_type = CFG_VAL_TYPE_STRING, - }, { + }, + { .key_name = "announce_interval", .key_value = MCFG_KEY_ANN_INTERVAL, .value_type = CFG_VAL_TYPE_UINT16, - }, { + }, + { .key_name = "proxy_connection_interval", .key_value = MCFG_KEY_PROXY_CONN_INTERVAL, .value_type = CFG_VAL_TYPE_UINT16, - }, { + }, + { .key_name = "proxy_connection_attempts", .key_value = MCFG_KEY_PROXY_CONN_ATTEMPTS, .value_type = CFG_VAL_TYPE_UINT16, - }, { + }, + { .key_name = "socket_defer", .key_value = MCFG_KEY_SOCKET_DEFER, .value_type = CFG_VAL_TYPE_BOOL, - }, { + }, + { .key_name = "socket_freebind", .key_value = MCFG_KEY_SOCKET_FREEBIND, .value_type = CFG_VAL_TYPE_BOOL, - }, { + }, + { .key_name = "socket_keepalive", .key_value = MCFG_KEY_SOCKET_KEEPALIVE, .value_type = CFG_VAL_TYPE_BOOL, - }, { + }, + { .key_name = "socket_iptos", .key_value = MCFG_KEY_SOCKET_IPTOS, .value_type = CFG_VAL_TYPE_BOOL, - }, { + }, + { .key_name = "socket_nodelay", .key_value = MCFG_KEY_SOCKET_NODELAY, .value_type = CFG_VAL_TYPE_BOOL, - }, { + }, + { .key_name = NULL, .key_value = MCFG_KEY_INVALID, .value_type = CFG_VAL_TYPE_INVALID, } }; -static void -cfg_read() +static void cfg_read() { FILE *cfgfile; const char *path; @@ -297,8 +302,8 @@ cfg_read() const char *keyname; struct cfg_value value; - if (!config_parse_line(path, &pos, mcfg_key_map, - &key, &keyname, &value, false)) + if (!config_parse_line(path, &pos, mcfg_key_map, &key, &keyname, + &value, false)) break; if (key == MCFG_KEY_INVALID) @@ -307,7 +312,6 @@ cfg_read() debug(DBG_CFG, "main cfg: key %s", keyname); switch (key) { - case MCFG_KEY_IGMP: cfg->do_igmp = value.boolean; break; @@ -358,6 +362,7 @@ cfg_read() } } +/* clang-format off */ const struct { const char *name; unsigned val; @@ -409,9 +414,9 @@ const struct { .val = 0, } }; +/* clang-format on */ -_noreturn_ static void -usage(bool invalid) +_noreturn_ static void usage(bool invalid) { if (invalid) info("Invalid option(s)"); @@ -434,8 +439,7 @@ usage(bool invalid) exit(invalid ? EXIT_FAILURE : EXIT_SUCCESS); } -static void -cfg_init(int argc, char **argv) +static void cfg_init(int argc, char **argv) { int c; unsigned i; @@ -463,6 +467,7 @@ cfg_init(int argc, char **argv) while (true) { int option_index = 0; + /* clang-format off */ static struct option long_options[] = { { "cfgdir", required_argument, 0, 'c' }, { "cfgfile", required_argument, 0, 'C' }, @@ -474,9 +479,10 @@ cfg_init(int argc, char **argv) { "debug", required_argument, 0, 'd' }, { 0, 0, 0, 0 } }; + /* clang-format on */ - c = getopt_long(argc, argv, ":c:C:u:Dl:hvd:", - long_options, &option_index); + c = getopt_long(argc, argv, ":c:C:u:Dl:hvd:", long_options, + &option_index); if (c == -1) break; @@ -512,12 +518,12 @@ cfg_init(int argc, char **argv) if (errno == ESRCH) die("failed to find user %s", optarg); else - die("failed to find user %s (%m)", optarg); + die("failed to find user %s (%m)", + optarg); } debug(DBG_CFG, "asked to execute with uid %ji gid %ji", - (intmax_t)pwd->pw_uid, - (intmax_t)pwd->pw_gid); + (intmax_t)pwd->pw_uid, (intmax_t)pwd->pw_gid); cfg->uid = pwd->pw_uid; cfg->gid = pwd->pw_gid; break; @@ -531,12 +537,14 @@ cfg_init(int argc, char **argv) info("Debug categories:"); info(" * all"); for (i = 0; debug_category_str[i].name; i++) - info(" * %s", debug_category_str[i].name); + info(" * %s", + debug_category_str[i].name); exit(EXIT_FAILURE); } for (i = 0; debug_category_str[i].name; i++) { - if (strcaseeq(optarg, debug_category_str[i].name)) + if (strcaseeq(optarg, + debug_category_str[i].name)) break; } @@ -553,29 +561,25 @@ cfg_init(int argc, char **argv) default: usage(true); } - } if (optind < argc) usage(true); } -static void -cfg_apply() +static void cfg_apply() { if (cfg->uid == 0 || cfg->gid == 0) /* This catches both -u root and running as root without -u */ die("Execution as root is not supported (use -u )"); capng_clear(CAPNG_SELECT_BOTH); - if (capng_updatev(CAPNG_ADD, - CAPNG_EFFECTIVE | CAPNG_PERMITTED, + if (capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, CAP_NET_RAW, CAP_NET_BIND_SERVICE, -1)) die("capng_updatev failed"); if (geteuid() != cfg->uid) { - if (capng_change_id(cfg->uid, - cfg->gid, + if (capng_change_id(cfg->uid, cfg->gid, CAPNG_DROP_SUPP_GRP | CAPNG_CLEAR_BOUNDING)) die("capng_change_id failed"); } else { @@ -614,8 +618,7 @@ cfg_apply() } } -void -dump_tree() +void dump_tree() { struct server *server; @@ -639,8 +642,7 @@ dump_tree() info("\n\n"); } -int -main(int argc, char **argv) +int main(int argc, char **argv) { struct server *server; unsigned server_count; @@ -679,8 +681,7 @@ main(int argc, char **argv) /* Drop CAP_NET_RAW (if we have it), only used for igmp */ capng_clear(CAPNG_SELECT_BOTH); - if (capng_update(CAPNG_ADD, - CAPNG_EFFECTIVE | CAPNG_PERMITTED, + if (capng_update(CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, CAP_NET_BIND_SERVICE)) die("capng_update failed"); @@ -708,14 +709,14 @@ main(int argc, char **argv) list_for_each_entry(server, &cfg->servers, list) server_count++; - sd_notifyf(0, "READY=1\n" + sd_notifyf(0, + "READY=1\n" "STATUS=Running, %u server configurations loaded\n" "MAINPID=%lu", - server_count, - (unsigned long)getpid()); + server_count, (unsigned long)getpid()); - info("mcproxy (%s) started, %u server configurations loaded", - VERSION, server_count); + info("mcproxy (%s) started, %u server configurations loaded", VERSION, + server_count); uring_event_loop(); -- cgit v1.2.3