Skip to content

Commit

Permalink
gh-96534: socketmodule: support FreeBSD divert(4) socket (#96536)
Browse files Browse the repository at this point in the history
  • Loading branch information
glebius authored May 4, 2023
1 parent fdcb49c commit b17d32c
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 0 deletions.
11 changes: 11 additions & 0 deletions Doc/library/socket.rst
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,17 @@ Constants
.. versionadded:: 3.9


.. data:: AF_DIVERT
PF_DIVERT

These two constants, documented in the FreeBSD divert(4) manual page, are
also defined in the socket module.

.. availability:: FreeBSD >= 14.0.

.. versionadded:: 3.12


.. data:: AF_PACKET
PF_PACKET
PACKET_*
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support divert(4) added in FreeBSD 14.
13 changes: 13 additions & 0 deletions Modules/socketmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1903,6 +1903,11 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
/* RDS sockets use sockaddr_in: fall-through */
#endif /* AF_RDS */

#ifdef AF_DIVERT
case AF_DIVERT:
/* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
#endif /* AF_DIVERT */

case AF_INET:
{
struct maybe_idna host = {NULL, NULL};
Expand Down Expand Up @@ -7683,6 +7688,14 @@ socket_exec(PyObject *m)
ADD_INT_MACRO(m, AF_SYSTEM);
#endif

/* FreeBSD divert(4) */
#ifdef PF_DIVERT
PyModule_AddIntMacro(m, PF_DIVERT);
#endif
#ifdef AF_DIVERT
PyModule_AddIntMacro(m, AF_DIVERT);
#endif

#ifdef AF_PACKET
ADD_INT_MACRO(m, AF_PACKET);
#endif
Expand Down

0 comments on commit b17d32c

Please sign in to comment.