Page MenuHomeFreeBSD
Differential D40259 Diff 122385 sys/netpfil/pf/pf_ioctl.c

Changeset View

Standalone View

View Options

sys/netpfil/pf/pf_ioctl.c

Show First 20 Lines • Show All 5,781 Lines • ▼ Show 20 Linespf_state_export(struct pf_state_export *sp, struct pf_kstate *st)
if (sp->expire <= time_uptime) if (sp->expire <= time_uptime)
sp->expire = htonl(0); sp->expire = htonl(0);
else else
sp->expire = htonl(sp->expire - time_uptime); sp->expire = htonl(sp->expire - time_uptime);
sp->direction = st->direction; sp->direction = st->direction;
sp->log = st->log; sp->log = st->log;
sp->timeout = st->timeout; sp->timeout = st->timeout;
/* 8 bits for old peers, 16 bits for new peers */ /* 8 bits for the old libpfctl, 16 bits for the new libpfctl */
sp->state_flags_compat = st->state_flags; sp->state_flags_compat = st->state_flags;
sp->state_flags = st->state_flags; sp->state_flags = htons(st->state_flags);
if (st->src_node) if (st->src_node)
sp->sync_flags |= PFSYNC_FLAG_SRCNODE; sp->sync_flags |= PFSYNC_FLAG_SRCNODE;
if (st->nat_src_node) if (st->nat_src_node)
sp->sync_flags |= PFSYNC_FLAG_NATSRCNODE; sp->sync_flags |= PFSYNC_FLAG_NATSRCNODE;
sp->id = st->id; sp->id = st->id;
sp->creatorid = st->creatorid; sp->creatorid = st->creatorid;
pf_state_peer_hton(&st->src, &sp->src); pf_state_peer_hton(&st->src, &sp->src);
Show All 11 Lines if (st->nat_rule.ptr == NULL)
sp->nat_rule = htonl(-1); sp->nat_rule = htonl(-1);
else else
sp->nat_rule = htonl(st->nat_rule.ptr->nr); sp->nat_rule = htonl(st->nat_rule.ptr->nr);
sp->packets[0] = st->packets[0]; sp->packets[0] = st->packets[0];
sp->packets[1] = st->packets[1]; sp->packets[1] = st->packets[1];
sp->bytes[0] = st->bytes[0]; sp->bytes[0] = st->bytes[0];
sp->bytes[1] = st->bytes[1]; sp->bytes[1] = st->bytes[1];
sp->qid = htons(st->qid);
sp->pqid = htons(st->pqid);
sp->dnpipe = htons(st->dnpipe);
sp->dnrpipe = htons(st->dnrpipe);
sp->rtableid = htonl(st->rtableid);
sp->min_ttl = st->min_ttl;
sp->set_tos = st->set_tos;
sp->max_mss = htons(st->max_mss);
sp->rt = st->rt;
kpUnsubmitted
Not Done
Inline Actions

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];
kp: Does this rely on another patch? It seems to be unhappy when I try to build it on main: ```…
vegeta_tuxpowered.netAuthorUnsubmitted
Done
Inline Actions

Yes, this needs D39392 merged first.

vegeta_tuxpowered.net: Yes, this needs D39392 merged first.
if (st->rt_kif)
strlcpy(sp->rt_ifname, st->rt_kif->pfik_name,
sizeof(sp->rt_ifname));
sp->set_prio[0] = st->set_prio[0];
sp->set_prio[1] = st->set_prio[1];
} }
static void static void
pf_tbladdr_copyout(struct pf_addr_wrap *aw) pf_tbladdr_copyout(struct pf_addr_wrap *aw)
{ {
struct pfr_ktable *kt; struct pfr_ktable *kt;
KASSERT(aw->type == PF_ADDR_TABLE, ("%s: type %u", __func__, aw->type)); KASSERT(aw->type == PF_ADDR_TABLE, ("%s: type %u", __func__, aw->type));
▲ Show 20 Lines • Show All 1,095 Lines • Show Last 20 Lines