From a6cc551502aac1fd011009abe40686f4647ba6b0 Mon Sep 17 00:00:00 2001 From: Larry Hastings Date: Mon, 13 Apr 2015 17:48:40 -0400 Subject: Issue #22631: Added Linux-specific socket constant CAN_RAW_FD_FRAMES. Patch courtesy of Joe Jevnik. --- Doc/library/socket.rst | 12 ++++++++++++ Doc/whatsnew/3.5.rst | 3 +++ Misc/ACKS | 1 + Misc/NEWS | 4 +++- Modules/socketmodule.c | 3 +++ configure | 30 ++++++++++++++++++++++++++++++ configure.ac | 10 ++++++++++ pyconfig.h.in | 3 +++ 8 files changed, 65 insertions(+), 1 deletion(-) diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index 530fbb0..84fa10d 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -279,6 +279,18 @@ Constants .. versionadded:: 3.4 +.. data:: CAN_RAW_FD_FRAMES + + Enables CAN FD support in a CAN_RAW socket. This is disabled by default. + This allows your application to send both CAN and CAN FD frames; however, + you one must accept both CAN and CAN FD frames when reading from the socket. + + This constant is documented in the Linux documentation. + + Availability: Linux >= 3.6. + + .. versionadded:: 3.5 + .. data:: AF_RDS PF_RDS SOL_RDS diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst index 7a8c3f8..a1130df 100644 --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -792,6 +792,9 @@ Changes in the Python API in Python 3.5, all old `.pyo` files from previous versions of Python are invalid regardless of this PEP. + * The :mod:`socket` module now exports the CAN_RAW_FD_FRAMES constant on linux + 3.6 and greater. + Changes in the C API -------------------- diff --git a/Misc/ACKS b/Misc/ACKS index d1074bd..eeb1869 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -664,6 +664,7 @@ Flemming Kjær Jensen Philip H. Jensen Philip Jenvey MunSic Jeong +Joe Jevnik Chris Jerdonek Jim Jewett Pedro Diaz Jimenez diff --git a/Misc/NEWS b/Misc/NEWS index e4574a1..79ed545 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1,4 +1,4 @@ -+++++++++++ ++++++++++++ Python News +++++++++++ @@ -9,6 +9,8 @@ Release date: XXX Core and Builtins ----------------- +- Issue #22631: Added Linux-specific socket constant CAN_RAW_FD_FRAMES. + Patch courtesy of Joe Jevnik. - Issue #23731: Implement PEP 488: removal of .pyo files. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index fd20b17..7610b0c 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -6617,6 +6617,9 @@ PyInit__socket(void) PyModule_AddIntMacro(m, CAN_RAW_LOOPBACK); PyModule_AddIntMacro(m, CAN_RAW_RECV_OWN_MSGS); #endif +#ifdef HAVE_LINUX_CAN_RAW_FD_FRAMES + PyModule_AddIntMacro(m, CAN_RAW_FD_FRAMES); +#endif #ifdef HAVE_LINUX_CAN_BCM_H PyModule_AddIntMacro(m, CAN_BCM); PyModule_AddIntConstant(m, "CAN_BCM_TX_SETUP", TX_SETUP); diff --git a/configure b/configure index 72751ed..26b8911 100755 --- a/configure +++ b/configure @@ -10495,6 +10495,36 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAN_RAW_FD_FRAMES" >&5 +$as_echo_n "checking for CAN_RAW_FD_FRAMES... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + /* CAN_RAW_FD_FRAMES available check */ +#include +int +main () +{ +int can_raw_fd_frames = CAN_RAW_FD_FRAMES; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + +$as_echo "#define HAVE_LINUX_CAN_RAW_FD_FRAMES 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSX 10.5 SDK or later" >&5 $as_echo_n "checking for OSX 10.5 SDK or later... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 69f7b7d..d15f264 100644 --- a/configure.ac +++ b/configure.ac @@ -2876,6 +2876,16 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then fi fi +AC_MSG_CHECKING(for CAN_RAW_FD_FRAMES) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ /* CAN_RAW_FD_FRAMES available check */ +#include ]], +[[int can_raw_fd_frames = CAN_RAW_FD_FRAMES;]])],[ + AC_DEFINE(HAVE_LINUX_CAN_RAW_FD_FRAMES, 1, [Define if compiling using Linux 3.6 or later.]) + AC_MSG_RESULT(yes) +],[ + AC_MSG_RESULT(no) +]) + AC_MSG_CHECKING(for OSX 10.5 SDK or later) AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[#include ]], [[FSIORefNum fRef = 0]]) diff --git a/pyconfig.h.in b/pyconfig.h.in index c8ce976..0d40c94 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -531,6 +531,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_CAN_H +/* Define if compiling using Linux 3.6 or later. */ +#undef HAVE_LINUX_CAN_RAW_FD_FRAMES + /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_CAN_RAW_H -- cgit v0.12