Added support for CAN_ISOTP protocol

python · tiran · Aug 28, 2017 · Jul 26, 2017 · Jul 31, 2017 · Jul 31, 2017
commit 4d609c08e748168f03ab5ed8b9976996f3fcdf02
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -1869,7 +1869,9 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
     }
 #endif
 
-#if defined(AF_CAN) && defined(CAN_RAW) && defined(CAN_BCM)
+#if defined(AF_CAN)
+
+#if defined(CAN_RAW) && defined(CAN_BCM)
     case AF_CAN:
         switch (s->sock_proto) {
         case CAN_RAW:
@@ -1880,7 +1882,6 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
             PyObject *interfaceName;
             struct ifreq ifr;
             Py_ssize_t len;
-
             addr = (struct sockaddr_can *)addr_ret;
 
             if (!PyArg_ParseTuple(args, "O&", PyUnicode_FSConverter,
@@ -1913,6 +1914,54 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
             Py_DECREF(interfaceName);
             return 1;
         }
+#endif
+
+#if defined(CAN_ISOTP)
+        case CAN_ISOTP:
+        {
+            struct sockaddr_can *addr;
+            PyObject *interfaceName;
+            struct ifreq ifr;
+            Py_ssize_t len;
+            unsigned long int rx_id, tx_id;
+
+            addr = (struct sockaddr_can *)addr_ret;
+
+            if (!PyArg_ParseTuple(args, "O&kk", PyUnicode_FSConverter,
+                                              &interfaceName,
+                                              &rx_id,
+                                              &tx_id))
+                return 0;
+
+            len = PyBytes_GET_SIZE(interfaceName);
+
+            if (len == 0) {
+                ifr.ifr_ifindex = 0;
+            } 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) {
+                    s->errorhandler();
+                    Py_DECREF(interfaceName);
+                    return 0;
+                }
+            } else {
+                PyErr_SetString(PyExc_OSError,
+                                "AF_CAN interface name too long");
+                Py_DECREF(interfaceName);
+                return 0;
+            }
+
+            addr->can_family = AF_CAN;
+            addr->can_ifindex = ifr.ifr_ifindex;
+            addr->can_addr.tp.rx_id = rx_id;
+            addr->can_addr.tp.tx_id = tx_id;
+
+            *len_ret = sizeof(*addr);
+            Py_DECREF(interfaceName);
+            return 1;
+        }
+#endif
         default:
             PyErr_SetString(PyExc_OSError,
                             "getsockaddrarg: unsupported CAN protocol");
@@ -7018,6 +7067,25 @@ PyInit__socket(void)
     PyModule_AddIntConstant(m, "CAN_BCM_RX_TIMEOUT", RX_TIMEOUT);
     PyModule_AddIntConstant(m, "CAN_BCM_RX_CHANGED", RX_CHANGED);
 #endif
+#ifdef HAVE_LINUX_CAN_ISOTP_H
+    PyModule_AddIntMacro(m, SOL_CAN_ISOTP);
+    PyModule_AddIntMacro(m, CAN_ISOTP);
+    PyModule_AddIntMacro(m, CAN_ISOTP_OPTS);
+    PyModule_AddIntMacro(m, CAN_ISOTP_RECV_FC);
+    PyModule_AddIntMacro(m, CAN_ISOTP_TX_STMIN);
+    PyModule_AddIntMacro(m, CAN_ISOTP_RX_STMIN);
+    PyModule_AddIntMacro(m, CAN_ISOTP_LL_OPTS);
+    PyModule_AddIntMacro(m, CAN_ISOTP_LISTEN_MODE);
+    PyModule_AddIntMacro(m, CAN_ISOTP_EXTEND_ADDR);
+    PyModule_AddIntMacro(m, CAN_ISOTP_TX_PADDING);
+    PyModule_AddIntMacro(m, CAN_ISOTP_RX_PADDING);
+    PyModule_AddIntMacro(m, CAN_ISOTP_CHK_PAD_LEN);
+    PyModule_AddIntMacro(m, CAN_ISOTP_CHK_PAD_DATA);
+    PyModule_AddIntMacro(m, CAN_ISOTP_HALF_DUPLEX);
+    PyModule_AddIntMacro(m, CAN_ISOTP_FORCE_TXSTMIN);
+    PyModule_AddIntMacro(m, CAN_ISOTP_FORCE_RXSTMIN);
+    PyModule_AddIntMacro(m, CAN_ISOTP_RX_EXT_ADDR);
+#endif
 #ifdef SOL_RDS
     PyModule_AddIntMacro(m, SOL_RDS);
 #endif

diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
@@ -91,6 +91,10 @@ typedef int socklen_t;
 #include <linux/can/bcm.h>
 #endif
 
+#ifdef HAVE_LINUX_CAN_ISOTP_H
+#include <linux/can/isotp.h>
+#endif
+
 #ifdef HAVE_SYS_SYS_DOMAIN_H
 #include <sys/sys_domain.h>
 #endif

diff --git a/configure b/configure
@@ -8127,8 +8127,8 @@ fi
 done
 
 
-# On Linux, can.h and can/raw.h require sys/socket.h
-for ac_header in linux/can.h linux/can/raw.h linux/can/bcm.h
+# On Linux, can.h, can/raw.h, can/isotp.h require sys/socket.h
+for ac_header in linux/can.h linux/can/raw.h linux/can/bcm.h linux/can/isotp.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "

diff --git a/configure.ac b/configure.ac
@@ -2120,8 +2120,8 @@ AC_CHECK_HEADERS(linux/netlink.h,,,[
 #endif
 ])
 
-# On Linux, can.h and can/raw.h require sys/socket.h
-AC_CHECK_HEADERS(linux/can.h linux/can/raw.h linux/can/bcm.h,,,[
+# On Linux, can.h, can/raw.h, can/isotp.h require sys/socket.h
+AC_CHECK_HEADERS(linux/can.h linux/can/raw.h linux/can/bcm.h linux/can/isotp.h,,,[
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/pyconfig.h.in b/pyconfig.h.in
@@ -559,6 +559,9 @@
 /* Define to 1 if you have the <linux/can.h> header file. */
 #undef HAVE_LINUX_CAN_H
 
+/* Define to 1 if you have the <linux/can/isotp.h> header file. */
+#undef HAVE_LINUX_CAN_ISOTP_H
+
 /* Define if compiling using Linux 3.6 or later. */
 #undef HAVE_LINUX_CAN_RAW_FD_FRAMES