Merge 1fe71b00ff into 665d8699eb
Dan Zhukov
GitHub
commit
587bdae7b6
103
candump.c
103
candump.c
|
|
@ -106,6 +106,8 @@ static int dindex[MAXIFNAMES];
|
|||
static int max_devname_len; /* to prevent frazzled device name output */
|
||||
const int canfd_on = 1;
|
||||
|
||||
static char fname[83] = { 0 }; /* suggested by -Wformat-overflow= */
|
||||
|
||||
#define MAXANI 4
|
||||
const char anichar[MAXANI] = {'|', '/', '-', '\\'};
|
||||
const char extra_m_info[4][4] = {"- -", "B -", "- E", "B E"};
|
||||
|
|
@ -129,6 +131,7 @@ void print_usage(char *prg)
|
|||
fprintf(stderr, " -B <can> (bridge mode - like '-b' with disabled loopback)\n");
|
||||
fprintf(stderr, " -u <usecs> (delay bridge forwarding by <usecs> microseconds)\n");
|
||||
fprintf(stderr, " -l (log CAN-frames into file. Sets '-s %d' by default)\n", SILENT_ON);
|
||||
fprintf(stderr, " -m <size> (log file max size - size examples: 1024, 1k, 100m, 1g)\n");
|
||||
fprintf(stderr, " -L (use log file format on stdout)\n");
|
||||
fprintf(stderr, " -n <count> (terminate after reception of <count> CAN frames)\n");
|
||||
fprintf(stderr, " -r <size> (set socket receive buffer to <size>)\n");
|
||||
|
|
@ -213,6 +216,56 @@ int idx2dindex(int ifidx, int socket) {
|
|||
return i;
|
||||
}
|
||||
|
||||
int openlogfile(FILE **logfile) {
|
||||
time_t currtime;
|
||||
struct tm now;
|
||||
|
||||
if (time(&currtime) == (time_t)-1) {
|
||||
perror("time");
|
||||
return 1;
|
||||
}
|
||||
|
||||
localtime_r(&currtime, &now);
|
||||
|
||||
if (fname[0] == 0) {
|
||||
sprintf(fname, "candump-%04d-%02d-%02d_%02d%02d%02d.log", now.tm_year + 1900,
|
||||
now.tm_mon + 1, now.tm_mday, now.tm_hour, now.tm_min, now.tm_sec);
|
||||
|
||||
fprintf(stderr, "Enabling Logfile '%s'\n", fname);
|
||||
}
|
||||
|
||||
FILE *tmpfile = fopen(fname, "w");
|
||||
if (!tmpfile) {
|
||||
perror("logfile");
|
||||
return 1;
|
||||
}
|
||||
*logfile = tmpfile;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
unsigned long convertsize(const char *str) {
|
||||
char *tmp;
|
||||
unsigned long ret = strtoul(str, &tmp, 10);
|
||||
|
||||
if (strlen(tmp) == 0)
|
||||
return ret;
|
||||
|
||||
if (strlen(tmp) == 1)
|
||||
{
|
||||
if (tmp[0] == 'k')
|
||||
return ret * 1024;
|
||||
|
||||
if (tmp[0] == 'm')
|
||||
return ret * 1024 * 1024;
|
||||
|
||||
if (tmp[0] == 'g')
|
||||
return ret * 1024 * 1024 * 1024;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
fd_set rdfs;
|
||||
|
|
@ -230,6 +283,8 @@ int main(int argc, char **argv)
|
|||
unsigned char view = 0;
|
||||
unsigned char log = 0;
|
||||
unsigned char logfrmt = 0;
|
||||
unsigned long logmax = 0;
|
||||
unsigned char part = 0;
|
||||
int count = 0;
|
||||
int rcvbuf_size = 0;
|
||||
int opt, ret;
|
||||
|
|
@ -257,7 +312,7 @@ int main(int argc, char **argv)
|
|||
last_tv.tv_sec = 0;
|
||||
last_tv.tv_usec = 0;
|
||||
|
||||
while ((opt = getopt(argc, argv, "t:HciaSs:b:B:u:lDdxLn:r:heT:?")) != -1) {
|
||||
while ((opt = getopt(argc, argv, "t:HciaSs:b:B:u:lm:DdxLn:r:heT:?")) != -1) {
|
||||
switch (opt) {
|
||||
case 't':
|
||||
timestamp = optarg[0];
|
||||
|
|
@ -351,6 +406,10 @@ int main(int argc, char **argv)
|
|||
log = 1;
|
||||
break;
|
||||
|
||||
case 'm':
|
||||
logmax = convertsize(optarg);
|
||||
break;
|
||||
|
||||
case 'D':
|
||||
down_causes_exit = 0;
|
||||
break;
|
||||
|
|
@ -618,35 +677,11 @@ int main(int argc, char **argv)
|
|||
}
|
||||
|
||||
if (log) {
|
||||
time_t currtime;
|
||||
struct tm now;
|
||||
char fname[83]; /* suggested by -Wformat-overflow= */
|
||||
|
||||
if (time(&currtime) == (time_t)-1) {
|
||||
perror("time");
|
||||
if (openlogfile(&logfile) != 0)
|
||||
return 1;
|
||||
}
|
||||
|
||||
localtime_r(&currtime, &now);
|
||||
|
||||
sprintf(fname, "candump-%04d-%02d-%02d_%02d%02d%02d.log",
|
||||
now.tm_year + 1900,
|
||||
now.tm_mon + 1,
|
||||
now.tm_mday,
|
||||
now.tm_hour,
|
||||
now.tm_min,
|
||||
now.tm_sec);
|
||||
|
||||
if (silent != SILENT_ON)
|
||||
fprintf(stderr, "Warning: Console output active while logging!\n");
|
||||
|
||||
fprintf(stderr, "Enabling Logfile '%s'\n", fname);
|
||||
|
||||
logfile = fopen(fname, "w");
|
||||
if (!logfile) {
|
||||
perror("logfile");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* these settings are static and can be held out of the hot path */
|
||||
|
|
@ -765,12 +800,26 @@ int main(int argc, char **argv)
|
|||
|
||||
if (log) {
|
||||
char buf[CL_CFSZ]; /* max length */
|
||||
char line[CL_CFSZ + max_devname_len + 22];
|
||||
|
||||
/* log CAN frame with absolute timestamp & device */
|
||||
sprint_canframe(buf, &frame, 0, maxdlen);
|
||||
fprintf(logfile, "(%010ld.%06ld) %*s %s\n",
|
||||
int n = sprintf(line, "(%010ld.%06ld) %*s %s\n",
|
||||
tv.tv_sec, tv.tv_usec,
|
||||
max_devname_len, devname[idx], buf);
|
||||
if (logmax && ftell(logfile) + n > logmax) {
|
||||
fclose(logfile);
|
||||
char postfix[7] = { 0 };
|
||||
char fullfname[sizeof(fname) + sizeof(postfix)];
|
||||
sprintf(postfix, ".pt%u", part);
|
||||
strcpy(fullfname, fname);
|
||||
strcat(fullfname, postfix);
|
||||
rename(fname, fullfname);
|
||||
++part;
|
||||
if (openlogfile(&logfile) != 0)
|
||||
return 1;
|
||||
}
|
||||
fprintf(logfile, "%s", line);
|
||||
}
|
||||
|
||||
if ((logfrmt) && (silent == SILENT_OFF)){
|
||||
|
|
|
|||
Loading…
Reference in New Issue