Skip to content

C
cpython
Commit f56a288b authored by Antoine Pitrou's avatar Antoine Pitrou
Browse files
Options

Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions 

of the Linux kernel.  Patch by Yaniv Aknin.
parent b17b3c51
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
Misc/ACKS
View file @ f56a288b
...@@ -14,6 +14,7 @@ David Abrahams ...@@ -14,6 +14,7 @@ David Abrahams
Jim Ahlstrom Jim Ahlstrom
Farhan Ahmad Farhan Ahmad
Nir Aides Nir Aides
Yaniv Aknin
Jyrki Alakuijala Jyrki Alakuijala
Billy G. Allie Billy G. Allie
Kevin Altis Kevin Altis
......
Misc/NEWS
View file @ f56a288b
...@@ -31,6 +31,9 @@ Core and Builtins ...@@ -31,6 +31,9 @@ Core and Builtins
Library Library
------- -------
- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions
of the Linux kernel. Patch by Yaniv Aknin.
- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked. - Issue #6312: Fixed http HEAD request when the transfer encoding is chunked.
It should correctly return an empty response now. It should correctly return an empty response now.
......
Modules/socketmodule.c
View file @ f56a288b
...@@ -1326,6 +1326,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, ...@@ -1326,6 +1326,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
char *straddr; char *straddr;
addr = (struct sockaddr_l2 *)addr_ret; addr = (struct sockaddr_l2 *)addr_ret;
memset(addr, 0, sizeof(struct sockaddr_l2));
_BT_L2_MEMB(addr, family) = AF_BLUETOOTH; _BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
if (!PyArg_ParseTuple(args, "si", &straddr, if (!PyArg_ParseTuple(args, "si", &straddr,
&_BT_L2_MEMB(addr, psm))) { &_BT_L2_MEMB(addr, psm))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7