doveadm-penalty: Convert to ver2 infra

diff --git a/src/doveadm/doveadm-cmd.c b/src/doveadm/doveadm-cmd.c
index c06e60c3b8e8f76ce11cc682a59208b89a402f09..b1533c05a96c0059419ef06574a4d74c5a2d50ea 100644 (file)
--- a/src/doveadm/doveadm-cmd.c
+++ b/src/doveadm/doveadm-cmd.c
@@ -14,7 +14,6 @@
 
 static struct doveadm_cmd *doveadm_commands[] = {
        &doveadm_cmd_who,
-       &doveadm_cmd_penalty,
        &doveadm_cmd_kick,
        &doveadm_cmd_mailbox_mutf7,
        &doveadm_cmd_sis_deduplicate,
@@ -25,7 +24,8 @@ static struct doveadm_cmd_ver2 *doveadm_commands_ver2[] = {
        &doveadm_cmd_stop_ver2,
        &doveadm_cmd_reload_ver2,
        &doveadm_cmd_stats_dump_ver2,
-       &doveadm_cmd_stats_reset_ver2
+       &doveadm_cmd_stats_reset_ver2,
+       &doveadm_cmd_penalty_ver2
 };
 
 ARRAY_TYPE(doveadm_cmd) doveadm_cmds;

diff --git a/src/doveadm/doveadm-cmd.h b/src/doveadm/doveadm-cmd.h
index 0fc24656661eb2a6276c9ebaf43ee6d62b94b773..1f4cc629d5b8c0eb0427869e2d83de379b3d7504 100644 (file)
--- a/src/doveadm/doveadm-cmd.h
+++ b/src/doveadm/doveadm-cmd.h
@@ -75,7 +75,6 @@ extern ARRAY_TYPE(doveadm_cmd_ver2) doveadm_cmds_ver2;
 extern struct doveadm_cmd doveadm_cmd_dump;
 extern struct doveadm_cmd doveadm_cmd_pw;
 extern struct doveadm_cmd doveadm_cmd_who;
-extern struct doveadm_cmd doveadm_cmd_penalty;
 extern struct doveadm_cmd doveadm_cmd_kick;
 extern struct doveadm_cmd doveadm_cmd_mailbox_mutf7;
 extern struct doveadm_cmd doveadm_cmd_sis_deduplicate;
@@ -136,5 +135,6 @@ extern struct doveadm_cmd_ver2 doveadm_cmd_reload_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_stats_reset_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_stats_dump_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_stats_top_ver2;
+extern struct doveadm_cmd_ver2 doveadm_cmd_penalty_ver2;
 
 #endif

diff --git a/src/doveadm/doveadm-penalty.c b/src/doveadm/doveadm-penalty.c
index 93ddee566c0cf1c0199996b2a5a9d9332e99ec5f..2b91fa9db9e9b82fc2600c3ff3e5ff112f29ad0c 100644 (file)
--- a/src/doveadm/doveadm-penalty.c
+++ b/src/doveadm/doveadm-penalty.c
@@ -5,11 +5,11 @@
 #include "net.h"
 #include "istream.h"
 #include "hash.h"
+#include "time-util.h"
 #include "doveadm.h"
+#include "doveadm-print.h"
 
-#include <stdio.h>
 #include <unistd.h>
-#include <time.h>
 
 struct penalty_line {
        struct ip_addr ip;
@@ -45,19 +45,15 @@ static void
 penalty_print_line(struct penalty_context *ctx,
                   const struct penalty_line *line)
 {
-       const struct tm *tm;
-       char buf[10];
-
        if (ctx->net_bits > 0) {
                if (!net_is_in_network(&line->ip, &ctx->net_ip, ctx->net_bits))
                        return;
        }
 
-       tm = localtime(&line->last_update);
-       strftime(buf, sizeof(buf), "%H:%M:%S", tm);
-
-       printf("%-16s %7u %s %s\n", net_ip2addr(&line->ip), line->penalty,
-              unixdate2str(line->last_penalty), buf);
+       doveadm_print(net_ip2addr(&line->ip));
+       doveadm_print(dec2str(line->penalty));
+       doveadm_print(unixdate2str(line->last_penalty));
+       doveadm_print(t_strflocaltime("%H:%M:%S", line->last_update));
 }
 
 static void penalty_lookup(struct penalty_context *ctx)
@@ -90,36 +86,38 @@ static void penalty_lookup(struct penalty_context *ctx)
        i_stream_destroy(&input);
 }
 
-static void cmd_penalty(int argc, char *argv[])
+static void cmd_penalty(const struct doveadm_cmd_ver2 *cmd ATTR_UNUSED, int argc, const struct doveadm_cmd_param *argv)
 {
        struct penalty_context ctx;
-       int c;
+       const char *netmask;
 
        memset(&ctx, 0, sizeof(ctx));
-       ctx.anvil_path = t_strconcat(doveadm_settings->base_dir, "/anvil", NULL);
-       while ((c = getopt(argc, argv, "a:")) > 0) {
-               switch (c) {
-               case 'a':
-                       ctx.anvil_path = optarg;
-                       break;
-               default:
-                       help(&doveadm_cmd_penalty);
+       if (!doveadm_cmd_param_str(argc, argv, "socket-path", &(ctx.anvil_path)))
+               ctx.anvil_path = t_strconcat(doveadm_settings->base_dir, "/anvil", NULL);
+
+       if (doveadm_cmd_param_str(argc, argv, "netmask", &netmask)) {
+               if (net_parse_range(netmask, &ctx.net_ip, &ctx.net_bits) != 0) {
+                       doveadm_exit_code = EX_USAGE;
+                       i_error("Invalid netmask '%s' given", netmask);
+                       return;
                }
        }
-       argv += optind-1;
 
-       if (argv[1] != NULL) {
-               if (net_parse_range(argv[1], &ctx.net_ip, &ctx.net_bits) == 0)
-                       argv++;
-       }
-       if (argv[1] != NULL)
-               help(&doveadm_cmd_penalty);
+       doveadm_print_init(DOVEADM_PRINT_TYPE_TABLE);
+       doveadm_print_header_simple("IP");
+       doveadm_print_header_simple("penalty");
+       doveadm_print_header_simple("last_penalty");
+       doveadm_print_header_simple("last_update");
 
-       fprintf(stderr, "%-16s penalty last_penalty        last_update\n", "IP");
        penalty_lookup(&ctx);
 }
 
-struct doveadm_cmd doveadm_cmd_penalty = {
-       cmd_penalty, "penalty",
-       "[-a <anvil socket path>] [<ip/bits>]"
+struct doveadm_cmd_ver2 doveadm_cmd_penalty_ver2 = {
+       .name = "penalty",
+       .cmd = cmd_penalty,
+       .usage = "[-a <anvil socket path>] [<ip/bits>]",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_PARAM('a',"socket-path", CMD_PARAM_STR,0)
+DOVEADM_CMD_PARAM('\0',"netmask", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
 };