Page MenuHomeFreeBSD
Files F102727197

D42101.diff
No OneTemporary
Actions

D42101.diff
View Options

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1951,7 +1951,9 @@
#define DIOCCLRSTATUS _IO ('D', 22)
#define DIOCNATLOOK _IOWR('D', 23, struct pfioc_natlook)
#define DIOCSETDEBUG _IOWR('D', 24, u_int32_t)
+#ifdef COMPAT_FREEBSD14
#define DIOCGETSTATES _IOWR('D', 25, struct pfioc_states)
+#endif
#define DIOCCHANGERULE _IOWR('D', 26, struct pfioc_rule)
/* XXX cut 26 - 28 */
#define DIOCSETTIMEOUT _IOWR('D', 29, struct pfioc_tm)
@@ -2012,7 +2014,9 @@
#define DIOCKILLSRCNODES _IOWR('D', 91, struct pfioc_src_node_kill)
#define DIOCGIFSPEEDV0 _IOWR('D', 92, struct pf_ifspeed_v0)
#define DIOCGIFSPEEDV1 _IOWR('D', 92, struct pf_ifspeed_v1)
+#ifdef COMPAT_FREEBSD14
#define DIOCGETSTATESV2 _IOWR('D', 93, struct pfioc_states_v2)
+#endif
#define DIOCGETSYNCOOKIES _IOWR('D', 94, struct pfioc_nv)
#define DIOCSETSYNCOOKIES _IOWR('D', 95, struct pfioc_nv)
#define DIOCKEEPCOUNTERS _IOWR('D', 96, struct pfioc_nv)
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -2365,8 +2365,10 @@
case DIOCCLRSTATUS:
case DIOCNATLOOK:
case DIOCSETDEBUG:
+#ifdef COMPAT_FREEBSD14
case DIOCGETSTATES:
case DIOCGETSTATESV2:
+#endif
case DIOCGETTIMEOUT:
case DIOCCLRRULECTRS:
case DIOCGETLIMIT:
@@ -2423,8 +2425,10 @@
case DIOCGETSTATE:
case DIOCGETSTATENV:
case DIOCGETSTATUSNV:
+#ifdef COMPAT_FREEBSD14
case DIOCGETSTATES:
case DIOCGETSTATESV2:
+#endif
case DIOCGETTIMEOUT:
case DIOCGETLIMIT:
case DIOCGETALTQSV0:
@@ -3546,6 +3550,7 @@
break;
}
+#ifdef COMPAT_FREEBSD14
case DIOCGETSTATES: {
struct pfioc_states *ps = (struct pfioc_states *)addr;
struct pf_kstate *s;
@@ -3697,7 +3702,7 @@
break;
}
-
+#endif
case DIOCGETSTATUSNV: {
error = pf_getstatus((struct pfioc_nv *)addr);
break;

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 10:37 AM (21 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14674836
Default Alt Text
D42101.diff (1 KB)

Event Timeline