pf: Fix tests broken by enabling inet-local filtering
ClosedPublic
Actions

Authored by dfr on Jun 2 2023, 5:01 PM.

Details

Reviewers

Commits

rG4a6b92849e61: pf: Fix tests broken by enabling inet-local filtering

Summary

Three of the pf dummynet tests were using filter rules which matched
both the intended epair interface as well as lo0 which now receives
PFIL_OUT events for messages delivered to the local network stack (if
enabled). This commit changes the rules to match only for the expected
epair interface.

PR: 268717

Test Plan

kyua test -k /usr/tests/Kyuafile sys/netpfil/common/dummynet

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 51863
Build 48754: arc lint + arc unit

Event Timeline

dfr created this revision.Jun 2 2023, 5:01 PM

Herald added subscribers: glebius, melifaro, imp. · View Herald TranscriptJun 2 2023, 5:01 PM

dfr requested review of this revision.Jun 2 2023, 5:01 PM

Harbormaster completed remote builds in B51863: Diff 122761.Jun 2 2023, 5:01 PM

dfr mentioned this in D40373: pf: Add code to enable filtering for locally delivered packets.Jun 3 2023, 9:27 AM

That's a little unexpected, but given that it'd only happen when the (currently) non-default hook is enabled that fine.
It's also pretty common for users to have a 'set skip on lo' rule, which I assume would prevent this too.

This revision is now accepted and ready to land.Jun 3 2023, 9:55 AM

I actually tried adding a 'skip on lo' rule to these tests but for some reason the dnpipe rules still matched. Possibly i had the rule ordering wrong or needed 'skip quick on lo' instead. In real-world scenarios, I don't think this is likely to be a widespread problem and I still would like to move forward with D40373.

Closed by commit rG4a6b92849e61: pf: Fix tests broken by enabling inet-local filtering (authored by dfr). · Explain WhyJun 3 2023, 10:10 AM

This revision was automatically updated to reflect the committed changes.

dfr added a commit: rG4a6b92849e61: pf: Fix tests broken by enabling inet-local filtering.

Revision Contents
Changeset List

Path

Size

tests/

sys/

netpfil/

common/

dummynet.sh

6 lines

Diff 122761

View Options

tests/sys/netpfil/common/dummynet.sh

Show All 22 Lines
USES= gmake lua:51,run mono openal:soft		USES= gmake lua:51,run mono openal:soft
USE_SDL= sdl2		USE_SDL= sdl2
INSTALLS_ICONS= yes		INSTALLS_ICONS= yes
MAKE_ENV= prefix="${PREFIX}"		MAKE_ENV= prefix="${PREFIX}"
MAKE_ARGS= VERSION="${GH_TAGNAME}"		MAKE_ARGS= VERSION="${GH_TAGNAME}"
INSTALL_TARGET= install-all install-linux-shortcuts		INSTALL_TARGET= install-all install-linux-shortcuts
DATADIR= ${PREFIX}/lib/${PORTNAME}		DATADIR= ${PREFIX}/lib/${PORTNAME}
PORTDATA= *		PORTDATA= *
PORTDOCS= *		PORTDOCS= *.html

OPTIONS_DEFINE= DOCS TEST ZENITY		OPTIONS_DEFINE= DOCS TEST ZENITY
OPTIONS_DEFAULT=ZENITY		OPTIONS_DEFAULT=ZENITY

DOCS_BUILD_DEPENDS=markdown:${PORTSDIR}/textproc/markdown		DOCS_BUILD_DEPENDS=markdown:${PORTSDIR}/textproc/markdown
DOCS_ALL_TARGET=docs		DOCS_ALL_TARGET=docs

TEST_MAKE_ENV= HOME="${WRKDIR}"		TEST_MAKE_ENV= HOME="${WRKDIR}"
Show All 27 Lines	.if ${PORT_OPTIONS:MDOCS}
@for f in ${WRKSRC}/*.md; do \		@for f in ${WRKSRC}/*.md; do \
markdown $$f >$${f%.md}.html; \		markdown $$f >$${f%.md}.html; \
done		done
.endif		.endif

post-install:		post-install:
.if ${PORT_OPTIONS:MDOCS}		.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}		@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR}		${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.endif		.endif

.include <bsd.port.mk>		.include <bsd.port.mk>

pf: Fix tests broken by enabling inet-local filteringClosedPublicActions