summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Oliver Hartkopp [Tue, 9 Sep 2008 12:56:05 +0000 (12:56 +0000)]
Added support for comments in logfiles.
Added some sanity checks and error messages.
Oliver Hartkopp [Fri, 25 Jul 2008 06:32:20 +0000 (06:32 +0000)]
Create an informative error message when detecting a wrong line format.
Oliver Hartkopp [Thu, 24 Jul 2008 19:12:19 +0000 (19:12 +0000)]
Changed comment line recognition:
Everything without a '(' at the beginning of an input line is treated as comment.
Changed buffer size to allow long comment lines & added overflow handling.
Oliver Hartkopp [Thu, 24 Jul 2008 13:03:18 +0000 (13:03 +0000)]
Support for comment lines in the logfile:
'#' at the beginning of a line marks comment lines.
Oliver Hartkopp [Thu, 10 Jul 2008 11:01:37 +0000 (11:01 +0000)]
Added missing help test.
Oliver Hartkopp [Thu, 10 Jul 2008 10:59:37 +0000 (10:59 +0000)]
Added -f option to filter only on the CAN-ID and not on the content.
This can be useful when the timestamp cyle needs to be displayed.
Oliver Hartkopp [Wed, 2 Jul 2008 04:19:07 +0000 (04:19 +0000)]
Do not allow to create error frame filters via standard filter sets.
Oliver Hartkopp [Wed, 2 Jul 2008 04:05:11 +0000 (04:05 +0000)]
Added automatic extended frame format recognition.
Most SocketCAN userspace tools (like cansend) recognize the EFF by the
stringlength of the given CAN-ID: 3 -> SFF , 8 -> EFF.
This was missing in the candump filter definition and therefore the
values had to be specified with the CAN_EFF_FLAG set in the value, e.g.
92345678 for the extended CAN-ID
12345678 - this was not really nice.
Now the filtersets for extended frames can be specified as expected:
12345678:
1FFFFFFF to filter for only
12345678 extended CAN-ID
000000AA:
1FFFFFFF to filter for only AA extended CAN-ID.
Oliver Hartkopp [Tue, 1 Jul 2008 11:31:59 +0000 (11:31 +0000)]
Added silent correction for can_dlc out of range.
Oliver Hartkopp [Thu, 26 Jun 2008 14:35:46 +0000 (14:35 +0000)]
Fixed condition pointed out by Uwe Bonnes:
https://lists.berlios.de/pipermail/socketcan-core/2008-June/001625.html
Oliver Hartkopp [Fri, 20 Jun 2008 09:19:13 +0000 (09:19 +0000)]
Fix typo.
Oliver Hartkopp [Fri, 20 Jun 2008 09:16:06 +0000 (09:16 +0000)]
Fix commandline parameter handling for fixed canframe.data[] .
Oliver Hartkopp [Fri, 20 Jun 2008 09:15:13 +0000 (09:15 +0000)]
Introduced new functions:
unsigned char asc2nibble(char c);
int hexstring2candata(char *arg, struct can_frame *cf);
(see documentation in lib.h)
As prerequsite to fix the commandline interface of cangen.
Oliver Hartkopp [Wed, 11 Jun 2008 16:38:00 +0000 (16:38 +0000)]
fixed comment.
Oliver Hartkopp [Wed, 11 Jun 2008 16:35:19 +0000 (16:35 +0000)]
Removed bad hacks in vcan.c and slcan_attach.c.
Giving some hints for users of older kernels than 2.6.25 that a
compilation error is a normal behaviour in these cases.
Oliver Hartkopp [Tue, 3 Jun 2008 08:52:06 +0000 (08:52 +0000)]
Added Id properties that gone lost.
Oliver Hartkopp [Tue, 3 Jun 2008 08:46:57 +0000 (08:46 +0000)]
Whitespace fixes. Indented the code following Linux styleguide to fix
the mess between tabs and spaces.
Oliver Hartkopp [Mon, 2 Jun 2008 20:06:37 +0000 (20:06 +0000)]
Added binary output option to candump.c and sprint_long_canframe() in lib.c .
Oliver Hartkopp [Tue, 27 May 2008 13:47:20 +0000 (13:47 +0000)]
Added tiny tool to measure CAN busload.
Oliver Hartkopp [Sun, 11 May 2008 11:46:00 +0000 (11:46 +0000)]
Added hint about hexadecimal data representation.
Oliver Hartkopp [Mon, 5 May 2008 12:20:34 +0000 (12:20 +0000)]
Updated new 'cangen' and 'candump' in the trunk.
Oliver Hartkopp [Thu, 13 Mar 2008 21:52:20 +0000 (21:52 +0000)]
Allow commandline option '-?' to print the help text.
Oliver Hartkopp [Thu, 13 Mar 2008 21:44:20 +0000 (21:44 +0000)]
Updated help text for commandline options.
Oliver Hartkopp [Sun, 23 Dec 2007 18:17:29 +0000 (18:17 +0000)]
Fixed the temporary hack to run with 2.6.24-rc5 again.
Oliver Hartkopp [Mon, 10 Dec 2007 15:47:01 +0000 (15:47 +0000)]
- allow timout to be zero, which means timeout is off.
Oliver Hartkopp [Fri, 30 Nov 2007 13:35:01 +0000 (13:35 +0000)]
Added canlogserver programmed by Andre Naujoks.
Oliver Hartkopp [Tue, 20 Nov 2007 18:37:30 +0000 (18:37 +0000)]
Changed color order at colorized output.
Remove index cache zombies when unloading CAN drivers.
Modified index cache failure message.
Oliver Hartkopp [Sun, 7 Oct 2007 14:39:52 +0000 (14:39 +0000)]
Fixed checking of CAN interface name commandline parameter.
Cosmetics.
Oliver Hartkopp [Mon, 1 Oct 2007 05:48:50 +0000 (05:48 +0000)]
Reverted most of the changes since r500 except the changes in
drivers/net/can/* after discussion with Urs.
TODO: Documentation & new Version.
Oliver Hartkopp [Sun, 30 Sep 2007 13:00:42 +0000 (13:00 +0000)]
Changed loopback to echo in CAN RAW sockets. The binary interface does
not change through this renaming of CAN_RAW_LOOPBACK to CAN_RAW_ECHO.
Oliver Hartkopp [Thu, 27 Sep 2007 12:29:32 +0000 (12:29 +0000)]
Fixed contradiction in Sourcecode discalimer.
See details at
http://marc.info/?l=linux-netdev&m=
119074747913703&w=2
Oliver Hartkopp [Fri, 21 Sep 2007 07:21:24 +0000 (07:21 +0000)]
Update outdated comment.
Oliver Hartkopp [Fri, 7 Sep 2007 11:15:22 +0000 (11:15 +0000)]
Updated the canplayer to accept logfile timestamps in the future (which
is very nice when you don't have a RTC and your systemtime is somewhere
in the 1970's :)
Added a new commandline option to skip timestamp jumps greater than x
seconds to allow to concatenate different logfiles that replay
constantly and not waiting for the absolute timestamp offsets.
Oliver Hartkopp [Fri, 3 Aug 2007 11:17:10 +0000 (11:17 +0000)]
Removed "unused variable i" warning for the dry-run testing.
Oliver Hartkopp [Mon, 16 Jul 2007 09:52:43 +0000 (09:52 +0000)]
Added the blanking of 'old' data when the can_dlc decreases between two
receiptions of the same can_id.
Thanks to Andre Naujoks for the bug report.
Oliver Hartkopp [Mon, 16 Jul 2007 08:29:28 +0000 (08:29 +0000)]
Added -B option to display binary content with a gap after each data byte.
This option is similar to -b but may exceed the 80 char boundary.
Oliver Hartkopp [Sun, 8 Jul 2007 12:44:12 +0000 (12:44 +0000)]
Fixed compilation warning on 64bit architectures.
Thanks to Neal Probert for the hint.
Urs Thuermann [Sat, 7 Jul 2007 01:36:36 +0000 (01:36 +0000)]
Add vcan config tool to Makefile.
Urs Thuermann [Fri, 6 Jul 2007 15:50:55 +0000 (15:50 +0000)]
Add a tool "vcan" to add/remove vcan interfaces.
Oliver Hartkopp [Mon, 25 Jun 2007 13:05:43 +0000 (13:05 +0000)]
Updated LDISC number to 17 (16 is occupied in the Kernel)
Oliver Hartkopp [Fri, 22 Jun 2007 08:33:18 +0000 (08:33 +0000)]
Added option '-x' to disable local loopback for sent CAN frames.
Oliver Hartkopp [Fri, 22 Jun 2007 08:25:34 +0000 (08:25 +0000)]
Changed option name '-l' to '-x' as this option should also go into canplayer.
Cosmetics in print_help().
Oliver Hartkopp [Fri, 22 Jun 2007 08:04:48 +0000 (08:04 +0000)]
Added option '-l' to disable local loopback for generated data.
Oliver Hartkopp [Mon, 18 Jun 2007 20:04:23 +0000 (20:04 +0000)]
Added program exit on SIOCGIFINDEX error.
Oliver Hartkopp [Mon, 18 Jun 2007 19:59:20 +0000 (19:59 +0000)]
Disabled obsolte receive filter. Added error checking for SIOCGIFINDEX.
Oliver Hartkopp [Wed, 30 May 2007 07:20:18 +0000 (07:20 +0000)]
Added new commandline option '-B' which acts like the bridging option '-b' but
disables the local loopback functionality (for ECU analysis and MITM-attacks :)
Fixed missing fflush().
Oliver Hartkopp [Wed, 9 May 2007 07:33:34 +0000 (07:33 +0000)]
Added missing initialisation to prevent a gcc warning.
Oliver Hartkopp [Mon, 5 Mar 2007 21:58:28 +0000 (21:58 +0000)]
Fixed Makefiles to compile test-apps and can-utils again.
Added new commandline parameter (linediscipline value) to slcan_attach.
Oliver Hartkopp [Thu, 22 Feb 2007 12:47:37 +0000 (12:47 +0000)]
Added CAN interface driver for low-cost CAN-Interfaces with ASCII protocol
via serial (or quasi serial via USB) lines.
This driver is partly derived from linux/net/driver/slip.c and uses a new
tty line discipline (N_SLCAN) analogue to N_SLIP to encapsulate can_frames
sent to a slc* netdevice for the serial line and vice versa.
As only the sending and receiving of can_frames is implemented, this driver
should work with the (serial/USB) CAN hardware from:
> www.canusb.com / www.can232.com / www.mictronic.com / www.canhack.de <
The sending and receiving frames format is pretty common. The other settings
and the 'open' command 'O' of the specific adapters may be set with a
terminal programm (like minicom) before switching the CAN data stream to
the slc* netdevice using the slcan_attach userspace tool.
Feel free to send patches / extensions to slcan.c / slcan_attach.c :)
ps. There had been no performances measurements until now. As long as the
data fit's through the 'serial' line it works obviously well. The slcan-driver
nor the Linux network layer will definitely have no problems to process
the received data. Remember the 'low-cost' hardware approach. We'll see ...
Oliver Hartkopp [Mon, 12 Feb 2007 08:36:38 +0000 (08:36 +0000)]
Added Option -l ('l'oop) to make the canplayer replay a given file more than
one time. To replay a given file infinitely say '-l i'. Of course it is not
possible/reasonable to define '-l' when reading from stdin ...
Oliver Hartkopp [Fri, 9 Feb 2007 09:53:16 +0000 (09:53 +0000)]
Removed possibility to terminate candump with an input from stdin.
Therefore it can be used in scripts now, e.g. for CAN-frame bridging:
candump can1 -mFFF -v123 -b can3 -s 2 &
Use CTRL-C to terminate candump.
Oliver Hartkopp [Thu, 8 Feb 2007 13:18:07 +0000 (13:18 +0000)]
Renamed can-sniffer to cansniffer.
Oliver Hartkopp [Wed, 10 Jan 2007 17:18:01 +0000 (17:18 +0000)]
Fixed typo in log2asc.c
Added asc2log.c to convert existing CANoe/CANalyser logfiles into socketcan
logfiles (with absolute and full qualified timestamps).
The date and the other settings (dec/hex absolute/relative) are taken from
the head of the ASC files.
Oliver Hartkopp [Tue, 9 Jan 2007 16:01:46 +0000 (16:01 +0000)]
Some new ASC files support 6 digits in decimal place.
Added new option '-4' to generate 'old-style' ASC files.
Oliver Hartkopp [Sun, 7 Jan 2007 11:19:37 +0000 (11:19 +0000)]
Added option '-L' to candump to create the compact logfile output on stdout.
Now you can forward CAN frames e.g. via netcat with candump and canplayer:
candump can0 can1 -L | canplayer vcan3=can0 vcan0=can1 -t
OK, maybe it would be reasonable to write a short program for this application.
But for some tests all this can be done with existing commandline tools.
In addition the filtering possibilities of candump can be used here.
Oliver Hartkopp [Sat, 6 Jan 2007 15:43:12 +0000 (15:43 +0000)]
Minor fix and cosmetics in color handling in candump.c .
Added new tool 'canplayer' to replay logfiles generated by candump -l .
Features of canplayer:
- Input from stdin or file.
- throttling of the replay to get nearly original timestamps / message gaps
- mapping and selection of CAN interfaces (assignment)
e.g. canplay -I logfile vcan2=can2 vcan0=can1 can2=can3
means: send frames received on can1 in the logfile to vcan0 and so on ...
- if no assignment is made the original interfaces are used for replay
- handling of multiple CAN interfaces simultaneously (if in logfile)
- option: throttle disable (do not look on timestamps => very FAST replay!)
- option: change the 'sleep time' in milli seconds
Remarks:
canplayer uses nanosleep() for throttling which means that the resolution of
the canplayer is about 1ms (Kernel HZ = 1000) or 10ms (Kernel HZ = 100).
After each nanosleep() all the CAN frames are send that had to be transmitted
until the timestamp at the current time. Giving e.g. the option '-g 500' for
500ms let's you see the behaviour. Using nanosleep() makes canplay a very
performant tool with minimum CPU load.
To transfer CAN frames over a TCP/IP network you may now say something like:
candump -> netcat -> netcat -> canplayer
Oliver Hartkopp [Mon, 1 Jan 2007 18:29:52 +0000 (18:29 +0000)]
- added error frame support in lib.c
- added sprint_* functions for CAN-frame output in lib.c / lib.h
- added comments / cosmetics
candump.c:
- removed support for the output in ASC representation (moved to log2asc.c)
- added option '-l' for logfile creation e.g. 'candump-2007-01-01_164123.log'
- added funtionality to terminate candump by pressing [ENTER] (not only ^C)
- added error frame support
- added color support even when reading from 'any'
- three different color levels (e.g. -c -c -c)
- making use if lib.c
cangen.c:
- CAN frames generator for testing purposes (e.g. on vcanx)
(nice when you're on vacancy at the baltic sea and have no real CAN source :)
log2long.c:
- convert compact CAN frame representation into user readable representation
log2asc.c:
- convert compact CAN frame logfile to ASC logfile for 3rd party CAN tools
Next step: Create a tool to replay candump logfiles.
Oliver Hartkopp [Tue, 31 Oct 2006 10:41:21 +0000 (10:41 +0000)]
Added include <sys/socket.h> to lib.c after discussion on commit-mailing-list.
Fixed comments.
Fixed Makefile (remove all *.o files / added empty line at end of file).
Oliver Hartkopp [Mon, 30 Oct 2006 13:14:36 +0000 (13:14 +0000)]
Added tiny tool cansend and a library to parse ASCII CAN frames (e.g. from
the command line) that are defined in one concatenated string.
This is a requirement for the comming command line tool 'bcmsend' that allows
to send more than one CAN frame at a time.
Urs Thuermann [Tue, 24 Oct 2006 13:55:43 +0000 (13:55 +0000)]
changed user space programs to use new include files.
added missing include file <net/if.h> in most programs.
added volatile modifier to "int running" in candump.c.
Urs Thuermann [Fri, 7 Jul 2006 06:58:26 +0000 (06:58 +0000)]
Remove remnants of the projects VW history (Email addresses, Makefile targets).
Move version.h to include/linux/can.
Fix Makefiles to include raw.ko and bcm.ko in compilation and to make
vcan compile again.
Change ioctl names in SJA1000 driver to make it compile again.
Add parenthesis around assignment in vcan.c to eliminate gcc warning.
Urs Thuermann [Thu, 11 May 2006 07:59:37 +0000 (07:59 +0000)]
add Id to svn:keywords property.
Urs Thuermann [Mon, 24 Apr 2006 14:14:09 +0000 (14:14 +0000)]
Initial import of llcf-2.0-pre2