Apr 1, 2025 · Mar 24, 2025 · Mar 24, 2025 · Mar 24, 2025 · Mar 28, 2025 · Mar 28, 2025
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
            }
            strncpy(_BT_HCI_MEMB(addr, node), straddr,
                    sizeof(_BT_HCI_MEMB(addr, node)));
 #else  /* __NetBSD__ || __DragonFly__ */
 #else
            _BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
            unsigned short dev = _BT_HCI_MEMB(addr, dev);
            if (!PyArg_ParseTuple(args, "H", &dev)) {
                return 0;
            }
            _BT_HCI_MEMB(addr, dev) = dev;
 #endif /* !(__NetBSD__ || __DragonFly__) */
 #endif
            *len_ret = sizeof *addr;
            return 1;
        }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2132,7 +2132,7 @@ getsockaddrarg(PySocketSockObject s, PyObject args,
		}
		strncpy(_BT_HCI_MEMB(addr, node), straddr,
		sizeof(_BT_HCI_MEMB(addr, node)));
		#else /* __NetBSD__ \|\| __DragonFly__ */
		#else
		_BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
		unsigned short dev = _BT_HCI_MEMB(addr, dev);
Copy link Member serhiy-storchakaMar 29, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Where is it defined? Copy link Member picnixzApr 1, 2025• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. There's a bunch of`define` at the top of the file: #if (defined(HAVE_BLUETOOTH_H)\|\| defined(HAVE_BLUETOOTH_BLUETOOTH_H)) \&& !defined(__NetBSD__)&& !defined(__DragonFly__)#defineUSE_BLUETOOTH 1#if defined(__FreeBSD__)...#define_BT_HCI_MEMB(sa,memb) ((sa)->hci_##memb)...#elif defined(__NetBSD__)\|\| defined(__DragonFly__)// <- unreachable...#define_BT_HCI_MEMB(sa,memb) ((sa)->bt_##memb)#else...#define_BT_HCI_MEMB(sa,memb) ((sa)->hci_##memb)...#endif#endif But AFAICT, the`elif defined(__NetBSD__) \|\| defined(__DragonFly__)` is not possible at all since we're still in the big`#if` where we want`!defined(__NetBSD__) && !defined(__DragonFly__)`. So indeed, it looks like the macro wouldn't be defined here. I think we should remove`!defined(__NetBSD__) && !defined(__DragonFly__)` Copy link Member serhiy-storchakaApr 1, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I know about`_BT_HCI_MEMB`. I asked on what platform the`*_dev` member is defined, what its name and the structure name. Its turned out that it is`hci_node` on FreeBSD and NetBSD.`hci_dev` should exist on Linux.
		if (!PyArg_ParseTuple(args, "H", &dev)) {
Expand All		@@ -2141,7 +2141,7 @@ getsockaddrarg(PySocketSockObject s, PyObject args,
		return 0;
		}
		_BT_HCI_MEMB(addr, dev) = dev;
		#endif /* !(__NetBSD__ \|\| __DragonFly__) */
		#endif
		len_ret = sizeof addr;
		return 1;
		}
Expand Down