From a2a11cf6a3ac9963f00baefbf40ebeda29b6f023 Mon Sep 17 00:00:00 2001
From: Christian Deacon <christianmdeacon@gmail.com>
Date: Mon, 10 Mar 2025 19:04:51 -0400
Subject: [PATCH] Change block time type in xdpfw-add util.

---
 src/loader/utils/config.c |  4 ++--
 src/rule_add/prog.c       | 10 ++++++----
 src/rule_add/utils/cli.c  |  2 +-
 src/rule_add/utils/cli.h  |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/loader/utils/config.c b/src/loader/utils/config.c
index 710d2bc..75ed1b5 100644
--- a/src/loader/utils/config.c
+++ b/src/loader/utils/config.c
@@ -794,8 +794,8 @@ int save_cfg(config__t* cfg, const char* file_path)
                 // Add block time.
                 if (filter->block_time > -1)
                 {
-                    config_setting_t* block_time = config_setting_add(filter_cfg, "block_time", CONFIG_TYPE_INT64);
-                    config_setting_set_int64(block_time, filter->block_time);
+                    config_setting_t* block_time = config_setting_add(filter_cfg, "block_time", CONFIG_TYPE_INT);
+                    config_setting_set_int(block_time, filter->block_time);
                 }
 
                 // Add PPS.
diff --git a/src/rule_add/prog.c b/src/rule_add/prog.c
index 057fac2..fd63b0e 100644
--- a/src/rule_add/prog.c
+++ b/src/rule_add/prog.c
@@ -24,18 +24,20 @@ int main(int argc, char *argv[])
 
     // We need to set integers for dynamic filters to -1 since we consider -1 as 'unset'.
     cli.enabled = -1;
-    cli.action = -1;
     cli.log = -1;
 
+    cli.action = -1;
+    cli.block_time = -1;
+
+    cli.pps = -1;
+    cli.bps = -1;
+
     cli.min_ttl = -1;
     cli.max_ttl = -1;
     cli.min_len = -1;
     cli.max_len = -1;
     cli.tos = -1;
 
-    cli.pps = -1;
-    cli.bps = -1;
-
     cli.tcp_enabled = -1;
     cli.tcp_sport = -1;
     cli.tcp_dport = -1;
diff --git a/src/rule_add/utils/cli.c b/src/rule_add/utils/cli.c
index dc199e8..c22160f 100644
--- a/src/rule_add/utils/cli.c
+++ b/src/rule_add/utils/cli.c
@@ -120,7 +120,7 @@ void parse_cli(cli_t* cli, int argc, char* argv[])
                 break;
 
             case 31:
-                cli->block_time = strtoll(optarg, NULL, 10);
+                cli->block_time = atoi(optarg);
 
                 break;
 
diff --git a/src/rule_add/utils/cli.h b/src/rule_add/utils/cli.h
index 3e9eb62..5be753f 100644
--- a/src/rule_add/utils/cli.h
+++ b/src/rule_add/utils/cli.h
@@ -28,7 +28,7 @@ struct cli
     int enabled;
     int log;
     int action;
-    s64 block_time;
+    int block_time;
 
     char* src_ip;
     char* dst_ip;