X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/can-utils.git/blobdiff_plain/12f91703381a2595433d08a27c5ec0b1fc0f15ea..HEAD:/cansniffer.c

diff --git a/cansniffer.c b/cansniffer.c
index 1d7eb64..71ca721 100644
--- a/cansniffer.c
+++ b/cansniffer.c
@@ -1,7 +1,3 @@
-/*
- *  $Id$
- */
-
 /*
  * can-sniffer.c
  *
@@ -41,7 +37,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
+ * Send feedback to <linux-can@vger.kernel.org>
  *
  */
 
@@ -102,15 +98,15 @@ const char anichar[MAXANI] = {'|', '/', '-', '\\', '|', '/', '-', '\\'};
 #define STARTLINESTR "X  time    ID  data ... "
 
 struct snif {
-    int flags;
-    long hold;
-    long timeout;
-    struct timeval laststamp;
-    struct timeval currstamp;
-    struct can_frame last;
-    struct can_frame current;
-    struct can_frame marker;
-    struct can_frame notch;
+	int flags;
+	long hold;
+	long timeout;
+	struct timeval laststamp;
+	struct timeval currstamp;
+	struct can_frame last;
+	struct can_frame current;
+	struct can_frame marker;
+	struct can_frame notch;
 } sniftab[2048];
 
 
@@ -118,13 +114,15 @@ extern int optind, opterr, optopt;
 
 static int running = 1;
 static int clearscreen = 1;
-static int notch = 0;
+static int notch;
+static int filter_id_only;
 static long timeout = TIMEOUT;
 static long hold = HOLD;
 static long loop = LOOP;
-static unsigned char binary = 0;
-static unsigned char binary_gap = 0;
-static unsigned char color  = 0;
+static unsigned char binary;
+static unsigned char binary_gap;
+static unsigned char color;
+static char *interface;
 
 void rx_setup (int fd, int id);
 void rx_delete (int fd, int id);
@@ -137,613 +135,622 @@ void readsettings(char* name, int sockfd);
 
 void print_usage(char *prg)
 {
-    const char manual [] = {
-	"commands that can be entered at runtime:\n"
-	"\n"
-	"q<ENTER>       - quit\n"
-	"b<ENTER>       - toggle binary / HEX-ASCII output\n"
-	"B<ENTER>       - toggle binary with gap / HEX-ASCII output (exceeds 80 chars!)\n"
-	"c<ENTER>       - toggle color mode\n"
-	"#<ENTER>       - notch currently marked/changed bits (can be used repeatedly)\n"
-	"*<ENTER>       - clear notched marked\n"
-	"rMYNAME<ENTER> - read settings file (filter/notch)\n"
-	"wMYNAME<ENTER> - write settings file (filter/notch)\n"
-	"+FILTER<ENTER> - add CAN-IDs to sniff\n"
-	"-FILTER<ENTER> - remove CAN-IDs to sniff\n"
-	"\n"
-	"FILTER can be a single CAN-ID or a CAN-ID/Bitmask:\n"
-	"+1F5<ENTER>    - add CAN-ID 0x1F5\n"
-	"-42E<ENTER>    - remove CAN-ID 0x42E\n"
-	"-42E7FF<ENTER> - remove CAN-ID 0x42E (using Bitmask)\n"
-	"-500700<ENTER> - remove CAN-IDs 0x500 - 0x5FF\n"
-	"+400600<ENTER> - add CAN-IDs 0x400 - 0x5FF\n"
-	"+000000<ENTER> - add all CAN-IDs\n"
-	"-000000<ENTER> - remove all CAN-IDs\n"
-	"\n"
-	"if (id & filter) == (sniff-id & filter) the action (+/-) is performed,\n"
-	"which is quite easy when the filter is 000\n"
-	"\n"
-    };
-
-    fprintf(stderr, "\nUsage: %s [can-interface]\n", prg);
-    fprintf(stderr, "Options: -m <mask>  (initial FILTER default 0x00000000)\n");
-    fprintf(stderr, "         -v <value> (initial FILTER default 0x00000000)\n");
-    fprintf(stderr, "         -q         (quiet - all IDs deactivated)\n");
-    fprintf(stderr, "         -r <name>  (read %sname from file)\n", SETFNAME);
-    fprintf(stderr, "         -b         (start with binary mode)\n");
-    fprintf(stderr, "         -B         (start with binary mode with gap - exceeds 80 chars!)\n");
-    fprintf(stderr, "         -c         (color changes)\n");
-    fprintf(stderr, "         -t <time>  (timeout for ID display [x100ms] default: %d)\n", TIMEOUT);
-    fprintf(stderr, "         -h <time>  (hold marker on changes [x100ms] default: %d)\n", HOLD);
-    fprintf(stderr, "         -l <time>  (loop time (display) [x100ms] default: %d)\n", LOOP);
-    fprintf(stderr, "Use interface name '%s' to receive from all can-interfaces\n", ANYDEV);
-    fprintf(stderr, "\n");
-    fprintf(stderr, "%s", manual);
+	const char manual [] = {
+		"commands that can be entered at runtime:\n"
+		"\n"
+		"q<ENTER>       - quit\n"
+		"b<ENTER>       - toggle binary / HEX-ASCII output\n"
+		"B<ENTER>       - toggle binary with gap / HEX-ASCII output (exceeds 80 chars!)\n"
+		"c<ENTER>       - toggle color mode\n"
+		"#<ENTER>       - notch currently marked/changed bits (can be used repeatedly)\n"
+		"*<ENTER>       - clear notched marked\n"
+		"rMYNAME<ENTER> - read settings file (filter/notch)\n"
+		"wMYNAME<ENTER> - write settings file (filter/notch)\n"
+		"+FILTER<ENTER> - add CAN-IDs to sniff\n"
+		"-FILTER<ENTER> - remove CAN-IDs to sniff\n"
+		"\n"
+		"FILTER can be a single CAN-ID or a CAN-ID/Bitmask:\n"
+		"+1F5<ENTER>    - add CAN-ID 0x1F5\n"
+		"-42E<ENTER>    - remove CAN-ID 0x42E\n"
+		"-42E7FF<ENTER> - remove CAN-ID 0x42E (using Bitmask)\n"
+		"-500700<ENTER> - remove CAN-IDs 0x500 - 0x5FF\n"
+		"+400600<ENTER> - add CAN-IDs 0x400 - 0x5FF\n"
+		"+000000<ENTER> - add all CAN-IDs\n"
+		"-000000<ENTER> - remove all CAN-IDs\n"
+		"\n"
+		"if (id & filter) == (sniff-id & filter) the action (+/-) is performed,\n"
+		"which is quite easy when the filter is 000\n"
+		"\n"
+	};
+
+	fprintf(stderr, "\nUsage: %s [can-interface]\n", prg);
+	fprintf(stderr, "Options: -m <mask>  (initial FILTER default 0x00000000)\n");
+	fprintf(stderr, "         -v <value> (initial FILTER default 0x00000000)\n");
+	fprintf(stderr, "         -q         (quiet - all IDs deactivated)\n");
+	fprintf(stderr, "         -r <name>  (read %sname from file)\n", SETFNAME);
+	fprintf(stderr, "         -b         (start with binary mode)\n");
+	fprintf(stderr, "         -B         (start with binary mode with gap - exceeds 80 chars!)\n");
+	fprintf(stderr, "         -c         (color changes)\n");
+	fprintf(stderr, "         -f         (filter on CAN-ID only)\n");
+	fprintf(stderr, "         -t <time>  (timeout for ID display [x100ms] default: %d, 0 = OFF)\n", TIMEOUT);
+	fprintf(stderr, "         -h <time>  (hold marker on changes [x100ms] default: %d)\n", HOLD);
+	fprintf(stderr, "         -l <time>  (loop time (display) [x100ms] default: %d)\n", LOOP);
+	fprintf(stderr, "Use interface name '%s' to receive from all can-interfaces\n", ANYDEV);
+	fprintf(stderr, "\n");
+	fprintf(stderr, "%s", manual);
 }
 
 void sigterm(int signo)
 {
-    running = 0;
+	running = 0;
 }
 
 int main(int argc, char **argv)
 {
-    fd_set rdfs;
-    int s;
-    canid_t mask = 0;
-    canid_t value = 0;
-    long currcms = 0;
-    long lastcms = 0;
-    unsigned char quiet = 0;
-
-    int opt, ret;
-    struct timeval timeo, start_tv, tv;
-    struct sockaddr_can addr;
-    struct ifreq ifr;
-    int i;
-
-
-    signal(SIGTERM, sigterm);
-    signal(SIGHUP, sigterm);
-    signal(SIGINT, sigterm);
-
-    for (i=0; i < 2048 ;i++) /* default: check all CAN-IDs */
-	do_set(i, ENABLE);
-
-    while ((opt = getopt(argc, argv, "m:v:r:t:h:l:qbBc")) != -1) {
-	switch (opt) {
-	case 'm':
-	    sscanf(optarg, "%x", &mask);
-	    break;
-
-	case 'v':
-	    sscanf(optarg, "%x", &value);
-	    break;
-
-	case 'r':
-	    readsettings(optarg, 0); /* no BCM-setting here */
-	    break;
-
-	case 't':
-	    sscanf(optarg, "%ld", &timeout);
-	    break;
-
-	case 'h':
-	    sscanf(optarg, "%ld", &hold);
-	    break;
-
-	case 'l':
-	    sscanf(optarg, "%ld", &loop);
-	    break;
-
-	case 'q':
-	    quiet = 1;
-	    break;
-
-	case 'b':
-	    binary = 1;
-	    binary_gap = 0;
-	    break;
-
-	case 'B':
-	    binary = 1;
-	    binary_gap = 1;
-	    break;
-
-	case 'c':
-	    color = 1;
-	    break;
-
-	case '?':
-	    break;
+	fd_set rdfs;
+	int s;
+	canid_t mask = 0;
+	canid_t value = 0;
+	long currcms = 0;
+	long lastcms = 0;
+	unsigned char quiet = 0;
+	int opt, ret;
+	struct timeval timeo, start_tv, tv;
+	struct sockaddr_can addr;
+	struct ifreq ifr;
+	int i;
+
+
+	signal(SIGTERM, sigterm);
+	signal(SIGHUP, sigterm);
+	signal(SIGINT, sigterm);
+
+	for (i=0; i < 2048 ;i++) /* default: check all CAN-IDs */
+		do_set(i, ENABLE);
 
-	default:
-	    fprintf(stderr, "Unknown option %c\n", opt);
-	    break;
+	while ((opt = getopt(argc, argv, "m:v:r:t:h:l:qbBcf?")) != -1) {
+		switch (opt) {
+		case 'm':
+			sscanf(optarg, "%x", &mask);
+			break;
+
+		case 'v':
+			sscanf(optarg, "%x", &value);
+			break;
+
+		case 'r':
+			readsettings(optarg, 0); /* no BCM-setting here */
+			break;
+
+		case 't':
+			sscanf(optarg, "%ld", &timeout);
+			break;
+
+		case 'h':
+			sscanf(optarg, "%ld", &hold);
+			break;
+
+		case 'l':
+			sscanf(optarg, "%ld", &loop);
+			break;
+
+		case 'q':
+			quiet = 1;
+			break;
+
+		case 'b':
+			binary = 1;
+			binary_gap = 0;
+			break;
+
+		case 'B':
+			binary = 1;
+			binary_gap = 1;
+			break;
+
+		case 'c':
+			color = 1;
+			break;
+
+		case 'f':
+			filter_id_only = 1;
+			break;
+
+		case '?':
+			break;
+
+		default:
+			fprintf(stderr, "Unknown option %c\n", opt);
+			break;
+		}
 	}
-    }
 
-    if (optind == argc) {
-	print_usage(basename(argv[0]));
-	exit(0);
-    }
+	if (optind == argc) {
+		print_usage(basename(argv[0]));
+		exit(0);
+	}
 	
-    if (mask || value) {
-	for (i=0; i < 2048 ;i++) {
-	    if ((i & mask) ==  (value & mask))
-		do_set(i, ENABLE);
-	    else
-		do_clr(i, ENABLE);
+	if (mask || value) {
+		for (i=0; i < 2048 ;i++) {
+			if ((i & mask) ==  (value & mask))
+				do_set(i, ENABLE);
+			else
+				do_clr(i, ENABLE);
+		}
 	}
-    }
 
-    if (quiet)
-	for (i=0; i < 2048 ;i++)
-	    do_clr(i, ENABLE);
+	if (quiet)
+		for (i=0; i < 2048 ;i++)
+			do_clr(i, ENABLE);
+
+	if (strlen(argv[optind]) >= IFNAMSIZ) {
+		printf("name of CAN device '%s' is too long!\n", argv[optind]);
+		return 1;
+	}
 
-    if (strlen(argv[optind]) >= IFNAMSIZ) {
-	printf("name of CAN device '%s' is too long!\n", argv[optind]);
-	return 1;
-    }
+	interface = argv[optind];
 
-    if ((s = socket(PF_CAN, SOCK_DGRAM, CAN_BCM)) < 0) {
-	perror("socket");
-	return 1;
-    }
+	if ((s = socket(PF_CAN, SOCK_DGRAM, CAN_BCM)) < 0) {
+		perror("socket");
+		return 1;
+	}
 
-    addr.can_family = AF_CAN;
+	addr.can_family = AF_CAN;
 
-    if (strcmp(ANYDEV, argv[optind])) {
-	strcpy(ifr.ifr_name, argv[optind]);
-	if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
-	    perror("SIOCGIFINDEX");
-	    exit(1);
+	if (strcmp(ANYDEV, argv[optind])) {
+		strcpy(ifr.ifr_name, argv[optind]);
+		if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
+			perror("SIOCGIFINDEX");
+			exit(1);
+		}
+		addr.can_ifindex = ifr.ifr_ifindex;
 	}
-	addr.can_ifindex = ifr.ifr_ifindex;
-    }
-    else
-	addr.can_ifindex = 0; /* any can interface */
+	else
+		addr.can_ifindex = 0; /* any can interface */
 
-    if (connect(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-	perror("connect");
-	return 1;
-    }
+	if (connect(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+		perror("connect");
+		return 1;
+	}
 
-    for (i=0; i < 2048 ;i++) /* initial BCM setup */
-	if (is_set(i, ENABLE))
-	    rx_setup(s, i);
+	for (i=0; i < 2048 ;i++) /* initial BCM setup */
+		if (is_set(i, ENABLE))
+			rx_setup(s, i);
 
-    gettimeofday(&start_tv, NULL);
-    tv.tv_sec = tv.tv_usec = 0;
+	gettimeofday(&start_tv, NULL);
+	tv.tv_sec = tv.tv_usec = 0;
 
-    printf("%s", CSR_HIDE); /* hide cursor */
+	printf("%s", CSR_HIDE); /* hide cursor */
 
-    while (running) {
+	while (running) {
 
-	FD_ZERO(&rdfs);
-	FD_SET(0, &rdfs);
-	FD_SET(s, &rdfs);
+		FD_ZERO(&rdfs);
+		FD_SET(0, &rdfs);
+		FD_SET(s, &rdfs);
 
-	timeo.tv_sec  = 0;
-	timeo.tv_usec = 100000 * loop;
+		timeo.tv_sec  = 0;
+		timeo.tv_usec = 100000 * loop;
 
-	if ((ret = select(s+1, &rdfs, NULL, NULL, &timeo)) < 0) {
-	    //perror("select");
-	    running = 0;
-	    continue;
-	}
+		if ((ret = select(s+1, &rdfs, NULL, NULL, &timeo)) < 0) {
+			//perror("select");
+			running = 0;
+			continue;
+		}
 
-	gettimeofday(&tv, NULL);
-	currcms = (tv.tv_sec - start_tv.tv_sec) * 10 + (tv.tv_usec / 100000);
+		gettimeofday(&tv, NULL);
+		currcms = (tv.tv_sec - start_tv.tv_sec) * 10 + (tv.tv_usec / 100000);
 
-	if (FD_ISSET(0, &rdfs))
-	    running &= handle_keyb(s);
+		if (FD_ISSET(0, &rdfs))
+			running &= handle_keyb(s);
 
-	if (FD_ISSET(s, &rdfs))
-	    running &= handle_bcm(s, currcms);
+		if (FD_ISSET(s, &rdfs))
+			running &= handle_bcm(s, currcms);
 
-        if (currcms - lastcms >= loop) {
-		running &= handle_timeo(s, currcms);
-		lastcms = currcms;
+		if (currcms - lastcms >= loop) {
+			running &= handle_timeo(s, currcms);
+			lastcms = currcms;
+		}
 	}
-    }
 
-    printf("%s", CSR_SHOW); /* show cursor */
+	printf("%s", CSR_SHOW); /* show cursor */
 
-    close(s);
-    return 0;
+	close(s);
+	return 0;
 }
 
 void rx_setup (int fd, int id){
 
-    struct {
-	struct bcm_msg_head msg_head;
-	struct can_frame frame;
-    } txmsg;
-
-    txmsg.msg_head.opcode  = RX_SETUP;
-    txmsg.msg_head.can_id  = id;
-    txmsg.msg_head.flags   = RX_CHECK_DLC;
-    txmsg.msg_head.ival1.tv_sec  = 0;
-    txmsg.msg_head.ival1.tv_usec = 0;
-    txmsg.msg_head.ival2.tv_sec  = 0;
-    txmsg.msg_head.ival2.tv_usec = 0;
-    txmsg.msg_head.nframes = 1;
-    U64_DATA(&txmsg.frame) = (__u64) 0xFFFFFFFFFFFFFFFFULL;
-
-    if (write(fd, &txmsg, sizeof(txmsg)) < 0)
-      perror("write");
+	struct {
+		struct bcm_msg_head msg_head;
+		struct can_frame frame;
+	} txmsg;
+
+	txmsg.msg_head.opcode  = RX_SETUP;
+	txmsg.msg_head.can_id  = id;
+	txmsg.msg_head.flags   = RX_CHECK_DLC;
+	txmsg.msg_head.ival1.tv_sec  = 0;
+	txmsg.msg_head.ival1.tv_usec = 0;
+	txmsg.msg_head.ival2.tv_sec  = 0;
+	txmsg.msg_head.ival2.tv_usec = 0;
+	txmsg.msg_head.nframes = 1;
+	U64_DATA(&txmsg.frame) = (__u64) 0xFFFFFFFFFFFFFFFFULL;
+
+	if (filter_id_only)
+		txmsg.msg_head.flags |= RX_FILTER_ID;
+
+	if (write(fd, &txmsg, sizeof(txmsg)) < 0)
+		perror("write");
 };
 
 void rx_delete (int fd, int id){
 
-    struct bcm_msg_head msg_head;
+	struct bcm_msg_head msg_head;
 
-    msg_head.opcode  = RX_DELETE;
-    msg_head.can_id  = id;
-    msg_head.nframes = 0;
+	msg_head.opcode  = RX_DELETE;
+	msg_head.can_id  = id;
+	msg_head.nframes = 0;
 
-    if (write(fd, &msg_head, sizeof(msg_head)) < 0)
-      perror("write");
+	if (write(fd, &msg_head, sizeof(msg_head)) < 0)
+		perror("write");
 }
 
 int handle_keyb(int fd){
 
-    char cmd [20] = {0};
-    int i;
-    unsigned int mask;
-    unsigned int value;
-
-    if (read(0, cmd, 19) > strlen("+123456\n"))
-	return 1; /* ignore */
+	char cmd [20] = {0};
+	int i;
+	unsigned int mask;
+	unsigned int value;
 
-    if (strlen(cmd) > 0)
-	cmd[strlen(cmd)-1] = 0; /* chop off trailing newline */
+	if (read(0, cmd, 19) > strlen("+123456\n"))
+		return 1; /* ignore */
 
-    switch (cmd[0]) {
+	if (strlen(cmd) > 0)
+		cmd[strlen(cmd)-1] = 0; /* chop off trailing newline */
 
-    case '+':
-    case '-':
-	sscanf(&cmd[1], "%x", &value);
-	if (strlen(&cmd[1]) > 3) {
-	    mask = value & 0xFFF;
-	    value >>= 12;
-	}
-	else
-	    mask = 0x7FF;
+	switch (cmd[0]) {
 
-	if (cmd[0] == '+') {
-	    for (i=0; i < 2048 ;i++) {
-		if (((i & mask) == (value & mask)) && (is_clr(i, ENABLE))) {
-		    do_set(i, ENABLE);
-		    rx_setup(fd, i);
+	case '+':
+	case '-':
+		sscanf(&cmd[1], "%x", &value);
+		if (strlen(&cmd[1]) > 3) {
+			mask = value & 0xFFF;
+			value >>= 12;
 		}
-	    }
-	}
-	else { /* '-' */
-	    for (i=0; i < 2048 ;i++) {
-		if (((i & mask) == (value & mask)) && (is_set(i, ENABLE))) {
-		    do_clr(i, ENABLE);
-		    rx_delete(fd, i);
+		else
+			mask = 0x7FF;
+
+		if (cmd[0] == '+') {
+			for (i=0; i < 2048 ;i++) {
+				if (((i & mask) == (value & mask)) && (is_clr(i, ENABLE))) {
+					do_set(i, ENABLE);
+					rx_setup(fd, i);
+				}
+			}
 		}
-	    }
-	}
-	break;
+		else { /* '-' */
+			for (i=0; i < 2048 ;i++) {
+				if (((i & mask) == (value & mask)) && (is_set(i, ENABLE))) {
+					do_clr(i, ENABLE);
+					rx_delete(fd, i);
+				}
+			}
+		}
+		break;
 
-    case 'w' :
-	writesettings(&cmd[1]);
-	break;
+	case 'w' :
+		writesettings(&cmd[1]);
+		break;
 
-    case 'r' :
-	readsettings(&cmd[1], fd);
-	break;
+	case 'r' :
+		readsettings(&cmd[1], fd);
+		break;
 
-    case 'q' :
-	running = 0;
-	break;
+	case 'q' :
+		running = 0;
+		break;
 
-    case 'B' :
-	binary_gap = 1;
-	if (binary)
-	    binary = 0;
-	else
-	    binary = 1;
+	case 'B' :
+		binary_gap = 1;
+		if (binary)
+			binary = 0;
+		else
+			binary = 1;
 
-	break;
+		break;
 
-    case 'b' :
-	binary_gap = 0;
-	if (binary)
-	    binary = 0;
-	else
-	    binary = 1;
+	case 'b' :
+		binary_gap = 0;
+		if (binary)
+			binary = 0;
+		else
+			binary = 1;
 
-	break;
+		break;
 
-    case 'c' :
-	if (color)
-	    color = 0;
-	else
-	    color = 1;
+	case 'c' :
+		if (color)
+			color = 0;
+		else
+			color = 1;
 
-	break;
+		break;
 
-    case '#' :
-	notch = 1;
-	break;
+	case '#' :
+		notch = 1;
+		break;
 
-    case '*' :
-	for (i=0; i < 2048; i++)
-	    U64_DATA(&sniftab[i].notch) = (__u64) 0;
-	break;
+	case '*' :
+		for (i=0; i < 2048; i++)
+			U64_DATA(&sniftab[i].notch) = (__u64) 0;
+		break;
 
-    default:
-	break;
-    }
+	default:
+		break;
+	}
 
-    clearscreen = 1;
+	clearscreen = 1;
 
-    return 1; /* ok */
+	return 1; /* ok */
 };
 
 int handle_bcm(int fd, long currcms){
 
-    int nbytes, id;
+	int nbytes, id;
 
-    struct {
-        struct bcm_msg_head msg_head;
-        struct can_frame frame;
-    } bmsg;
+	struct {
+		struct bcm_msg_head msg_head;
+		struct can_frame frame;
+	} bmsg;
 
-    if ((nbytes = read(fd, &bmsg, sizeof(bmsg))) < 0) {
-        perror("bcm read");
-        return 0; /* quit */
-    }
+	if ((nbytes = read(fd, &bmsg, sizeof(bmsg))) < 0) {
+		perror("bcm read");
+		return 0; /* quit */
+	}
 
-    id = bmsg.msg_head.can_id;
-    ioctl(fd, SIOCGSTAMP, &sniftab[id].currstamp);
+	id = bmsg.msg_head.can_id;
+	ioctl(fd, SIOCGSTAMP, &sniftab[id].currstamp);
 
-    if (bmsg.msg_head.opcode != RX_CHANGED) {
-	printf("received strange BCM opcode %d!\n", bmsg.msg_head.opcode);
-        return 0; /* quit */
-    }
+	if (bmsg.msg_head.opcode != RX_CHANGED) {
+		printf("received strange BCM opcode %d!\n", bmsg.msg_head.opcode);
+		return 0; /* quit */
+	}
 
-    if (nbytes != sizeof(bmsg)) {
-	printf("received strange BCM data length %d!\n", nbytes);
-        return 0; /* quit */
-    }
+	if (nbytes != sizeof(bmsg)) {
+		printf("received strange BCM data length %d!\n", nbytes);
+		return 0; /* quit */
+	}
 
-    sniftab[id].current = bmsg.frame;
-    U64_DATA(&sniftab[id].marker) |= 
-	U64_DATA(&sniftab[id].current) ^ U64_DATA(&sniftab[id].last);
-    sniftab[id].timeout = currcms + timeout;
+	sniftab[id].current = bmsg.frame;
+	U64_DATA(&sniftab[id].marker) |= 
+		U64_DATA(&sniftab[id].current) ^ U64_DATA(&sniftab[id].last);
+	sniftab[id].timeout = (timeout)?(currcms + timeout):0;
 
-    if (is_clr(id, DISPLAY))
-	clearscreen = 1; /* new entry -> new drawing */
+	if (is_clr(id, DISPLAY))
+		clearscreen = 1; /* new entry -> new drawing */
 
-    do_set(id, DISPLAY);
-    do_set(id, UPDATE);
+	do_set(id, DISPLAY);
+	do_set(id, UPDATE);
 	
-    return 1; /* ok */
+	return 1; /* ok */
 };
 
 int handle_timeo(int fd, long currcms){
 
-    int i;
-    int force_redraw = 0;
+	int i;
+	int force_redraw = 0;
 
-    if (clearscreen) {
-	char startline[80];
-	printf("%s%s", CLR_SCREEN, CSR_HOME);
-	snprintf(startline, 79, "< can-sniffer parameters: l=%ld h=%ld t=%ld >", loop, hold, timeout);
-	printf("%s%*s",STARTLINESTR, 79-(int)strlen(STARTLINESTR), startline);
-	force_redraw = 1;
-	clearscreen = 0;
-    }
-
-    if (notch) {
-	for (i=0; i < 2048; i++)
-	    U64_DATA(&sniftab[i].notch) |= U64_DATA(&sniftab[i].marker);
-	notch = 0;
-    }
-
-    printf("%s", CSR_HOME);
-    printf("%c\n", anichar[currcms % MAXANI]); /* funny animation */
-
-    for (i=0; i < 2048; i++) {
-
-	if is_set(i, ENABLE) {
+	if (clearscreen) {
+		char startline[80];
+		printf("%s%s", CLR_SCREEN, CSR_HOME);
+		snprintf(startline, 79, "< cansniffer %s # l=%ld h=%ld t=%ld >", interface, loop, hold, timeout);
+		printf("%s%*s",STARTLINESTR, 79-(int)strlen(STARTLINESTR), startline);
+		force_redraw = 1;
+		clearscreen = 0;
+	}
 
-	    if is_set(i, DISPLAY) {
+	if (notch) {
+		for (i=0; i < 2048; i++)
+			U64_DATA(&sniftab[i].notch) |= U64_DATA(&sniftab[i].marker);
+		notch = 0;
+	}
 
-		if (is_set(i, UPDATE) || (force_redraw)){
-		    print_snifline(i);
-		    sniftab[i].hold = currcms + hold;
-		    do_clr(i, UPDATE);
-		}
-		else
-		    if ((sniftab[i].hold) && (sniftab[i].hold < currcms)) {
-			U64_DATA(&sniftab[i].marker) = (__u64) 0;
-			print_snifline(i);
-			sniftab[i].hold = 0; /* disable update by hold */
-		    }
-		    else
-			printf("%s", CSR_DOWN); /* skip my line */
-
-		if (sniftab[i].timeout < currcms) {
-		    do_clr(i, DISPLAY);
-		    do_clr(i, UPDATE);
-		    clearscreen = 1; /* removed entry -> new drawing next time */
-		}
-	    }
-	    sniftab[i].last      = sniftab[i].current;
-	    sniftab[i].laststamp = sniftab[i].currstamp;
+	printf("%s", CSR_HOME);
+	printf("%c\n", anichar[currcms % MAXANI]); /* funny animation */
+
+	for (i=0; i < 2048; i++) {
+
+		if is_set(i, ENABLE) {
+
+				if is_set(i, DISPLAY) {
+
+						if (is_set(i, UPDATE) || (force_redraw)){
+							print_snifline(i);
+							sniftab[i].hold = currcms + hold;
+							do_clr(i, UPDATE);
+						}
+						else
+							if ((sniftab[i].hold) && (sniftab[i].hold < currcms)) {
+								U64_DATA(&sniftab[i].marker) = (__u64) 0;
+								print_snifline(i);
+								sniftab[i].hold = 0; /* disable update by hold */
+							}
+							else
+								printf("%s", CSR_DOWN); /* skip my line */
+
+						if (sniftab[i].timeout && sniftab[i].timeout < currcms) {
+							do_clr(i, DISPLAY);
+							do_clr(i, UPDATE);
+							clearscreen = 1; /* removed entry -> new drawing next time */
+						}
+					}
+				sniftab[i].last      = sniftab[i].current;
+				sniftab[i].laststamp = sniftab[i].currstamp;
+			}
 	}
-    }
 
-    return 1; /* ok */
+	return 1; /* ok */
 
 };
 
 void print_snifline(int id){
 
-    long diffsec  = sniftab[id].currstamp.tv_sec  - sniftab[id].laststamp.tv_sec;
-    long diffusec = sniftab[id].currstamp.tv_usec - sniftab[id].laststamp.tv_usec;
-    int dlc_diff  = sniftab[id].last.can_dlc - sniftab[id].current.can_dlc;
-    int i,j;
-
-    if (diffusec < 0)
-	diffsec--, diffusec += 1000000;
-
-    if (diffsec < 0)
-	diffsec = diffusec = 0;
-
-    if (diffsec > 10)
-	diffsec = 9, diffusec = 999999;
-
-    printf("%ld.%06ld  %3x  ", diffsec, diffusec, id);
-
-    if (binary) {
+	long diffsec  = sniftab[id].currstamp.tv_sec  - sniftab[id].laststamp.tv_sec;
+	long diffusec = sniftab[id].currstamp.tv_usec - sniftab[id].laststamp.tv_usec;
+	int dlc_diff  = sniftab[id].last.can_dlc - sniftab[id].current.can_dlc;
+	int i,j;
+
+	if (diffusec < 0)
+		diffsec--, diffusec += 1000000;
+
+	if (diffsec < 0)
+		diffsec = diffusec = 0;
+
+	if (diffsec > 10)
+		diffsec = 9, diffusec = 999999;
+
+	printf("%ld.%06ld  %3x  ", diffsec, diffusec, id);
+
+	if (binary) {
+
+		for (i=0; i<sniftab[id].current.can_dlc; i++) {
+			for (j=7; j>=0; j--) {
+				if ((color) && (sniftab[id].marker.data[i] & 1<<j) &&
+				    (!(sniftab[id].notch.data[i] & 1<<j)))
+					if (sniftab[id].current.data[i] & 1<<j)
+						printf("%s1%s", ATTCOLOR, ATTRESET);
+					else
+						printf("%s0%s", ATTCOLOR, ATTRESET);
+				else
+					if (sniftab[id].current.data[i] & 1<<j)
+						putchar('1');
+					else
+						putchar('0');
+			}
+			if (binary_gap)
+				putchar(' ');
+		}
 
-	for (i=0; i<sniftab[id].current.can_dlc; i++) {
-	    for (j=7; j>=0; j--) {
-		if ((color) && (sniftab[id].marker.data[i] & 1<<j) &&
-		    (!(sniftab[id].notch.data[i] & 1<<j)))
-		    if (sniftab[id].current.data[i] & 1<<j)
-			printf("%s1%s", ATTCOLOR, ATTRESET);
-		    else
-			printf("%s0%s", ATTCOLOR, ATTRESET);
-		else
-		    if (sniftab[id].current.data[i] & 1<<j)
-			putchar('1');
-		    else
-			putchar('0');
-	    }
-	    if (binary_gap)
-		putchar(' ');
+		/*
+		 * when the can_dlc decreased (dlc_diff > 0),
+		 * we need to blank the former data printout
+		 */
+		for (i=0; i<dlc_diff; i++) {
+			printf("        ");
+			if (binary_gap)
+				putchar(' ');
+		}
 	}
-
-	/*
-	 * when the can_dlc decreased (dlc_diff > 0),
-	 * we need to blank the former data printout
-	 */
-	for (i=0; i<dlc_diff; i++) {
-	    printf("        ");
-	    if (binary_gap)
-		putchar(' ');
+	else {
+
+		for (i=0; i<sniftab[id].current.can_dlc; i++)
+			if ((color) && (sniftab[id].marker.data[i]) && (!(sniftab[id].notch.data[i])))
+				printf("%s%02X%s ", ATTCOLOR, sniftab[id].current.data[i], ATTRESET);
+			else
+				printf("%02X ", sniftab[id].current.data[i]);
+
+		if (sniftab[id].current.can_dlc < 8)
+			printf("%*s", (8 - sniftab[id].current.can_dlc) * 3, "");
+
+		for (i=0; i<sniftab[id].current.can_dlc; i++)
+			if ((sniftab[id].current.data[i] > 0x1F) && 
+			    (sniftab[id].current.data[i] < 0x7F))
+				if ((color) && (sniftab[id].marker.data[i]) && (!(sniftab[id].notch.data[i])))
+					printf("%s%c%s", ATTCOLOR, sniftab[id].current.data[i], ATTRESET);
+				else
+					putchar(sniftab[id].current.data[i]);
+			else
+				putchar('.');
+
+		/*
+		 * when the can_dlc decreased (dlc_diff > 0),
+		 * we need to blank the former data printout
+		 */
+		for (i=0; i<dlc_diff; i++)
+			putchar(' ');
 	}
-    }
-    else {
-
-	for (i=0; i<sniftab[id].current.can_dlc; i++)
-	    if ((color) && (sniftab[id].marker.data[i]) && (!(sniftab[id].notch.data[i])))
-		printf("%s%02X%s ", ATTCOLOR, sniftab[id].current.data[i], ATTRESET);
-	    else
-		printf("%02X ", sniftab[id].current.data[i]);
-
-	if (sniftab[id].current.can_dlc < 8)
-	    printf("%*s", (8 - sniftab[id].current.can_dlc) * 3, "");
-
-	for (i=0; i<sniftab[id].current.can_dlc; i++)
-	    if ((sniftab[id].current.data[i] > 0x1F) && 
-		(sniftab[id].current.data[i] < 0x7F))
-		if ((color) && (sniftab[id].marker.data[i]) && (!(sniftab[id].notch.data[i])))
-		    printf("%s%c%s", ATTCOLOR, sniftab[id].current.data[i], ATTRESET);
-		else
-		    putchar(sniftab[id].current.data[i]);
-	    else
-		putchar('.');
 
-	/*
-	 * when the can_dlc decreased (dlc_diff > 0),
-	 * we need to blank the former data printout
-	 */
-	for (i=0; i<dlc_diff; i++)
-	    putchar(' ');
-    }
+	putchar('\n');
 
-    putchar('\n');
-
-    U64_DATA(&sniftab[id].marker) = (__u64) 0;
+	U64_DATA(&sniftab[id].marker) = (__u64) 0;
 
 };
 
 
 void writesettings(char* name){
 
-    int fd;
-    char fname[30] = SETFNAME;
-    int i,j;
-    char buf[8]= {0};
+	int fd;
+	char fname[30] = SETFNAME;
+	int i,j;
+	char buf[8]= {0};
 
-    strncat(fname, name, 29 - strlen(fname)); 
-    fd = open(fname,  O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+	strncat(fname, name, 29 - strlen(fname)); 
+	fd = open(fname,  O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
     
-    if (fd > 0) {
-
-	for (i=0; i < 2048 ;i++) {
-	    sprintf(buf, "<%03X>%c.", i, (is_set(i, ENABLE))?'1':'0');
-	    write(fd, buf, 7);
-	    for (j=0; j<8 ; j++){
-		sprintf(buf, "%02X", sniftab[i].notch.data[j]);
-		write(fd, buf, 2);
-	    }
-	    write(fd, "\n", 1);
-	    /* 7 + 16 + 1 = 24 bytes per entry */ 
+	if (fd > 0) {
+
+		for (i=0; i < 2048 ;i++) {
+			sprintf(buf, "<%03X>%c.", i, (is_set(i, ENABLE))?'1':'0');
+			write(fd, buf, 7);
+			for (j=0; j<8 ; j++){
+				sprintf(buf, "%02X", sniftab[i].notch.data[j]);
+				write(fd, buf, 2);
+			}
+			write(fd, "\n", 1);
+			/* 7 + 16 + 1 = 24 bytes per entry */ 
+		}
+		close(fd);
 	}
-	close(fd);
-    }
-    else
-	printf("unable to write setting file '%s'!\n", fname);
+	else
+		printf("unable to write setting file '%s'!\n", fname);
 };
 
 void readsettings(char* name, int sockfd){
 
-    int fd;
-    char fname[30] = SETFNAME;
-    char buf[25] = {0};
-    int i,j;
+	int fd;
+	char fname[30] = SETFNAME;
+	char buf[25] = {0};
+	int i,j;
 
-    strncat(fname, name, 29 - strlen(fname)); 
-    fd = open(fname, O_RDONLY);
+	strncat(fname, name, 29 - strlen(fname)); 
+	fd = open(fname, O_RDONLY);
     
-    if (fd > 0) {
-	if (!sockfd)
-	    printf("reading setting file '%s' ... ", fname);
-
-	for (i=0; i < 2048 ;i++) {
-	    if (read(fd, &buf, 24) == 24) {
-		if (buf[5] & 1) {
-		    if (is_clr(i, ENABLE)) {
-			do_set(i, ENABLE);
-			if (sockfd)
-			    rx_setup(sockfd, i);
-		    }
-		}
-		else
-		    if (is_set(i, ENABLE)) {
-			do_clr(i, ENABLE);
-			if (sockfd)
-			    rx_delete(sockfd, i);
-		    }
-		for (j=7; j>=0 ; j--){
-		    sniftab[i].notch.data[j] =
-			(__u8) strtoul(&buf[2*j+7], (char **)NULL, 16) & 0xFF;
-		    buf[2*j+7] = 0; /* cut off each time */
-		}
-	    }
-	    else {
+	if (fd > 0) {
 		if (!sockfd)
-		    printf("was only able to read until index %d from setting file '%s'!\n",
-			   i, fname);
-	    }
-	}
+			printf("reading setting file '%s' ... ", fname);
+
+		for (i=0; i < 2048 ;i++) {
+			if (read(fd, &buf, 24) == 24) {
+				if (buf[5] & 1) {
+					if (is_clr(i, ENABLE)) {
+						do_set(i, ENABLE);
+						if (sockfd)
+							rx_setup(sockfd, i);
+					}
+				}
+				else
+					if (is_set(i, ENABLE)) {
+						do_clr(i, ENABLE);
+						if (sockfd)
+							rx_delete(sockfd, i);
+					}
+				for (j=7; j>=0 ; j--){
+					sniftab[i].notch.data[j] =
+						(__u8) strtoul(&buf[2*j+7], (char **)NULL, 16) & 0xFF;
+					buf[2*j+7] = 0; /* cut off each time */
+				}
+			}
+			else {
+				if (!sockfd)
+					printf("was only able to read until index %d from setting file '%s'!\n",
+					       i, fname);
+			}
+		}
     
-	if (!sockfd)
-	    printf("done\n");
+		if (!sockfd)
+			printf("done\n");
 
-	close(fd);
-    }
-    else
-	printf("unable to read setting file '%s'!\n", fname);
+		close(fd);
+	}
+	else
+		printf("unable to read setting file '%s'!\n", fname);
 };