Share config parsing fully between server and cmdline tool

1 files changed, 5 insertions, 4 deletions

diff --git a/minecproxy/server-rcon.c b/minecproxy/server-rcon.c
index 9562aa9..9ae49ef 100644
--- a/minecproxy/server-rcon.c
+++ b/minecproxy/server-rcon.c
@@ -168,7 +168,8 @@ static void rcon_connected_cb(struct connection *conn, bool connected)
 	rcon_protocol_create_packet(server->rcon_tbuf.buf,
 				    sizeof(server->rcon_tbuf.buf),
 				    &server->rcon_tbuf.len, 1,
-				    RCON_PACKET_LOGIN, server->rcon_password);
+				    RCON_PACKET_LOGIN,
+				    server->scfg.rcon_password);
 	uring_tbuf_write(&server->rcon_task, rcon_login_sent);
 }
 
@@ -183,11 +184,11 @@ static void rcon_free(struct uring_task *task)
 
 void rcon_stop(struct server *server)
 {
-	assert_return(server && !list_empty(&server->rcons) &&
-		      !empty_str(server->rcon_password));
+	assert_return(server && !list_empty(&server->scfg.rcons) &&
+		      !empty_str(server->scfg.rcon_password));
 	assert_task_alive(DBG_RCON, &server->rcon_task);
 
-	connect_any(&server->rcon_task, &server->rcons, &server->rcon_conn,
+	connect_any(&server->rcon_task, &server->scfg.rcons, &server->rcon_conn,
 		    rcon_connected_cb);
 }