src/sbin/pfctl, branch upstream/13.1.0

libpfctl: fix creatorid endianness

2022-02-18T10:14:58Z

We provide the hostid (which is the state creatorid) to the kernel as a big endian number (see pfctl/pfctl.c pfctl_set_hostid()), so convert it back to system endianness when we get it from the kernel. This avoids a confusing mismatch between the value the user configures and the value displayed in the state. MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D33989 (cherry picked from commit 735748f30aad80593e2b7f5f5f175d64484c5eeb)

pfctl: improve error reporting for routehost

2022-02-18T10:14:58Z

If an invalid (i.e. overly long) interface name is specified error out immediately, rather than in expand_rule() so we point at the incorrect line. PR: 260958 MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D34008 (cherry picked from commit e68de6694381748b7578703b22580c0f17780b32)

sys/bitset.h: reduce visibility of BIT_* macros

2022-01-14T16:17:30Z

(cherry picked from commit 5e04571cf3cf4024be926976a6abf19626df30be)

pf: Introduce ridentifier

2021-11-26T03:39:05Z

Allow users to set a number on rules which will be exposed as part of the pflog header. The intent behind this is to allow users to correlate rules across updates (remember that pf rules continue to exist and match existing states, even if they're removed from the active ruleset) and pflog. Obtained from: pfSense MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D32750 (cherry picked from commit 76c5eecc3490d89a9a3492ed2354802b69d69602)

pfctl: delay label macro expansion until after rule optimisation

2021-10-22T07:34:25Z

We used to expand the $nr macro in labels into the rule number prior to the optimisation step. This would occasionally produce incorrect rule numbers in the labels. Delay all macro expansion until after the optimisation step to ensure that we expand the correct values. MFC after: 1 week Reported by: Özkan KIRIK Differential Revision: https://reviews.freebsd.org/D32488 (cherry picked from commit 09c7f2386973f8c36978895a7600320916bc3d07)

pfctl: Remove unused variable

2021-10-22T07:32:24Z

MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 90dedf0fef71d3e3081015525665bf335f9c7ee3)

pfctl: userspace adaptive syncookies configration

2021-10-06T08:46:54Z

Hook up the userspace bits to configure syncookies in adaptive mode. MFC after: 1 week Sponsored by: Modirum MDPay Differential Revision: https://reviews.freebsd.org/D32136 (cherry picked from commit 5062afff9de7e67da96e3f0dcb9d8bbd5a4e1c5b)

pfctl: print counters in decimal

2021-09-08T07:28:29Z

795d78a46713 pfctl: Don't use PRIu64 mistakenly changed these to be printed as hexadecimal numbers. Reported by: Florian Smeets MFC after: 4 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 846a6e8f9ab25df4e06d28c05fb66060d803c9ba)

pfctl: Don't use PRIu64

2021-09-08T07:28:25Z

Rather than PRIu64 we can just treat the data as uintmax_t, and use %jx instead. MFC after: 1 week Suggested by: kib Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 795d78a46713fc16153966e77f20da2f40aac2a3)

Fix -Wformat errors in pfctl on 32-bit architectures

2021-09-06T13:42:53Z

Use PRIu64 to printf(3) uint64_t quantities, otherwise this will result in "error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]" on 32-bit architectures. Fixes: 80078d9d38fd MFC after: 1 week (cherry picked from commit 5b8f07b12f8477f1679013d6b3abdab8d33c7243)