Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Feb 7, 2020

Conversation

vktg
Copy link
Contributor

@vktg vktg commented Jan 29, 2020

Redmine Issue: https://redmine.pfsense.org/issues/10220
Ready for review

Add sampling configuration to softflowd package:

  -s sampling_rate        Specify periodical sampling rate (denominator)

Add PSAMP export:

 -v 1|5|9|10|psamp       NetFlow export packet version
                          10 means IPFIX and psamp means PSAMP (packet sampling)

see https://tools.ietf.org/html/rfc5476

original PR #700 can be closed

Co-authored-by: chrono@open-resource.org
Co-authored-by: viktor@netgate.com

Copy link
Contributor

@jim-p jim-p left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One small change and it'll be fine

@@ -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) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$cf['sample'] > 0 should be surrounded by parenthesis.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

Co-authored-by: <chrono@open-resource.org>
Co-authored-by: <viktor@netgate.com>
@netgate-git-updates netgate-git-updates merged commit 6725fa1 into pfsense:devel Feb 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants