Annotation of pkgsrc/lang/python37/patches/patch-Modules_socketmodule.c, revision 1.2
1.2 ! jperkin 1: $NetBSD: patch-Modules_socketmodule.c,v 1.1 2018/07/03 03:55:40 adam Exp $
1.1 adam 2:
3: Support NetBSD's socketcan implementation
4:
1.2 ! jperkin 5: --- Modules/socketmodule.c.orig 2021-09-04 03:49:21.000000000 +0000
1.1 adam 6: +++ Modules/socketmodule.c
1.2 ! jperkin 7: @@ -1461,8 +1461,13 @@ makesockaddr(SOCKET_T sockfd, struct soc
1.1 adam 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) {
1.2 ! jperkin 21: @@ -2032,7 +2037,12 @@ getsockaddrarg(PySocketSockObject *s, Py
1.1 adam 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;
1.2 ! jperkin 35: @@ -5218,7 +5228,7 @@ socket_sethostname(PyObject *self, PyObj
! 36: Py_buffer buf;
! 37: int res, flag = 0;
! 38:
! 39: -#ifdef _AIX
! 40: +#if defined(_AIX) || (defined(__sun) && PKGSRC_OPSYS_VERSION < 051100)
! 41: /* issue #18259, not declared in any useful header file */
! 42: extern int sethostname(const char *, size_t);
! 43: #endif
! 44: @@ -7415,6 +7425,20 @@ PyInit__socket(void)
1.1 adam 45: PyModule_AddIntConstant(m, "CAN_BCM_RX_TIMEOUT", RX_TIMEOUT);
46: PyModule_AddIntConstant(m, "CAN_BCM_RX_CHANGED", RX_CHANGED);
47: #endif
48: +#ifdef HAVE_NETCAN_CAN_H
49: + PyModule_AddIntMacro(m, CAN_EFF_FLAG);
50: + PyModule_AddIntMacro(m, CAN_RTR_FLAG);
51: + PyModule_AddIntMacro(m, CAN_ERR_FLAG);
52: +
53: + PyModule_AddIntMacro(m, CAN_SFF_MASK);
54: + PyModule_AddIntMacro(m, CAN_EFF_MASK);
55: + PyModule_AddIntMacro(m, CAN_ERR_MASK);
56: +
57: + PyModule_AddIntMacro(m, CAN_RAW_FILTER);
58: + /* PyModule_AddIntMacro(m, CAN_RAW_ERR_FILTER); */
59: + PyModule_AddIntMacro(m, CAN_RAW_LOOPBACK);
60: + PyModule_AddIntMacro(m, CAN_RAW_RECV_OWN_MSGS);
61: +#endif
62: #ifdef SOL_RDS
63: PyModule_AddIntMacro(m, SOL_RDS);
64: #endif
CVSweb <webmaster@jp.NetBSD.org>