Page MenuHomeFreeBSD

pfctl: Add missing state parameters in DIOCGETSTATESV2
AbandonedPublic

Authored by vegeta_tuxpowered.net on May 24 2023, 8:38 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Feb 18, 8:29 AM
Unknown Object (File)
Fri, Feb 9, 11:39 AM
Unknown Object (File)
Jan 8 2024, 1:28 PM
Unknown Object (File)
Dec 31 2023, 7:48 PM
Unknown Object (File)
Dec 28 2023, 12:38 PM
Unknown Object (File)
Dec 20 2023, 6:15 AM
Unknown Object (File)
Dec 10 2023, 8:31 PM
Unknown Object (File)
Dec 1 2023, 7:15 PM

Details

Reviewers
None

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

Looks sane at forst glance, but I’m travelling home mow, so it’ll probably be a day or two before I can take a deeper look.

Not insisting, but maybe it's a good time to look at D38888 once again? :-)

Not insisting, but maybe it's a good time to look at D38888 once again? :-)

That's moving upwards on my priority list. I'm slowly coming around to the view that we should just do everything pf via netlink, and drop the existing ioctl (both old style and nvlist-based).
I don't think that's blocking for this change though.

sys/netpfil/pf/pf_ioctl.c
5829

Does this rely on another patch? It seems to be unhappy when I try to build it on main:

cc -target x86_64-unknown-freebsd14.0 --sysroot=/usr/obj/usr/src/amd64.amd64/tmp -B/usr/obj/usr/src/amd64.amd64/tmp/usr/bin  -O2 -pipe -fno-common  -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -DKLD_TIED -nostdinc   -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/amd64.amd64/sys/GENERIC/opt_global.h -I. -I/usr/src/sys -I/usr/src/sys/contrib/ck/include -fno-common -g -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fdebug-prefix-map=./machine=/usr/src/sys/amd64/include -fdebug-prefix-map=./x86=/usr/src/sys/x86/include -fdebug-prefix-map=./i386=/usr/src/sys/i386/include -I/usr/obj/usr/src/amd64.amd64/sys/GENERIC     -MD  -MF.depend.pf_ioctl.o -MTpf_ioctl.o -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float  -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-qual -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__ -Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragmas -Wno-error=tautological-compare -Wno-error=empty-body -Wno-error=parentheses-equality -Wno-error=unused-function -Wno-error=pointer-sign -Wno-error=shift-negative-value -Wno-address-of-packed-member -Wno-error=strict-prototypes -Wno-error=unused-but-set-variable -Wno-format-zero-length   -mno-aes -mno-avx  -std=iso9899:1999 -c /usr/src/sys/netpfil/pf/pf_ioctl.c -o pf_ioctl.o
/usr/src/sys/netpfil/pf/pf_ioctl.c:5799:15: error: no member named 'rt' in 'struct pf_kstate'
        sp->rt = st->rt;
                 ~~  ^
/usr/src/sys/netpfil/pf/pf_ioctl.c:5803:24: error: no member named 'set_prio' in 'struct pf_kstate'
        sp->set_prio[0] = st->set_prio[0];
                          ~~  ^
/usr/src/sys/netpfil/pf/pf_ioctl.c:5804:24: error: no member named 'set_prio' in 'struct pf_kstate'
        sp->set_prio[1] = st->set_prio[1];
sys/netpfil/pf/pf_ioctl.c
5829

Yes, this needs D39392 merged first.

I've changed the title line of the commit message, so I expect the hooks won't pick up that this landed. Can you close/abandon this review?

This change has been in fact merged.