[PATCH] monitor: fix the CQM RSSI threshold attribute

[PATCH] monitor: fix the CQM RSSI threshold attribute

[James Prestwood]

This attribute is actually an array of signed 32 bit integers and it
was being treated as a single integer. This would work until more
than one threshold was set, then it would fail to parse it.
---
 monitor/nlmon.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/monitor/nlmon.c b/monitor/nlmon.c
index a900f7cc..e5cd5451 100644
--- a/monitor/nlmon.c
+++ b/monitor/nlmon.c
@@ -5618,8 +5618,26 @@ static void print_cqm_event(unsigned int level, const char *label,
 	}
 }
 
+static void print_cqm_thresholds(unsigned int level, const char *label,
+					const void *data, uint16_t size)
+{
+	const int32_t *thresholds = data;
+	unsigned int i;
+
+	if (size % 4) {
+		printf("malformed packet");
+		return;
+	}
+
+	print_attr(level, "%s:", label);
+
+	for (i = 0; i < size / 4; i++)
+		print_attr(level + 1, "Threshold: %d", thresholds[i]);
+
+}
 static const struct attr_entry cqm_table[] = {
-	{ NL80211_ATTR_CQM_RSSI_THOLD,	"RSSI threshold",	ATTR_U32 },
+	{ NL80211_ATTR_CQM_RSSI_THOLD,	"RSSI thresholds",	ATTR_CUSTOM,
+					{ .function = print_cqm_thresholds } },
 	{ NL80211_ATTR_CQM_RSSI_HYST,	"RSSI hysteresis",	ATTR_U32 },
 	{ NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT,
 					"RSSI threshold event",	ATTR_CUSTOM,
-- 
2.34.1

Re: [PATCH] monitor: fix the CQM RSSI threshold attribute

[Denis Kenzior]

Hi James,

On 7/26/24 7:18 AM, James Prestwood wrote:
> This attribute is actually an array of signed 32 bit integers and it
> was being treated as a single integer. This would work until more
> than one threshold was set, then it would fail to parse it.
> ---
>   monitor/nlmon.c | 20 +++++++++++++++++++-
>   1 file changed, 19 insertions(+), 1 deletion(-)

Applied, thanks.

Regards,
-Denis