sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
789 Commits
1 Branch
9 Tags
2.9 MiB
Commit Graph

789 Commits (e370ad5256f4a0b37f70a5b2e4a56f2c37235026)

Author SHA1 Message Date
Oliver Hartkopp f91b537c01
Merge pull request #69 from gerasiov/help-reformat 
Reformat output of help/usage information - Thanks Alexander!
 2020-04-27 09:16:13 +02:00
Alexander GQ Gerasiov b43d1b4d27 cansend.c: Reformat help/usage output to be compatible with help2man. 
Gbp-Pq: Name 0010-cansend.c-Reformat-help-usage-output-to-be-compatibl.patch
 2020-04-27 08:20:09 +03:00
Alexander GQ Gerasiov f638cdc79b slcanpty.c: Reformat help/usage output to be compatible with help2man. 
Gbp-Pq: Name 0029-slcanpty.c-Reformat-help-usage-output-to-be-compatib.patch
 2020-04-27 08:20:09 +03:00
Alexander GQ Gerasiov d89b38de8a jcat.c: Reformat help/usage output to be compatible with help2man. 
Gbp-Pq: Name 0028-jcat.c-Reformat-help-usage-output-to-be-compatible-w.patch
 2020-04-27 08:20:09 +03:00
Alexander Gerasiov d39cb046d1 testj1939.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0025-testj1939.c-Reformat-help-usage-output-to-be-compati.patch
 2020-04-27 08:20:09 +03:00
Alexander Gerasiov 9e491bc553 slcand.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0024-slcand.c-Reformat-help-usage-output-to-be-compatible.patch
 2020-04-27 08:20:09 +03:00
Alexander Gerasiov 09f6dc6d17 slcan_attach.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0023-slcan_attach.c-Reformat-help-usage-output-to-be-comp.patch
 2020-04-27 08:20:09 +03:00
Alexander Gerasiov 8e6c11128d log2asc.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0022-log2asc.c-Reformat-help-usage-output-to-be-compatibl.patch
 2020-04-27 08:20:09 +03:00
Alexander Gerasiov 276688f2ad jsr.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0021-jsr.c-Reformat-help-usage-output-to-be-compatible-wi.patch
 2020-04-27 08:20:09 +03:00
Alexander Gerasiov 0155472ee0 jspy.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0020-jspy.c-Reformat-help-usage-output-to-be-compatible-w.patch
 2020-04-27 08:20:09 +03:00
Alexander GQ Gerasiov 211c5cea49 can-calc-bit-timing.c: Reformat help/usage output to be compatible with help2man. 
Gbp-Pq: Name 0020-can-calc-bit-timing.c-Reformat-help-usage-output-to-.patch
 2020-04-27 08:20:09 +03:00
Alexander GQ Gerasiov c1fdfb09fc jcat.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander GQ Gerasiov <gq@cs.msu.su>

Gbp-Pq: Name 0019-jcat.c-Reformat-help-usage-output-to-be-compatible-w.patch
 2020-04-27 08:20:09 +03:00
Alexander Gerasiov 506252e9bc jacd.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0019-jacd.c-Reformat-help-usage-output-to-be-compatible-w.patch
 2020-04-27 08:20:09 +03:00
Alexander Gerasiov 89c66aba5f isotptun.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0018-isotptun.c-Reformat-help-usage-output-to-be-compatib.patch
 2020-04-27 08:20:09 +03:00
Alexander GQ Gerasiov c61c9bc030 isotpsniffer.c: Reformat help/usage output to be compatible with help2man. 
Gbp-Pq: Name 0017-isotpsniffer.c-Reformat-help-usage-output-to-be-comp.patch
 2020-04-27 08:20:09 +03:00
Alexander GQ Gerasiov 9240ccfcb7 isotpserver.c: Reformat help/usage output to be compatible with help2man. 
Gbp-Pq: Name 0016-isotpserver.c-Reformat-help-usage-output-to-be-compa.patch
 2020-04-27 08:20:09 +03:00
Alexander Gerasiov 3d6a53550e isotpsend.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0015-isotpsend.c-Reformat-help-usage-output-to-be-compati.patch
 2020-04-27 08:20:09 +03:00
Alexander GQ Gerasiov 1cf4d86874 isotprecv.c: Reformat help/usage output to be compatible with help2man. 
Gbp-Pq: Name 0014-isotprecv.c-Reformat-help-usage-output-to-be-compati.patch
 2020-04-27 08:20:09 +03:00
Alexander Gerasiov 4db63e4b55 isotpperf.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0013-isotpperf.c-Reformat-help-usage-output-to-be-compati.patch
 2020-04-27 08:20:09 +03:00
Alexander GQ Gerasiov 24af048812 isotpdump.c: Reformat help/usage output to be compatible with help2man. 
Gbp-Pq: Name 0012-isotpdump.c-Reformat-help-usage-output-to-be-compati.patch
 2020-04-27 08:20:09 +03:00
Alexander Gerasiov 4568d4a180 cansniffer.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0011-cansniffer.c-Reformat-help-usage-output-to-be-compat.patch
 2020-04-27 08:20:09 +03:00
Alexander Gerasiov 3e2c1d3cbd canplayer.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0009-canplayer.c-Reformat-help-usage-output-to-be-compati.patch
 2020-04-27 08:20:08 +03:00
Alexander Gerasiov 65399166c1 canlogserver.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0008-canlogserver.c-Reformat-help-usage-output-to-be-comp.patch
 2020-04-27 08:20:08 +03:00
Alexander GQ Gerasiov 1127609357 cangw.c: Reformat help/usage output to be compatible with help2man. 
Gbp-Pq: Name 0007-cangw.c-Reformat-help-usage-output-to-be-compatible-.patch
 2020-04-27 08:20:08 +03:00
Alexander Gerasiov f503097a38 cangen.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0006-cangen.c-Reformat-help-usage-output-to-be-compatible.patch
 2020-04-27 08:20:08 +03:00
Alexander Gerasiov c56259ab33 canfdtest.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0005-canfdtest.c-Reformat-help-usage-output-to-be-compati.patch
 2020-04-27 08:20:08 +03:00
Alexander GQ Gerasiov 6db632531d candump.c: Reformat help/usage output to be compatible with help2man. 
Gbp-Pq: Name 0004-candump.c-Reformat-help-usage-output-to-be-compatibl.patch
 2020-04-27 08:20:08 +03:00
Alexander Gerasiov f4a9e5b57d can-calc-bit-timing.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0003-can-calc-bit-timing.c-Reformat-help-usage-output-to-.patch
 2020-04-27 08:20:08 +03:00
Alexander Gerasiov 69865c8247 canbusload.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0002-canbusload.c-Reformat-help-usage-output-to-be-compat.patch
 2020-04-27 08:20:08 +03:00
Alexander Gerasiov b740fb7fab asc2log.c: Reformat help/usage output to be compatible with help2man. 
Signed-off-by: Alexander Gerasiov <gq@debian.org>

Gbp-Pq: Name 0001-asc2log.c-Reformat-help-usage-output-to-be-compatibl.patch
 2020-04-27 08:20:08 +03:00
Oliver Hartkopp bceadb8696 cansniffer: fix colorization when notching relevant bits 
When notching marked (and colored) bits with the interactive '#' command
the binary output omits colored bits - as intended.

But when switching back to the hex and ASCII output the bytes with
notched bits remained uncolored even when some bits inside the hex bytes
would have needed to be colored.

The check for the colored output was a logical AND operation which is
fine for the binary representation but needed to be a bit-wise operation
in the hex/ASCII byte mode case.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
 2020-04-26 15:56:08 +02:00
Oliver Hartkopp eb639c1b3d cansniffer: fix gap calculation output 
The gap between two consecutive frames of a specific has been calculated in
handle_timeo() instead of handle_bcm() which lead to values that where
at minimum the loop time of the display refresh.

The effect can be seen when displaying a 10ms gap CAN frame with a 200ms
display refresh (option -l 20 => default) in opposite to a 10ms display
refresh (option -l 1).

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
 2020-04-26 08:30:55 +02:00
Marc Kleine-Budde 6cdccbbafc
Merge pull request #199 from gerasiov/j1939rename 
Rename j* to j1939\1
 2020-04-24 13:01:51 +02:00
Alexander GQ Gerasiov 8106214b55 Rename j* to j1939\1 
Using j*smthng* for j1939-related tools is not very good for 2 reasons:
1. j prefix is not very informative;
2. jcat name is used by journal cat tool from popular sleuthkit toolkit;
2`. jacd sounds very similar to jackd.
2``. Possible future name conflicts for new tools.

Thus I renamed j* to j1939\1 to deal with this issue.

Signed-off-by: Alexander GQ Gerasiov <gq@cs.msu.su>
 2020-04-20 10:18:13 +03:00
Oliver Hartkopp da65fdfe0d isotpsniffer: only invoke LL_OPTS setsockopt when set on commandline 
In commit da33f96edf ("isotpsniffer: Add support for llopts") the
setsockopt() syscall for the link layer options CAN_ISOTP_LL_OPTS
has been added.

Unfortunately the syscall has been invoked even if there were no values
given on the command line and 'zero values' have been passed to the
kernel which correctly answered with -EINVAL.

And a missing check for a mandatory non-zero value for the MTU.

Fixes: da33f96edf ("isotpsniffer: Add support for llopts")
Reported by: https://github.com/ikuyas
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
 2020-02-04 17:28:11 +01:00
Oliver Hartkopp ae69062657 isotpsniffer: remove duplicated code 
In commit da33f96edf ("isotpsniffer: Add support for llopts") the setsockopt
call has been executed twice. (copy & paste issue?)

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
 2020-02-04 08:31:48 +01:00
Marc Kleine-Budde 506f6f3043 canfdtest: can_echo_gen(): initialize tx_frames with zero 
This avoids having the padding in the struct can_fame contain bogus
values, which are interpreted by "candump -x" as CAN-FD BRS and ESI
values.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-02-03 23:58:34 +01:00
Oliver Hartkopp 8027b498cf
Merge pull request #191 from hartkopp/candump-remove-bridging 
candump: remove bridging functionality
 2020-02-01 09:55:23 +01:00
Oliver Hartkopp a9985c7652 candump: remove bridging functionality 
The tool 'candump' is used to dump CAN traffic to stdout or logfile.
In early days where the in-kernel CAN gateway (can-gw) with the cangw tool was
not yet implemented the bridging functionality allowed to send received (and
filtered) CAN frames to another outgoing CAN interface.

As we now have can-gw and sending CAN frames from a 'reading tool' seems wrong
especially from the Unix philosophy "Write programs that do one thing and do
it well." this patch removes the obsolete functionality from candump.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
 2020-01-04 14:11:34 +01:00
Marc Kleine-Budde 665d8699eb
Merge pull request #172 from jluebbe/jluebbe-actions 
add github actions
 2019-12-06 13:55:33 +01:00
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