sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #499 from marckleinebudde/cleanups 

Cleanups
pull/502/head
Marc Kleine-Budde 2024-02-19 09:44:58 +01:00 committed by GitHub
parent 0e0a033993 e4ba924b21
commit 53ea0d0218
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 51 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -148,8 +148,8 @@ isobusfs_srv.o: libj1939.h lib.h
isobusfs_c.o: libj1939.h lib.h isobusfs_c.o: libj1939.h lib.h
canframelen.o: canframelen.h canframelen.o: canframelen.h
canbusload: canbusload.o canframelen.o
asc2log: asc2log.o lib.o asc2log: asc2log.o lib.o
canbusload: canbusload.o canframelen.o
candump: candump.o lib.o candump: candump.o lib.o
cangen: cangen.o lib.o cangen: cangen.o lib.o
canlogserver: canlogserver.o lib.o canlogserver: canlogserver.o lib.o

111
slcanpty.c
View File

@ -46,12 +46,11 @@
#include "lib.h" #include "lib.h"
/* maximum rx buffer len: extended CAN frame with timestamp */ /* maximum rx buffer len: extended CAN frame with timestamp */
#define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1) #define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r") + 1)
#define DEVICE_NAME_PTMX "/dev/ptmx" #define DEVICE_NAME_PTMX "/dev/ptmx"
/* read data from pty, send CAN frames to CAN socket and answer commands */ /* read data from pty, send CAN frames to CAN socket and answer commands */
int pty2can(int pty, int socket, struct can_filter *fi, int pty2can(int pty, int socket, struct can_filter *fi, int *is_open, int *tstamp)
int *is_open, int *tstamp)
{ {
unsigned int nbytes; unsigned int nbytes;
char cmd; char cmd;
@ -62,7 +61,7 @@ int pty2can(int pty, int socket, struct can_filter *fi,
int ret, tmp, i; int ret, tmp, i;
static unsigned int rxoffset = 0; /* points to the end of an received incomplete SLCAN message */ static unsigned int rxoffset = 0; /* points to the end of an received incomplete SLCAN message */
ret = read(pty, &buf[rxoffset], sizeof(buf)-rxoffset-1); ret = read(pty, &buf[rxoffset], sizeof(buf) - rxoffset - 1);
if (ret <= 0) { if (ret <= 0) {
/* ret == 0 : no error but pty descriptor has been closed */ /* ret == 0 : no error but pty descriptor has been closed */
if (ret < 0) if (ret < 0)
@ -80,7 +79,7 @@ rx_restart:
/* remove trailing '\r' characters to be robust against some apps */ /* remove trailing '\r' characters to be robust against some apps */
while (buf[0] == '\r' && nbytes > 0) { while (buf[0] == '\r' && nbytes > 0) {
for (tmp = 0; tmp < nbytes; tmp++) for (tmp = 0; tmp < nbytes; tmp++)
buf[tmp] = buf[tmp+1]; buf[tmp] = buf[tmp + 1];
nbytes--; nbytes--;
} }
@ -137,7 +136,6 @@ rx_restart:
goto rx_out_ack; goto rx_out_ack;
} }
/* check for timestamp on/off command */ /* check for timestamp on/off command */
if (cmd == 'Z') { if (cmd == 'Z') {
*tstamp = buf[1] & 0x01; *tstamp = buf[1] & 0x01;
@ -147,9 +145,7 @@ rx_restart:
/* check for 'O'pen command */ /* check for 'O'pen command */
if (cmd == 'O') { if (cmd == 'O') {
setsockopt(socket, SOL_CAN_RAW, setsockopt(socket, SOL_CAN_RAW, CAN_RAW_FILTER, fi, sizeof(struct can_filter));
CAN_RAW_FILTER, fi,
sizeof(struct can_filter));
ptr = 1; ptr = 1;
*is_open = 1; *is_open = 1;
goto rx_out_ack; goto rx_out_ack;
@ -157,8 +153,7 @@ rx_restart:
/* check for 'C'lose command */ /* check for 'C'lose command */
if (cmd == 'C') { if (cmd == 'C') {
setsockopt(socket, SOL_CAN_RAW, CAN_RAW_FILTER, setsockopt(socket, SOL_CAN_RAW, CAN_RAW_FILTER, NULL, 0);
NULL, 0);
ptr = 1; ptr = 1;
*is_open = 0; *is_open = 0;
goto rx_out_ack; goto rx_out_ack;
@ -221,9 +216,8 @@ rx_restart:
} }
/* catch unknown commands */ /* catch unknown commands */
if ((cmd != 't') && (cmd != 'T') && if ((cmd != 't') && (cmd != 'T') && (cmd != 'r') && (cmd != 'R')) {
(cmd != 'r') && (cmd != 'R')) { ptr = nbytes - 1;
ptr = nbytes-1;
goto rx_out_nack; goto rx_out_nack;
} }
@ -235,8 +229,7 @@ rx_restart:
memset(&frame.data, 0, 8); /* clear data[] */ memset(&frame.data, 0, 8); /* clear data[] */
if ((cmd | 0x20) == 'r' && buf[ptr] != '0') { if ((cmd | 0x20) == 'r' && buf[ptr] != '0') {
/*
/*
* RTR frame without dlc information! * RTR frame without dlc information!
* This is against the SLCAN spec but sent * This is against the SLCAN spec but sent
* by a commercial CAN tool ... so we are * by a commercial CAN tool ... so we are
@ -247,18 +240,17 @@ rx_restart:
buf[ptr] = 0; /* terminate can_id string */ buf[ptr] = 0; /* terminate can_id string */
frame.can_id = strtoul(buf+1, NULL, 16); frame.can_id = strtoul(buf + 1, NULL, 16);
frame.can_id |= CAN_RTR_FLAG; frame.can_id |= CAN_RTR_FLAG;
if (!(cmd & 0x20)) /* NO tiny chars => EFF */ if (!(cmd & 0x20)) /* NO tiny chars => EFF */
frame.can_id |= CAN_EFF_FLAG; frame.can_id |= CAN_EFF_FLAG;
buf[ptr] = frame.can_dlc; /* restore following byte */ buf[ptr] = frame.can_dlc; /* restore following byte */
frame.can_dlc = 0; frame.can_dlc = 0;
ptr--; /* we have no dlc component in the violation case */ ptr--; /* we have no dlc component in the violation case */
} else { } else {
if (!(buf[ptr] >= '0' && buf[ptr] < '9')) if (!(buf[ptr] >= '0' && buf[ptr] < '9'))
goto rx_out_nack; goto rx_out_nack;
@ -266,7 +258,7 @@ rx_restart:
buf[ptr] = 0; /* terminate can_id string */ buf[ptr] = 0; /* terminate can_id string */
frame.can_id = strtoul(buf+1, NULL, 16); frame.can_id = strtoul(buf + 1, NULL, 16);
if (!(cmd & 0x20)) /* NO tiny chars => EFF */ if (!(cmd & 0x20)) /* NO tiny chars => EFF */
frame.can_id |= CAN_EFF_FLAG; frame.can_id |= CAN_EFF_FLAG;
@ -275,7 +267,6 @@ rx_restart:
frame.can_id |= CAN_RTR_FLAG; frame.can_id |= CAN_RTR_FLAG;
for (i = 0, ptr++; i < frame.can_dlc; i++) { for (i = 0, ptr++; i < frame.can_dlc; i++) {
tmp = asc2nibble(buf[ptr++]); tmp = asc2nibble(buf[ptr++]);
if (tmp > 0x0F) if (tmp > 0x0F)
goto rx_out_nack; goto rx_out_nack;
@ -311,9 +302,9 @@ rx_out:
} }
/* check if there is another command in this buffer */ /* check if there is another command in this buffer */
if (nbytes > ptr+1) { if (nbytes > ptr + 1) {
for (tmp = 0, ptr++; ptr+tmp < nbytes; tmp++) for (tmp = 0, ptr++; ptr + tmp < nbytes; tmp++)
buf[tmp] = buf[ptr+tmp]; buf[tmp] = buf[ptr + tmp];
nbytes = tmp; nbytes = tmp;
goto rx_restart; goto rx_restart;
} }
@ -344,19 +335,14 @@ int can2pty(int pty, int socket, int *tstamp)
cmd = 'T'; /* becomes 't' in SFF format */ cmd = 'T'; /* becomes 't' in SFF format */
if (frame.can_id & CAN_EFF_FLAG) if (frame.can_id & CAN_EFF_FLAG)
sprintf(buf, "%c%08X%d", cmd, sprintf(buf, "%c%08X%d", cmd, frame.can_id & CAN_EFF_MASK, frame.can_dlc);
frame.can_id & CAN_EFF_MASK,
frame.can_dlc);
else else
sprintf(buf, "%c%03X%d", cmd | 0x20, sprintf(buf, "%c%03X%d", cmd | 0x20, frame.can_id & CAN_SFF_MASK, frame.can_dlc);
frame.can_id & CAN_SFF_MASK,
frame.can_dlc);
ptr = strlen(buf); ptr = strlen(buf);
for (i = 0; i < frame.can_dlc; i++) for (i = 0; i < frame.can_dlc; i++)
sprintf(&buf[ptr + 2*i], "%02X", sprintf(&buf[ptr + 2 * i], "%02X", frame.data[i]);
frame.data[i]);
if (*tstamp) { if (*tstamp) {
struct timeval tv; struct timeval tv;
@ -401,11 +387,29 @@ int check_select_stdin(void)
return 1; return 1;
} }
static void print_usage(const char *prg)
{
fprintf(stderr,
"%s: adapter for applications using the slcan ASCII protocol.\n"
"\n"
"%s creates a pty for applications using the slcan ASCII protocol and\n"
"converts the ASCII data to a CAN network interface (and vice versa)\n"
"\n"
"Usage: %s <pty> <can interface>\n"
"\n"
"Examples:\n"
"%s /dev/ptyc0 can0 - creates /dev/ttyc0 for the slcan application\n"
"\n"
"e.g. for pseudo-terminal '%s %s can0' creates /dev/pts/N\n"
"\n",
prg, prg, prg, prg, prg, DEVICE_NAME_PTMX);
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
fd_set rdfs; fd_set rdfs;
int p; /* pty master file */ int p; /* pty master file */
int s; /* can raw socket */ int s; /* can raw socket */
struct sockaddr_can addr; struct sockaddr_can addr;
struct termios topts; struct termios topts;
int select_stdin = 0; int select_stdin = 0;
@ -416,19 +420,7 @@ int main(int argc, char **argv)
/* check command line options */ /* check command line options */
if (argc != 3) { if (argc != 3) {
fprintf(stderr, "%s: adapter for applications using" print_usage(basename(argv[0]));
" the slcan ASCII protocol.\n", basename(argv[0]));
fprintf(stderr, "\n%s creates a pty for applications using"
" the slcan ASCII protocol and\n", basename(argv[0]));
fprintf(stderr, "converts the ASCII data to a CAN network"
" interface (and vice versa)\n\n");
fprintf(stderr, "Usage: %s <pty> <can interface>\n", basename(argv[0]));
fprintf(stderr, "\nExamples:\n");
fprintf(stderr, "%s /dev/ptyc0 can0 - creates /dev/ttyc0 for the slcan application\n\n",
basename(argv[0]));
fprintf(stderr, "e.g. for pseudo-terminal '%s %s can0' creates"
" /dev/pts/N\n", basename(argv[0]), DEVICE_NAME_PTMX);
fprintf(stderr, "\n");
return 1; return 1;
} }
@ -447,16 +439,14 @@ int main(int argc, char **argv)
} }
/* disable local echo which would cause double frames */ /* disable local echo which would cause double frames */
topts.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHOK | topts.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHOK | ECHONL | ECHOPRT | ECHOKE);
ECHONL | ECHOPRT | ECHOKE);
topts.c_iflag &= ~(ICRNL); topts.c_iflag &= ~(ICRNL);
topts.c_iflag |= INLCR; topts.c_iflag |= INLCR;
tcsetattr(p, TCSANOW, &topts); tcsetattr(p, TCSANOW, &topts);
/* Support for the Unix 98 pseudo-terminal interface /dev/ptmx /dev/pts/N */ /* Support for the Unix 98 pseudo-terminal interface /dev/ptmx /dev/pts/N */
if (strcmp(argv[1], DEVICE_NAME_PTMX) == 0) { if (strcmp(argv[1], DEVICE_NAME_PTMX) == 0) {
char *name_pts = NULL; /* slave pseudo-terminal device name */
char *name_pts = NULL; /* slave pseudo-terminal device name */
if (grantpt(p) < 0) { if (grantpt(p) < 0) {
perror("grantpt"); perror("grantpt");
@ -499,11 +489,10 @@ int main(int argc, char **argv)
} }
/* open filter by default */ /* open filter by default */
fi.can_id = 0; fi.can_id = 0;
fi.can_mask = 0; fi.can_mask = 0;
while (running) { while (running) {
FD_ZERO(&rdfs); FD_ZERO(&rdfs);
if (select_stdin) if (select_stdin)
@ -512,7 +501,7 @@ int main(int argc, char **argv)
FD_SET(p, &rdfs); FD_SET(p, &rdfs);
FD_SET(s, &rdfs); FD_SET(s, &rdfs);
if (select(s+1, &rdfs, NULL, NULL, NULL) < 0) { if (select(s + 1, &rdfs, NULL, NULL, NULL) < 0) {
perror("select"); perror("select");
return 1; return 1;
} }
@ -524,15 +513,15 @@ int main(int argc, char **argv)
if (FD_ISSET(p, &rdfs)) if (FD_ISSET(p, &rdfs))
if (pty2can(p, s, &fi, &is_open, &tstamp)) { if (pty2can(p, s, &fi, &is_open, &tstamp)) {
running = 0; running = 0;
continue; continue;
} }
if (FD_ISSET(s, &rdfs)) if (FD_ISSET(s, &rdfs))
if (can2pty(p, s, &tstamp)) { if (can2pty(p, s, &tstamp)) {
running = 0; running = 0;
continue; continue;
} }
} }
close(p); close(p);