Skip to content

Commit 92bdb2a

Browse files
authored
Merge branch 'main' into manjusaka/to-bool-str
2 parents a439ed5 + 05406b2 commit 92bdb2a

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fixed socket operations such as recvfrom() and sendto() for FreeBSD
2+
divert(4) socket.

Modules/socketmodule.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2769,6 +2769,12 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
27692769
_Py_FALLTHROUGH;
27702770
#endif /* AF_RDS */
27712771

2772+
#ifdef AF_DIVERT
2773+
case AF_DIVERT:
2774+
/* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
2775+
_Py_FALLTHROUGH;
2776+
#endif /* AF_DIVERT */
2777+
27722778
case AF_INET:
27732779
{
27742780
*len_ret = sizeof (struct sockaddr_in);

0 commit comments

Comments
 (0)