Skip to content

Commit 64959b8

Browse files
Patrick Menschelrumpelsepp
andcommitted
Add constants to socket module for ISO-TP CAN protocol
Co-authored-by: Stefan Tatschner <stefan@rumpelsepp.org>
1 parent e545bae commit 64959b8

6 files changed

Lines changed: 90 additions & 2 deletions

File tree

Doc/whatsnew/3.15.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,13 @@ shelve
368368
(Contributed by Andrea Oliveri in :gh:`134004`.)
369369

370370

371+
socket
372+
------
373+
374+
Add constants for the ISO-TP CAN protocol.
375+
(Contributed by Patrick Menschel and Stefan Tatschner in :gh:`86819`.)
376+
377+
371378
sqlite3
372379
-------
373380

Lib/test/test_socket.py

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,6 +2392,45 @@ def testCrucialConstants(self):
23922392
socket.CAN_ISOTP
23932393
socket.SOCK_DGRAM
23942394

2395+
@unittest.skipUnless(hasattr(socket, "SOL_CAN_ISOTP"),
2396+
"missing <linux/can/isotp.h>")
2397+
def testISOTP(self):
2398+
socket.SOL_CAN_ISOTP
2399+
2400+
socket.CAN_ISOTP_OPTS
2401+
socket.CAN_ISOTP_RECV_FC
2402+
2403+
socket.CAN_ISOTP_TX_STMIN
2404+
socket.CAN_ISOTP_RX_STMIN
2405+
socket.CAN_ISOTP_LL_OPTS
2406+
2407+
socket.CAN_ISOTP_LISTEN_MODE
2408+
socket.CAN_ISOTP_EXTEND_ADDR
2409+
socket.CAN_ISOTP_TX_PADDING
2410+
socket.CAN_ISOTP_RX_PADDING
2411+
socket.CAN_ISOTP_CHK_PAD_LEN
2412+
socket.CAN_ISOTP_CHK_PAD_DATA
2413+
socket.CAN_ISOTP_HALF_DUPLEX
2414+
socket.CAN_ISOTP_FORCE_TXSTMIN
2415+
socket.CAN_ISOTP_FORCE_RXSTMIN
2416+
socket.CAN_ISOTP_RX_EXT_ADDR
2417+
socket.CAN_ISOTP_WAIT_TX_DONE
2418+
# This constant is not always available
2419+
# socket.CAN_ISOTP_SF_BROADCAST
2420+
2421+
socket.CAN_ISOTP_DEFAULT_FLAGS
2422+
socket.CAN_ISOTP_DEFAULT_EXT_ADDRESS
2423+
socket.CAN_ISOTP_DEFAULT_PAD_CONTENT
2424+
socket.CAN_ISOTP_DEFAULT_FRAME_TXTIME
2425+
socket.CAN_ISOTP_DEFAULT_RECV_BS
2426+
socket.CAN_ISOTP_DEFAULT_EXT_ADDRESS
2427+
socket.CAN_ISOTP_DEFAULT_RECV_STMIN
2428+
socket.CAN_ISOTP_DEFAULT_RECV_WFTMAX
2429+
2430+
socket.CAN_ISOTP_DEFAULT_LL_MTU
2431+
socket.CAN_ISOTP_DEFAULT_LL_TX_DL
2432+
socket.CAN_ISOTP_DEFAULT_LL_TX_FLAGS
2433+
23952434
def testCreateSocket(self):
23962435
with socket.socket(socket.PF_CAN, socket.SOCK_RAW, socket.CAN_RAW) as s:
23972436
pass
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
:mod:`socket`: Add missing constants for ISO-TP sockets.

Modules/socketmodule.c

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8536,6 +8536,43 @@ socket_exec(PyObject *m)
85368536

85378537
ADD_INT_MACRO(m, J1939_FILTER_MAX);
85388538
#endif
8539+
#ifdef HAVE_LINUX_CAN_ISOTP_H
8540+
ADD_INT_MACRO(m, SOL_CAN_ISOTP);
8541+
8542+
ADD_INT_MACRO(m, CAN_ISOTP_OPTS);
8543+
ADD_INT_MACRO(m, CAN_ISOTP_RECV_FC);
8544+
8545+
ADD_INT_MACRO(m, CAN_ISOTP_TX_STMIN);
8546+
ADD_INT_MACRO(m, CAN_ISOTP_RX_STMIN);
8547+
ADD_INT_MACRO(m, CAN_ISOTP_LL_OPTS);
8548+
8549+
ADD_INT_MACRO(m, CAN_ISOTP_LISTEN_MODE);
8550+
ADD_INT_MACRO(m, CAN_ISOTP_EXTEND_ADDR);
8551+
ADD_INT_MACRO(m, CAN_ISOTP_TX_PADDING);
8552+
ADD_INT_MACRO(m, CAN_ISOTP_RX_PADDING);
8553+
ADD_INT_MACRO(m, CAN_ISOTP_CHK_PAD_LEN);
8554+
ADD_INT_MACRO(m, CAN_ISOTP_CHK_PAD_DATA);
8555+
ADD_INT_MACRO(m, CAN_ISOTP_HALF_DUPLEX);
8556+
ADD_INT_MACRO(m, CAN_ISOTP_FORCE_TXSTMIN);
8557+
ADD_INT_MACRO(m, CAN_ISOTP_FORCE_RXSTMIN);
8558+
ADD_INT_MACRO(m, CAN_ISOTP_RX_EXT_ADDR);
8559+
ADD_INT_MACRO(m, CAN_ISOTP_WAIT_TX_DONE);
8560+
#ifdef CAN_ISOTP_SF_BROADCAST
8561+
ADD_INT_MACRO(m, CAN_ISOTP_SF_BROADCAST);
8562+
#endif
8563+
8564+
ADD_INT_MACRO(m, CAN_ISOTP_DEFAULT_FLAGS);
8565+
ADD_INT_MACRO(m, CAN_ISOTP_DEFAULT_EXT_ADDRESS);
8566+
ADD_INT_MACRO(m, CAN_ISOTP_DEFAULT_PAD_CONTENT);
8567+
ADD_INT_MACRO(m, CAN_ISOTP_DEFAULT_FRAME_TXTIME);
8568+
ADD_INT_MACRO(m, CAN_ISOTP_DEFAULT_RECV_BS);
8569+
ADD_INT_MACRO(m, CAN_ISOTP_DEFAULT_RECV_STMIN);
8570+
ADD_INT_MACRO(m, CAN_ISOTP_DEFAULT_RECV_WFTMAX);
8571+
8572+
ADD_INT_MACRO(m, CAN_ISOTP_DEFAULT_LL_MTU);
8573+
ADD_INT_MACRO(m, CAN_ISOTP_DEFAULT_LL_TX_DL);
8574+
ADD_INT_MACRO(m, CAN_ISOTP_DEFAULT_LL_TX_FLAGS);
8575+
#endif
85398576
#ifdef SOL_RDS
85408577
ADD_INT_MACRO(m, SOL_RDS);
85418578
#endif

Modules/socketmodule.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ typedef int socklen_t;
165165
#include <linux/can/bcm.h>
166166
#endif
167167

168+
#ifdef HAVE_LINUX_CAN_ISOTP_H
169+
#include <linux/can/isotp.h>
170+
#endif
171+
168172
#ifdef HAVE_LINUX_CAN_J1939_H
169173
#include <linux/can/j1939.h>
170174
#endif

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3046,10 +3046,10 @@ AC_CHECK_HEADERS([linux/vm_sockets.h], [], [], [
30463046
#endif
30473047
])
30483048

3049-
# On Linux, can.h, can/bcm.h, can/j1939.h, can/raw.h require sys/socket.h
3049+
# On Linux, can.h, can/bcm.h, can/isotp.h, can/j1939.h, can/raw.h require sys/socket.h
30503050
# On NetBSD, netcan/can.h requires sys/socket.h
30513051
AC_CHECK_HEADERS(
3052-
[linux/can.h linux/can/bcm.h linux/can/j1939.h linux/can/raw.h netcan/can.h],
3052+
[linux/can.h linux/can/bcm.h linux/can/isotp.h linux/can/j1939.h linux/can/raw.h netcan/can.h],
30533053
[], [], [
30543054
#ifdef HAVE_SYS_SOCKET_H
30553055
#include <sys/socket.h>

0 commit comments

Comments
 (0)