[PATCH 85/97] wpa_supplicant: List NDPs in NAN_PEER_INFO command

[Andrei Otcheretianski]

"NAN_PEER_INFO <peer_nmi> ndps" will list all the NDPs with the given
peer.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski at intel.com>
---
 src/nan/nan.c                   | 37 +++++++++++++++++++++++++++++++++
 src/nan/nan.h                   |  2 ++
 wpa_supplicant/nan_supplicant.c |  9 ++++++++
 wpa_supplicant/wpa_cli.c        |  2 +-
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/nan/nan.c b/src/nan/nan.c
index 869d379acb..6dab63abfa 100644
--- a/src/nan/nan.c
+++ b/src/nan/nan.c
@@ -3589,3 +3589,40 @@ int nan_get_status(struct nan_data *nan, char *buf, size_t buflen)
 
 	return pos - buf;
 }
+
+
+int nan_peer_dump_ndps_to_buf(struct nan_data *nan, const u8 *addr,
+			      char *buf, size_t buflen)
+{
+	struct nan_peer *peer;
+	struct nan_ndp *ndp;
+	char *pos, *end;
+
+	if (!nan)
+		return -1;
+
+	peer = nan_get_peer(nan, addr);
+	if (!peer) {
+		wpa_printf(MSG_DEBUG, "NAN: Peer " MACSTR " not found",
+			   MAC2STR(addr));
+		return -1;
+	}
+
+	pos = buf;
+	end = buf + buflen;
+
+	dl_list_for_each(ndp, &peer->ndps, struct nan_ndp, list) {
+		pos += os_snprintf(pos, end - pos,
+				   "ndp_id=%u initiator=%d "
+				   "init_ndi=" MACSTR " resp_ndi=" MACSTR
+				   " qos_min_slots=%u qos_max_latency=%u\n",
+				   ndp->ndp_id, ndp->initiator,
+				   MAC2STR(ndp->init_ndi),
+				   MAC2STR(ndp->resp_ndi),
+				   ndp->qos.min_slots, ndp->qos.max_latency);
+		if (pos >= end)
+			return pos - buf;
+	}
+
+	return pos - buf;
+}
diff --git a/src/nan/nan.h b/src/nan/nan.h
index 0af1c90f43..4512c2ecbd 100644
--- a/src/nan/nan.h
+++ b/src/nan/nan.h
@@ -875,6 +875,8 @@ int nan_set_beacon_prot(struct nan_data *nan, bool enable);
 int nan_set_max_ndl_idle_period(struct nan_data *nan, u16 max_idle_period);
 bool nan_has_active_ndp(struct nan_data *nan);
 int nan_get_status(struct nan_data *nan, char *buf, size_t buflen);
+int nan_peer_dump_ndps_to_buf(struct nan_data *nan, const u8 *addr,
+			      char *buf, size_t buflen);
 #ifdef CONFIG_PASN
 int nan_pairing_add_attrs(struct nan_data *nan_data, struct wpabuf *buf);
 int nan_pairing_initiate_pasn_auth(struct nan_data *nan_data, const u8 *addr,
diff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c
index 83de8dd441..9928afa91c 100644
--- a/wpa_supplicant/nan_supplicant.c
+++ b/wpa_supplicant/nan_supplicant.c
@@ -3278,6 +3278,15 @@ int wpas_nan_peer_info(struct wpa_supplicant *wpa_s, const char *cmd,
 			ret += wpas_nan_append_ik_info(reply + ret,
 						       reply_size - ret, ik);
 #endif /* CONFIG_PASN */
+	} else if (os_strncmp(pos + 1, "ndps", 4) == 0) {
+		ret = nan_peer_dump_ndps_to_buf(wpa_s->nan, addr, reply,
+						reply_size);
+		if (ret < 0) {
+			wpa_printf(MSG_DEBUG,
+				   "NAN: Failed to get NDPs for peer " MACSTR,
+				   MAC2STR(addr));
+			return -1;
+		}
 	} else {
 		wpa_printf(MSG_INFO, "NAN: Unknown info type: %s", pos + 1);
 		ret = -1;
diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index 62f01ca2f1..45ec8900bf 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -4296,7 +4296,7 @@ static const struct wpa_cli_cmd wpa_cli_commands[] = {
 	  "peer_nmi=<nmi> init_ndi=<ndi> ndp_id=<id> = Terminate NAN data path" },
 	{ "nan_peer_info", wpa_cli_cmd_nan_peer_info, NULL,
 	  cli_cmd_flag_none,
-	  "<addr> <schedule|potential|capa> [map_id] = Get NAN peer information" },
+	  "<addr> <schedule|potential|capa|ndps> [map_id] = Get NAN peer information" },
 	{ "nan_status", wpa_cli_cmd_nan_status, NULL,
 	  cli_cmd_flag_none, "= Get NAN status" },
 	{ "nan_bootstrap", wpa_cli_cmd_nan_bootstrap, NULL,
-- 
2.53.0