vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

T75: ipt-netflow enable direction + fix vlan out

Browse Source 
* add --enable-direction as requested
* Fix output of `cat /proc/net/stat/ipt_netflow_flows`:
  previously if no VLAN, there was no output and table
  columns were shifted when parsed.
This commit is contained in:
Kyrylo Yatsenko 2025-09-01 20:07:09 +03:00
parent 9ea81ca125
commit 3c43575369
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/package-build/linux-kernel/build-ipt-netflow.sh
View File

@ -37,7 +37,7 @@ DEBIAN_DIR="tmp/"
DEBIAN_CONTROL="${DEBIAN_DIR}/DEBIAN/control"
DEBIAN_POSTINST="${CWD}/vyos-ipt-netflow.postinst"
./configure --enable-macaddress --enable-vlan --enable-sampler --enable-aggregation --kdir=${KERNEL_DIR}
./configure --enable-direction --enable-macaddress --enable-vlan --enable-sampler --enable-aggregation --kdir=${KERNEL_DIR}
make all
if [ "x$?" != "x0" ]; then

27
scripts/package-build/linux-kernel/patches/ipt-netflow/0003-flows_dump_seq_show-fix-table-when-no-VLAN.patch Normal file
View File

@ -0,0 +1,27 @@
From a4f8dda069dfce77e6ef0764de476dfdca7dc812 Mon Sep 17 00:00:00 2001
From: Kyrylo Yatsenko <hedrok@gmail.com>
Date: Mon, 1 Sep 2025 19:57:27 +0300
Subject: [PATCH] flows_dump_seq_show: fix table when no VLAN
When no VLAN nothing was output, so columns were off.
Output "-" when no VLAN.
---
ipt_NETFLOW.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
index eee8074..ca4d0f2 100644
--- a/ipt_NETFLOW.c
+++ b/ipt_NETFLOW.c
@@ -1153,6 +1153,8 @@ static int flows_dump_seq_show(struct seq_file *seq, void *v)
seq_printf(seq, " %d", ntohs(nf->tuple.tag[0]));
if (nf->tuple.tag[1])
seq_printf(seq, ",%d", ntohs(nf->tuple.tag[1]));
+ } else {
+ seq_printf(seq, " -");
}
#endif
#if defined(ENABLE_MAC) || defined(ENABLE_VLAN)
--
2.50.1