samples: dect_phy: dect_shell: ping/perf: coverity issues fixed

Changes due to Coverity report.

Signed-off-by: Jani Hirsimäki <[email protected]>

Author: jhirsi

samples/dect/dect_phy/dect_shell/src/dect/perf/dect_phy_perf.c

@@ -465,6 +465,8 @@ static void dect_phy_perf_rx_pcc_cb(uint64_t const *time,
 
 	ctrl_pcc_op_params.pcc_status = *p_rx_status;
 	ctrl_pcc_op_params.phy_header = *p_phy_header;
+	ctrl_pcc_op_params.phy_len = header->packet_length;
+	ctrl_pcc_op_params.phy_len_type = header->packet_length_type;
 	ctrl_pcc_op_params.time = *time;
 	ctrl_pcc_op_params.stf_start_time = p_rx_status->stf_start_time;
 
@@ -596,6 +598,7 @@ static void dect_phy_perf_rx_pdc_cb(uint64_t const *time,
 
 	perf_pdc_op_params.rx_pwr_dbm = 0; /* Not needed from PDC */
 	perf_pdc_op_params.rx_rssi_level_dbm = rssi_level;
+	perf_pdc_op_params.last_rx_op_channel = perf_data.cmd_params.channel;
 
 	if (length <= sizeof(perf_pdc_op_params.data)) {
 		memcpy(perf_pdc_op_params.data, p_data, length);
@@ -1062,6 +1065,7 @@ static int dect_phy_perf_tx_request_results(void)
 	memcpy(&phy_header.type_2, &header, sizeof(phy_header.type_2));
 
 	perf_pdu.header.message_type = DECT_MAC_MESSAGE_TYPE_PERF_RESULTS_REQ;
+	perf_pdu.message.results_req.unused = 0;
 	perf_pdu.header.transmitter_id = current_settings->common.transmitter_id;
 	dect_phy_perf_pdu_encode(encoded_data_to_send, &perf_pdu);
 

samples/dect/dect_phy/dect_shell/src/dect/perf/dect_phy_perf_pdu.c

@@ -42,10 +42,10 @@ uint8_t *dect_phy_perf_pdu_encode(uint8_t *p_target, const dect_phy_perf_pdu_t *
 		p_target = p_target + sizeof(p_input->message.tx_data.pdu_payload);
 	} else if (p_input->header.message_type == DECT_MAC_MESSAGE_TYPE_PERF_RESULTS_REQ) {
 		p_target = dect_common_utils_32bit_be_write(p_target,
-							    p_input->message.results_req.foo);
+							    p_input->message.results_req.unused);
 	} else if (p_input->header.message_type == DECT_MAC_MESSAGE_TYPE_PERF_RESULTS_RESP) {
 		strncpy(p_target, p_input->message.results.results_str,
-			DECT_PHY_PERF_RESULTS_DATA_MAX_LEN);
+			DECT_PHY_PERF_RESULTS_DATA_MAX_LEN - 1);
 	}
 
 	return p_target;
@@ -66,7 +66,7 @@ int dect_phy_perf_pdu_decode(dect_phy_perf_pdu_t *p_target, const uint8_t *p_dat
 		       p_target->message.tx_data.payload_length);
 	} else if (p_target->header.message_type == DECT_MAC_MESSAGE_TYPE_PERF_RESULTS_RESP) {
 		strncpy(p_target->message.results.results_str, p_ptr,
-			DECT_PHY_PERF_RESULTS_DATA_MAX_LEN);
+			DECT_PHY_PERF_RESULTS_DATA_MAX_LEN - 1);
 	}
 
 	return 0;

samples/dect/dect_phy/dect_shell/src/dect/perf/dect_phy_perf_pdu.h

@@ -34,7 +34,7 @@ typedef struct {
 	char results_str[DECT_PHY_PERF_RESULTS_DATA_MAX_LEN];
 } dect_phy_perf_pdu_results_resp_data;
 typedef struct {
-	uint32_t foo;
+	uint32_t unused;
 } dect_phy_perf_pdu_results_req;
 
 typedef struct {
@@ -44,7 +44,7 @@ typedef struct {
 } dect_phy_perf_pdu_tx_data;
 
 typedef struct {
-	uint8_t foo_fighters;
+	uint8_t unused;
 } dect_phy_perf_pdu_harq_feedback_t;
 
 typedef union {

samples/dect/dect_phy/dect_shell/src/dect/ping/dect_phy_ping.c

@@ -543,6 +543,8 @@ static void dect_phy_ping_rx_pcc_cb(uint64_t const *time,
 	ctrl_pcc_op_params.pcc_status = *p_rx_status;
 	ctrl_pcc_op_params.phy_header = *p_phy_header;
 	ctrl_pcc_op_params.time = *time;
+	ctrl_pcc_op_params.stf_start_time = p_rx_status->stf_start_time;
+	/* Others from struct dect_phy_common_op_pcc_rcv_params are not needed */
 
 	/* Provide HARQ feedback if requested */
 	if (p_rx_status->header_status == NRF_MODEM_DECT_PHY_HDR_STATUS_VALID &&
@@ -626,7 +628,7 @@ static void dect_phy_ping_rx_pdc_cb(uint64_t const *time,
 
 	dect_app_modem_time_save(time);
 
-	struct dect_phy_commmon_op_pdc_rcv_params ping_pdc_op_params;
+	struct dect_phy_commmon_op_pdc_rcv_params ping_pdc_op_params = { 0 };
 
 	ping_pdc_op_params.rx_status = *p_rx_status;
 
@@ -637,6 +639,9 @@ static void dect_phy_ping_rx_pdc_cb(uint64_t const *time,
 		dect_common_utils_phy_tx_power_to_dbm(ping_data.rx_metrics.rx_phy_transmit_pwr);
 	ping_pdc_op_params.rx_mcs = ping_data.rx_metrics.rx_last_pcc_mcs;
 	ping_pdc_op_params.rx_rssi_level_dbm = rssi_level;
+	ping_pdc_op_params.last_rx_op_channel = ping_data.cmd_params.channel;
+
+	/* Others from struct dect_phy_commmon_op_pdc_rcv_params are not needed */
 
 	if (length <= sizeof(ping_pdc_op_params.data)) {
 		memcpy(ping_pdc_op_params.data, p_data, length);
@@ -1018,6 +1023,9 @@ static int dect_phy_ping_client_start(void)
 	ping_data.client_data.tx_op.data_size = ping_pdu_byte_count;
 	ping_data.client_data.tx_op.data = encoded_data_to_send;
 	ping_data.client_data.tx_op.lbt_period = 0;
+	ping_data.client_data.tx_op.lbt_rssi_threshold_max =
+		current_settings->rssi_scan.busy_threshold;
+
 	ping_data.client_data.tx_op.network_id = current_settings->common.network_id;
 	ping_data.client_data.tx_op.phy_header = &ping_data.client_data.tx_phy_header;
 	ping_data.client_data.tx_op.phy_type = DECT_PHY_HEADER_TYPE2;
@@ -1146,13 +1154,15 @@ static int dect_phy_ping_tx_request_results(void)
 	ping_pdu.header.transmitter_id = current_settings->common.transmitter_id;
 	ping_pdu.header.pwr_ctrl_expected_rssi_level_dbm =
 		params->pwr_ctrl_pdu_expected_rx_rssi_level;
+	ping_pdu.message.results_req.unused = 0;
 	dect_phy_ping_pdu_encode(encoded_data_to_send, &ping_pdu);
 
 	tx_op.bs_cqi = NRF_MODEM_DECT_PHY_BS_CQI_NOT_USED;
 	tx_op.carrier = params->channel;
 	tx_op.data_size = DECT_PHY_PING_RESULTS_REQ_LEN;
 	tx_op.data = encoded_data_to_send;
 	tx_op.lbt_period = 0;
+	tx_op.lbt_rssi_threshold_max = current_settings->rssi_scan.busy_threshold;
 	tx_op.network_id = current_settings->common.network_id;
 	tx_op.phy_header = &phy_header;
 	tx_op.phy_type = DECT_PHY_HEADER_TYPE2;
@@ -1263,7 +1273,7 @@ dect_phy_ping_client_report_local_results_and_req_server_results(int64_t *elapse
 	ping_data.restarted_count = 0;
 	dect_phy_ping_rx_metrics_reset(params);
 
-	memset(&ping_data.tx_metrics, 0, sizeof(struct dect_phy_ping_rx_metrics));
+	memset(&ping_data.tx_metrics, 0, sizeof(struct dect_phy_ping_tx_metrics));
 
 	return ret;
 }
@@ -1322,11 +1332,14 @@ static int dect_phy_ping_server_results_tx(char *result_str)
 	tx_op.data_size = bytes_to_send;
 	tx_op.data = encoded_data_to_send;
 	tx_op.lbt_period = 0;
+	tx_op.lbt_rssi_threshold_max = current_settings->rssi_scan.busy_threshold;
+
 	tx_op.network_id = current_settings->common.network_id;
 	tx_op.phy_header = &phy_header;
 	tx_op.phy_type = DECT_PHY_HEADER_TYPE2;
 	tx_op.handle = DECT_PHY_PING_RESULTS_RESP_TX_HANDLE;
 	tx_op.start_time = first_possible_tx;
+
 	tx_rx_param.tx = tx_op;
 	tx_rx_param.rx = ping_data.server_data.server_rx_op;
 
@@ -1414,6 +1427,8 @@ static int dect_phy_ping_server_ping_resp_tx(struct dect_phy_data_rcv_common_par
 	tx_op.data_size = bytes_to_send;
 	tx_op.data = encoded_data_to_send;
 	tx_op.lbt_period = 0;
+	tx_op.lbt_rssi_threshold_max = current_settings->rssi_scan.busy_threshold;
+
 	tx_op.network_id = current_settings->common.network_id;
 	tx_op.phy_header = &phy_header;
 	tx_op.phy_type = DECT_PHY_HEADER_TYPE2;

samples/dect/dect_phy/dect_shell/src/dect/ping/dect_phy_ping_pdu.c

@@ -44,10 +44,10 @@ uint8_t *dect_phy_ping_pdu_encode(uint8_t *p_target, const dect_phy_ping_pdu_t *
 		p_target = p_target + sizeof(p_input->message.tx_data.pdu_payload);
 	} else if (p_input->header.message_type == DECT_MAC_MESSAGE_TYPE_PING_RESULTS_REQ) {
 		p_target = dect_common_utils_32bit_be_write(p_target,
-							    p_input->message.results_req.foo);
+							    p_input->message.results_req.unused);
 	} else if (p_input->header.message_type == DECT_MAC_MESSAGE_TYPE_PING_RESULTS_RESP) {
 		strncpy(p_target, p_input->message.results.results_str,
-			DECT_PHY_PING_RESULTS_DATA_MAX_LEN);
+			DECT_PHY_PING_RESULTS_DATA_MAX_LEN - 1);
 	}
 
 	return p_target;
@@ -69,7 +69,7 @@ int dect_phy_ping_pdu_decode(dect_phy_ping_pdu_t *p_target, const uint8_t *p_dat
 		       p_target->message.tx_data.payload_length);
 	} else if (p_target->header.message_type == DECT_MAC_MESSAGE_TYPE_PING_RESULTS_RESP) {
 		strncpy(p_target->message.results.results_str, p_ptr,
-			DECT_PHY_PING_RESULTS_DATA_MAX_LEN);
+			DECT_PHY_PING_RESULTS_DATA_MAX_LEN - 1);
 	}
 
 	return 0;

samples/dect/dect_phy/dect_shell/src/dect/ping/dect_phy_ping_pdu.h

@@ -37,7 +37,7 @@ typedef struct {
 } dect_phy_ping_pdu_results_resp_data;
 
 typedef struct {
-	uint32_t foo;
+	uint32_t unused;
 } dect_phy_ping_pdu_results_req;
 
 typedef struct {

samples/dect/dect_phy/dect_shell/src/dect/rf_tool/dect_phy_rf_tool.c

@@ -178,13 +178,16 @@ static void dect_phy_rf_tool_rx_pcc_cb(uint64_t const *time,
 				       union nrf_modem_dect_phy_hdr const *p_phy_header)
 {
 	struct dect_phy_common_op_pcc_rcv_params ctrl_pcc_op_params;
+	struct dect_phy_header_type2_format0_t *header = (void *)p_phy_header;
 
 	dect_app_modem_time_save(time);
 
 	ctrl_pcc_op_params.pcc_status = *p_rx_status;
 	ctrl_pcc_op_params.phy_header = *p_phy_header;
 	ctrl_pcc_op_params.time = *time;
 	ctrl_pcc_op_params.stf_start_time = p_rx_status->stf_start_time;
+	ctrl_pcc_op_params.phy_len = header->packet_length;
+	ctrl_pcc_op_params.phy_len_type = header->packet_length_type;
 
 	dect_phy_rf_tool_msgq_data_op_add(DECT_PHY_RF_TOOL_EVT_RX_PCC,
 					  (void *)&ctrl_pcc_op_params,
@@ -222,6 +225,7 @@ static void dect_phy_rf_tool_rx_pdc_cb(uint64_t const *time,
 
 	rf_tool_pdc_op_params.rx_pwr_dbm = 0;		      /* Taken from PCC */
 	rf_tool_pdc_op_params.rx_rssi_level_dbm = rssi_level; /* Used from PCC */
+	rf_tool_pdc_op_params.last_rx_op_channel = rf_tool_data.cmd_params.channel;
 
 	if (length <= sizeof(rf_tool_pdc_op_params.data)) {
 		memcpy(rf_tool_pdc_op_params.data, p_data, length);
@@ -1191,7 +1195,11 @@ static int dect_phy_rf_tool_start(struct dect_phy_rf_tool_params *params, bool r
 			dect_common_utils_subslots_in_bytes(len_subslots, params->tx_mcs);
 
 		if (len_bytes <= 0) {
-			desh_error("Unsupported slot/mcs combination");
+			desh_error("%s: Unsupported slot/mcs combination", __func__);
+			return -1;
+		}
+		if (len_bytes > DECT_DATA_MAX_LEN) {
+			desh_error("%s: Too long TX data: %d bytes", __func__, len_bytes);
 			return -1;
 		}