diff --git a/src/commands.c b/src/commands.c index d391b19..1796808 100644 --- a/src/commands.c +++ b/src/commands.c @@ -63,19 +63,19 @@ struct f2b_cmd_t { .tokens = { "jail", "", "set", "", "", NULL }, .help = "Set parameter of given jail", }, - [CMD_JAIL_IP_SHOW] = { - .argc = 2, .tokenc = 4, - .tokens = { "jail", "", "show", "", NULL }, + [CMD_JAIL_IP_STATUS] = { + .argc = 2, .tokenc = 5, + .tokens = { "jail", "", "ip", "status", "", NULL }, .help = "Show ip status in given jail", }, [CMD_JAIL_IP_BAN] = { - .argc = 2, .tokenc = 4, - .tokens = { "jail", "", "ban", "", NULL }, + .argc = 2, .tokenc = 5, + .tokens = { "jail", "", "ip", "ban", "", NULL }, .help = "Forcefully ban some ip in given jail", }, [CMD_JAIL_IP_RELEASE] = { - .argc = 2, .tokenc = 4, - .tokens = { "jail", "", "release", "", NULL }, + .argc = 2, .tokenc = 5, + .tokens = { "jail", "", "ip", "release", "", NULL }, .help = "Forcefully release some ip in given jail", }, [CMD_JAIL_FILTER_STATS] = { @@ -167,18 +167,18 @@ f2b_cmd_parse(const char *src, char *buf, size_t buflen) { strlcat(buf, "\n", buflen); return CMD_JAIL_SET; } - if (tokenc == 4 && strcmp(tokens[2], "show") == 0) { - strlcat(buf, tokens[3], buflen); + if (tokenc == 5 && strcmp(tokens[2], "ip") == 0 && strcmp(tokens[3], "status") == 0) { + strlcat(buf, tokens[4], buflen); strlcat(buf, "\n", buflen); - return CMD_JAIL_IP_SHOW; + return CMD_JAIL_IP_STATUS; } - if (tokenc == 4 && strcmp(tokens[2], "ban") == 0) { - strlcat(buf, tokens[3], buflen); + if (tokenc == 5 && strcmp(tokens[2], "ip") == 0 && strcmp(tokens[3], "ban") == 0) { + strlcat(buf, tokens[4], buflen); strlcat(buf, "\n", buflen); return CMD_JAIL_IP_BAN; } - if (tokenc == 4 && strcmp(tokens[2], "release") == 0) { - strlcat(buf, tokens[3], buflen); + if (tokenc == 5 && strcmp(tokens[2], "ip") == 0 && strcmp(tokens[3], "release") == 0) { + strlcat(buf, tokens[4], buflen); strlcat(buf, "\n", buflen); return CMD_JAIL_IP_RELEASE; } diff --git a/src/commands.h b/src/commands.h index a4fb3b3..02996e5 100644 --- a/src/commands.h +++ b/src/commands.h @@ -22,7 +22,7 @@ enum f2b_cmd_type { CMD_SHUTDOWN, CMD_JAIL_STATUS = 16, CMD_JAIL_SET, - CMD_JAIL_IP_SHOW, + CMD_JAIL_IP_STATUS, CMD_JAIL_IP_BAN, CMD_JAIL_IP_RELEASE, CMD_JAIL_FILTER_STATS, diff --git a/src/daemon.c b/src/daemon.c index 24da9f9..144f614 100644 --- a/src/daemon.c +++ b/src/daemon.c @@ -129,7 +129,7 @@ f2b_cmsg_process(const f2b_cmsg_t *msg, char *res, size_t ressize) { } } else if (msg->type == CMD_JAIL_STATUS) { f2b_jail_cmd_status(res, ressize, args[0]); - } else if (msg->type == CMD_JAIL_IP_SHOW) { + } else if (msg->type == CMD_JAIL_IP_STATUS) { if ((addr = f2b_addrlist_lookup(jail->ipaddrs, args[1])) != NULL) { f2b_ipaddr_status(addr, res, ressize); } else {