1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
$NetBSD: patch-Modules_socketmodule.c,v 1.2 2017/12/19 09:37:14 adam Exp $
Support NetBSD's socketcan implementation
--- Modules/socketmodule.c.orig 2017-12-19 04:53:56.000000000 +0000
+++ Modules/socketmodule.c
@@ -1375,8 +1375,13 @@ makesockaddr(SOCKET_T sockfd, struct soc
/* need to look up interface name given index */
if (a->can_ifindex) {
ifr.ifr_ifindex = a->can_ifindex;
+#ifdef __NetBSD__
+ if (if_indextoname(a->can_ifindex, ifr.ifr_name) != NULL)
+ ifname = ifr.ifr_name;
+#else
if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
ifname = ifr.ifr_name;
+#endif /* __NetBSD__ */
}
return Py_BuildValue("O&h", PyUnicode_DecodeFSDefault,
@@ -1878,12 +1883,14 @@ getsockaddrarg(PySocketSockObject *s, Py
}
#endif /* HAVE_LINUX_TIPC_H */
-#if defined(AF_CAN) && defined(CAN_RAW) && defined(CAN_BCM) && defined(SIOCGIFINDEX)
+#if defined(AF_CAN) && defined(CAN_RAW) && defined(SIOCGIFINDEX)
case AF_CAN:
switch (s->sock_proto) {
case CAN_RAW:
+#if defined(CAN_BCM)
/* fall-through */
case CAN_BCM:
+#endif
{
struct sockaddr_can *addr;
PyObject *interfaceName;
@@ -1903,7 +1910,12 @@ getsockaddrarg(PySocketSockObject *s, Py
} else if ((size_t)len < sizeof(ifr.ifr_name)) {
strncpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName), sizeof(ifr.ifr_name));
ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
- if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
+#ifdef __NetBSD__
+ if ((ifr.ifr_ifindex = if_nametoindex(ifr.ifr_name)) == 0)
+#else
+ if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0)
+#endif
+ {
s->errorhandler();
Py_DECREF(interfaceName);
return 0;
@@ -7111,6 +7123,20 @@ PyInit__socket(void)
PyModule_AddIntConstant(m, "CAN_BCM_RX_TIMEOUT", RX_TIMEOUT);
PyModule_AddIntConstant(m, "CAN_BCM_RX_CHANGED", RX_CHANGED);
#endif
+#ifdef HAVE_NETCAN_CAN_H
+ PyModule_AddIntMacro(m, CAN_EFF_FLAG);
+ PyModule_AddIntMacro(m, CAN_RTR_FLAG);
+ PyModule_AddIntMacro(m, CAN_ERR_FLAG);
+
+ PyModule_AddIntMacro(m, CAN_SFF_MASK);
+ PyModule_AddIntMacro(m, CAN_EFF_MASK);
+ PyModule_AddIntMacro(m, CAN_ERR_MASK);
+
+ PyModule_AddIntMacro(m, CAN_RAW_FILTER);
+ /* PyModule_AddIntMacro(m, CAN_RAW_ERR_FILTER); */
+ PyModule_AddIntMacro(m, CAN_RAW_LOOPBACK);
+ PyModule_AddIntMacro(m, CAN_RAW_RECV_OWN_MSGS);
+#endif
#ifdef SOL_RDS
PyModule_AddIntMacro(m, SOL_RDS);
#endif
|
