[RFC v2 90/99] NAN: Make ndp_connected() callback return int

[Andrei Otcheretianski]

ndp_connected() callback is used to notify upper layers about NDP
establishment. Allow this callback to fail.
This is needed to allow proper NDP tear down in case upper layers fail
to configure the newly established NDP connection.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski at intel.com>
---
 src/nan/nan.c                   | 18 ++++++++++++++----
 src/nan/nan.h                   |  6 ++++--
 src/nan/nan_module_tests.c      | 11 +++++++----
 wpa_supplicant/nan_supplicant.c |  9 ++++++---
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/nan/nan.c b/src/nan/nan.c
index ee95a10661..d64ae71aee 100644
--- a/src/nan/nan.c
+++ b/src/nan/nan.c
@@ -1218,7 +1218,7 @@ static void nan_ndp_action_notif(struct nan_data *nan, struct nan_peer *peer)
 }
 
 
-static void nan_ndp_connected(struct nan_data *nan, struct nan_peer *peer)
+static int nan_ndp_connected(struct nan_data *nan, struct nan_peer *peer)
 {
 	struct nan_ndp_connection_params params;
 
@@ -1246,13 +1246,19 @@ static void nan_ndp_connected(struct nan_data *nan, struct nan_peer *peer)
 	nan_sec_ndp_store_keys(nan, peer, params.peer_ndi,
 			       params.local_ndi);
 
-	nan->cfg->ndp_connected(nan->cfg->cb_ctx, &params);
+	if (nan->cfg->ndp_connected(nan->cfg->cb_ctx, &params)) {
+		wpa_printf(MSG_DEBUG,
+			   "NAN: NDP connected notification failed");
+		return -1;
+	}
 
 	/* Move the NDP to the list of tracked NDPs */
 	dl_list_add(&peer->ndps, &peer->ndp_setup.ndp->list);
 	peer->ndp_setup.ndp = NULL;
 
 	nan_ndp_setup_stop(nan, peer);
+
+	return 0;
 }
 
 
@@ -1376,7 +1382,9 @@ static int nan_action_rx_ndp(struct nan_data *nan, struct nan_peer *peer,
 	    peer->ndl->state == NAN_NDL_STATE_DONE) {
 		wpa_printf(MSG_DEBUG, "NAN: NAF: NDP setup done");
 
-		nan_ndp_connected(nan, peer);
+		if (nan_ndp_connected(nan, peer))
+			nan_ndp_disconnected(nan, peer,
+					     NAN_REASON_UNSPECIFIED_REASON);
 		return 0;
 	}
 
@@ -1553,7 +1561,9 @@ int nan_tx_status(struct nan_data *nan, const u8 *dst, const u8 *data,
 	    peer->ndl->state == NAN_NDL_STATE_DONE) {
 		wpa_printf(MSG_DEBUG, "NAN: TX status:  NDP setup done");
 
-		nan_ndp_connected(nan, peer);
+		if (nan_ndp_connected(nan, peer))
+			nan_ndp_disconnected(nan, peer,
+					     NAN_REASON_UNSPECIFIED_REASON);
 	}
 
 	return 0;
diff --git a/src/nan/nan.h b/src/nan/nan.h
index 3f6f840f34..40d870e46c 100644
--- a/src/nan/nan.h
+++ b/src/nan/nan.h
@@ -434,9 +434,11 @@ struct nan_config {
 	 *
 	 * @ctx: Callback context from cb_ctx
 	 * @params: NDP connection parameters
+	 *
+	 * Returns: 0 on success, -1 on failure.
 	 */
-	void (*ndp_connected)(void *ctx,
-			      struct nan_ndp_connection_params *params);
+	int (*ndp_connected)(void *ctx,
+			     struct nan_ndp_connection_params *params);
 
 	/**
 	 * ndp_disconnected - Notify that NDP was disconnected.
diff --git a/src/nan/nan_module_tests.c b/src/nan/nan_module_tests.c
index 87f9271a8d..164982b5d3 100644
--- a/src/nan/nan_module_tests.c
+++ b/src/nan/nan_module_tests.c
@@ -594,16 +594,16 @@ static void nan_test_ndp_action_notfi_cb(void *ctx, struct
  * @params: NDP action notification parameters
  *
  * The handling of the event is done asynchronously through the NAN test actions
- * processing.
+ * processing. Returns 0 on success, -1 on failure.
  */
-static void nan_test_ndp_connected_cb(void *ctx,
-				      struct nan_ndp_connection_params *params)
+static int nan_test_ndp_connected_cb(void *ctx,
+				     struct nan_ndp_connection_params *params)
 {
 	struct nan_device *dev = (struct nan_device *)ctx;
 	struct nan_peer_schedule sched;
 	struct nan_peer_potential_avail pot;
 
-	DEV_NOT_INIT_ERR_VOID(dev);
+	DEV_NOT_INIT_ERR(dev);
 
 	wpa_printf(MSG_INFO,
 		   "%s: %s: Enter. local_ndi=" MACSTR " peer_ndi=" MACSTR,
@@ -625,6 +625,7 @@ static void nan_test_ndp_connected_cb(void *ctx,
 				   "%s: Unexpected CSID: got %u expected %u",
 				   dev->name, dev->csid,
 				   dev->conf->ndp_confs[dev->n_ndps].expected_csid);
+			return -1;
 		}
 	}
 
@@ -634,6 +635,8 @@ static void nan_test_ndp_connected_cb(void *ctx,
 			    NAN_CS_NONE, NULL);
 
 	dev->connected_notify_received = true;
+
+	return 0;
 }
 
 
diff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c
index 18f55d8e91..6b8f234c2e 100644
--- a/wpa_supplicant/nan_supplicant.c
+++ b/wpa_supplicant/nan_supplicant.c
@@ -210,8 +210,8 @@ static void wpas_nan_ndp_action_notif_cb(void *ctx,
 }
 
 
-static void wpas_nan_ndp_connected_cb(void *ctx,
-				      struct nan_ndp_connection_params *params)
+static int wpas_nan_ndp_connected_cb(void *ctx,
+				     struct nan_ndp_connection_params *params)
 {
 	struct wpa_supplicant *wpa_s = ctx;
 	char *ssi_hex = NULL;
@@ -219,7 +219,8 @@ static void wpas_nan_ndp_connected_cb(void *ctx,
 	if (params->ssi) {
 		ssi_hex = os_zalloc(2 * params->ssi_len + 1);
 		if (!ssi_hex)
-			return;
+			return -1;
+
 		wpa_snprintf_hex(ssi_hex, 2 * params->ssi_len + 1, params->ssi,
 				 params->ssi_len);
 	}
@@ -231,6 +232,8 @@ static void wpas_nan_ndp_connected_cb(void *ctx,
 		       MAC2STR(params->local_ndi), MAC2STR(params->peer_ndi),
 		       ssi_hex ? ssi_hex : "");
        os_free(ssi_hex);
+
+       return 0;
 }
 
 
-- 
2.49.0