Fix cut-n-paste bugs in hccontrol(8). Its very strange that no one noticed

them earlier. Thanks to Mike Crosland (mcrosland at xs4all.nl) for pointing
them out.

2 files changed, 17 insertions, 17 deletions

diff --git a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
index c8e03d2..5998e5c 100644
--- a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
+++ b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
@@ -689,7 +689,7 @@ hci_write_page_scan_activity(int s, int argc, char **argv)
 		cp.page_scan_interval = (uint16_t) n;
 
 		/* page scan window */
-		if (sscanf(argv[0], "%d", &n) != 1 || n < 0x12 || n > 0x1000)
+		if (sscanf(argv[1], "%d", &n) != 1 || n < 0x12 || n > 0x1000)
 			return (USAGE);
 
 		cp.page_scan_window = (uint16_t) n;
@@ -770,7 +770,7 @@ hci_write_inquiry_scan_activity(int s, int argc, char **argv)
 		cp.inquiry_scan_interval = (uint16_t) n;
 
 		/* inquiry scan window */
-		if (sscanf(argv[0], "%d", &n) != 1 || n < 0x12 || n > 0x1000)
+		if (sscanf(argv[1], "%d", &n) != 1 || n < 0x12 || n > 0x1000)
 			return (USAGE);
 
 		cp.inquiry_scan_window = (uint16_t) n;
@@ -1334,7 +1334,7 @@ hci_write_link_supervision_timeout(int s, int argc, char **argv)
 		cp.con_handle = htole16(cp.con_handle);
 
 		/* link supervision timeout */
-		if (sscanf(argv[1], "%d", &n) != 1 || n < 0 || n > 0xeff)
+		if (sscanf(argv[1], "%d", &n) != 1 || n < 0 || n > 0xffff)
 			return (USAGE);
 
 		cp.timeout = (uint16_t) (n & 0x0fff);
diff --git a/usr.sbin/bluetooth/hccontrol/link_control.c b/usr.sbin/bluetooth/hccontrol/link_control.c
index c8e5cb1..34dae7b 100644
--- a/usr.sbin/bluetooth/hccontrol/link_control.c
+++ b/usr.sbin/bluetooth/hccontrol/link_control.c
@@ -56,30 +56,30 @@ hci_inquiry(int s, int argc, char **argv)
 	/* parse command parameters */
 	switch (argc) {
 	case 3:
-		/* LAP */
-		if (sscanf(argv[0], "%x:%x:%x", &n2, &n1, &n0) != 3)
+		/* number of responses, range 0x00 - 0xff */
+		if (sscanf(argv[2], "%d", &n0) != 1 || n0 < 0 || n0 > 0xff)
 			return (USAGE);
 
-		cp.lap[0] = (n0 & 0xff);
-		cp.lap[1] = (n1 & 0xff);
-		cp.lap[2] = (n2 & 0xff);
+		cp.num_responses = (n0 & 0xff);
 
-	/* inquiry length (N * 1.28) sec, range 0x01 - 0x30 */
 	case 2:
+		/* inquiry length (N * 1.28) sec, range 0x01 - 0x30 */
 		if (sscanf(argv[1], "%d", &n0) != 1 || n0 < 0x1 || n0 > 0x30)
 			return (USAGE);
 
 		cp.inquiry_length = (n0 & 0xff);
 
-	/* number of responses, range 0x00 - 0xff */
 	case 1:
-		if (sscanf(argv[2], "%d", &n0) != 1 || n0 > 0xff)
+		/* LAP */
+		if (sscanf(argv[0], "%x:%x:%x", &n2, &n1, &n0) != 3)
 			return (USAGE);
 
-		cp.num_responses = (n0 & 0xff);
+		cp.lap[0] = (n0 & 0xff);
+		cp.lap[1] = (n1 & 0xff);
+		cp.lap[2] = (n2 & 0xff);
 
-	/* use defaults */
 	case 0:
+		/* use defaults */
 		break;
 
 	default:
@@ -194,14 +194,14 @@ hci_create_connection(int s, int argc, char **argv)
 	switch (argc) {
 	case 6:
 		/* accept role switch */
-		if (sscanf(argv[2], "%d", &n0) != 1)
+		if (sscanf(argv[5], "%d", &n0) != 1)
 			return (USAGE);
 
 		cp.accept_role_switch = n0 ? 1 : 0;
 
 	case 5:
 		/* clock offset */
-		if (sscanf(argv[2], "%d", &n0) != 1)
+		if (sscanf(argv[4], "%d", &n0) != 1)
 			return (USAGE);
 
 		cp.clock_offset = (n0 & 0xffff);
@@ -209,7 +209,7 @@ hci_create_connection(int s, int argc, char **argv)
 
 	case 4:
 		/* page scan mode */
-		if (sscanf(argv[2], "%d", &n0) != 1 || n0 < 0 || n0 > 3)
+		if (sscanf(argv[3], "%d", &n0) != 1 || n0 < 0 || n0 > 3)
 			return (USAGE);
 
 		cp.page_scan_mode = (n0 & 0xff);
@@ -383,7 +383,7 @@ hci_add_sco_connection(int s, int argc, char **argv)
 	switch (argc) {
 	case 2:
 		/* packet type */
-		if (sscanf(argv[0], "%x", &n) != 1)
+		if (sscanf(argv[1], "%x", &n) != 1)
 			return (USAGE);
 
 		n &= (NG_HCI_PKT_HV1 | NG_HCI_PKT_HV2 | NG_HCI_PKT_HV3);