[PATCH 67/97] NAN: Update peer schedule when the peer advertises new availability map

[Andrei Otcheretianski]

From: Avraham Stern <avraham.stern at intel.com>

When a peer with whom the device has an active NDL advertises a new
availability map, update the peer's schedule according to the new
map. If the new map doesn't intersect with the local availability or
breaks NDC or QoS requirements, terminate any existing NDPs with
this peer.

Signed-off-by: Avraham Stern <avraham.stern at intel.com>
---
 src/nan/nan.c     | 77 +++++++++++++++++++++++++++++++++++++++++++++--
 src/nan/nan.h     |  8 +++++
 src/nan/nan_i.h   |  1 +
 src/nan/nan_ndl.c |  3 +-
 4 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/src/nan/nan.c b/src/nan/nan.c
index ed948b1a44..a1a72a5a31 100644
--- a/src/nan/nan.c
+++ b/src/nan/nan.c
@@ -26,6 +26,8 @@ static void nan_idle_period_timeout(void *eloop_ctx, void *timeout_ctx);
 static void nan_ndp_disconnected(struct nan_data *nan, struct nan_peer *peer,
 				 enum nan_reason reason,
 				 bool locally_generated);
+static int nan_action_send(struct nan_data *nan, struct nan_peer *peer,
+			   enum nan_subtype subtype);
 
 
 struct nan_data * nan_init(const struct nan_config *cfg)
@@ -945,12 +947,80 @@ static void nan_peer_dump(struct nan_data *nan, struct nan_peer *peer)
 }
 
 
+static void nan_peer_disconnect_all_ndps(struct nan_data *nan,
+					 struct nan_peer *peer)
+{
+	struct nan_ndp *ndp, *tmp;
+	u8 *local_ndi = NULL, *peer_ndi = NULL;
+	struct nan_ndp_id ndp_id;
+
+	if (peer->ndp_setup.ndp)
+		nan_ndp_disconnected(nan, peer,
+				     NAN_REASON_UNSPECIFIED_REASON,
+				     false);
+
+	dl_list_for_each_safe(ndp, tmp, &peer->ndps, struct nan_ndp,
+			      list) {
+		if (ndp->initiator) {
+			local_ndi = ndp->init_ndi;
+			peer_ndi = ndp->resp_ndi;
+		} else {
+			local_ndi = ndp->resp_ndi;
+			peer_ndi = ndp->init_ndi;
+		}
+
+		os_memcpy(&ndp_id.peer_nmi, peer->nmi_addr, ETH_ALEN);
+		os_memcpy(ndp_id.init_ndi, ndp->init_ndi, ETH_ALEN);
+		ndp_id.id = ndp->ndp_id;
+
+		peer->ndp_setup.ndp = ndp;
+		peer->ndp_setup.state = NAN_NDP_STATE_DONE;
+		peer->ndp_setup.status = NAN_NDP_STATUS_REJECTED;
+		peer->ndp_setup.reason = NAN_REASON_UNSPECIFIED_REASON;
+		nan_action_send(nan, peer,
+				NAN_SUBTYPE_DATA_PATH_TERMINATION);
+		peer->ndp_setup.ndp = NULL;
+
+		dl_list_del(&ndp->list);
+		nan_ndp_terminated(nan, peer, &ndp_id, local_ndi,
+				   peer_ndi,
+				   NAN_REASON_UNSPECIFIED_REASON,
+				   ndp->gtk_id);
+		os_free(ndp);
+	}
+}
+
+
+static void nan_peer_update_schedule(struct nan_data *nan,
+				     struct nan_peer *peer,
+				     struct nan_schedule *sched)
+{
+	struct bitfield *common_bf;
+	int ret = -1;
+
+	common_bf = nan_peer_schedule_intersection(nan, peer, sched);
+	if (common_bf && nan_ndl_meets_qos(nan, peer, common_bf) &&
+	    nan_ndl_validate_peer_avail(nan, peer))
+		ret = nan_configure_peer_schedule(nan, peer, sched);
+	else
+		wpa_printf(MSG_DEBUG, "NAN: New peer schedule breaks NDL");
+
+	if (ret)
+		nan_peer_disconnect_all_ndps(nan, peer);
+	else if (nan->cfg->schedule_changed)
+		nan->cfg->schedule_changed(nan->cfg->cb_ctx, peer->nmi_addr);
+
+	bitfield_free(common_bf);
+}
+
+
 /*
  * Update the old peer info with information from the new peer info.
  * Information that is available in the old peer info but is not available
  * in the new peer info will not be changed.
  */
-static void nan_merge_peer_info(struct nan_peer_info *old,
+static void nan_merge_peer_info(struct nan_data *nan, struct nan_peer *peer,
+				struct nan_peer_info *old,
 				struct nan_peer_info *new)
 {
 	if (!dl_list_empty(&new->avail_entries)) {
@@ -965,6 +1035,9 @@ static void nan_merge_peer_info(struct nan_peer_info *old,
 			dl_list_add(&old->avail_entries, &avail->list);
 		}
 		old->seq_id = new->seq_id;
+
+		if (peer->ndl && peer->ndl->state == NAN_NDL_STATE_DONE)
+			nan_peer_update_schedule(nan, peer, &nan->sched);
 	}
 
 	old->last_seen = new->last_seen;
@@ -1209,7 +1282,7 @@ int nan_parse_device_attrs(struct nan_data *nan, struct nan_peer *peer,
 		goto out;
 	}
 
-	nan_merge_peer_info(&peer->info, &info);
+	nan_merge_peer_info(nan, peer, &peer->info, &info);
 	nan_parse_peer_device_capa(nan, peer, &attrs);
 	nan_parse_peer_elem_container(nan, peer, &attrs);
 	nan_parse_peer_dev_capa_ext(nan, peer, &attrs);
diff --git a/src/nan/nan.h b/src/nan/nan.h
index 0aa380e4d4..7e1eb20143 100644
--- a/src/nan/nan.h
+++ b/src/nan/nan.h
@@ -781,6 +781,14 @@ struct nan_config {
 	 */
 	int (*get_peer_inactivity)(void *ctx, const u8 *local_ndi,
 				   const u8 *peer_ndi);
+
+	/**
+	 * schedule_changed - Notify about peer schedule change
+	 *
+	 * @ctx: Callback context from cb_ctx
+	 * @peer_nmi: Peer NMI address
+	 */
+	void (*schedule_changed)(void *ctx, const u8 *peer_nmi);
 };
 
 struct nan_data * nan_init(const struct nan_config *cfg);
diff --git a/src/nan/nan_i.h b/src/nan/nan_i.h
index 6a75467659..f4fad1bd39 100644
--- a/src/nan/nan_i.h
+++ b/src/nan/nan_i.h
@@ -736,6 +736,7 @@ struct bitfield *nan_peer_schedule_intersection(
 	const struct nan_schedule *sched);
 bool nan_ndl_meets_qos(struct nan_data *nan, struct nan_peer *peer,
 		       struct bitfield *common_bf);
+bool nan_ndl_validate_peer_avail(struct nan_data *nan, struct nan_peer *peer);
 int nan_convert_chan_sched_to_bf(struct nan_data *nan,
 				 const struct nan_chan_schedule *chan,
 				 struct bitfield **avail_bf, u8 *map_id,
diff --git a/src/nan/nan_ndl.c b/src/nan/nan_ndl.c
index e54bb0303f..0eb7c798fb 100644
--- a/src/nan/nan_ndl.c
+++ b/src/nan/nan_ndl.c
@@ -195,8 +195,7 @@ static struct nan_ndl * nan_ndl_alloc(struct nan_data *nan)
 }
 
 
-static bool nan_ndl_validate_peer_avail(struct nan_data *nan,
-					struct nan_peer *peer)
+bool nan_ndl_validate_peer_avail(struct nan_data *nan, struct nan_peer *peer)
 {
 	struct nan_ndl *ndl = peer->ndl;
 	bool ret;
-- 
2.53.0