@@ -466,6 +466,7 @@ remove_unusable_flags(PyObject *m)
466
466
#define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
467
467
#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
468
468
#define BTPROTO_HCI BLUETOOTH_PROTO_HCI
469
+ #define BTPROTO_SCO BLUETOOTH_PROTO_SCO
469
470
#define SOL_HCI SOL_HCI_RAW
470
471
#define HCI_FILTER SO_HCI_RAW_FILTER
471
472
#define sockaddr_l2 sockaddr_l2cap
@@ -474,6 +475,7 @@ remove_unusable_flags(PyObject *m)
474
475
#define _BT_L2_MEMB (sa , memb ) ((sa)->l2cap_##memb)
475
476
#define _BT_RC_MEMB (sa , memb ) ((sa)->rfcomm_##memb)
476
477
#define _BT_HCI_MEMB (sa , memb ) ((sa)->hci_##memb)
478
+ #define _BT_SCO_MEMB (sa , memb ) ((sa)->sco_##memb)
477
479
#elif defined(__NetBSD__ ) || defined(__DragonFly__ )
478
480
#define sockaddr_l2 sockaddr_bt
479
481
#define sockaddr_rc sockaddr_bt
@@ -1536,15 +1538,15 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
1536
1538
return ret ;
1537
1539
#endif
1538
1540
}
1541
+ #endif /* BTPROTO_HCI */
1539
1542
1540
- #if !defined( __FreeBSD__ )
1543
+ #ifdef BTPROTO_SCO
1541
1544
case BTPROTO_SCO :
1542
1545
{
1543
1546
struct sockaddr_sco * a = (struct sockaddr_sco * ) addr ;
1544
1547
return makebdaddr (& _BT_SCO_MEMB (a , bdaddr ));
1545
1548
}
1546
- #endif /* !__FreeBSD__ */
1547
- #endif /* BTPROTO_HCI */
1549
+ #endif /* BTPROTO_SCO */
1548
1550
1549
1551
default :
1550
1552
PyErr_SetString (PyExc_ValueError ,
@@ -2156,7 +2158,8 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
2156
2158
* len_ret = sizeof * addr ;
2157
2159
return 1 ;
2158
2160
}
2159
- #if !defined(__FreeBSD__ )
2161
+ #endif /* BTPROTO_HCI */
2162
+ #ifdef BTPROTO_SCO
2160
2163
case BTPROTO_SCO :
2161
2164
{
2162
2165
const char * straddr ;
@@ -2176,8 +2179,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
2176
2179
* len_ret = sizeof * addr ;
2177
2180
return 1 ;
2178
2181
}
2179
- #endif /* !__FreeBSD__ */
2180
- #endif /* BTPROTO_HCI */
2182
+ #endif /* BTPROTO_SCO */
2181
2183
default :
2182
2184
PyErr_Format (PyExc_OSError ,
2183
2185
"%s(): unknown Bluetooth protocol" , caller );
@@ -2732,11 +2734,11 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
2732
2734
case BTPROTO_HCI :
2733
2735
* len_ret = sizeof (struct sockaddr_hci );
2734
2736
return 1 ;
2735
- #if !defined(__FreeBSD__ )
2737
+ #endif /* BTPROTO_HCI */
2738
+ #ifdef BTPROTO_SCO
2736
2739
case BTPROTO_SCO :
2737
2740
* len_ret = sizeof (struct sockaddr_sco );
2738
2741
return 1 ;
2739
- #endif /* !__FreeBSD__ */
2740
2742
#endif /* BTPROTO_HCI */
2741
2743
default :
2742
2744
PyErr_SetString (PyExc_OSError , "getsockaddrlen: "
0 commit comments