summaryrefslogtreecommitdiff
path: root/net/dhcpd/files/patch-pfutils.c
diff options
context:
space:
mode:
authorTilman Keskinoz <arved@FreeBSD.org>2024-05-05 18:23:43 +0200
committerTilman Keskinoz <arved@FreeBSD.org>2024-05-05 18:25:12 +0200
commitad291cdd00b7e7c6db2fce4e71811e4e83a3b5bc (patch)
tree357903a419122893eb7b7c5081aa55f305006b88 /net/dhcpd/files/patch-pfutils.c
parentRevert "www/chromium: Change default audio output to PULSEAUDIO to make chrom... (diff)
net/dhcpd: fix build on 15-CURRENT
PR: 275313 Reported by: Mallorya@fastmail.com Submitted by: maintainer
Diffstat (limited to 'net/dhcpd/files/patch-pfutils.c')
-rw-r--r--net/dhcpd/files/patch-pfutils.c34
1 files changed, 34 insertions, 0 deletions
diff --git a/net/dhcpd/files/patch-pfutils.c b/net/dhcpd/files/patch-pfutils.c
new file mode 100644
index 000000000000..4c652c9ea1b8
--- /dev/null
+++ b/net/dhcpd/files/patch-pfutils.c
@@ -0,0 +1,34 @@
+--- pfutils.c.orig 2024-02-29 18:24:10.373450000 +0000
++++ pfutils.c 2024-02-29 18:35:27.247364000 +0000
+@@ -190,9 +190,15 @@ pf_kill_state(int fd, struct in_addr ip)
+ sizeof(psk.psk_src.addr.v.a.addr));
+ memset(&psk.psk_src.addr.v.a.mask, 0xff,
+ sizeof(psk.psk_src.addr.v.a.mask));
++#if (defined(__FreeBSD_version) && (__FreeBSD_version < 1500000))
+ if (ioctl(fd, DIOCKILLSTATES, &psk) == -1) {
+ log_warn("DIOCKILLSTATES failed");
+ }
++#else
++ if (ioctl(fd, DIOCKILLSTATESNV, &psk) == -1) {
++ log_warn("DIOCKILLSTATESNV failed");
++ }
++#endif
+
+ /* Kill all states to target */
+ memset(&psk.psk_src, 0, sizeof(psk.psk_src));
+@@ -200,9 +206,15 @@ pf_kill_state(int fd, struct in_addr ip)
+ sizeof(psk.psk_dst.addr.v.a.addr));
+ memset(&psk.psk_dst.addr.v.a.mask, 0xff,
+ sizeof(psk.psk_dst.addr.v.a.mask));
++#if (defined(__FreeBSD_version) && (__FreeBSD_version < 1500000))
+ if (ioctl(fd, DIOCKILLSTATES, &psk) == -1) {
+ log_warn("DIOCKILLSTATES failed");
+ }
++#else
++ if (ioctl(fd, DIOCKILLSTATESNV, &psk) == -1) {
++ log_warn("DIOCKILLSTATESNV failed");
++ }
++#endif
+ }
+
+ /* inspired by ("stolen") from usr.bin/ssh/atomicio.c */