Commit Graph

599 Commits (e393697112e4c2c01a999c704d65b76858ec51ae)

Author SHA1 Message Date
Marc Kleine-Budde 4e36059f6a
Merge pull request #175 from olerem/testj1938
sync testj1939 with latest kernel UAPI
2019-12-06 11:41:10 +01:00
Marc Kleine-Budde 6831eeeb62
Merge pull request #180 from olerem/jacd
jacd: remove SO_BINDTODEVICE setsockopt call
2019-12-06 11:31:53 +01:00
Oleksij Rempel a8456276df jacd: remove SO_BINDTODEVICE setsockopt call
This was used in the non mainline stack version.
Removing this call allows to use jacd without root permissions.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
2019-12-06 11:24:44 +01:00
Marc Kleine-Budde 6eeedb0e66
Merge pull request #177 from marckleinebudde/fix-error-handling
isotpsniffer: fix error handling, "0" is a valid filedescriptor
2019-12-02 19:16:55 +01:00
Marc Kleine-Budde b6a44803fd isotpsniffer: fix error handling, "0" is a valid filedescriptor
Fixes: b04108c615 ("isotpsniffer: Fix error handling")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-12-02 11:20:03 +01:00
Oleksij Rempel 153501c0ab can-j1939-kickstart: remove "Use source address" example
This example do not really demonstrate UAPI or testj1939 functionality.
So, remove it.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
2019-12-02 08:29:45 +01:00
Oleksij Rempel 8cf6353039 can-j1939-kickstart: update documentation for testj1939
testj1939 need to use -B (broadcast) flag to be able to send or receive
broadcast packages.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
2019-11-29 14:16:04 +01:00
Oleksij Rempel 5d3f8073b2 testj1939: add optional promiscuous mode and boradcast support
Upstream version of J1939 stack has different UAPI. To make documented
testj1939 examples work again we need at least boradcast flag.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
2019-11-29 13:53:55 +01:00
Jan Luebbe d75122f649 add github actions 2019-11-25 15:29:47 +01:00
Oliver Hartkopp 9ae877ce32
Merge pull request #169 from rumpelsepp/isotpsniffer
isotpsniffer: add llopts support, use isprint() instead of open coded check and clean up error paths.
2019-11-14 13:54:05 +01:00
Stefan Tatschner da33f96edf isotpsniffer: Add support for llopts 2019-11-14 13:10:49 +01:00
Stefan Tatschner b04108c615 isotpsniffer: Fix error handling 2019-11-14 13:00:21 +01:00
Stefan Tatschner ecf80e8f91 isotpsniffer: Use isprint() instead of manual check 2019-11-14 07:23:28 +01:00
Yegor Yefremov bf30a4bc01
Merge pull request #167 from yegorich/err-handling
libj1939: fix missing include and syntax
2019-11-12 10:05:48 +01:00
Yegor Yefremov 63d9a3d87b libj1939: fix missing include and syntax
Include err.h and remove the unneeded parameter errno and
its header include.

Fixes: 791b6de ("treewide: Fix compilation on libmusl, replace error() by err()")

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2019-11-12 10:04:24 +01:00
Yegor Yefremov c0dba0a454
Merge pull request #166 from yegorich/sync-headers
include: import header files from kernel v5.4-rc7
2019-11-12 10:02:20 +01:00
Yegor Yefremov a67bf7aa89
Merge pull request #168 from yegorich/typo
jacd: fix typo in a comment
2019-11-12 10:01:57 +01:00
Yegor Yefremov 276077de00 jacd: fix typo in a comment
s/ourselve/ourselves

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2019-11-12 09:06:17 +01:00
Yegor Yefremov ffd60c9b74 include: import header files from kernel v5.4-rc7
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2019-11-12 08:59:58 +01:00
Yegor Yefremov 8426d63ecf
Merge pull request #165 from yegorich/spelling
Fix spelling in various files
2019-11-11 14:40:26 +01:00
Yegor Yefremov 14ccc06eba Fix spelling in various files
codespell parameters:

codespell -q 3 --skip="*.in,*.sh,*.m4,config,configure,autom4te.cache"

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2019-11-11 14:21:49 +01:00
Marc Kleine-Budde 35b2ef691c
Merge pull request #163 from marckleinebudde/libmusl-fix
treewide: Fix compilation on libmusl, replace error() by err()
2019-10-31 08:57:29 +01:00
Marc Kleine-Budde a08b61621d
Merge pull request #162 from josemic/patch-1
Update can-j1939-kickstart.md
2019-10-31 08:52:13 +01:00
josemic 275f606a1f
Update can-j1939-kickstart.md
Added the padding to the candump output.
2019-10-30 19:22:23 +01:00
Marc Kleine-Budde 791b6de786 treewide: Fix compilation on libmusl, replace error() by err()
Reported-by: Brandon Ros <brandonros1@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-10-30 11:59:49 +01:00
Oliver Hartkopp 7e9bc7719b
Merge pull request #155 from yegorich/reuse-fixes
Reuse fixes
2019-09-26 20:14:40 +02:00
Yegor Yefremov 0b93e9836f libj1939.h: add missing license and copyright header
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2019-09-26 15:46:20 +02:00
Yegor Yefremov d66295ee75 Add license texts as files
Add license texts mentioned by REUSE tool.

Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2019-09-26 15:45:43 +02:00
Oliver Hartkopp 26ae1fffa8
Merge pull request #154 from yegorich/readme-fix
README: update the list of CAN over IP tools
2019-09-19 19:17:15 +02:00
Yegor Yefremov de8bb5fd8f README: update the list of CAN over IP tools
Fix socketcand URL and add cannelloni.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2019-09-19 14:14:36 +02:00
Marc Kleine-Budde a8d4827d0f
Merge pull request #151 from olerem/recvown 2019-08-26 14:16:05 +02:00
Oleksij Rempel 7337cb12de j1939: drop SO_J1939_RECV_OWN support
SO_J1939_RECV_OWN is no longer supported by the kernel. So, sync the
headers and rework jacd.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
2019-08-26 11:03:36 +02:00
Oleksij Rempel d5ba0e2d23 can/j1939.h: sync with latest kernel state
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
2019-08-26 11:03:36 +02:00
Oliver Hartkopp 226d6393b8 slcan tools: fix stringop-truncation warnings
Rework string handling for ioctl() syscalls for netdev name operations.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2019-08-25 18:25:35 +02:00
Oliver Hartkopp 1331c56393 isotptun: fix stringop-truncation warnings
Rework string handling for ioctl() syscalls for netdev name operations.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2019-08-25 18:20:37 +02:00
Oliver Hartkopp 319bd5de45 candump: silence format-overflow warning
When -Wformat-overflow= is enabled the gcc notes ...
"‘sprintf’ output between 30 and 82 bytes into a destination of size xx"
Increasing the buffer for the file name to 83 bytes removes the warning.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2019-08-23 19:57:06 +02:00
Oliver Hartkopp 83a1210b75 candump: preserve silent mode with enabled log file output format
As seen in https://github.com/linux-can/can-utils/issues/150 the logfile
format switch ignores the silent mode switch.

Fix this by checking the silent mode when using logfile format on stdout.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2019-08-23 19:40:27 +02:00
Oliver Hartkopp 818dacd78f candump: fix formatting of status messages regarding standard output
As remarked by Victor in https://github.com/linux-can/can-utils/issues/150
the output in the case of silent mode has puzzled line feeds.

Reported-by: Victor Cushman <VictorSCushman@gmail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2019-08-23 19:34:10 +02:00
Oliver Hartkopp d45f3f46bd cangw: add CAN FD support
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2019-08-16 15:32:16 +02:00
Oliver Hartkopp 07054c06f5 cangw: remove sanity checks that are better handled in the kernel
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2019-08-16 15:26:58 +02:00
Oliver Hartkopp 24923df749 cangw: add new command line option '-X' to handle CAN FD rules
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2019-08-16 15:26:50 +02:00
Oliver Hartkopp 0669215a4b cangw: update include files for CAN FD support
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2019-08-16 15:26:41 +02:00
jogo- 9aa993df4c isotpdump: fix service 0x23 naming according to UDS specification
Fix Service 0x23 naming according to the standard
"ReadDataByMemory" -> "ReadMemoryByAddress"

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2019-07-30 22:09:50 +02:00
Marc Kleine-Budde c10c049ce7
Merge pull request #147 from ffontaine/master
fix include to find SIOCGSTAMP with latest kernel
2019-07-15 08:34:00 +02:00
Fabrice Fontaine e9590b1ca7 fix include to find SIOCGSTAMP with latest kernel
In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115
the asm-generic/sockios.h header no longer defines SIOCGSTAMP.
Instead it provides only SIOCGSTAMP_OLD.

The linux/sockios.h header now defines SIOCGSTAMP using either
SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. This linux only
header file is not pulled so we get a build failure.

canlogserver.c: In function 'main':
canlogserver.c:404:21: error: 'SIOCGSTAMP' undeclared (first use in this function); did you mean 'SIOCGRARP'?
     if (ioctl(s[i], SIOCGSTAMP, &tv) < 0)
                     ^~~~~~~~~~
                     SIOCGRARP
canlogserver.c:404:21: note: each undeclared identifier is reported only once for each function it appears in

Fixes:
 - http://autobuild.buildroot.org/results/363de7d9bf433be8bc47ba4ee52ae0bb80fa9021

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2019-07-14 22:14:10 +02:00
Yegor Yefremov 9ffb16495c
Merge pull request #146 from yegorich/gpl-2-only
Relicense GPL-2.0-or-later files to GPL-2.0-only
2019-07-10 22:47:11 +02:00
Yegor Yefremov 59f92965b9 Relicense GPL-2.0-or-later files to GPL-2.0-only
This way all licenses in the project will be homogenised.

Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Sven Schmitt <sven.schmitt@gmx.net>
Acked-by: Oleksij Rempel <ore@pengutronix.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Brennan Ashton <bashton@brennanashton.com>
Acked-By: IOhannes m zmölnig <zmoelnig@iem.at>
Acked-by: Frank Theile <ftheile@grundfos.com>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Jeremiah Mahler <jmmahler@gmail.com>
Acked-by: Jonathan Challinger <mr.challinger@gmail.com>
Acked-by: Cheng-Lung Lee <chenglung@gmail.com>
Acked-by: Ramesh Shanmugasundaram <rashanmu@gmail.com>
Acked-by: Mans Rullgard <mans@mansr.com>
Acked-by: Søren Holm <sgh@sgh.dk>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
2019-07-10 14:01:23 +02:00
Yegor Yefremov 9d0c08d8cb
Merge pull request #143 from yegorich/spdx
Add SPDX identifiers
2019-07-10 13:42:21 +02:00
Marc Kleine-Budde bb2cc1140f
Merge pull request #144 from olerem/errq-2019.05.25
queue status
2019-06-27 12:05:52 +02:00
Oleksij Rempel c4e68aff78 jcat: get status for all queued messages
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
2019-06-25 07:36:36 +02:00