X-Git-Url: http://rtime.felk.cvut.cz/gitweb/socketcan-devel.git/blobdiff_plain/d3a0e48807ffead48ea85ce82236fc34608fd442..7242dfaaacd11619e0ab730d9e9601112e97c05a:/can-utils/slcan_attach.c

diff --git a/can-utils/slcan_attach.c b/can-utils/slcan_attach.c
index 458bd50..89366be 100644
--- a/can-utils/slcan_attach.c
+++ b/can-utils/slcan_attach.c
@@ -61,14 +61,17 @@ void print_usage(char *prg)
 	fprintf(stderr, "\nUsage: %s [options] tty\n\n", prg);
 	fprintf(stderr, "Options: -o         (send open command 'O\\r')\n");
 	fprintf(stderr, "         -c         (send close command 'C\\r')\n");
+	fprintf(stderr, "         -f         (read status flags with 'F\\r' to reset error states)\n");
 	fprintf(stderr, "         -s <speed> (set CAN speed 0..8)\n");
 	fprintf(stderr, "         -b <btr>   (set bit time register value)\n");
 	fprintf(stderr, "         -d         (only detach line discipline)\n");
 	fprintf(stderr, "         -w         (attach - wait for keypess - detach)\n");
+	fprintf(stderr, "         -n <name>  (assign created netdevice name)\n");
 	fprintf(stderr, "\nExamples:\n");
-	fprintf(stderr, "slcan_attach -w -o -s6 -c /dev/ttyS1\n");
+	fprintf(stderr, "slcan_attach -w -o -f -s6 -c /dev/ttyS1\n");
 	fprintf(stderr, "slcan_attach /dev/ttyS1\n");
 	fprintf(stderr, "slcan_attach -d /dev/ttyS1\n");
+	fprintf(stderr, "slcan_attach -w -n can15 /dev/ttyS1\n");
 	fprintf(stderr, "\n");
 	exit(1);
 }
@@ -81,13 +84,15 @@ int main(int argc, char **argv)
 	int waitkey = 0;
 	int send_open = 0;
 	int send_close = 0;
+	int send_read_status_flags = 0;
 	char *speed = NULL;
 	char *btr = NULL;
 	char buf[IFNAMSIZ+1];
 	char *tty;
+	char *name = NULL;
 	int opt;
 
-	while ((opt = getopt(argc, argv, "l:dwocs:b:?")) != -1) {
+	while ((opt = getopt(argc, argv, "l:dwocfs:b:n:?")) != -1) {
 		switch (opt) {
 		case 'l':
 			fprintf(stderr, "Ignored option '-l'\n");
@@ -109,6 +114,10 @@ int main(int argc, char **argv)
 			send_close = 1;
 			break;
 
+		case 'f':
+			send_read_status_flags = 1;
+			break;
+
 		case 's':
 			speed = optarg;
 			if (strlen(speed) > 1)
@@ -121,6 +130,12 @@ int main(int argc, char **argv)
 				print_usage(argv[0]);
 			break;
 
+		case 'n':
+			name = optarg;
+			if (strlen(name) > IFNAMSIZ-1)
+				print_usage(argv[0]);
+			break;
+
 		case '?':
 		default:
 			print_usage(argv[0]);
@@ -141,12 +156,17 @@ int main(int argc, char **argv)
 	if (waitkey || !detach) {
 
 		if (speed) {
-			sprintf(buf, "S%s\r", speed);
+			sprintf(buf, "C\rS%s\r", speed);
 			write(fd, buf, strlen(buf));
 		}
 
 		if (btr) {
-			sprintf(buf, "s%s\r", btr);
+			sprintf(buf, "C\rs%s\r", btr);
+			write(fd, buf, strlen(buf));
+		}
+
+		if (send_read_status_flags) {
+			sprintf(buf, "F\r");
 			write(fd, buf, strlen(buf));
 		}
 
@@ -155,16 +175,41 @@ int main(int argc, char **argv)
 			write(fd, buf, strlen(buf));
 		}
 
+		/* set slcan line discipline on given tty */
 		if (ioctl (fd, TIOCSETD, &ldisc) < 0) {
 			perror("ioctl TIOCSETD");
 			exit(1);
 		}
 
+		/* retrieve the name of the created CAN netdevice */
 		if (ioctl (fd, SIOCGIFNAME, buf) < 0) {
 			perror("ioctl SIOCGIFNAME");
 			exit(1);
-		} else
-			printf("attached tty %s to netdevice %s\n", tty, buf);
+		}
+
+		printf("attached tty %s to netdevice %s\n", tty, buf);
+
+		/* try to rename the created device if requested */
+		if (name) {
+			struct ifreq ifr;
+			int s = socket(PF_INET, SOCK_DGRAM, 0);
+ 
+			printf("rename netdevice %s to %s ... ", buf, name);
+
+			if (s < 0)
+				perror("socket for interface rename");
+			else {
+				strncpy (ifr.ifr_name, buf, IFNAMSIZ);
+				strncpy (ifr.ifr_newname, name, IFNAMSIZ);
+ 
+				if (ioctl(s, SIOCSIFNAME, &ifr) < 0)
+					printf("failed!\n");
+				else
+					printf("ok.\n");
+ 
+				close(s);
+			}
+		}
 	}
 
 	if (waitkey) {