From e680ccb0ecd96be57f0a0d8bde317340b99ae3cc Mon Sep 17 00:00:00 2001 From: Jeremy Lakeman Date: Mon, 30 Mar 2015 13:48:13 +1030 Subject: [PATCH] Update test_cli to match recent config changes --- Makefile.in | 1 + test_cli.c | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 73060668..d59b1311 100644 --- a/Makefile.in +++ b/Makefile.in @@ -172,6 +172,7 @@ $(OBJSDIR_LIB)/%.o: %.c $(SERVAL_DAEMON_OBJS): $(HDRS) $(SERVALD_OBJS): Makefile $(LIB_SERVAL_OBJS): $(HDRS) Makefile +$(TEST_OBJS): $(HDRS) Makefile $(MONITOR_CLIENT_OBJS): $(HDRS) Makefile $(SIMULATOR_OBJS): $(HDRS) Makefile diff --git a/test_cli.c b/test_cli.c index e6daa8a9..cf39d01b 100644 --- a/test_cli.c +++ b/test_cli.c @@ -311,10 +311,6 @@ static int app_config_test(const struct cli_parsed *UNUSED(parsed), struct cli_c DEBUGF("config.directory.service = %s", alloca_tohex_sid_t(config.directory.service)); DEBUGF("config.rhizome.api.addfile.allow_host = %s", inet_ntoa(config.rhizome.api.addfile.allow_host)); unsigned j; - for (j = 0; j < config.mdp.iftype.ac; ++j) { - DEBUGF("config.mdp.iftype.%u", config.mdp.iftype.av[j].key); - DEBUGF(" .tick_ms = %u", config.mdp.iftype.av[j].value.tick_ms); - } for (j = 0; j < config.dna.helper.argv.ac; ++j) { DEBUGF("config.dna.helper.argv.%u=%s", config.dna.helper.argv.av[j].key, config.dna.helper.argv.av[j].value); } @@ -334,8 +330,8 @@ static int app_config_test(const struct cli_parsed *UNUSED(parsed), struct cli_c DEBUGF(" ]"); DEBUGF(" .type = %d", config.interfaces.av[j].value.type); DEBUGF(" .port = %u", config.interfaces.av[j].value.port); - DEBUGF(" .drop_broadcasts = %d", (int) config.interfaces.av[j].value.drop_broadcasts); - DEBUGF(" .drop_unicasts = %d", (int) config.interfaces.av[j].value.drop_unicasts); + DEBUGF(" .broadcast.drop = %d", (int) config.interfaces.av[j].value.broadcast.drop); + DEBUGF(" .unicast.drop = %d", (int) config.interfaces.av[j].value.unicast.drop); DEBUGF(" .drop_packets = %u", (unsigned) config.interfaces.av[j].value.drop_packets); } for (j = 0; j < config.hosts.ac; ++j) {