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

Reverted most of the changes since r500 except the changes in 

drivers/net/can/* after discussion with Urs.
TODO: Documentation & new Version.
pull/7/head
Oliver Hartkopp 2007-10-01 05:48:50 +00:00
parent 6689e9600d
commit d72681c442
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
candump.c
View File

@ -106,7 +106,7 @@ void print_usage(char *prg)
fprintf(stderr, " -a (enable additional ASCII output)\n");
fprintf(stderr, " -s <level> (silent mode - 1: animation 2: nothing)\n");
fprintf(stderr, " -b <can> (bridge mode - send received frames to <can>)\n");
fprintf(stderr, " -B <can> (bridge mode - like '-b' with disabled echo)\n");
fprintf(stderr, " -B <can> (bridge mode - like '-b' with disabled loopback)\n");
fprintf(stderr, " -l (log CAN-frames into file)\n");
fprintf(stderr, " -L (use log file format on stdout)\n");
fprintf(stderr, "\n");
@ -271,9 +271,9 @@ int main(int argc, char **argv)
}
if (opt == 'B') {
int echo = 0;
int loopback = 0;
setsockopt(bridge, SOL_CAN_RAW, CAN_RAW_ECHO, &echo, sizeof(echo));
setsockopt(bridge, SOL_CAN_RAW, CAN_RAW_LOOPBACK, &loopback, sizeof(loopback));
}
if (bind(bridge, (struct sockaddr *)&addr, sizeof(addr)) < 0) {

16
cangen.c
View File

@ -88,8 +88,8 @@ void print_usage(char *prg)
"default: 8\n");
fprintf(stderr, " -f <canframe> (other fixed CAN frame) "
"default: 123#0123456789ABCDEF\n");
fprintf(stderr, " -x (disable echo) "
"default: standard echo\n");
fprintf(stderr, " -x (disable loopback) "
"default: standard loopback\n");
fprintf(stderr, " -v (verbose) "
"default: don't print sent frames\n");
}
@ -107,7 +107,7 @@ int main(int argc, char **argv)
unsigned char fix_data = 0;
unsigned char fix_dlc = 0;
unsigned char default_frame = 1;
unsigned char echo_disable = 0;
unsigned char loopback_disable = 0;
unsigned char verbose = 0;
int opt;
@ -159,7 +159,7 @@ int main(int argc, char **argv)
break;
case 'x':
echo_disable = 1;
loopback_disable = 1;
break;
default:
@ -216,11 +216,11 @@ int main(int argc, char **argv)
/* little (really a very little!) CPU usage. */
setsockopt(s, SOL_CAN_RAW, CAN_RAW_FILTER, NULL, 0);
if (echo_disable) {
int echo = 0;
if (loopback_disable) {
int loopback = 0;
setsockopt(s, SOL_CAN_RAW, CAN_RAW_ECHO,
&echo, sizeof(echo));
setsockopt(s, SOL_CAN_RAW, CAN_RAW_LOOPBACK,
&loopback, sizeof(loopback));
}
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {

14
canplayer.c
View File

@ -89,7 +89,7 @@ void print_usage(char *prg)
fprintf(stderr, " -s <s> (skip gaps in "
"timestamps > 's' seconds)\n");
fprintf(stderr, " -x (disable local "
"echo of sent CAN frames)\n");
"loopback of sent CAN frames)\n");
fprintf(stderr, " -v (verbose: print "
"sent CAN frames)\n\n");
fprintf(stderr, "Interface assignment: 0..n assignments like "
@ -235,7 +235,7 @@ int main(int argc, char **argv)
unsigned long gap = DEFAULT_GAP;
int use_timestamps = 1;
static int verbose, opt, delay_loops, skipgap;
static int echo_disable = 0;
static int loopback_disable = 0;
static int infinite_loops = 0;
static int loops = DEFAULT_LOOPS;
int assignments; /* assignments defined on the commandline */
@ -279,7 +279,7 @@ int main(int argc, char **argv)
break;
case 'x':
echo_disable = 1;
loopback_disable = 1;
break;
case 'v':
@ -321,11 +321,11 @@ int main(int argc, char **argv)
/* disable unneeded default receive filter on this RAW socket */
setsockopt(s, SOL_CAN_RAW, CAN_RAW_FILTER, NULL, 0);
if (echo_disable) {
int echo = 0;
if (loopback_disable) {
int loopback = 0;
setsockopt(s, SOL_CAN_RAW, CAN_RAW_ECHO,
&echo, sizeof(echo));
setsockopt(s, SOL_CAN_RAW, CAN_RAW_LOOPBACK,
&loopback, sizeof(loopback));
}
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {