Page MenuHomeFreeBSD
Differential D29795

pf: Refactor state killing
ClosedPublic
Actions

Authored by kp on Apr 16 2021, 5:52 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 20, 12:44 AM
Unknown Object (File)
Thu, Mar 13, 2:40 AM
Unknown Object (File)
Feb 26 2025, 2:36 PM
Unknown Object (File)
Feb 24 2025, 3:25 PM
Unknown Object (File)
Feb 21 2025, 8:59 AM
Unknown Object (File)
Feb 20 2025, 1:59 PM
Unknown Object (File)
Feb 18 2025, 3:59 AM
Unknown Object (File)
Feb 8 2025, 3:34 PM
View All 81 Files
Subscribers
eri
farrokhi
imp
melifaro

Details

Reviewers
eri
Group Reviewers
network
Commits
rG6210e809da13: pf: Refactor state killing
rG3a1c3e11ac11: pf: Refactor state killing
rG586aab9e0aa6: pf: Refactor state killing
Summary

Extract the state killing code from pfioctl() and rephrase the filtering
conditions for readability.

No functional change intended.

MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kp created this revision.Apr 16 2021, 5:52 PM
Herald added subscribers: melifaro, farrokhi, imp. · View Herald TranscriptApr 16 2021, 5:52 PM
kp requested review of this revision.Apr 16 2021, 5:52 PM
Harbormaster completed remote builds in B38626: Diff 87556.Apr 16 2021, 5:52 PM
eri requested changes to this revision.Apr 16 2021, 7:29 PM
eri added a subscriber: eri.
eri added inline comments.
sys/netpfil/pf/pf_ioctl.c
2553

You should invert the check here to !=

This revision now requires changes to proceed.Apr 16 2021, 7:29 PM
kp updated this revision to Diff 87566.Apr 16 2021, 8:07 PM

Fix issue found by eri

Harbormaster completed remote builds in B38629: Diff 87566.Apr 16 2021, 8:07 PM
This revision was not accepted when it landed; it landed in state Needs Review.Apr 20 2021, 11:23 AM
Closed by commit rG586aab9e0aa6: pf: Refactor state killing (authored by kp). · Explain Why
This revision was automatically updated to reflect the committed changes.
kp added a commit: rG586aab9e0aa6: pf: Refactor state killing.
kp added a commit: rG3a1c3e11ac11: pf: Refactor state killing.Apr 28 2021, 3:14 PM
kp added a commit: rG6210e809da13: pf: Refactor state killing.

Revision Contents
Changeset List

PathSize
sys/
netpfil/
pf/
122 lines

Diff 87786

View Options

sys/netpfil/pf/pf_ioctl.c

PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullFreeBSD=%H
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
# $FreeBSD$
PORTNAME= pyfda
PORTVERSION= 0.1
DISTVERSIONSUFFIX= rc6
CATEGORIES= cad python devel
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= yuri@FreeBSD.org
COMMENT= GUI tool for designing and analysing discrete time filters
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \
${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
USES= python:3.4+ pyqt:5
USE_PYTHON= distutils autoplist noflavors
matUnsubmitted
Not Done
Inline Actions

Also, setting noflavors (which is weird, no reason to do it) means that the FLAVOR variable is empty, thus, it makes this port broken because the dependencies line end with @ with no flavor.

mat: Also, setting noflavors (which is weird, no reason to do it) means that the FLAVOR variable is…
yuriAuthorUnsubmitted
Not Done
Inline Actions

But this is an app, not a library. Shouldn't python apps all be noflavors?

yuri: But this is an app, not a library. Shouldn't python apps all be `noflavors`?
matUnsubmitted
Not Done
Inline Actions

this has a PKGNAMEPREFIX, nothing against it having noflavors.

mat: this has a PKGNAMEPREFIX, nothing against it having noflavors.
USE_PYQT= core_run gui_run widgets_run
NO_ARCH= yes
post-extract:
@${MV} ${WRKSRC}/pyfda/pyfda_log.conf ${WRKSRC}/pyfda/pyfda_log.conf.sample
@${MV} ${WRKSRC}/pyfda/pyfda_log_debug.conf ${WRKSRC}/pyfda/pyfda_log_debug.conf.sample
post-patch:
@${REINPLACE_CMD} -e " \
s|package_data={'pyfda': \['pyfda_log.conf', 'pyfda_log_debug.conf',|package_data={'pyfda': [|; \
s|data_files = \[|data_files = [('${PREFIX}/etc', ['pyfda/pyfda_log.conf.sample', 'pyfda/pyfda_log_debug.conf.sample'])|" \
${WRKSRC}/setup.py
@${REINPLACE_CMD} -e " \
s|logging.config.fileConfig(os.path.join(base_dir, rc.log_config_file))|logging.config.fileConfig(os.path.join('${PREFIX}/etc', rc.log_config_file))|" \
${WRKSRC}/pyfda/pyfdax.py
@${REINPLACE_CMD} -e " \
s|'pyfda.log'|'/tmp/pyfda.log'|" \
${WRKSRC}/pyfda/*.conf.sample
post-stage:
@${REINPLACE_CMD} -E " \
s|(.*\.sample)$$|@sample \1|" \
${WRKDIR}/.PLIST.pymodtmp
.include <bsd.port.mk>