From 6689e9600d0dd2e9d760503abfbeaf492cfa2c42 Mon Sep 17 00:00:00 2001 From: Oliver Hartkopp Date: Sun, 30 Sep 2007 13:00:42 +0000 Subject: [PATCH] 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. --- candump.c | 6 +++--- cangen.c | 16 ++++++++-------- canplayer.c | 14 +++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/candump.c b/candump.c index c5ce33b..174af4e 100644 --- a/candump.c +++ b/candump.c @@ -106,7 +106,7 @@ void print_usage(char *prg) fprintf(stderr, " -a (enable additional ASCII output)\n"); fprintf(stderr, " -s (silent mode - 1: animation 2: nothing)\n"); fprintf(stderr, " -b (bridge mode - send received frames to )\n"); - fprintf(stderr, " -B (bridge mode - like '-b' with disabled loopback)\n"); + fprintf(stderr, " -B (bridge mode - like '-b' with disabled echo)\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 loopback = 0; + int echo = 0; - setsockopt(bridge, SOL_CAN_RAW, CAN_RAW_LOOPBACK, &loopback, sizeof(loopback)); + setsockopt(bridge, SOL_CAN_RAW, CAN_RAW_ECHO, &echo, sizeof(echo)); } if (bind(bridge, (struct sockaddr *)&addr, sizeof(addr)) < 0) { diff --git a/cangen.c b/cangen.c index 101c47a..58398bd 100644 --- a/cangen.c +++ b/cangen.c @@ -88,8 +88,8 @@ void print_usage(char *prg) "default: 8\n"); fprintf(stderr, " -f (other fixed CAN frame) " "default: 123#0123456789ABCDEF\n"); - fprintf(stderr, " -x (disable loopback) " - "default: standard loopback\n"); + fprintf(stderr, " -x (disable echo) " + "default: standard echo\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 loopback_disable = 0; + unsigned char echo_disable = 0; unsigned char verbose = 0; int opt; @@ -159,7 +159,7 @@ int main(int argc, char **argv) break; case 'x': - loopback_disable = 1; + echo_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 (loopback_disable) { - int loopback = 0; + if (echo_disable) { + int echo = 0; - setsockopt(s, SOL_CAN_RAW, CAN_RAW_LOOPBACK, - &loopback, sizeof(loopback)); + setsockopt(s, SOL_CAN_RAW, CAN_RAW_ECHO, + &echo, sizeof(echo)); } if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { diff --git a/canplayer.c b/canplayer.c index 7260b3a..be6fb6c 100644 --- a/canplayer.c +++ b/canplayer.c @@ -89,7 +89,7 @@ void print_usage(char *prg) fprintf(stderr, " -s (skip gaps in " "timestamps > 's' seconds)\n"); fprintf(stderr, " -x (disable local " - "loopback of sent CAN frames)\n"); + "echo 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 loopback_disable = 0; + static int echo_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': - loopback_disable = 1; + echo_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 (loopback_disable) { - int loopback = 0; + if (echo_disable) { + int echo = 0; - setsockopt(s, SOL_CAN_RAW, CAN_RAW_LOOPBACK, - &loopback, sizeof(loopback)); + setsockopt(s, SOL_CAN_RAW, CAN_RAW_ECHO, + &echo, sizeof(echo)); } if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {