diff options
Diffstat (limited to 'minecctl/minecctl.c')
| -rw-r--r-- | minecctl/minecctl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/minecctl/minecctl.c b/minecctl/minecctl.c index 3d21ae6..231b150 100644 --- a/minecctl/minecctl.c +++ b/minecctl/minecctl.c @@ -44,13 +44,13 @@ static void dump_config(struct cfg *cfg) list_for_each_entry(server, &cfg->servers, list) { info(" * server"); info(" name : %s", server->name); - info(" filename : %s", server->filename); - info(" rcon_password : %s", server->rcon_password); + info(" filename : %s", server->scfg.filename); + info(" rcon_password : %s", server->scfg.rcon_password); info(" file_read : %s", server->file_read ? "yes" : "no"); - list_for_each_entry(saddr, &server->rcon_addrs, list) + list_for_each_entry(saddr, &server->scfg.rcons, list) info(" * rcon addr : %s", saddr->addrstr); - list_for_each_entry(saddr, &server->mc_addrs, list) + list_for_each_entry(saddr, &server->scfg.remotes, list) info(" * mc addr : %s", saddr->addrstr); } @@ -133,10 +133,10 @@ static bool create_server_from_cmdline_args(struct cfg *cfg) if (!cfg->rcon_addrstr && !cfg->mc_addrstr) return false; - server = server_new(); + server = server_new(NULL); if (cfg->rcon_addrstr) { - if (!str_to_addrs(cfg->rcon_addrstr, &server->rcon_addrs)) + if (!str_to_addrs(cfg->rcon_addrstr, &server->scfg.rcons)) goto error; server->name = cfg->rcon_addrstr; @@ -144,7 +144,7 @@ static bool create_server_from_cmdline_args(struct cfg *cfg) } if (cfg->mc_addrstr) { - if (!str_to_addrs(cfg->mc_addrstr, &server->mc_addrs)) + if (!str_to_addrs(cfg->mc_addrstr, &server->scfg.remotes)) goto error; if (!server->name) @@ -156,7 +156,7 @@ static bool create_server_from_cmdline_args(struct cfg *cfg) } if (cfg->rcon_password) { - server->rcon_password = cfg->rcon_password; + server->scfg.rcon_password = cfg->rcon_password; cfg->rcon_password = NULL; } |