Convert cfgdir to use debugging

1 files changed, 6 insertions, 5 deletions

diff --git a/cfgdir.c b/cfgdir.c
index 54a2e6e..040e016 100644
--- a/cfgdir.c
+++ b/cfgdir.c
@@ -100,7 +100,7 @@ scfg_parse(struct cfg *cfg, struct server *scfg)
 {
 	char *pos = &scfg->tbuf.buf[0];
 
-	if (!config_parse_header(cfg, "server", &pos))
+	if (!config_parse_header(cfg, scfg->name, "server", &pos))
 		return;
 
 	while (true) {
@@ -108,7 +108,8 @@ scfg_parse(struct cfg *cfg, struct server *scfg)
 		const char *keyname;
 		union cfg_value value;
 
-		if (!config_parse_line(cfg, &pos, scfg_key_map, &key, &keyname, &value))
+		if (!config_parse_line(cfg, scfg->name, &pos, scfg_key_map,
+				       &key, &keyname, &value))
 			break;
 
 		if (key == SCFG_KEY_INVALID)
@@ -141,7 +142,7 @@ scfg_parse(struct cfg *cfg, struct server *scfg)
 		case SCFG_KEY_LOCAL: {
 			struct sockaddr_in46 *addr, *tmp;
 
-			list_for_each_entry_safe(addr, tmp, &value.addr_list, list) {
+			list_for_each_entry_safe(addr, tmp, &value.addrs, list) {
 				list_del(&addr->list);
 				server_add_local(cfg, scfg, addr);
 			}
@@ -151,7 +152,7 @@ scfg_parse(struct cfg *cfg, struct server *scfg)
 		case SCFG_KEY_REMOTE: {
 			struct sockaddr_in46 *addr, *tmp;
 
-			list_for_each_entry_safe(addr, tmp, &value.addr_list, list) {
+			list_for_each_entry_safe(addr, tmp, &value.addrs, list) {
 				list_del(&addr->list);
 				server_add_remote(cfg, scfg, addr);
 			}
@@ -199,7 +200,7 @@ scfg_parse(struct cfg *cfg, struct server *scfg)
 		case SCFG_KEY_RCON: {
 			struct sockaddr_in46 *addr, *tmp;
 
-			list_for_each_entry_safe(addr, tmp, &value.addr_list, list) {
+			list_for_each_entry_safe(addr, tmp, &value.addrs, list) {
 				list_del(&addr->list);
 				server_add_rcon(cfg, scfg, addr);
 			}