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 #270 from marckleinebudde/candump-cleanups 

Candump cleanups
pull/268/head
Marc Kleine-Budde 2020-12-06 10:22:14 +01:00 committed by GitHub
parent aa6411075f bfaa44fa91
commit 33de12680a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
candump.c
View File

@ -89,15 +89,15 @@
#define SILENT_ON 2 /* silent mode (completely silent) */ #define SILENT_ON 2 /* silent mode (completely silent) */
#define BOLD ATTBOLD #define BOLD ATTBOLD
#define RED ATTBOLD FGRED #define RED (ATTBOLD FGRED)
#define GREEN ATTBOLD FGGREEN #define GREEN (ATTBOLD FGGREEN)
#define YELLOW ATTBOLD FGYELLOW #define YELLOW (ATTBOLD FGYELLOW)
#define BLUE ATTBOLD FGBLUE #define BLUE (ATTBOLD FGBLUE)
#define MAGENTA ATTBOLD FGMAGENTA #define MAGENTA (ATTBOLD FGMAGENTA)
#define CYAN ATTBOLD FGCYAN #define CYAN (ATTBOLD FGCYAN)
const char col_on [MAXCOL][19] = {BLUE, RED, GREEN, BOLD, MAGENTA, CYAN}; static const char col_on[MAXCOL][19] = { BLUE, RED, GREEN, BOLD, MAGENTA, CYAN };
const char col_off [] = ATTRESET; static const char col_off[] = ATTRESET;
struct if_info { /* bundled information per open socket */ struct if_info { /* bundled information per open socket */
int s; /* socket */ int s; /* socket */
@ -110,17 +110,17 @@ static struct if_info sock_info[MAXSOCK];
static char devname[MAXIFNAMES][IFNAMSIZ+1]; static char devname[MAXIFNAMES][IFNAMSIZ+1];
static int dindex[MAXIFNAMES]; static int dindex[MAXIFNAMES];
static int max_devname_len; /* to prevent frazzled device name output */ static int max_devname_len; /* to prevent frazzled device name output */
const int canfd_on = 1; static const int canfd_on = 1;
#define MAXANI 4 #define MAXANI 4
const char anichar[MAXANI] = {'|', '/', '-', '\\'}; static const char anichar[MAXANI] = { '|', '/', '-', '\\' };
const char extra_m_info[4][4] = {"- -", "B -", "- E", "B E"}; static const char extra_m_info[4][4] = { "- -", "B -", "- E", "B E" };
extern int optind, opterr, optopt; extern int optind, opterr, optopt;
static volatile int running = 1; static volatile int running = 1;
void print_usage(char *prg) static void print_usage(char *prg)
{ {
fprintf(stderr, "%s - dump CAN bus traffic.\n", prg); fprintf(stderr, "%s - dump CAN bus traffic.\n", prg);
fprintf(stderr, "\nUsage: %s [options] <CAN interface>+\n", prg); fprintf(stderr, "\nUsage: %s [options] <CAN interface>+\n", prg);
@ -166,12 +166,13 @@ void print_usage(char *prg)
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
void sigterm(int signo) static void sigterm(int signo)
{ {
running = 0; running = 0;
} }
int idx2dindex(int ifidx, int socket) { static int idx2dindex(int ifidx, int socket)
{
int i; int i;
struct ifreq ifr; struct ifreq ifr;
@ -313,6 +314,7 @@ int main(int argc, char **argv)
} }
break; break;
case 'l': case 'l':
log = 1; log = 1;
break; break;
@ -522,7 +524,6 @@ int main(int argc, char **argv)
setsockopt(obj->s, SOL_CAN_RAW, CAN_RAW_FD_FRAMES, &canfd_on, sizeof(canfd_on)); setsockopt(obj->s, SOL_CAN_RAW, CAN_RAW_FD_FRAMES, &canfd_on, sizeof(canfd_on));
if (rcvbuf_size) { if (rcvbuf_size) {
int curr_rcvbuf_size; int curr_rcvbuf_size;
socklen_t curr_rcvbuf_size_len = sizeof(curr_rcvbuf_size); socklen_t curr_rcvbuf_size_len = sizeof(curr_rcvbuf_size);
@ -553,10 +554,9 @@ int main(int argc, char **argv)
} }
if (timestamp || log || logfrmt) { if (timestamp || log || logfrmt) {
if (hwtimestamp) { if (hwtimestamp) {
const int timestamping_flags = (SOF_TIMESTAMPING_SOFTWARE | \ const int timestamping_flags = (SOF_TIMESTAMPING_SOFTWARE |
SOF_TIMESTAMPING_RX_SOFTWARE | \ SOF_TIMESTAMPING_RX_SOFTWARE |
SOF_TIMESTAMPING_RAW_HARDWARE); SOF_TIMESTAMPING_RAW_HARDWARE);
if (setsockopt(obj->s, SOL_SOCKET, SO_TIMESTAMPING, if (setsockopt(obj->s, SOL_SOCKET, SO_TIMESTAMPING,
@ -576,7 +576,6 @@ int main(int argc, char **argv)
} }
if (dropmonitor) { if (dropmonitor) {
const int dropmonitor_on = 1; const int dropmonitor_on = 1;
if (setsockopt(obj->s, SOL_SOCKET, SO_RXQ_OVFL, if (setsockopt(obj->s, SOL_SOCKET, SO_RXQ_OVFL,