Add softflow 1.0.0 features - sampling and PSAMP export. Issue #10220

Co-authored-by: <chrono@open-resource.org> Co-authored-by: <viktor@netgate.com>
pfsense · Jan 29, 2020 · 76af0f6 · 76af0f6
1 parent ce0f792
commit 76af0f6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/net-mgmt/pfSense-pkg-softflowd/Makefile b/net-mgmt/pfSense-pkg-softflowd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pfSense-pkg-softflowd
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	# empty
 DISTFILES=	# empty

diff --git a/net-mgmt/pfSense-pkg-softflowd/files/usr/local/pkg/softflowd.inc b/net-mgmt/pfSense-pkg-softflowd/files/usr/local/pkg/softflowd.inc
@@ -56,6 +56,9 @@ function sync_package_softflowd() {
 			if (is_numericint($cf['hoplimit'])) {
 				$start .= " -L " . escapeshellarg($cf['hoplimit']);
 			}
+			if (is_numericint($cf['sample']) && $cf['sample'] > 0) {
+				$start .= " -s " . escapeshellarg($cf['sample']);
+			}
 			if ($cf['version'] != "") {
 				$start .= " -v " . escapeshellarg($cf['version']);
 			}

diff --git a/net-mgmt/pfSense-pkg-softflowd/files/usr/local/pkg/softflowd.xml b/net-mgmt/pfSense-pkg-softflowd/files/usr/local/pkg/softflowd.xml
@@ -78,6 +78,13 @@
 			<type>input</type>
 			<required/>
 		</field>
+		<field>
+			<fielddescr>Sample</fielddescr>
+			<fieldname>sample</fieldname>
+			<description>Specify periodical sampling rate (denominator). Empty or 0 disables sampling.</description>
+			<default_value>0</default_value>
+			<type>input</type>
+		</field>
 		<field>
 			<fielddescr>Max Flows</fielddescr>
 			<fieldname>maxflows</fieldname>
@@ -106,11 +113,13 @@
 			<description>Select the desired version of the NetFlow protocol (10 means IPFIX).</description>
 			<type>select</type>
 			<options>
+				<option><name>PSAMP</name><value>psamp</value></option>
 				<option><name>10</name><value>10</value></option>
 				<option><name>9</name><value>9</value></option>
 				<option><name>5</name><value>5</value></option>
 				<option><name>1</name><value>1</value></option>
 			</options>
+			<default_value>10</default_value>
 			<required/>
 		</field>
 		<field>