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

Change default log file path and clean up some code.

Browse Source
This commit is contained in:
Christian Deacon
2025-02-27 07:03:41 -05:00
parent c631266061
commit 47753af3d5
7 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/types.h
View File

@@ -98,7 +98,7 @@ struct filter
unsigned int do_bps : 1;
u64 bps;
u64 blocktime;
u64 block_time;
tcp_opts_t tcpopts;
udp_opts_t udpopts;

14
src/loader/utils/config.c
View File

@@ -46,7 +46,7 @@ int LoadConfig(config__t *cfg, char *cfg_file, config_overrides_t* overrides)
void SetCfgDefaults(config__t *cfg)
{
cfg->verbose = 2;
cfg->log_file = strdup("/var/log/xdpfw/xdpfw.log");
cfg->log_file = strdup("/var/log/xdpfw.log");
cfg->update_time = 0;
cfg->interface = NULL;
cfg->no_stats = 0;
@@ -90,7 +90,7 @@ void SetCfgDefaults(config__t *cfg)
filter->do_bps = 0;
filter->bps = 0;
filter->blocktime = 1;
filter->block_time = 1;
filter->tcpopts.enabled = 0;
filter->tcpopts.do_dport = 0;
@@ -465,15 +465,15 @@ int ReadCfg(config__t *cfg, config_overrides_t* overrides)
}
// Block time (default 1).
long long blocktime;
long long block_time;
if (config_setting_lookup_int64(filter_cfg, "block_time", &blocktime) == CONFIG_TRUE)
if (config_setting_lookup_int64(filter_cfg, "block_time", &block_time) == CONFIG_TRUE)
{
filter->blocktime = blocktime;
filter->block_time = block_time;
}
else
{
filter->blocktime = 1;
filter->block_time = 1;
}
/* TCP options */
@@ -729,7 +729,7 @@ void PrintConfig(config__t* cfg)
printf("\t\t\t\tTOS => %d\n", filter->tos);
printf("\t\t\t\tPPS => %llu\n", filter->pps);
printf("\t\t\t\tBPS => %llu\n", filter->bps);
printf("\t\t\t\tBlock Time => %llu\n\n", filter->blocktime);
printf("\t\t\t\tBlock Time => %llu\n\n", filter->block_time);
// TCP Options.
printf("\t\t\tTCP Options\n");

2
src/loader/utils/logging.c
View File

@@ -164,7 +164,7 @@ int HandleRbEvent(void* ctx, void* data, size_t sz)
const char* protocol_str = GetProtocolStrById(e->protocol);
LogMsg(cfg, 0, 0, "[FILTER %d] %s %s packet '%s:%d' => '%s:%d' (PPS => %llu, BPS => %llu, Filter Block Time => %llu)...", e->filter_id + 1, action, protocol_str, src_ip_str, htons(e->src_port), dst_ip_str, htons(e->dst_port), e->pps, e->bps, filter->blocktime);
LogMsg(cfg, 0, 0, "[FILTER %d] %s %s packet '%s:%d' => '%s:%d' (PPS => %llu, BPS => %llu, Filter Block Time => %llu)...", e->filter_id + 1, action, protocol_str, src_ip_str, htons(e->src_port), dst_ip_str, htons(e->dst_port), e->pps, e->bps, filter->block_time);
return 0;
}

12
src/xdp/prog.c
View File

@@ -45,7 +45,7 @@ int xdp_prog_main(struct xdp_md *ctx)
}
u8 action = 0;
u64 blocktime = 1;
u64 block_time = 1;
// Initialize IP headers.
struct iphdr *iph = NULL;
@@ -539,7 +539,7 @@ int xdp_prog_main(struct xdp_md *ctx)
// Matched.
action = filter->action;
blocktime = filter->blocktime;
block_time = filter->block_time;
goto matched;
}
@@ -555,17 +555,17 @@ int xdp_prog_main(struct xdp_md *ctx)
if (action == 0)
{
// Before dropping, update the blacklist map.
if (blocktime > 0)
if (block_time > 0)
{
u64 newTime = now + (blocktime * NANO_TO_SEC);
u64 new_time = now + (block_time * NANO_TO_SEC);
if (iph6)
{
bpf_map_update_elem(&ip6_blacklist_map, &src_ip6, &newTime, BPF_ANY);
bpf_map_update_elem(&ip6_blacklist_map, &src_ip6, &new_time, BPF_ANY);
}
else if (iph)
{
bpf_map_update_elem(&ip_blacklist_map, &iph->saddr, &newTime, BPF_ANY);
bpf_map_update_elem(&ip_blacklist_map, &iph->saddr, &new_time, BPF_ANY);
}
}