GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-132429: Fix support of Bluetooth sockets on NetBSD and DragonFly B… · python/cpython@f2f86d3

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • Lib/test
    • test_socket.py
  • Misc/NEWS.d/next/Library
    • 2025-04-12-12-59-51.gh-issue-132429.OEIdlW.rst
  • Modules
    • socketmodule.c
    • socketmodule.h
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎Lib/test/test_socket.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_socket.py
+15-7Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2643,36 +2643,44 @@ def testCreateScoSocket(self):
26432643

26442644
@unittest.skipUnless(HAVE_SOCKET_BLUETOOTH_L2CAP, 'Bluetooth L2CAP sockets required for this test')
26452645
def testBindLeAttL2capSocket(self):
2646+
BDADDR_LE_PUBLIC = support.get_attribute(socket, 'BDADDR_LE_PUBLIC')
26462647
with socket.socket(socket.AF_BLUETOOTH, socket.SOCK_SEQPACKET, socket.BTPROTO_L2CAP) as f:
26472648
# ATT is the only CID allowed in userspace by the Linux kernel
26482649
CID_ATT = 4
2649-
f.bind((socket.BDADDR_ANY, 0, CID_ATT, socket.BDADDR_LE_PUBLIC))
2650+
f.bind((socket.BDADDR_ANY, 0, CID_ATT, BDADDR_LE_PUBLIC))
26502651
addr = f.getsockname()
2651-
self.assertEqual(addr, (socket.BDADDR_ANY, 0, CID_ATT, socket.BDADDR_LE_PUBLIC))
2652+
self.assertEqual(addr, (socket.BDADDR_ANY, 0, CID_ATT, BDADDR_LE_PUBLIC))
26522653

26532654
@unittest.skipUnless(HAVE_SOCKET_BLUETOOTH_L2CAP, 'Bluetooth L2CAP sockets required for this test')
26542655
def testBindLePsmL2capSocket(self):
2656+
BDADDR_LE_RANDOM = support.get_attribute(socket, 'BDADDR_LE_RANDOM')
26552657
with socket.socket(socket.AF_BLUETOOTH, socket.SOCK_SEQPACKET, socket.BTPROTO_L2CAP) as f:
26562658
# First user PSM in LE L2CAP
26572659
psm = 0x80
2658-
f.bind((socket.BDADDR_ANY, psm, 0, socket.BDADDR_LE_RANDOM))
2660+
f.bind((socket.BDADDR_ANY, psm, 0, BDADDR_LE_RANDOM))
26592661
addr = f.getsockname()
2660-
self.assertEqual(addr, (socket.BDADDR_ANY, psm, 0, socket.BDADDR_LE_RANDOM))
2662+
self.assertEqual(addr, (socket.BDADDR_ANY, psm, 0, BDADDR_LE_RANDOM))
26612663

26622664
@unittest.skipUnless(HAVE_SOCKET_BLUETOOTH_L2CAP, 'Bluetooth L2CAP sockets required for this test')
26632665
def testBindBrEdrL2capSocket(self):
2666+
# First user PSM in BR/EDR L2CAP
2667+
psm = 0x1001
26642668
with socket.socket(socket.AF_BLUETOOTH, socket.SOCK_SEQPACKET, socket.BTPROTO_L2CAP) as f:
2665-
# First user PSM in BR/EDR L2CAP
2666-
psm = 0x1001
26672669
f.bind((socket.BDADDR_ANY, psm))
26682670
addr = f.getsockname()
26692671
self.assertEqual(addr, (socket.BDADDR_ANY, psm))
26702672

2673+
cid = 1
2674+
with socket.socket(socket.AF_BLUETOOTH, socket.SOCK_SEQPACKET, socket.BTPROTO_L2CAP) as f:
2675+
f.bind((socket.BDADDR_ANY, psm, cid))
2676+
addr = f.getsockname()
2677+
self.assertEqual(addr, (socket.BDADDR_ANY, psm, cid))
2678+
26712679
@unittest.skipUnless(HAVE_SOCKET_BLUETOOTH_L2CAP, 'Bluetooth L2CAP sockets required for this test')
26722680
def testBadL2capAddr(self):
26732681
with socket.socket(socket.AF_BLUETOOTH, socket.SOCK_SEQPACKET, socket.BTPROTO_L2CAP) as f:
26742682
with self.assertRaises(OSError):
2675-
f.bind((socket.BDADDR_ANY, 0, 0, socket.BDADDR_BREDR, 0))
2683+
f.bind((socket.BDADDR_ANY, 0, 0, 0, 0))
26762684
with self.assertRaises(OSError):
26772685
f.bind((socket.BDADDR_ANY,))
26782686
with self.assertRaises(OSError):
Collapse file

‎Misc/NEWS.d/next/Library/2025-04-12-12-59-51.gh-issue-132429.OEIdlW.rst‎

Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fix support of Bluetooth sockets on NetBSD and DragonFly BSD. Add support
2+
for *cid* and *bdaddr_type* in the BTPROTO_L2CAP address on FreeBSD. Return
3+
*cid* in ``getsockname()`` for BTPROTO_L2CAP if it is not zero.
Collapse file

‎Modules/socketmodule.c‎

Copy file name to clipboardExpand all lines: Modules/socketmodule.c
+91-68Lines changed: 91 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -460,39 +460,44 @@ remove_unusable_flags(PyObject *m)
460460
# define SOCKETCLOSE close
461461
#endif
462462

463-
#if (defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)) && !defined(__NetBSD__) && !defined(__DragonFly__)
464-
#define USE_BLUETOOTH 1
465-
#if defined(__FreeBSD__)
466-
#define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
467-
#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
468-
#define BTPROTO_HCI BLUETOOTH_PROTO_HCI
469-
#define BTPROTO_SCO BLUETOOTH_PROTO_SCO
470-
#define SOL_HCI SOL_HCI_RAW
471-
#define HCI_FILTER SO_HCI_RAW_FILTER
472-
#define sockaddr_l2 sockaddr_l2cap
473-
#define sockaddr_rc sockaddr_rfcomm
474-
#define hci_dev hci_node
475-
#define _BT_L2_MEMB(sa, memb) ((sa)->l2cap_##memb)
476-
#define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb)
477-
#define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
478-
#define _BT_SCO_MEMB(sa, memb) ((sa)->sco_##memb)
479-
#elif defined(__NetBSD__) || defined(__DragonFly__)
480-
#define sockaddr_l2 sockaddr_bt
481-
#define sockaddr_rc sockaddr_bt
482-
#define sockaddr_hci sockaddr_bt
483-
#define sockaddr_sco sockaddr_bt
484-
#define SOL_HCI BTPROTO_HCI
485-
#define HCI_DATA_DIR SO_HCI_DIRECTION
486-
#define _BT_L2_MEMB(sa, memb) ((sa)->bt_##memb)
487-
#define _BT_RC_MEMB(sa, memb) ((sa)->bt_##memb)
488-
#define _BT_HCI_MEMB(sa, memb) ((sa)->bt_##memb)
489-
#define _BT_SCO_MEMB(sa, memb) ((sa)->bt_##memb)
490-
#else
491-
#define _BT_L2_MEMB(sa, memb) ((sa)->l2_##memb)
492-
#define _BT_RC_MEMB(sa, memb) ((sa)->rc_##memb)
493-
#define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
494-
#define _BT_SCO_MEMB(sa, memb) ((sa)->sco_##memb)
495-
#endif
463+
#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)
464+
# define USE_BLUETOOTH 1
465+
# if defined(HAVE_BLUETOOTH_BLUETOOTH_H) // Linux
466+
# define _BT_L2_MEMB(sa, memb) ((sa)->l2_##memb)
467+
# define _BT_RC_MEMB(sa, memb) ((sa)->rc_##memb)
468+
# define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
469+
# define _BT_SCO_MEMB(sa, memb) ((sa)->sco_##memb)
470+
# elif defined(__FreeBSD__)
471+
# define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
472+
# define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
473+
# define BTPROTO_HCI BLUETOOTH_PROTO_HCI
474+
# define BTPROTO_SCO BLUETOOTH_PROTO_SCO
475+
# define SOL_HCI SOL_HCI_RAW
476+
# define HCI_FILTER SO_HCI_RAW_FILTER
477+
# define sockaddr_l2 sockaddr_l2cap
478+
# define sockaddr_rc sockaddr_rfcomm
479+
# define hci_dev hci_node
480+
# define _BT_L2_MEMB(sa, memb) ((sa)->l2cap_##memb)
481+
# define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb)
482+
# define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
483+
# define _BT_SCO_MEMB(sa, memb) ((sa)->sco_##memb)
484+
# else // NetBSD, DragonFly BSD
485+
# define sockaddr_l2 sockaddr_bt
486+
# define sockaddr_rc sockaddr_bt
487+
# define sockaddr_hci sockaddr_bt
488+
# define sockaddr_sco sockaddr_bt
489+
# define bt_l2 bt
490+
# define bt_rc bt
491+
# define bt_sco bt
492+
# define bt_hci bt
493+
# define bt_cid bt_channel
494+
# define SOL_HCI BTPROTO_HCI
495+
# define HCI_DATA_DIR SO_HCI_DIRECTION
496+
# define _BT_L2_MEMB(sa, memb) ((sa)->bt_##memb)
497+
# define _BT_RC_MEMB(sa, memb) ((sa)->bt_##memb)
498+
# define _BT_HCI_MEMB(sa, memb) ((sa)->bt_##memb)
499+
# define _BT_SCO_MEMB(sa, memb) ((sa)->bt_##memb)
500+
# endif
496501
#endif
497502

498503
#ifdef MS_WINDOWS_DESKTOP
@@ -1487,20 +1492,28 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
14871492
PyObject *addrobj = makebdaddr(&_BT_L2_MEMB(a, bdaddr));
14881493
PyObject *ret = NULL;
14891494
if (addrobj) {
1490-
/* Retain old format for non-LE address.
1491-
(cid may be set for BR/EDR, but we're discarding it for now)
1492-
*/
1493-
if (_BT_L2_MEMB(a, bdaddr_type) == BDADDR_BREDR) {
1494-
ret = Py_BuildValue("Oi",
1495-
addrobj,
1496-
_BT_L2_MEMB(a, psm));
1497-
} else {
1495+
#if defined(BDADDR_BREDR) // Linux, FreeBSD
1496+
if (_BT_L2_MEMB(a, bdaddr_type) != BDADDR_BREDR) {
14981497
ret = Py_BuildValue("OiiB",
14991498
addrobj,
15001499
_BT_L2_MEMB(a, psm),
15011500
_BT_L2_MEMB(a, cid),
15021501
_BT_L2_MEMB(a, bdaddr_type));
15031502
}
1503+
else
1504+
#endif
1505+
if (_BT_L2_MEMB(a, cid) != 0) {
1506+
ret = Py_BuildValue("Oii",
1507+
addrobj,
1508+
_BT_L2_MEMB(a, psm),
1509+
_BT_L2_MEMB(a, cid));
1510+
}
1511+
else {
1512+
/* Retain old format for non-LE address. */
1513+
ret = Py_BuildValue("Oi",
1514+
addrobj,
1515+
_BT_L2_MEMB(a, psm));
1516+
}
15041517
Py_DECREF(addrobj);
15051518
}
15061519
return ret;
@@ -1526,16 +1539,16 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
15261539
case BTPROTO_HCI:
15271540
{
15281541
struct sockaddr_hci *a = (struct sockaddr_hci *) addr;
1529-
#if defined(__NetBSD__) || defined(__DragonFly__)
1530-
return makebdaddr(&_BT_HCI_MEMB(a, bdaddr));
1542+
#if defined(HAVE_BLUETOOTH_BLUETOOTH_H)
1543+
PyObject *ret = NULL;
1544+
ret = Py_BuildValue("i", _BT_HCI_MEMB(a, dev));
1545+
return ret;
15311546
#elif defined(__FreeBSD__)
1532-
char *node = _BT_HCI_MEMB(a, node);
1547+
const char *node = _BT_HCI_MEMB(a, node);
15331548
size_t len = strnlen(node, sizeof(_BT_HCI_MEMB(a, node)));
15341549
return PyBytes_FromStringAndSize(node, (Py_ssize_t)len);
15351550
#else
1536-
PyObject *ret = NULL;
1537-
ret = Py_BuildValue("i", _BT_HCI_MEMB(a, dev));
1538-
return ret;
1551+
return makebdaddr(&_BT_HCI_MEMB(a, bdaddr));
15391552
#endif
15401553
}
15411554
#endif /* BTPROTO_HCI */
@@ -2060,6 +2073,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
20602073
memset(addr, 0, sizeof(struct sockaddr_l2));
20612074
_BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
20622075
unsigned short psm;
2076+
#if defined(BDADDR_BREDR) // Linux, FreeBSD
20632077
unsigned short cid = 0;
20642078
unsigned char bdaddr_type = BDADDR_BREDR;
20652079
if (!PyArg_ParseTuple(args, "sH|HB", &straddr,
@@ -2070,9 +2084,18 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
20702084
"%s(): wrong format", caller);
20712085
return 0;
20722086
}
2087+
_BT_L2_MEMB(addr, bdaddr_type) = bdaddr_type;
2088+
#else
2089+
unsigned char cid = 0;
2090+
if (!PyArg_ParseTuple(args, "sH|B", &straddr,
2091+
&psm, &cid)) {
2092+
PyErr_Format(PyExc_OSError,
2093+
"%s(): wrong format", caller);
2094+
return 0;
2095+
}
2096+
#endif
20732097
_BT_L2_MEMB(addr, psm) = psm;
20742098
_BT_L2_MEMB(addr, cid) = cid;
2075-
_BT_L2_MEMB(addr, bdaddr_type) = bdaddr_type;
20762099

20772100
if (setbdaddr(straddr, &_BT_L2_MEMB(addr, bdaddr)) < 0)
20782101
return 0;
@@ -2113,19 +2136,16 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
21132136
{
21142137
struct sockaddr_hci *addr = &addrbuf->bt_hci;
21152138
memset(addr, 0, sizeof(struct sockaddr_hci));
2116-
#if defined(__NetBSD__) || defined(__DragonFly__)
2117-
const char *straddr;
21182139
_BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
2119-
if (!PyBytes_Check(args)) {
2120-
PyErr_Format(PyExc_OSError, "%s: "
2121-
"wrong format", caller);
2140+
#if defined(HAVE_BLUETOOTH_BLUETOOTH_H)
2141+
unsigned short dev = _BT_HCI_MEMB(addr, dev);
2142+
if (!PyArg_ParseTuple(args, "H", &dev)) {
2143+
PyErr_Format(PyExc_OSError,
2144+
"%s(): wrong format", caller);
21222145
return 0;
21232146
}
2124-
straddr = PyBytes_AS_STRING(args);
2125-
if (setbdaddr(straddr, &_BT_HCI_MEMB(addr, bdaddr)) < 0)
2126-
return 0;
2147+
_BT_HCI_MEMB(addr, dev) = dev;
21272148
#elif defined(__FreeBSD__)
2128-
_BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
21292149
if (!PyBytes_Check(args)) {
21302150
PyErr_Format(PyExc_OSError, "%s: "
21312151
"wrong node format", caller);
@@ -2146,14 +2166,15 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
21462166
strncpy(_BT_HCI_MEMB(addr, node), straddr,
21472167
sizeof(_BT_HCI_MEMB(addr, node)));
21482168
#else
2149-
_BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
2150-
unsigned short dev = _BT_HCI_MEMB(addr, dev);
2151-
if (!PyArg_ParseTuple(args, "H", &dev)) {
2152-
PyErr_Format(PyExc_OSError,
2153-
"%s(): wrong format", caller);
2169+
const char *straddr;
2170+
if (!PyBytes_Check(args)) {
2171+
PyErr_Format(PyExc_OSError, "%s: "
2172+
"wrong format", caller);
21542173
return 0;
21552174
}
2156-
_BT_HCI_MEMB(addr, dev) = dev;
2175+
straddr = PyBytes_AS_STRING(args);
2176+
if (setbdaddr(straddr, &_BT_HCI_MEMB(addr, bdaddr)) < 0)
2177+
return 0;
21572178
#endif
21582179
*len_ret = sizeof *addr;
21592180
return 1;
@@ -2739,7 +2760,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
27392760
case BTPROTO_SCO:
27402761
*len_ret = sizeof (struct sockaddr_sco);
27412762
return 1;
2742-
#endif /* BTPROTO_HCI */
2763+
#endif /* BTPROTO_SCO */
27432764
default:
27442765
PyErr_SetString(PyExc_OSError, "getsockaddrlen: "
27452766
"unknown BT protocol");
@@ -7845,20 +7866,22 @@ socket_exec(PyObject *m)
78457866
ADD_INT_MACRO(m, AF_BLUETOOTH);
78467867
#ifdef BTPROTO_L2CAP
78477868
ADD_INT_MACRO(m, BTPROTO_L2CAP);
7869+
#if defined(BDADDR_BREDR)
78487870
ADD_INT_MACRO(m, BDADDR_BREDR);
78497871
ADD_INT_MACRO(m, BDADDR_LE_PUBLIC);
78507872
ADD_INT_MACRO(m, BDADDR_LE_RANDOM);
7873+
#endif
78517874
#endif /* BTPROTO_L2CAP */
78527875
#ifdef BTPROTO_HCI
78537876
ADD_INT_MACRO(m, BTPROTO_HCI);
78547877
ADD_INT_MACRO(m, SOL_HCI);
7855-
#if !defined(__NetBSD__) && !defined(__DragonFly__)
7878+
#if defined(HCI_FILTER)
78567879
ADD_INT_MACRO(m, HCI_FILTER);
7857-
#if !defined(__FreeBSD__)
7880+
#endif
7881+
#if defined(HCI_TIME_STAMP)
78587882
ADD_INT_MACRO(m, HCI_TIME_STAMP);
78597883
ADD_INT_MACRO(m, HCI_DATA_DIR);
7860-
#endif /* !__FreeBSD__ */
7861-
#endif /* !__NetBSD__ && !__DragonFly__ */
7884+
#endif
78627885
#endif /* BTPROTO_HCI */
78637886
#ifdef BTPROTO_RFCOMM
78647887
ADD_INT_MACRO(m, BTPROTO_RFCOMM);
Collapse file

‎Modules/socketmodule.h‎

Copy file name to clipboardExpand all lines: Modules/socketmodule.h
+15-8Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ typedef int socklen_t;
122122
#endif
123123

124124
#ifdef HAVE_BLUETOOTH_H
125+
#ifdef __FreeBSD__
126+
#define L2CAP_SOCKET_CHECKED
127+
#endif
125128
#include <bluetooth.h>
126129
#endif
127130

@@ -274,18 +277,22 @@ typedef union sock_addr {
274277
struct sockaddr_in6 in6;
275278
struct sockaddr_storage storage;
276279
#endif
277-
#if defined(HAVE_BLUETOOTH_H) && defined(__FreeBSD__)
278-
struct sockaddr_l2cap bt_l2;
279-
struct sockaddr_rfcomm bt_rc;
280-
struct sockaddr_sco bt_sco;
281-
struct sockaddr_hci bt_hci;
282-
#elif defined(HAVE_BLUETOOTH_BLUETOOTH_H)
280+
#if defined(MS_WINDOWS)
281+
struct SOCKADDR_BTH_REDEF bt_rc;
282+
#elif defined(HAVE_BLUETOOTH_BLUETOOTH_H) // Linux
283283
struct sockaddr_l2 bt_l2;
284284
struct sockaddr_rc bt_rc;
285285
struct sockaddr_sco bt_sco;
286286
struct sockaddr_hci bt_hci;
287-
#elif defined(MS_WINDOWS)
288-
struct SOCKADDR_BTH_REDEF bt_rc;
287+
#elif defined(HAVE_BLUETOOTH_H)
288+
# if defined(__FreeBSD__)
289+
struct sockaddr_l2cap bt_l2;
290+
struct sockaddr_rfcomm bt_rc;
291+
struct sockaddr_sco bt_sco;
292+
struct sockaddr_hci bt_hci;
293+
# else // NetBSD, DragonFly BSD
294+
struct sockaddr_bt bt;
295+
# endif
289296
#endif
290297
#ifdef HAVE_NETPACKET_PACKET_H
291298
struct sockaddr_ll ll;

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.