[PATCH 35/71] 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                   | 20 +++++++++++++++-----
 src/nan/nan.h                   |  6 ++++--
 src/nan/nan_module_tests.c      | 11 +++++++----
 wpa_supplicant/nan_supplicant.c |  9 ++++++---
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/nan/nan.c b/src/nan/nan.c
index f202f97b89..6b0bd2b6fd 100644
--- a/src/nan/nan.c
+++ b/src/nan/nan.c
@@ -1254,7 +1254,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;
 
@@ -1280,14 +1280,20 @@ 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);
 
-	if (nan->cfg->ndp_connected)
-		nan->cfg->ndp_connected(nan->cfg->cb_ctx, &params);
+	if (nan->cfg->ndp_connected &&
+	    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;
 }
 
 
@@ -1411,7 +1417,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;
 	}
 
@@ -1583,7 +1591,9 @@ int nan_tx_status(struct nan_data *nan, const u8 *dst, const u8 *data,
 	if (peer->ndp_setup.state == NAN_NDP_STATE_DONE &&
 	    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 46525e2158..c6f06382c3 100644
--- a/src/nan/nan.h
+++ b/src/nan/nan.h
@@ -427,9 +427,11 @@ struct nan_config {
 	 * ndp_connected - Notify that NDP was successfully connected
 	 * @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 80e32b1b63..9fc0064308 100644
--- a/src/nan/nan_module_tests.c
+++ b/src/nan/nan_module_tests.c
@@ -587,16 +587,16 @@ nan_test_ndp_action_notfi_cb(void *ctx,
  * @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 = 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,
@@ -618,6 +618,7 @@ static void nan_test_ndp_connected_cb(void *ctx,
 				   dev->name, dev->csid,
 				   dev->conf->ndp_confs[dev->n_ndps].
 				   expected_csid);
+			return -1;
 		}
 	}
 
@@ -625,6 +626,8 @@ static void nan_test_ndp_connected_cb(void *ctx,
 			    0, params->ssi, params->ssi_len, 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 6973bccc39..f89c98753b 100644
--- a/wpa_supplicant/nan_supplicant.c
+++ b/wpa_supplicant/nan_supplicant.c
@@ -213,8 +213,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;
@@ -222,7 +222,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);
 	}
@@ -234,6 +235,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.53.0