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