Attachment 213720 Details for Bug 245848 – Adds commands to hccontrol to support advertising

[patch] Adds commands to hccontrol to support advertising

le_advertising_commands.diff (text/plain), 6.55 KB, created by Marc Veldman on 2020-04-23 13:14:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Veldman

Created: 2020-04-23 13:14:51 UTC

Size: 6.55 KB

patch

obsolete

>Index: usr.sbin/bluetooth/hccontrol/hccontrol.8
>===================================================================
>--- usr.sbin/bluetooth/hccontrol/hccontrol.8	(revision 360213)
>+++ usr.sbin/bluetooth/hccontrol/hccontrol.8	(working copy)
>@@ -133,6 +133,8 @@
> .It Cm Write_Page_Scan_Period_Mode
> .It Cm Read_Page_Scan_Mode
> .It Cm Write_Page_Scan_Mode
>+.It Cm Read_LE_Host_Support
>+.It Cm Write_LE_Host_Support
> .It Cm Read_Local_Version_Information
> .It Cm Read_Local_Supported_Commands
> .It Cm Read_Local_Supported_Features
>@@ -143,6 +145,15 @@
> .It Cm Reset_Failed_Contact_Counter
> .It Cm Get_Link_Quality
> .It Cm Read_RSSI
>+.It Cm LE_Read_Local_Supported_Features
>+.It Cm LE_Set_Advertising_Parameters 
>+.It Cm LE_Read_Advertising_Physical_Channel_Tx_Power 
>+.It Cm LE_Set_Advertising_Data
>+.It Cm LE_Set_Scan_Response_Data
>+.It Cm LE_Set_Advertising_Enable
>+.It Cm LE_Set_Scan_Parameters
>+.It Cm LE_Set_Scan_Enable
>+.It Cm LE_Read_Supported_States
> .El
> .Pp
> The currently supported node commands in
>Index: usr.sbin/bluetooth/hccontrol/le.c
>===================================================================
>--- usr.sbin/bluetooth/hccontrol/le.c	(revision 360213)
>+++ usr.sbin/bluetooth/hccontrol/le.c	(working copy)
>@@ -57,6 +57,9 @@
> static int set_le_event_mask(int s, uint64_t mask);
> static int set_event_mask(int s, uint64_t mask);
> static int le_enable(int s, int argc, char *argv[]);
>+static int le_set_advertising_enable(int s, int argc, char *argv[]);
>+static int le_set_advertising_param(int s, int argc, char *argv[]);
>+static int le_read_advertising_channel_tx_power(int s, int argc, char *argv[]);
> 
> static int
> le_set_scan_param(int s, int argc, char *argv[])
>@@ -339,6 +342,170 @@
> 	return OK;
> }
> 
>+static int
>+le_set_advertising_enable(int s, int argc, char *argv[])
>+{
>+	ng_hci_le_set_advertise_enable_cp cp;
>+	ng_hci_le_set_advertise_enable_rp rp;
>+	int n, enable = 0;
>+
>+	if (argc != 1)
>+		return USAGE;
>+	  
>+	if (strcmp(argv[0], "enable") == 0)
>+		enable = 1;
>+	else if (strcmp(argv[0], "disable") != 0)
>+		return USAGE;
>+
>+	n = sizeof(rp);
>+	cp.advertising_enable = enable;
>+	if (hci_request(s, NG_HCI_OPCODE(NG_HCI_OGF_LE,
>+		NG_HCI_OCF_LE_SET_ADVERTISE_ENABLE), 
>+		(void *)&cp, sizeof(cp), (void *)&rp, &n) == ERROR)
>+		return (ERROR);
>+			
>+	if (rp.status != 0x00) {
>+		fprintf(stdout, "Status: %s [%#02x]\n", 
>+			hci_status2str(rp.status), rp.status);
>+		return (FAILED);
>+	}
>+        fprintf(stdout, "LE Advertising %s\n", (enable ? "enabled" : "disabled"));
>+
>+	return (OK);
>+}
>+
>+static int
>+le_set_advertising_param(int s, int argc, char *argv[])
>+{
>+	ng_hci_le_set_advertising_parameters_cp cp;
>+	ng_hci_le_set_advertising_parameters_rp rp;
>+
>+	int n, ch;
>+
>+	cp.advertising_interval_min = 0x800;
>+	cp.advertising_interval_max = 0x800;
>+	cp.advertising_type = 0;
>+	cp.own_address_type = 0;
>+	cp.direct_address_type = 0;
>+
>+	cp.advertising_channel_map = 7;
>+	cp.advertising_filter_policy = 0;
>+
>+	optreset = 1;
>+	optind = 0;
>+	while ((ch = getopt(argc, argv , "m:M:t:o:p:a:c:f:")) != -1) {
>+		switch(ch){
>+		case 'm':
>+			cp.advertising_interval_min =
>+				(uint16_t)(strtod(optarg, NULL)/0.625);
>+			break;
>+		case 'M':
>+			cp.advertising_interval_max =
>+				(uint16_t)(strtod(optarg, NULL)/0.625);
>+			break;
>+		case 't':
>+			cp.advertising_type =
>+				(uint8_t)strtod(optarg, NULL);
>+			break;
>+		case 'o':
>+			cp.own_address_type =
>+				(uint8_t)strtod(optarg, NULL);
>+			break;
>+		case 'p':
>+			cp.direct_address_type =
>+				(uint8_t)strtod(optarg, NULL);
>+			break;
>+		case 'a':
>+			if (!bt_aton(optarg, &cp.direct_address)) {
>+				struct hostent	*he = NULL;
>+
>+				if ((he = bt_gethostbyname(optarg)) == NULL)
>+					return (USAGE);
>+
>+				memcpy(&cp.direct_address, he->h_addr, sizeof(cp.direct_address));
>+			}
>+			break;
>+		case 'c':
>+			cp.advertising_channel_map =
>+				(uint8_t)strtod(optarg, NULL);
>+			break;
>+		case 'f':
>+			cp.advertising_filter_policy =
>+				(uint8_t)strtod(optarg, NULL);
>+			break;
>+		}
>+	}
>+
>+	n = sizeof(rp);
>+	if (hci_request(s, NG_HCI_OPCODE(NG_HCI_OGF_LE,
>+		NG_HCI_OCF_LE_SET_ADVERTISING_PARAMETERS), 
>+		(void *)&cp, sizeof(cp), (void *)&rp, &n) == ERROR)
>+		return (ERROR);
>+			
>+	if (rp.status != 0x00) {
>+		fprintf(stdout, "Status: %s [%#02x]\n", 
>+			hci_status2str(rp.status), rp.status);
>+		return (FAILED);
>+	}
>+
>+	return (OK);
>+}
>+
>+static int
>+le_read_advertising_channel_tx_power(int s, int argc, char *argv[])
>+{
>+	ng_hci_le_read_advertising_channel_tx_power_rp rp;
>+	int n;
>+
>+	n = sizeof(rp);
>+
>+	if (hci_simple_request(s, NG_HCI_OPCODE(NG_HCI_OGF_LE,
>+		NG_HCI_OCF_LE_READ_ADVERTISING_CHANNEL_TX_POWER), 
>+		(void *)&rp, &n) == ERROR)
>+		return (ERROR);
>+			
>+	if (rp.status != 0x00) {
>+		fprintf(stdout, "Status: %s [%#02x]\n", 
>+			hci_status2str(rp.status), rp.status);
>+		return (FAILED);
>+	}
>+
>+        fprintf(stdout, "Advertising transmit power level: %d dBm\n",
>+		(int8_t)rp.transmit_power_level);
>+
>+	return (OK);
>+}
>+
>+static int
>+le_set_advertising_data(int s, int argc, char *argv[])
>+{
>+	ng_hci_le_set_advertising_data_cp cp;
>+	ng_hci_le_set_advertising_data_rp rp;
>+	int n, len;
>+
>+	n = sizeof(rp);
>+
>+	char buf[NG_HCI_ADVERTISING_DATA_SIZE];
>+
>+	len = sizeof(buf);
>+	parse_param(argc, argv, buf, &len);
>+	memset(cp.advertising_data, 0, sizeof(cp.advertising_data));
>+	cp.advertising_data_length = len;
>+
>+	if (hci_request(s, NG_HCI_OPCODE(NG_HCI_OGF_LE,
>+		NG_HCI_OCF_LE_SET_ADVERTISING_DATA), 
>+		(void *)&cp, sizeof(cp), (void *)&rp, &n) == ERROR)
>+		return (ERROR);
>+			
>+	if (rp.status != 0x00) {
>+		fprintf(stdout, "Status: %s [%#02x]\n", 
>+			hci_status2str(rp.status), rp.status);
>+		return (FAILED);
>+	}
>+
>+	return (OK);
>+}
>+
> struct hci_command le_commands[] = {
> {
> 	"le_enable",
>@@ -378,4 +545,31 @@
> 	  "set LE device scan parameter",
> 	  &le_set_scan_param
>   },
>+  {
>+	  "le_set_advertising_enable",
>+	  "le_set_advertising_enable [enable|disable] \n"
>+	  "Start or stop advertising",
>+	  &le_set_advertising_enable
>+  },
>+  {
>+	  "le_read_advertising_channel_tx_power",
>+	  "le_read_advertising_channel_tx_power\n"
>+	  "Read host advertising transmit poser level (dBm)",
>+	  &le_read_advertising_channel_tx_power
>+  },
>+  {
>+	  "le_set_advertising_param",
>+	  "le_set_advertising_param  [-m min_interval(ms)] [- M max_interval(ms)]\n"
>+	  "[-t advertising_type] [-o own_address_type] [-p peer_address_type]\n"
>+	  "[-c advertising_channel_map] [-f advertising_filter_policy]\n"
>+	  "[-a peer_address]\n"
>+	  "set LE device advertising parameters",
>+	  &le_set_advertising_param
>+  },
>+  {
>+	  "le_set_advertising_data",
>+	  "le_set_advertising_data -n $name -f $flag -u $uuid16,$uuid16 \n"
>+	  "set LE device advertising packed data",
>+	  &le_set_advertising_data
>+  },
> };

Actions: View | Diff

Attachments on bug 245848: 213720