From 8756bbcdb8fca5387603a89776c40cb2ce87d771 Mon Sep 17 00:00:00 2001 From: Christian Deacon Date: Sat, 1 Mar 2025 13:48:06 -0500 Subject: [PATCH] Update xdpfw-add and xdpfw-del utils. --- src/rule_add/prog.c | 17 +++++++++++------ src/rule_del/prog.c | 8 ++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/rule_add/prog.c b/src/rule_add/prog.c index 105dcde..e73c37e 100644 --- a/src/rule_add/prog.c +++ b/src/rule_add/prog.c @@ -463,15 +463,13 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - int expires = 0; + u64 expires_rel = 0; - if (cmd.expires > -1) + if (cmd.expires > 0) { - expires = cmd.expires; + expires_rel = GetBootNanoTime() + ((u64)cmd.expires * 1e9); } - u64 expires_rel = GetBootNanoTime() + ((u64)expires * 1e9); - int map_block = GetMapPinFd(XDP_MAP_PIN_DIR, "map_block"); int map_block6 = GetMapPinFd(XDP_MAP_PIN_DIR, "map_block6"); @@ -536,7 +534,14 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - printf("Added '%s' to block map...\n", cmd.ip); + if (cmd.expires > 0) + { + printf("Added '%s' to block map for %lld seconds...\n", cmd.ip, cmd.expires); + } + else + { + printf("Added '%s' to block map indefinitely...\n", cmd.ip); + } } } diff --git a/src/rule_del/prog.c b/src/rule_del/prog.c index a2ddb94..ca56cad 100644 --- a/src/rule_del/prog.c +++ b/src/rule_del/prog.c @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) printf("Using 'map_filters' FD => %d...\n", map_filters); - int index = -1; + int idx = -1; int cfg_idx = cmd.idx - 1; int cur_idx = 0; @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) if (i == cur_idx) { - index = cur_idx; + idx = cur_idx; break; } @@ -116,9 +116,9 @@ int main(int argc, char *argv[]) cur_idx++; } - if (index < 0) + if (idx < 0) { - fprintf(stderr, "[ERROR] Failed to find proper index in config file (%d).\n", index); + fprintf(stderr, "[ERROR] Failed to find proper index in config file (%d).\n", idx); return EXIT_FAILURE; }