Page MenuHomeFreeBSD
Differential D21276

Move pft_ping.py and sniffer.py to the common test directory
ClosedPublic
Actions

Authored by ahsanb on Aug 15 2019, 4:43 PM.
Tags
None
Referenced Files
F114707127: D21276.id60991.diff
Tue, Apr 15, 5:45 PM
Unknown Object (File)
Mon, Apr 14, 10:27 PM
Unknown Object (File)
Mon, Apr 14, 7:26 PM
Unknown Object (File)
Wed, Apr 2, 3:50 PM
Unknown Object (File)
Wed, Apr 2, 3:28 PM
Unknown Object (File)
Tue, Mar 25, 4:42 AM
Unknown Object (File)
Mar 15 2025, 9:27 PM
Unknown Object (File)
Mar 4 2025, 4:38 AM
View All Files
Subscribers
farrokhi
imp
melifaro

Details

Reviewers
kp
thj
Commits
rGf0cb921e361a: netpfil tests: Move pft_ping.py and sniffer.py to the common test directory
rS351212: netpfil tests: Move pft_ping.py and sniffer.py to the common test directory
Summary

The pft_ping.py and sniffer.py tool is moved from/tests/sys/netpfil/pf to /tests/sys/netpfil/common directory because these tools are to be used in common for all the firewalls.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

ahsanb created this revision.Aug 15 2019, 4:43 PM
Herald added a subscriber: farrokhi. · View Herald TranscriptAug 15 2019, 4:43 PM
ahsanb updated this revision to Diff 60873.Aug 16 2019, 7:36 AM
  • Make the pf tests use the sniffer and pft_ping tools from the common directory and hence ensure only one installation of these tools.
kp added a comment.Aug 16 2019, 9:29 AM

This probably also wants this:

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 19adf066b1b..1725b06fa69 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done

+# 20190816: move common netpfil test files
+OLD_FILES+=usr/tests/sys/netpfil/pf/sniffer.py
+OLD_FILES+=usr/tests/sys/netpfil/pf/pft_ping.py
 # 20190729: gzip'ed a.out support removed
 OLD_FILES+=usr/include/sys/inflate.h
 # 20190722: cap_random(3) removed

That'll allow people to clean up the old version of sniffer.py and pft_ping.py.

tests/sys/netpfil/pf/forward.sh
48

I'd do ${common_dir}/pft_ping.py, if only for consistency.

ahsanb updated this revision to Diff 60879.Aug 16 2019, 10:37 AM
  • Add old pft_ping and sniffer.py to ObsoleteFiles.inc
ahsanb updated this revision to Diff 60880.Aug 16 2019, 10:40 AM
  • replace $common_dir with ${common_dir} for consistency
ahsanb updated this revision to Diff 60885.Aug 16 2019, 12:49 PM
  • Fix “replace $common_dir with ${common_dir} for consistency”
kp accepted this revision.Aug 16 2019, 2:03 PM
This revision is now accepted and ready to land.Aug 16 2019, 2:03 PM
ahsanb updated this revision to Diff 60939.Aug 17 2019, 2:08 PM
  • Since the NAT tests landed before this diff the merge wouldn't be possible because the NAT tests changed the common/Makefile. Created an updated diff from the new upstream.
This revision now requires review to proceed.Aug 17 2019, 2:08 PM
ahsanb mentioned this in D21305: Add set ToS test for ipfw and pf.Aug 17 2019, 2:32 PM
thj accepted this revision.Aug 18 2019, 5:57 PM
This revision is now accepted and ready to land.Aug 18 2019, 5:57 PM
Closed by commit rS351212: netpfil tests: Move pft_ping.py and sniffer.py to the common test directory (authored by kp). · Explain WhyAug 19 2019, 10:49 AM
This revision was automatically updated to reflect the committed changes.
kp added a commit: rS351212: netpfil tests: Move pft_ping.py and sniffer.py to the common test directory.
Herald added a subscriber: imp. · View Herald TranscriptAug 19 2019, 10:49 AM
kp added a commit: rGf0cb921e361a: netpfil tests: Move pft_ping.py and sniffer.py to the common test directory.Jan 3 2021, 10:19 PM
Herald added a subscriber: melifaro. · View Herald TranscriptJan 3 2021, 10:19 PM

Revision Contents
Changeset List

PathSize
3 lines
tests/
sys/
netpfil/
common/
12 lines
common/
pf/
pf/
3 lines
18 lines
14 lines

Diff 60885

View Options

ObsoleteFiles.inc

Show First 20 Lines • Show All 215 Lines • ▼ Show 20 Linesprocfile(const char *fn)
for (c = 0; c == 0 || !(lflag || qflag); ) { for (c = 0; c == 0 || !(lflag || qflag); ) {
ln.off += ln.len + 1; ln.off += ln.len + 1;
if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) { if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) {
if (ln.line_no == 0 && matchall) if (ln.line_no == 0 && matchall)
exit(0); exit(0);
else else
break; break;
} }
if (ln.len > 0 && ln.dat[ln.len - 1] == '\n') if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol)
--ln.len; --ln.len;
ln.line_no++; ln.line_no++;
/* Return if we need to skip a binary file */ /* Return if we need to skip a binary file */
if (f->binary && binbehave == BINFILE_SKIP) { if (f->binary && binbehave == BINFILE_SKIP) {
grep_close(f); grep_close(f);
free(ln.file); free(ln.file);
free(f); free(f);
▲ Show 20 Lines • Show All 254 Lines • ▼ Show 20 Lines if ((oflag || color) && m > 0) {
} }
if (!oflag) { if (!oflag) {
if (line->len - a > 0) if (line->len - a > 0)
fwrite(line->dat + a, line->len - a, 1, stdout); fwrite(line->dat + a, line->len - a, 1, stdout);
putchar('\n'); putchar('\n');
} }
} else { } else {
fwrite(line->dat, line->len, 1, stdout); fwrite(line->dat, line->len, 1, stdout);
putchar('\n'); putchar(fileeol);
cemUnsubmitted
Not Done
Inline Actions

Hm, should the nul input separater really be used for outputting matched lines?

And if so, shouldn't it also be used with oflag above?

cem: Hm, should the nul input separater really be used for outputting matched lines? And if so…
kevansAuthorUnsubmitted
Not Done
Inline Actions

So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful to the input file -- i.e., this line, and actually line 491 that I missed (!oflag, but color). Everything else is printing excerpts and should use the standard grep newline separator.

kevans: So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful…
} }
} }
View Options

tests/sys/netpfil/common/Makefile

Show First 20 Lines • Show All 215 Lines • ▼ Show 20 Linesprocfile(const char *fn)
for (c = 0; c == 0 || !(lflag || qflag); ) { for (c = 0; c == 0 || !(lflag || qflag); ) {
ln.off += ln.len + 1; ln.off += ln.len + 1;
if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) { if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) {
if (ln.line_no == 0 && matchall) if (ln.line_no == 0 && matchall)
exit(0); exit(0);
else else
break; break;
} }
if (ln.len > 0 && ln.dat[ln.len - 1] == '\n') if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol)
--ln.len; --ln.len;
ln.line_no++; ln.line_no++;
/* Return if we need to skip a binary file */ /* Return if we need to skip a binary file */
if (f->binary && binbehave == BINFILE_SKIP) { if (f->binary && binbehave == BINFILE_SKIP) {
grep_close(f); grep_close(f);
free(ln.file); free(ln.file);
free(f); free(f);
▲ Show 20 Lines • Show All 254 Lines • ▼ Show 20 Lines if ((oflag || color) && m > 0) {
} }
if (!oflag) { if (!oflag) {
if (line->len - a > 0) if (line->len - a > 0)
fwrite(line->dat + a, line->len - a, 1, stdout); fwrite(line->dat + a, line->len - a, 1, stdout);
putchar('\n'); putchar('\n');
} }
} else { } else {
fwrite(line->dat, line->len, 1, stdout); fwrite(line->dat, line->len, 1, stdout);
putchar('\n'); putchar(fileeol);
cemUnsubmitted
Not Done
Inline Actions

Hm, should the nul input separater really be used for outputting matched lines?

And if so, shouldn't it also be used with oflag above?

cem: Hm, should the nul input separater really be used for outputting matched lines? And if so…
kevansAuthorUnsubmitted
Not Done
Inline Actions

So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful to the input file -- i.e., this line, and actually line 491 that I missed (!oflag, but color). Everything else is printing excerpts and should use the standard grep newline separator.

kevans: So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful…
} }
} }
View Options

tests/sys/netpfil/common/pft_ping.py

Show First 20 Lines • Show All 215 Lines • ▼ Show 20 Linesprocfile(const char *fn)
for (c = 0; c == 0 || !(lflag || qflag); ) { for (c = 0; c == 0 || !(lflag || qflag); ) {
ln.off += ln.len + 1; ln.off += ln.len + 1;
if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) { if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) {
if (ln.line_no == 0 && matchall) if (ln.line_no == 0 && matchall)
exit(0); exit(0);
else else
break; break;
} }
if (ln.len > 0 && ln.dat[ln.len - 1] == '\n') if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol)
--ln.len; --ln.len;
ln.line_no++; ln.line_no++;
/* Return if we need to skip a binary file */ /* Return if we need to skip a binary file */
if (f->binary && binbehave == BINFILE_SKIP) { if (f->binary && binbehave == BINFILE_SKIP) {
grep_close(f); grep_close(f);
free(ln.file); free(ln.file);
free(f); free(f);
▲ Show 20 Lines • Show All 254 Lines • ▼ Show 20 Lines if ((oflag || color) && m > 0) {
} }
if (!oflag) { if (!oflag) {
if (line->len - a > 0) if (line->len - a > 0)
fwrite(line->dat + a, line->len - a, 1, stdout); fwrite(line->dat + a, line->len - a, 1, stdout);
putchar('\n'); putchar('\n');
} }
} else { } else {
fwrite(line->dat, line->len, 1, stdout); fwrite(line->dat, line->len, 1, stdout);
putchar('\n'); putchar(fileeol);
cemUnsubmitted
Not Done
Inline Actions

Hm, should the nul input separater really be used for outputting matched lines?

And if so, shouldn't it also be used with oflag above?

cem: Hm, should the nul input separater really be used for outputting matched lines? And if so…
kevansAuthorUnsubmitted
Not Done
Inline Actions

So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful to the input file -- i.e., this line, and actually line 491 that I missed (!oflag, but color). Everything else is printing excerpts and should use the standard grep newline separator.

kevans: So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful…
} }
} }
View Options

tests/sys/netpfil/common/sniffer.py

Show First 20 Lines • Show All 215 Lines • ▼ Show 20 Linesprocfile(const char *fn)
for (c = 0; c == 0 || !(lflag || qflag); ) { for (c = 0; c == 0 || !(lflag || qflag); ) {
ln.off += ln.len + 1; ln.off += ln.len + 1;
if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) { if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) {
if (ln.line_no == 0 && matchall) if (ln.line_no == 0 && matchall)
exit(0); exit(0);
else else
break; break;
} }
if (ln.len > 0 && ln.dat[ln.len - 1] == '\n') if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol)
--ln.len; --ln.len;
ln.line_no++; ln.line_no++;
/* Return if we need to skip a binary file */ /* Return if we need to skip a binary file */
if (f->binary && binbehave == BINFILE_SKIP) { if (f->binary && binbehave == BINFILE_SKIP) {
grep_close(f); grep_close(f);
free(ln.file); free(ln.file);
free(f); free(f);
▲ Show 20 Lines • Show All 254 Lines • ▼ Show 20 Lines if ((oflag || color) && m > 0) {
} }
if (!oflag) { if (!oflag) {
if (line->len - a > 0) if (line->len - a > 0)
fwrite(line->dat + a, line->len - a, 1, stdout); fwrite(line->dat + a, line->len - a, 1, stdout);
putchar('\n'); putchar('\n');
} }
} else { } else {
fwrite(line->dat, line->len, 1, stdout); fwrite(line->dat, line->len, 1, stdout);
putchar('\n'); putchar(fileeol);
cemUnsubmitted
Not Done
Inline Actions

Hm, should the nul input separater really be used for outputting matched lines?

And if so, shouldn't it also be used with oflag above?

cem: Hm, should the nul input separater really be used for outputting matched lines? And if so…
kevansAuthorUnsubmitted
Not Done
Inline Actions

So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful to the input file -- i.e., this line, and actually line 491 that I missed (!oflag, but color). Everything else is printing excerpts and should use the standard grep newline separator.

kevans: So, it depends. If we're supposed to be printing the matched lines, we need to do so faithful…
} }
} }
View Options

tests/sys/netpfil/pf/Makefile

Loading...
View Options

tests/sys/netpfil/pf/forward.sh

Loading...
View Options

tests/sys/netpfil/pf/pft_ping.py

Loading...
View Options

tests/sys/netpfil/pf/set_tos.sh

Loading...
View Options

tests/sys/netpfil/pf/sniffer.py

Loading...