kaffa/XDP-Firewall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update xdpfw-add and xdpfw-del utils.

Browse Source
This commit is contained in:
Christian Deacon
2025-03-01 13:48:06 -05:00
parent de3739d027
commit 8756bbcdb8
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/rule_add/prog.c
View File

@@ -463,15 +463,13 @@ int main(int argc, char *argv[])
return EXIT_FAILURE; 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_block = GetMapPinFd(XDP_MAP_PIN_DIR, "map_block");
int map_block6 = GetMapPinFd(XDP_MAP_PIN_DIR, "map_block6"); int map_block6 = GetMapPinFd(XDP_MAP_PIN_DIR, "map_block6");
@@ -536,7 +534,14 @@ int main(int argc, char *argv[])
return EXIT_FAILURE; 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);
}
} }
} }

8
src/rule_del/prog.c
View File

@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
printf("Using 'map_filters' FD => %d...\n", map_filters); printf("Using 'map_filters' FD => %d...\n", map_filters);
int index = -1; int idx = -1;
int cfg_idx = cmd.idx - 1; int cfg_idx = cmd.idx - 1;
int cur_idx = 0; int cur_idx = 0;
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
if (i == cur_idx) if (i == cur_idx)
{ {
index = cur_idx; idx = cur_idx;
break; break;
} }
@@ -116,9 +116,9 @@ int main(int argc, char *argv[])
cur_idx++; 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; return EXIT_FAILURE;
} }