Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2198430/?format=api
{ "id": 2198430, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2198430/?format=api", "project": { "id": 22, "url": "http://patchwork.ozlabs.org/api/1.0/projects/22/?format=api", "name": "HostAP Development", "link_name": "hostap", "list_id": "hostap.lists.infradead.org", "list_email": "hostap@lists.infradead.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20260219202514.5781-33-andrei.otcheretianski@intel.com>", "date": "2026-02-19T20:24:48", "name": "[32/58] NAN: Process NAN Action frame", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4a5dc94a96da71950ee8292641befd2413844d8e", "submitter": { "id": 62065, "url": "http://patchwork.ozlabs.org/api/1.0/people/62065/?format=api", "name": "Andrei Otcheretianski", "email": "andrei.otcheretianski@intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/hostap/patch/20260219202514.5781-33-andrei.otcheretianski@intel.com/mbox/", "series": [ { "id": 492721, "url": "http://patchwork.ozlabs.org/api/1.0/series/492721/?format=api", "date": "2026-02-19T20:24:21", "name": "NAN: Add NAN Data Path (NDP) support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/492721/mbox/" } ], "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2198430/checks/", "tags": {}, "headers": { "Return-Path": "\n <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=lists.infradead.org header.i=@lists.infradead.org\n header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Z7bv3oYP;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256\n header.s=Intel header.b=PUEpFlLS;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=none (no SPF record) smtp.mailfrom=lists.infradead.org\n (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org;\n envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from bombadil.infradead.org (bombadil.infradead.org\n [IPv6:2607:7c80:54:3::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fH4hR37J9z1xpY\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 20 Feb 2026 07:28:23 +1100 (AEDT)", "from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1vtAcr-0000000BydZ-46HJ;\n\tThu, 19 Feb 2026 20:27:54 +0000", "from mgamail.intel.com ([198.175.65.10])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1vtAcQ-0000000BwCB-1J7s\n\tfor hostap@lists.infradead.org;\n\tThu, 19 Feb 2026 20:27:35 +0000", "from orviesa004.jf.intel.com ([10.64.159.144])\n by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 Feb 2026 12:27:03 -0800", "from aotchere-mobl1.ger.corp.intel.com (HELO\n aotchere-mobl1.intel.com) ([10.245.246.171])\n by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 Feb 2026 12:26:59 -0800" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=r0gL7z1x1CQJjOg3wTDEHvHV2XJrRxpRfaNPwIeekGo=; b=Z7bv3oYPJWgQsQ\n\tOVjlF5pSXGHGPvyRxGgX6U7wvorUwkRDSVEPOMjkr+jK2YCwdbQzco0qE/KbhVoqQUgmQ3rWo1U2E\n\t1aEKq2gBgAVdaowXW0wkkCMxTs1be52Sv7dbRhqAbAi9XS20rFDpiepL5yOMCP9T83zjJhcl+lHQV\n\t5GpeP6WDrflFMA8FaIUWPNv+hUZULYu8n4BWiNyTEUrMIMfB1qJY4a4808Q9mQbajL0rWLb4cYXMR\n\t+l7xovGMMNf5/ahUrSM1jL1U6ZdLuIBUmWK65GCmHpAVUzVlQP+Pnx3xdSCSXBQEwXnJ371hHD2kv\n\t7ArIR7s/IxglDFmxtqbw==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1771532847; x=1803068847;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=2P0kcbeoCj/cGmpdqKw0QPwtBuqmqXlUlNaoQDWXVDc=;\n b=PUEpFlLSj+xcNXNWzpj3jjUl0YrybtYcMDYs1Q0uLEfIWuVLE4/3Etm6\n FZ0ML4rTlMsokBrdZXj8R6uDN8jTbDXQX/zqAXQKkYnJAdeacNhRXz1vy\n sMgGrj4fktTFz2L1N4o5JnWNzkb1NNeVPH/S08nDZ3ynYSZxs3A5wjXcc\n hJNZ8jxv2lkHMfJxBgGdA6sTHNHuKAH9QM8pw3tmTwDIXIzcnjnT3i9F1\n VLnpFjRBqfjr2pAvCfZxenZLRImlvh/KrXhQoJ4d5qgbU5UwP+Y/E9/EG\n 415eHo3VgmmxxMb3Th57rTCxvHxzDejNO2bOgNsWsGeQTQjfbWysNgkY5\n Q==;" ], "X-CSE-ConnectionGUID": [ "PKGaFw03SWem7F8UOIQyyA==", "S3FQ0ut3Qx+uc+AGhpc8CQ==" ], "X-CSE-MsgGUID": [ "6wtqdgEiTrKUnwhVoqpKwA==", "AzTGHHSiRfCasiDInhmQ7Q==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11706\"; a=\"90040072\"", "E=Sophos;i=\"6.21,300,1763452800\";\n d=\"scan'208\";a=\"90040072\"", "E=Sophos;i=\"6.21,300,1763452800\";\n d=\"scan'208\";a=\"219153908\"" ], "X-ExtLoop1": "1", "From": "Andrei Otcheretianski <andrei.otcheretianski@intel.com>", "To": "hostap@lists.infradead.org,\n\tvamsin@qti.qualcomm.com,\n\tvganneva@qti.qualcomm.com,\n\tmaheshkkv@google.com", "Cc": "Ilan Peer <ilan.peer@intel.com>", "Subject": "[PATCH 32/58] NAN: Process NAN Action frame", "Date": "Thu, 19 Feb 2026 22:24:48 +0200", "Message-ID": "<20260219202514.5781-33-andrei.otcheretianski@intel.com>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20260219202514.5781-1-andrei.otcheretianski@intel.com>", "References": "<20260219202514.5781-1-andrei.otcheretianski@intel.com>", "MIME-Version": "1.0", "X-CRM114-Version": "20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ", "X-CRM114-CacheID": "sfid-20260219_122726_524452_00CF6962 ", "X-CRM114-Status": "GOOD ( 21.35 )", "X-Spam-Score": "-4.4 (----)", "X-Spam-Report": "Spam detection software,\n running on the system \"bombadil.infradead.org\",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n the administrator of that system for details.\n Content preview: From: Ilan Peer <ilan.peer@intel.com> Upon receiving a NAN\n NDP action frame: 1. Parse the message. 2. Trigger the NDP state machine.\n If the NDP state machine successfully handles a NDP request, send event to\n the higher layers and finish,\n waiting for the higher layers to respon [...] \n Content analysis details: (-4.4 points, 5.0 required)\n pts rule name description\n ---- ----------------------\n --------------------------------------------------\n -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/,\n medium trust\n [198.175.65.10 listed in list.dnswl.org]\n 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to\n Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [198.175.65.10 listed in sa-accredit.habeas.com]\n 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The\n query to Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [198.175.65.10 listed in\n sa-trusted.bondedsender.org]\n 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to\n Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [198.175.65.10 listed in\n bl.score.senderscore.com]\n -0.0 SPF_PASS SPF: sender matches SPF record\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n author's\n domain\n -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n envelope-from domain\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\n -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender", "X-BeenThere": "hostap@lists.infradead.org", "X-Mailman-Version": "2.1.34", "Precedence": "list", "List-Id": "<hostap.lists.infradead.org>", "List-Unsubscribe": "<http://lists.infradead.org/mailman/options/hostap>,\n <mailto:hostap-request@lists.infradead.org?subject=unsubscribe>", "List-Archive": "<http://lists.infradead.org/pipermail/hostap/>", "List-Post": "<mailto:hostap@lists.infradead.org>", "List-Help": "<mailto:hostap-request@lists.infradead.org?subject=help>", "List-Subscribe": "<http://lists.infradead.org/mailman/listinfo/hostap>,\n <mailto:hostap-request@lists.infradead.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "\"Hostap\" <hostap-bounces@lists.infradead.org>", "Errors-To": "hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org" }, "content": "From: Ilan Peer <ilan.peer@intel.com>\n\nUpon receiving a NAN NDP action frame:\n\n1. Parse the message.\n2. Trigger the NDP state machine. If the NDP state machine\n successfully handles a NDP request, send event to the\n higher layers and finish, waiting for the higher layers to\n respond.\n3. If the NDP state machine was done with status rejected,\n send an event and abort the NDP establishment. If there\n are no existing NDPs also tear down the NDL.\n4. Otherwise, trigger the NDL state machine. If the NDL\n establishment is rejected, send an event and tear down the\n NDP and NDL.\n5. If both the NDP and NDL state machines are done and the\n NDP is successfully established, send an event.\n6. Otherwise, the NDP establishment progresses, so build and\n send the required NAF.\n\nSigned-off-by: Ilan Peer <ilan.peer@intel.com>\n---\n src/nan/nan.c | 326 +++++++++++++++++++++++++++++++++++++++++++++++++-\n src/nan/nan.h | 3 +\n 2 files changed, 328 insertions(+), 1 deletion(-)", "diff": "diff --git a/src/nan/nan.c b/src/nan/nan.c\nindex 4984693fe0..43ff7d1686 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -11,7 +11,8 @@\n #include \"nan.h\"\n #include \"nan_i.h\"\n \n-#define NAN_MAX_PEERS 32\n+#define NAN_MAX_PEERS 32\n+#define NAN_MAX_NAF_LEN 1024\n \n struct nan_data * nan_init(const struct nan_config *cfg)\n {\n@@ -1058,6 +1059,329 @@ static int nan_action_build(struct nan_data *nan, struct nan_peer *peer,\n }\n \n \n+static int nan_action_send(struct nan_data *nan, struct nan_peer *peer,\n+\t\t\t enum nan_subtype subtype)\n+{\n+\tstruct wpabuf *buf;\n+\tint ret;\n+\n+\tbuf = wpabuf_alloc(NAN_MAX_NAF_LEN);\n+\tif (!buf)\n+\t\treturn -1;\n+\n+\tret = nan_action_build(nan, peer, subtype, buf);\n+\tif (ret)\n+\t\tgoto out;\n+\n+\tret = nan->cfg->send_naf(nan->cfg->cb_ctx, peer->nmi_addr, NULL,\n+\t\t\t\t nan->cluster_id, buf);\n+\n+out:\n+\twpa_printf(MSG_DEBUG, \"NAN: send_naf: ret=%d\", ret);\n+\twpabuf_free(buf);\n+\treturn ret;\n+}\n+\n+\n+static bool nan_ndp_supported(struct nan_data *nan)\n+{\n+\tif (nan->cfg->ndp_action_notif && nan->cfg->ndp_connected &&\n+\t nan->cfg->ndp_disconnected &&\n+\t nan->cfg->send_naf && nan->cfg->get_chans)\n+\t\treturn true;\n+\n+\twpa_printf(MSG_DEBUG, \"NAN: NDP operations are not supported\");\n+\treturn false;\n+}\n+\n+\n+static void nan_ndp_action_notif(struct nan_data *nan, struct nan_peer *peer)\n+{\n+\tstruct nan_ndp_action_notif_params notify;\n+\n+\tos_memset(¬ify, 0, sizeof(notify));\n+\n+\tos_memcpy(notify.ndp_id.peer_nmi, peer->nmi_addr, ETH_ALEN);\n+\tos_memcpy(notify.ndp_id.init_ndi, peer->ndp_setup.ndp->init_ndi,\n+\t\t ETH_ALEN);\n+\tnotify.ndp_id.id = peer->ndp_setup.ndp->ndp_id;\n+\tnotify.publish_inst_id = peer->ndp_setup.publish_inst_id;\n+\n+\tnotify.is_request = peer->ndp_setup.state == NAN_NDP_STATE_REQ_RECV;\n+\tnotify.ndp_status = peer->ndp_setup.status;\n+\n+\tif (peer->ndl)\n+\t\tnotify.ndl_status = peer->ndl->status;\n+\telse\n+\t\tnotify.ndl_status = NAN_NDL_STATUS_REJECTED;\n+\n+\tnotify.ssi = peer->ndp_setup.ssi;\n+\tnotify.ssi_len = peer->ndp_setup.ssi_len;\n+\n+\twpa_printf(MSG_DEBUG,\n+\t\t \"NAN: NDP action notification peer=\" MACSTR \", ndp_status=%u, ndl_status=%u\",\n+\t\t MAC2STR(peer->nmi_addr), notify.ndp_status,\n+\t\t notify.ndl_status);\n+\n+\tnan->cfg->ndp_action_notif(nan->cfg->cb_ctx, ¬ify);\n+}\n+\n+\n+static void nan_ndp_connected(struct nan_data *nan, struct nan_peer *peer)\n+{\n+\tstruct nan_ndp_connection_params params;\n+\n+\tos_memset(¶ms, 0, sizeof(params));\n+\n+\twpa_printf(MSG_DEBUG,\n+\t\t \"NAN: NDP connected notification peer=\" MACSTR,\n+\t\t MAC2STR(peer->nmi_addr));\n+\n+\tos_memcpy(params.ndp_id.peer_nmi, peer->nmi_addr, ETH_ALEN);\n+\tos_memcpy(params.ndp_id.init_ndi, peer->ndp_setup.ndp->init_ndi,\n+\t\t ETH_ALEN);\n+\tparams.ndp_id.id = peer->ndp_setup.ndp->ndp_id;\n+\tparams.ssi = peer->ndp_setup.ssi;\n+\tparams.ssi_len = peer->ndp_setup.ssi_len;\n+\n+\tif (peer->ndp_setup.ndp->initiator) {\n+\t\tparams.local_ndi = peer->ndp_setup.ndp->init_ndi;\n+\t\tparams.peer_ndi = peer->ndp_setup.ndp->resp_ndi;\n+\t} else {\n+\t\tparams.local_ndi = peer->ndp_setup.ndp->resp_ndi;\n+\t\tparams.peer_ndi = peer->ndp_setup.ndp->init_ndi;\n+\t}\n+\n+\tnan->cfg->ndp_connected(nan->cfg->cb_ctx, ¶ms);\n+\n+\t/* Move the NDP to the list of tracked NDPs */\n+\tdl_list_add(&peer->ndps, &peer->ndp_setup.ndp->list);\n+\tpeer->ndp_setup.ndp = NULL;\n+\n+\tnan_ndp_setup_reset(nan, peer);\n+}\n+\n+\n+static void nan_ndp_disconnected(struct nan_data *nan, struct nan_peer *peer,\n+\t\t\t\t enum nan_reason reason)\n+{\n+\tconst u8 *local_ndi, *peer_ndi;\n+\tstruct nan_ndp_id ndp_id;\n+\n+\tos_memset(&ndp_id, 0, sizeof(ndp_id));\n+\n+\twpa_printf(MSG_DEBUG,\n+\t\t \"NAN: NDP disconnected notification peer=\" MACSTR,\n+\t\t MAC2STR(peer->nmi_addr));\n+\n+\tos_memcpy(ndp_id.peer_nmi, peer->nmi_addr, ETH_ALEN);\n+\tos_memcpy(ndp_id.init_ndi, peer->ndp_setup.ndp->init_ndi, ETH_ALEN);\n+\tndp_id.id = peer->ndp_setup.ndp->ndp_id;\n+\n+\tif (peer->ndp_setup.ndp->initiator) {\n+\t\tlocal_ndi = peer->ndp_setup.ndp->init_ndi;\n+\t\tpeer_ndi = peer->ndp_setup.ndp->resp_ndi;\n+\t} else {\n+\t\tlocal_ndi = peer->ndp_setup.ndp->resp_ndi;\n+\t\tpeer_ndi = peer->ndp_setup.ndp->init_ndi;\n+\t}\n+\n+\tnan->cfg->ndp_disconnected(nan->cfg->cb_ctx, &ndp_id,\n+\t\t\t\t local_ndi, peer_ndi, reason);\n+\n+\t/* Reset the NDP setup data */\n+\tnan_ndp_setup_reset(nan, peer);\n+\n+\t/* Need to also remove the NDL if no active peers */\n+\tif (dl_list_empty(&peer->ndps))\n+\t\tnan_ndl_reset(nan, peer);\n+}\n+\n+\n+/*\n+ * nan_action_rx_ndp - Process a received NAN Data Path Action Frame\n+ * @nan: NAN module context from nan_init()\n+ * @peer: NAN peer\n+ * @msg: Parsed NAN message\n+ * @resp_oui: OUI subtype to use in case a response is needed\n+ * Return 0 on success; -1 on failure.\n+ */\n+static int nan_action_rx_ndp(struct nan_data *nan, struct nan_peer *peer,\n+\t\t\t struct nan_msg *msg, enum nan_subtype resp_oui)\n+{\n+\tint ret;\n+\n+\tret = nan_ndp_handle_ndp_attr(nan, peer, msg);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\t/*\n+\t * NDP request: Also process the NDL/NDC/QoS attributes and store the\n+\t * data without actually scheduling. send an indication to the\n+\t * encapsulating logic.\n+\t */\n+\tif (peer->ndp_setup.state == NAN_NDP_STATE_REQ_RECV) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: NDP request\");\n+\n+\t\tret = nan_ndl_handle_ndl_attr(nan, peer, msg);\n+\t\tif (ret || !peer->ndl) {\n+\t\t\tnan_ndp_setup_reset(nan, peer);\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\tnan_ndp_action_notif(nan, peer);\n+\t\treturn 0;\n+\t}\n+\n+\t/*\n+\t * NDP was rejected by the peer. Clear the ongoing setup and send an\n+\t * event. There is no need to send a NAF in this case.\n+\t */\n+\tif (peer->ndp_setup.status == NAN_NDP_STATUS_REJECTED) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: NAF: NDP rejected\");\n+\n+\t\tnan_ndp_disconnected(nan, peer,\n+\t\t\t\t peer->ndp_setup.reason);\n+\t\treturn 0;\n+\t}\n+\n+\t/*\n+\t * NDP state machine is either done or continued, need to trigger NDL\n+\t * state machine\n+\t */\n+\tret = nan_ndl_handle_ndl_attr(nan, peer, msg);\n+\tif (ret || !peer->ndl)\n+\t\treturn ret;\n+\n+\tif (peer->ndl->status == NAN_NDL_STATUS_REJECTED) {\n+\t\tenum nan_reason reason = peer->ndl->reason;\n+\n+\t\tif (reason == NAN_REASON_RESERVED)\n+\t\t\treason = NAN_REASON_UNSPECIFIED_REASON;\n+\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NAF: NDL rejected(ret=%d, reason=%u)\",\n+\t\t\t ret, reason);\n+\n+\t\t/* NDL handling failure on local side */\n+\t\tif (peer->ndl->send_naf_on_error) {\n+\t\t\tnan_ndp_setup_failure(nan, peer, reason, 0);\n+\t\t\tret = nan_action_send(nan, peer, resp_oui);\n+\t\t}\n+\n+\t\tnan_ndp_disconnected(nan, peer, reason);\n+\t\treturn 0;\n+\t}\n+\n+\tif (peer->ndl->status == NAN_NDL_STATUS_CONTINUED) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: NAF: NDL continues\");\n+\t\tnan_ndp_action_notif(nan, peer);\n+\t\treturn 0;\n+\t}\n+\n+\t/* Both state machines are done */\n+\tif (peer->ndp_setup.state == NAN_NDP_STATE_DONE &&\n+\t peer->ndl->state == NAN_NDL_STATE_DONE) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: NAF: NDP setup done\");\n+\n+\t\tnan_ndp_connected(nan, peer);\n+\t\treturn 0;\n+\t}\n+\n+\twpa_printf(MSG_DEBUG, \"NAN: NAF: NDP setup continues\");\n+\tret = nan_action_send(nan, peer, resp_oui);\n+\tif (ret) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NAF: failed to send NAF. Resetting ...\");\n+\t\tnan_ndp_disconnected(nan, peer, NAN_REASON_UNSPECIFIED_REASON);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+\n+/*\n+ * nan_action_rx - Process a received NAN Action Frame\n+ * @nan: NAN module context from nan_init()\n+ * @mgmt: Pointer to the IEEE 802.11 management frame\n+ * @len: Length of the management frame in octets\n+ * Return 0 on success; -1 on failure.\n+ */\n+int nan_action_rx(struct nan_data *nan, const struct ieee80211_mgmt *mgmt,\n+\t\t size_t len)\n+{\n+\tstruct nan_msg msg;\n+\tstruct nan_peer *peer;\n+\tenum nan_subtype resp_oui = NAN_SUBTYPE_INVALID;\n+\tint ret;\n+\n+\tif (!nan_ndp_supported(nan))\n+\t\treturn -1;\n+\n+\t/* parse the NAF and validate its general structure */\n+\tret = nan_parse_naf(nan, mgmt, len, &msg);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tret = nan_add_peer(nan, mgmt->sa,\n+\t\t\t mgmt->u.action.u.naf.variable,\n+\t\t\t len - IEEE80211_MIN_ACTION_LEN(naf));\n+\tif (ret)\n+\t\twpa_printf(MSG_DEBUG, \"NAN: Failed to parse peer from NAF\");\n+\n+\tpeer = nan_get_peer(nan, mgmt->sa);\n+\tif (!peer) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Failed to get a peer that was just added\");\n+\t\tgoto done;\n+\t}\n+\n+\twpa_printf(MSG_DEBUG, \"NAN: NAF: oui_subtype=%u\", msg.oui_subtype);\n+\n+\tret = nan_parse_device_attrs(nan, peer,\n+\t\t\t\t mgmt->u.action.u.naf.variable,\n+\t\t\t\t len - IEEE80211_MIN_ACTION_LEN(naf));\n+\tif (ret) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NAF: Failed to parse device attrs\");\n+\t\tgoto done;\n+\t}\n+\n+\tswitch (msg.oui_subtype) {\n+\tcase NAN_SUBTYPE_DATA_PATH_REQUEST:\n+\t\tresp_oui = NAN_SUBTYPE_DATA_PATH_RESPONSE;\n+\t\tbreak;\n+\tcase NAN_SUBTYPE_DATA_PATH_RESPONSE:\n+\t\tresp_oui = NAN_SUBTYPE_DATA_PATH_CONFIRM;\n+\t\tbreak;\n+\tcase NAN_SUBTYPE_DATA_PATH_CONFIRM:\n+\t\tresp_oui = NAN_SUBTYPE_DATA_PATH_KEY_INSTALL;\n+\t\tbreak;\n+\tcase NAN_SUBTYPE_DATA_PATH_KEY_INSTALL:\n+\tcase NAN_SUBTYPE_DATA_PATH_TERMINATION:\n+\t\tbreak;\n+\tcase NAN_SUBTYPE_RANGING_REQUEST:\n+\tcase NAN_SUBTYPE_RANGING_RESPONSE:\n+\tcase NAN_SUBTYPE_RANGING_TERMINATION:\n+\tcase NAN_SUBTYPE_RANGING_REPORT:\n+\tcase NAN_SUBTYPE_SCHEDULE_REQUEST:\n+\tcase NAN_SUBTYPE_SCHEDULE_RESPONSE:\n+\tcase NAN_SUBTYPE_SCHEDULE_CONFIRM:\n+\tcase NAN_SUBTYPE_SCHEDULE_UPDATE_NOTIF:\n+\t\tret = 0;\n+\t\tgoto done;\n+\tdefault:\n+\t\tret = -1;\n+\t\tgoto done;\n+\t}\n+\n+\tret = nan_action_rx_ndp(nan, peer, &msg, resp_oui);\n+done:\n+\tnan_attrs_clear(nan, &msg.attrs);\n+\treturn ret;\n+}\n+\n+\n /*\n * nan_publish_instance_id_valid - Check is instance ID is a valid publish ID\n *\ndiff --git a/src/nan/nan.h b/src/nan/nan.h\nindex ed54c5ee33..33614cf4b8 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -13,6 +13,7 @@\n \n struct nan_cluster_config;\n enum nan_reason;\n+struct ieee80211_mgmt;\n \n /*\n * struct nan_device_capabilities - NAN device capabilities.\n@@ -414,5 +415,7 @@ int nan_add_peer(struct nan_data *nan, const u8 *addr,\n bool nan_publish_instance_id_valid(struct nan_data *nan, u8 instance_id,\n \t\t\t\t u8 *service_id);\n void nan_set_cluster_id(struct nan_data *nan, const u8 *cluster_id);\n+int nan_action_rx(struct nan_data *nan, const struct ieee80211_mgmt *mgmt,\n+\t\t size_t len);\n \n #endif /* NAN_H */\n", "prefixes": [ "32/58" ] }