[nrf fromtree] tests: bluetooth: tester: Fix CSIS/SR/SP/BV-07-C

This particular test-case requires bttester to respond with an OOB
procedure SIRK only error. To enable this response, the BTP command to
set SIRK mode has been extended with a new selection.

Signed-off-by: Frode van der Meeren <frode.vandermeeren@nordicsemi.no>
(cherry picked from commit 03bfafe)

Author: Frodevan

tests/bluetooth/tester/src/audio/btp/btp_csis.h

@@ -12,6 +12,10 @@
 #include <zephyr/bluetooth/audio/csip.h>
 
 /* CSIS commands */
+#define BTP_CSIS_SIRK_TYPE_PLAINTEXT		0x00
+#define BTP_CSIS_SIRK_TYPE_ENCRYPTED		0x01
+#define BTP_CSIS_SIRK_TYPE_OOB_ONLY		0x02
+
 #define BTP_CSIS_READ_SUPPORTED_COMMANDS	0x01
 struct btp_csis_read_supported_commands_rp {
 	uint8_t data[0];
@@ -33,7 +37,7 @@ struct btp_csis_get_member_rsi_rp {
 	uint8_t rsi[BT_CSIP_RSI_SIZE];
 } __packed;
 
-#define BTP_CSIS_ENC_SIRK_TYPE			0x04
-struct btp_csis_sirk_type_cmd {
-	uint8_t encrypted;
+#define BTP_CSIS_SET_SIRK_TYPE			0x04
+struct btp_csis_sirk_set_type_cmd {
+	uint8_t type;
 } __packed;

tests/bluetooth/tester/src/audio/btp_csis.c

@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL);
 #define BTP_STATUS_VAL(err) (err) ? BTP_STATUS_FAILED : BTP_STATUS_SUCCESS
 
 static struct bt_csip_set_member_svc_inst *csis_svc_inst;
-static bool enc_sirk;
+static uint8_t sirk_read_response;
 
 static uint8_t csis_supported_commands(const void *cmd, uint16_t cmd_len,
 				       void *rsp, uint16_t *rsp_len)
@@ -65,13 +65,27 @@ static uint8_t csis_get_member_rsi(const void *cmd, uint16_t cmd_len,
 	return BTP_STATUS_VAL(err);
 }
 
-static uint8_t csis_sirk_type(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
+static uint8_t csis_set_sirk_type(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
 {
-	const struct btp_csis_sirk_type_cmd *cp = cmd;
-
-	enc_sirk = cp->encrypted != 0U;
-
-	LOG_DBG("SIRK type: %s", enc_sirk ? "encrypted" : "plain text");
+	const struct btp_csis_sirk_set_type_cmd *cp = cmd;
+
+	switch (cp->type) {
+	case BTP_CSIS_SIRK_TYPE_PLAINTEXT:
+		LOG_DBG("SIRK type: plain text");
+		sirk_read_response = BT_CSIP_READ_SIRK_REQ_RSP_ACCEPT;
+		break;
+	case BTP_CSIS_SIRK_TYPE_ENCRYPTED:
+		LOG_DBG("SIRK type: encrypted");
+		sirk_read_response = BT_CSIP_READ_SIRK_REQ_RSP_ACCEPT_ENC;
+		break;
+	case BTP_CSIS_SIRK_TYPE_OOB_ONLY:
+		LOG_DBG("SIRK type: OOB procedure only");
+		sirk_read_response = BT_CSIP_READ_SIRK_REQ_RSP_OOB_ONLY;
+		break;
+	default:
+		LOG_ERR("Unknown SIRK type: %u", cp->type);
+		return BTP_STATUS_FAILED;
+	}
 
 	return BTP_STATUS_SUCCESS;
 }
@@ -94,9 +108,9 @@ static const struct btp_handler csis_handlers[] = {
 		.func = csis_get_member_rsi,
 	},
 	{
-		.opcode = BTP_CSIS_ENC_SIRK_TYPE,
-		.expect_len = sizeof(struct btp_csis_sirk_type_cmd),
-		.func = csis_sirk_type,
+		.opcode = BTP_CSIS_SET_SIRK_TYPE,
+		.expect_len = sizeof(struct btp_csis_sirk_set_type_cmd),
+		.func = csis_set_sirk_type,
 	},
 };
 
@@ -108,11 +122,7 @@ static void lock_changed_cb(struct bt_conn *conn, struct bt_csip_set_member_svc_
 
 static uint8_t sirk_read_cb(struct bt_conn *conn, struct bt_csip_set_member_svc_inst *svc_inst)
 {
-	if (enc_sirk) {
-		return BT_CSIP_READ_SIRK_REQ_RSP_ACCEPT_ENC;
-	} else {
-		return BT_CSIP_READ_SIRK_REQ_RSP_ACCEPT;
-	}
+	return sirk_read_response;
 }
 
 static struct bt_csip_set_member_cb csis_cb = {
@@ -132,6 +142,8 @@ uint8_t tester_init_csis(void)
 	};
 	int err = bt_csip_set_member_register(&register_params, &csis_svc_inst);
 
+	sirk_read_response = BT_CSIP_READ_SIRK_REQ_RSP_ACCEPT;
+
 	tester_register_command_handlers(BTP_SERVICE_ID_CSIS, csis_handlers,
 					 ARRAY_SIZE(csis_handlers));
 

tests/bsim/bluetooth/tester/src/bsim_btp.c

@@ -1236,7 +1236,7 @@ static bool is_valid_csis_packet_len(const struct btp_hdr *hdr, struct net_buf_s
 		return buf_simple->len == 0U;
 	case BTP_CSIS_GET_MEMBER_RSI:
 		return buf_simple->len == sizeof(struct btp_csis_get_member_rsi_rp);
-	case BTP_CSIS_ENC_SIRK_TYPE:
+	case BTP_CSIS_SET_SIRK_TYPE:
 		return buf_simple->len == 0U;
 
 	/* No events */