Annotation of pkgsrc/lang/python37/patches/patch-Modules_socketmodule.c, revision 1.1
1.1 ! adam 1: $NetBSD: patch-Modules_socketmodule.c,v 1.2 2017/12/19 09:37:14 adam Exp $
! 2:
! 3: Support NetBSD's socketcan implementation
! 4:
! 5: --- Modules/socketmodule.c.orig 2018-03-29 11:57:55.000000000 +0000
! 6: +++ Modules/socketmodule.c
! 7: @@ -1439,8 +1439,13 @@ makesockaddr(SOCKET_T sockfd, struct soc
! 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: switch (proto) {
! 21: @@ -2010,7 +2015,12 @@ getsockaddrarg(PySocketSockObject *s, Py
! 22: } else if ((size_t)len < sizeof(ifr.ifr_name)) {
! 23: strncpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName), sizeof(ifr.ifr_name));
! 24: ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
! 25: - if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
! 26: +#ifdef __NetBSD__
! 27: + if ((ifr.ifr_ifindex = if_nametoindex(ifr.ifr_name)) == 0)
! 28: +#else
! 29: + if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0)
! 30: +#endif
! 31: + {
! 32: s->errorhandler();
! 33: Py_DECREF(interfaceName);
! 34: return 0;
! 35: @@ -7371,6 +7381,20 @@ PyInit__socket(void)
! 36: PyModule_AddIntConstant(m, "CAN_BCM_RX_TIMEOUT", RX_TIMEOUT);
! 37: PyModule_AddIntConstant(m, "CAN_BCM_RX_CHANGED", RX_CHANGED);
! 38: #endif
! 39: +#ifdef HAVE_NETCAN_CAN_H
! 40: + PyModule_AddIntMacro(m, CAN_EFF_FLAG);
! 41: + PyModule_AddIntMacro(m, CAN_RTR_FLAG);
! 42: + PyModule_AddIntMacro(m, CAN_ERR_FLAG);
! 43: +
! 44: + PyModule_AddIntMacro(m, CAN_SFF_MASK);
! 45: + PyModule_AddIntMacro(m, CAN_EFF_MASK);
! 46: + PyModule_AddIntMacro(m, CAN_ERR_MASK);
! 47: +
! 48: + PyModule_AddIntMacro(m, CAN_RAW_FILTER);
! 49: + /* PyModule_AddIntMacro(m, CAN_RAW_ERR_FILTER); */
! 50: + PyModule_AddIntMacro(m, CAN_RAW_LOOPBACK);
! 51: + PyModule_AddIntMacro(m, CAN_RAW_RECV_OWN_MSGS);
! 52: +#endif
! 53: #ifdef SOL_RDS
! 54: PyModule_AddIntMacro(m, SOL_RDS);
! 55: #endif
CVSweb <webmaster@jp.NetBSD.org>