D59018.id184411.diff
No OneTemporary
Actions

Size

905 B

Referenced Files

None

Subscribers

None

D59018.id184411.diff
View Options

	diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
	--- a/sys/kern/uipc_socket.c
	+++ b/sys/kern/uipc_socket.c
	@@ -989,6 +989,13 @@
	struct socket *so;
	int error;

	+#ifdef COMPAT_FREEBSD15
	+ /* divert(4) historically abuses PF_INET. Use PF_DIVERT instead. */
	+ if (__predict_false(dom == PF_INET && type == SOCK_RAW &&
	+ proto == 258 /* IPPROTO_DIVERT */))
	+ dom = PF_DIVERT;
	+#endif
	+
	prp = pffindproto(dom, type, proto);
	if (prp == NULL) {
	/* No support for domain. */
	diff --git a/sys/netinet/in.h b/sys/netinet/in.h
	--- a/sys/netinet/in.h
	+++ b/sys/netinet/in.h
	@@ -253,6 +253,8 @@
	/* last return value of _input(), meaning "all job for this pkt is done". /
	#define IPPROTO_DONE 257

	+/* #define IPPROTO_DIVERT 258 deprecated */
	+
	/* Only used internally, so can be outside the range of valid IP protocols. */
	#define IPPROTO_SEND 259 /* SeND pseudo-protocol */