mctpd: update get msg type if vdm is registered

If VDM type support is registered using dbus call
RegisterVDMTypeSupport then add 7E and 7F based on the format in
GetMsgType control command response

Signed-off-by: Nidhin MS <nidhin.ms@intel.com>

Author: msnidhin

src/mctpd.c

@@ -61,6 +61,8 @@ static const char *conf_file_default = MCTPD_CONF_FILE_DEFAULT;
 
 static const mctp_eid_t eid_alloc_min = 0x08;
 static const mctp_eid_t eid_alloc_max = 0xfe;
+static const uint8_t MCTP_TYPE_VENDOR_PCIE = 0x7e;
+static const uint8_t MCTP_TYPE_VENDOR_IANA = 0x7f;
 
 // arbitrary sanity
 static size_t MAX_PEER_SIZE = 1000000;
@@ -981,6 +983,7 @@ static int handle_control_get_message_type_support(
 {
 	struct mctp_ctrl_resp_get_msg_type_support *resp = NULL;
 	struct mctp_ctrl_cmd_get_msg_type_support *req = NULL;
+	bool pcie_support = false, iana_support = false;
 	size_t i, resp_len, type_count;
 	uint8_t *resp_buf, *msg_types;
 	int rc;
@@ -992,8 +995,8 @@ static int handle_control_get_message_type_support(
 
 	req = (void *)buf;
 	type_count = ctx->num_supported_msg_types;
-	// Allocate extra space for the message types
-	resp_len = sizeof(*resp) + type_count;
+	// Allocate extra space for the message types. Also two byte for PCIe or IANA VDM
+	resp_len = sizeof(*resp) + type_count + sizeof(uint16_t);
 	resp_buf = malloc(resp_len);
 	if (!resp_buf) {
 		warnx("Failed to allocate response buffer");
@@ -1004,13 +1007,30 @@ static int handle_control_get_message_type_support(
 	mctp_ctrl_msg_hdr_init_resp(&resp->ctrl_hdr, req->ctrl_hdr);
 	resp->completion_code = MCTP_CTRL_CC_SUCCESS;
 
-	resp->msg_type_count = type_count;
 	// Append message types after msg_type_count
 	msg_types = (uint8_t *)(resp + 1);
 	for (i = 0; i < type_count; i++) {
 		msg_types[i] = ctx->supported_msg_types[i].msg_type;
 	}
 
+	// Adjust response length and find VDM support
+	resp_len -= sizeof(uint16_t);
+	for (i = 0; i < ctx->num_supported_vdm_types; i++) {
+		if (!pcie_support &&
+		    ctx->supported_vdm_types[i].format == VID_FORMAT_PCIE) {
+			pcie_support = true;
+			msg_types[type_count++] = MCTP_TYPE_VENDOR_PCIE;
+			resp_len++;
+		}
+		if (!iana_support &&
+		    ctx->supported_vdm_types[i].format == VID_FORMAT_IANA) {
+			iana_support = true;
+			msg_types[type_count++] = MCTP_TYPE_VENDOR_IANA;
+			resp_len++;
+		}
+	}
+
+	resp->msg_type_count = type_count;
 	rc = reply_message(ctx, sd, resp, resp_len, addr);
 	free(resp_buf);
 

tests/test_mctpd.py

@@ -1279,6 +1279,35 @@ async def test_get_message_types(dbus, mctpd, routed_ep):
     rsp = await ep.send_control(mctpd.network.mctp_socket, cmd)
     assert rsp.hex(' ') == '00 04 00 01 f4 f3 f2 f1'
 
+""" Test GetMessageTypes when VDM is registered """
+async def test_get_message_types_with_vdm(dbus, mctpd, routed_ep):
+    ep = routed_ep
+
+    # Register VDM responder PCIe format
+    mctp = await mctpd_mctp_base_iface_obj(dbus)
+    v_type = asyncdbus.Variant('q', 0xABCD)
+    await mctp.call_register_vdm_type_support(0x00, v_type, 0x0001)
+
+    # Verify get message type response includes PCIe
+    cmd = MCTPControlCommand(True, 0, 0x05, bytes([0x00]))
+    rsp = await ep.send_control(mctpd.network.mctp_socket, cmd)
+    assert rsp.hex(' ') == '00 05 00 02 00 7e'
+
+    # Register VDM responder IANA format
+    v_type = asyncdbus.Variant('u', 0x1234ABCD)
+    await mctp.call_register_vdm_type_support(0x01, v_type, 0x5678)
+
+    # Verify get message type response includes IANA
+    cmd = MCTPControlCommand(True, 0, 0x05, bytes([0x00]))
+    rsp = await ep.send_control(mctpd.network.mctp_socket, cmd)
+    assert rsp.hex(' ') == '00 05 00 03 00 7e 7f'
+
+    await mctp.call_register_type_support(5, [0xF1F2F3F4])
+    # Verify get message type response includes SPDM and VDMs
+    cmd = MCTPControlCommand(True, 0, 0x05, bytes([0x00]))
+    rsp = await ep.send_control(mctpd.network.mctp_socket, cmd)
+    assert rsp.hex(' ') == '00 05 00 04 00 05 7e 7f'
+
 """ Test RegisterVDMTypeSupport when no responders are registered """
 async def test_register_vdm_type_support_empty(mctpd, routed_ep):
     ep = routed_ep