Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2218804/?format=api
{ "id": 2218804, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2218804/?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": "<20260401220220.4418-12-andrei.otcheretianski@intel.com>", "date": "2026-04-01T22:01:20", "name": "[11/71] wpa_supplicant: Support NAN_NDP_REQUEST command", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "6c318e1b9ecfb2f386f4836f5212f5e8509d418f", "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/20260401220220.4418-12-andrei.otcheretianski@intel.com/mbox/", "series": [ { "id": 498402, "url": "http://patchwork.ozlabs.org/api/1.0/series/498402/?format=api", "date": "2026-04-01T22:01:09", "name": "NAN Data Path and Bootstrapping support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/498402/mbox/" } ], "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2218804/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=YtYWvLi/;\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=QCTZCHrZ;\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 4fmJwD47tBz1yFv\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 02 Apr 2026 09:06:04 +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 1w83go-0000000G9on-3pmV;\n\tWed, 01 Apr 2026 22:05:30 +0000", "from mgamail.intel.com ([198.175.65.20])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w83gl-0000000G9ga-0L0R\n\tfor hostap@lists.infradead.org;\n\tWed, 01 Apr 2026 22:05:28 +0000", "from fmviesa003.fm.intel.com ([10.60.135.143])\n by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 01 Apr 2026 15:05:26 -0700", "from iapp347.iil.intel.com (HELO 87c02287900a.iil.intel.com)\n ([10.167.28.6])\n by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 01 Apr 2026 15:05:25 -0700" ], "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:To:From:Reply-To:Cc:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=j6ds2+Sw0k3GwTyZAGWtEz4S92s7aXICCh8m79fBRQI=; b=YtYWvLi/boCJxN\n\tC8sHlTadD/SFnWZOln1Jsod+Q3D7MPVFZU8D7gGwKEIc73/C0rIsK9JZojNuurQjH1wNQ0rSm27YE\n\tjHmeBX5fe7TRx6HUahcWzkdXXrvXCc35dL1tlXbYoqjKtk36usxNaWOJIsH8Sxqye1uiI1LsRkIUP\n\tZuVMyvlbACtepE2iDoyVMStcT3NR25w7pSqzjE7kuzj6oqr3OSMlFBxWB1ApB1QG6O0/DG8n5j0l0\n\tgnZZlh9NJ8VQPpB6yXQHAw0+uSAMXUW0A4fmuxNp51C3slIee034ScpoOOYFJuLenKML+VLPDDhf4\n\tsI479bAOB098XDz1PcPg==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1775081127; x=1806617127;\n h=from:to:subject:date:message-id:in-reply-to:references:\n mime-version:content-transfer-encoding;\n bh=nkt3bzzjcSIbH5FdXCrs/HHJXiOkNRGJf5HztHZd08c=;\n b=QCTZCHrZXFIDFmHLl5yEn3eGYD0j3Z6wiZatp98UhwB4H/ZDDMG7AWwE\n nzGaFsckf0YpYrcFIAR4Fv2m0XDcq2MH7GgOca7Y2lQbC3soWh1romVmA\n IDAy9GHkM7E7PZTq/8NGiZW9Iseppy/j9jMdPKh9QSqTthOFR1YEGE9yC\n jFYiWW0ICZtWHwbTy47Prcn6tEpDcrJKDPqF7oC0ptbh6LAf2jSsuL+Mj\n gaVMGWNOf+5M4awbGQANaVMZKhx6XKz+znRmmFkF5WJOlClkit2dNMFWy\n azVifXoRE+U+bJG6cm4DaTcMqcSB5C2daasgjqxx25L3GTcsXhESrRMy/\n g==;" ], "X-CSE-ConnectionGUID": [ "FVgoBhAJRfasY7k+GjzlUA==", "Uk+t6QtbSYKGz3MAyffhcQ==" ], "X-CSE-MsgGUID": [ "hipXT/r1Rj2qNoO1FYbOYA==", "+mKuoclQTeujqjZXsT09EA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11746\"; a=\"75851585\"", "E=Sophos;i=\"6.23,153,1770624000\";\n d=\"scan'208\";a=\"75851585\"" ], "X-ExtLoop1": "1", "From": "Andrei Otcheretianski <andrei.otcheretianski@intel.com>", "To": "hostap@lists.infradead.org", "Subject": "[PATCH 11/71] wpa_supplicant: Support NAN_NDP_REQUEST command", "Date": "Thu, 2 Apr 2026 01:01:20 +0300", "Message-ID": "<20260401220220.4418-12-andrei.otcheretianski@intel.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260401220220.4418-1-andrei.otcheretianski@intel.com>", "References": "<20260401220220.4418-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-20260401_150527_201706_D7CCE14E ", "X-CRM114-Status": "GOOD ( 22.39 )", "X-Spam-Score": "-1.9 (-)", "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: Parse the command and trigger NDP establishment flow.\n Currently\n only open connection is supported,\n so don't support parsing security parameters\n yet. Signed-off-by: Andrei Otcheretianski\n <andrei.otcheretianski@intel.com>\n --- wpa_supplicant/ctrl_iface.c | 3 + wpa_supplicant/nan_supplicant.c |\n 420\n ++++++++++++++++++++++++++++++++ wpa_supplicant/nan_s [...]\n Content analysis details: (-1.9 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.20 listed in list.dnswl.org]\n 1.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.20 listed in\n bl.score.senderscore.com]\n 1.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.20 listed in\n sa-trusted.bondedsender.org]\n 1.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.20 listed in sa-accredit.habeas.com]\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n -0.0 SPF_PASS SPF: sender matches SPF record\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\n -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n envelope-from domain\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 Message has at least one valid DKIM or DK\n signature\n -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n -0.5 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": "Parse the command and trigger NDP establishment flow.\nCurrently only open connection is supported, so don't support parsing\nsecurity parameters yet.\n\nSigned-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>\n---\n wpa_supplicant/ctrl_iface.c | 3 +\n wpa_supplicant/nan_supplicant.c | 420 ++++++++++++++++++++++++++++++++\n wpa_supplicant/nan_supplicant.h | 1 +\n 3 files changed, 424 insertions(+)", "diff": "diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c\nindex b713250df8..dabbf57940 100644\n--- a/wpa_supplicant/ctrl_iface.c\n+++ b/wpa_supplicant/ctrl_iface.c\n@@ -14401,6 +14401,9 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,\n \t} else if (os_strncmp(buf, \"NAN_SCHED_CONFIG_MAP \", 21) == 0) {\n \t\tif (wpas_nan_sched_config_map(wpa_s, buf + 21) < 0)\n \t\t\treply_len = -1;\n+\t} else if (os_strncmp(buf, \"NAN_NDP_REQUEST \", 16) == 0) {\n+\t\tif (wpas_nan_ndp_request(wpa_s, buf + 16) < 0)\n+\t\t\treply_len = -1;\n #endif /* CONFIG_NAN */\n \t} else {\n \t\tos_memcpy(reply, \"UNKNOWN COMMAND\\n\", 16);\ndiff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex 3027af79c9..07f30b7d43 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -719,6 +719,426 @@ out:\n }\n \n \n+static struct wpabuf * wpas_nan_build_ndp_elems(struct wpa_supplicant *wpa_s)\n+{\n+\tstruct ieee80211_ht_capabilities *ht_cap;\n+\tstruct ieee80211_vht_capabilities *vht_cap;\n+\tsize_t len;\n+\tstruct wpabuf *buf;\n+\n+\t/* Include HT and VHT capability elements */\n+\tlen = 2 + sizeof(struct ieee80211_ht_capabilities);\n+\tif (wpa_s->nan_capa.vht_valid)\n+\t\tlen += 2 + sizeof(struct ieee80211_vht_capabilities);\n+\n+\tbuf = wpabuf_alloc(len);\n+\tif (!buf)\n+\t\treturn NULL;\n+\n+\twpabuf_put_u8(buf, WLAN_EID_HT_CAP);\n+\twpabuf_put_u8(buf, sizeof(*ht_cap));\n+\tht_cap = wpabuf_put(buf, sizeof(*ht_cap));\n+\tht_cap->ht_capabilities_info = host_to_le16(wpa_s->nan_capa.ht_capab);\n+\tht_cap->a_mpdu_params = wpa_s->nan_capa.ht_ampdu_params;\n+\tos_memcpy(ht_cap->supported_mcs_set, wpa_s->nan_capa.ht_mcs_set,\n+\t\t sizeof(ht_cap->supported_mcs_set));\n+\n+\tif (!wpa_s->nan_capa.vht_valid)\n+\t\treturn buf;\n+\n+\twpabuf_put_u8(buf, WLAN_EID_VHT_CAP);\n+\twpabuf_put_u8(buf, sizeof(*vht_cap));\n+\tvht_cap = wpabuf_put(buf, sizeof(*vht_cap));\n+\tvht_cap->vht_capabilities_info = host_to_le32(wpa_s->nan_capa.vht_capab);\n+\tos_memcpy(&vht_cap->vht_supported_mcs_set,\n+\t\t wpa_s->nan_capa.vht_mcs_set,\n+\t\t sizeof(vht_cap->vht_supported_mcs_set));\n+\n+\t/* TODO: Add HE capabilities */\n+\treturn buf;\n+}\n+\n+\n+static void wpas_nan_fill_ndp_schedule(struct wpa_supplicant *wpa_s,\n+\t\t\t\t struct nan_schedule *sched)\n+{\n+\tint map_id;\n+\n+\tos_memset(sched, 0, sizeof(*sched));\n+\n+\t/* Fill the NAN schedule structure from the schedule config */\n+\tfor (map_id = 0; map_id < MAX_NAN_RADIOS; map_id++) {\n+\t\tint i;\n+\t\tstruct nan_schedule_config *sched_cfg =\n+\t\t\t\t\t&wpa_s->nan_sched[map_id];\n+\n+\t\tfor (i = 0; i < wpa_s->nan_sched[map_id].num_channels; i++) {\n+\t\t\tstruct nan_chan_schedule *chan_sched;\n+\t\t\tconst u8 *bitmap_data;\n+\t\t\tsize_t bitmap_len;\n+\n+\t\t\t/* None of these should happen */\n+\t\t\tif (!sched_cfg->channels[i].time_bitmap) {\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t\t\"NAN: Missing time bitmap for map_id %d freq %d\",\n+\t\t\t\t\t\tmap_id + 1,\n+\t\t\t\t\t\tsched_cfg->channels[i].freq);\n+\t\t\t\treturn;\n+\t\t\t}\n+\n+\t\t\tbitmap_len =\n+\t\t\t\twpabuf_len(sched_cfg->channels[i].time_bitmap);\n+\t\t\tbitmap_data =\n+\t\t\twpabuf_head(sched_cfg->channels[i].time_bitmap);\n+\t\t\tif (bitmap_len > NAN_TIME_BITMAP_MAX_LEN) {\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t \"NAN: Time bitmap length %zu exceeds maximum %d\",\n+\t\t\t\t\t bitmap_len,\n+\t\t\t\t\t NAN_TIME_BITMAP_MAX_LEN);\n+\t\t\t\treturn;\n+\t\t\t}\n+\n+\t\t\tchan_sched = &sched->chans[sched->n_chans++];\n+\t\t\tchan_sched->map_id = map_id + 1;\n+\t\t\tchan_sched->chan.freq = sched_cfg->channels[i].freq;\n+\t\t\tchan_sched->chan.center_freq1 =\n+\t\t\t\tsched_cfg->channels[i].center_freq1;\n+\t\t\tchan_sched->chan.center_freq2 =\n+\t\t\t\tsched_cfg->channels[i].center_freq2;\n+\t\t\tchan_sched->chan.bandwidth =\n+\t\t\t\tsched_cfg->channels[i].bandwidth;\n+\n+\t\t\tchan_sched->committed.duration =\n+\t\t\t\twpa_s->nan_capa.slot_duration >> 5;\n+\t\t\tchan_sched->committed.period =\n+\t\t\t\tffs(wpa_s->nan_capa.schedule_period) - 7;\n+\t\t\tchan_sched->committed.offset = 0;\n+\t\t\tchan_sched->committed.len = bitmap_len;\n+\t\t\tos_memcpy(chan_sched->committed.bitmap, bitmap_data,\n+\t\t\t\tbitmap_len);\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: NDP schedule channel added: map_id=%d freq=%d center_freq1=%d center_freq2=%d bandwidth=%d\",\n+\t\t\t\t chan_sched->map_id,\n+\t\t\t\t chan_sched->chan.freq,\n+\t\t\t\t chan_sched->chan.center_freq1,\n+\t\t\t\t chan_sched->chan.center_freq2,\n+\t\t\t\t chan_sched->chan.bandwidth);\n+\t\t}\n+\t}\n+\t/* Mark all supported radios - for potential availability */\n+\tsched->map_ids_bitmap = (BIT(wpa_s->nan_capa.num_radios) - 1) << 1;\n+}\n+\n+\n+static int wpas_nan_get_ndc_map_id(struct wpa_supplicant *wpa_s,\n+\t\t\t\t struct nan_peer_schedule *peer_sched,\n+\t\t\t\t u8 peer_map_id)\n+{\n+\tint i;\n+\tint freq = nan_get_peer_ndc_freq(wpa_s->nan, peer_sched, peer_map_id);\n+\n+\tif (freq < 0) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Failed to get NDC frequency from peer schedule\");\n+\t\treturn -1;\n+\t}\n+\n+\twpa_printf(MSG_DEBUG,\n+\t\t \"NAN: Peer NDC frequency is %d MHz\", freq);\n+\n+\tfor (i = 0; i < MAX_NAN_RADIOS; i++) {\n+\t\tstruct nan_schedule_config *sched_cfg =\n+\t\t\t\t\t&wpa_s->nan_sched[i];\n+\t\tint j;\n+\n+\t\tfor (j = 0; j < sched_cfg->num_channels; j++) {\n+\t\t\tif (sched_cfg->channels[j].freq == freq) {\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t \"NAN: Found local NDC map_id %d for peer NDC freq %d\",\n+\t\t\t\t\t i + 1, freq);\n+\t\t\t\treturn i + 1;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\treturn -1;\n+}\n+\n+\n+static int wpas_nan_select_ndc(struct wpa_supplicant *wpa_s,\n+\t\t\t struct nan_ndp_params *ndp)\n+{\n+\tint i;\n+\n+\t/* NDC attribute in request is optional, let the peer decide */\n+\tif (ndp->type == NAN_NDP_ACTION_REQ)\n+\t\treturn 0;\n+\n+\t/* For successfull confirm, copy peer's NDC */\n+\tif (ndp->type == NAN_NDP_ACTION_CONF &&\n+\t ndp->u.resp.status == NAN_NDP_STATUS_ACCEPTED) {\n+\t\tstruct nan_peer_schedule peer_sched;\n+\t\tint ret;\n+\t\tu8 map_id;\n+\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NDP CONF - use the NDC from peer\");\n+\t\tret = nan_peer_get_schedule_info(wpa_s->nan, ndp->ndp_id.peer_nmi,\n+\t\t\t\t\t\t &peer_sched);\n+\t\tif (ret) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: Failed to get peer schedule info\");\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\tfor (map_id = 0; map_id < peer_sched.n_maps; map_id++) {\n+\t\t\tif (peer_sched.maps[map_id].ndc.len) {\n+\t\t\t\tint ret = wpas_nan_get_ndc_map_id(wpa_s,\n+\t\t\t\t\t\t\t\t &peer_sched,\n+\t\t\t\t\t\t\t\t map_id);\n+\t\t\t\tif (ret < 0) {\n+\t\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t\t \"NAN: No local NDC map_id found for peer NDC\");\n+\t\t\t\t\treturn -1;\n+\t\t\t\t}\n+\n+\t\t\t\tndp->sched.ndc_map_id = ret;\n+\t\t\t\tos_memcpy(&ndp->sched.ndc,\n+\t\t\t\t\t &peer_sched.maps[map_id].ndc,\n+\t\t\t\t\t sizeof(ndp->sched.ndc));\n+\t\t\t\treturn 0;\n+\t\t\t}\n+\t\t}\n+\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: No NDC found in peer schedule\");\n+\t\treturn -1;\n+\t}\n+\n+\tos_memcpy(&ndp->sched.ndc, &ndp->sched.chans[0].committed,\n+\t\t sizeof(ndp->sched.ndc));\n+\tos_memset(ndp->sched.ndc.bitmap, 0,\n+\t\t sizeof(ndp->sched.ndc.bitmap));\n+\tndp->sched.ndc_map_id = ndp->sched.chans[0].map_id;\n+\n+\t/*\n+\t * For default NDC channels (6, 149, 44) take the first slot after\n+\t * DW. Note that if the slot duration is 16 TUs we need to select\n+\t * the next slot after DW.\n+\t * If the first channel is not one of default NDC channels, select the\n+\t * first available slot.\n+\t */\n+\tif (ndp->sched.chans[0].chan.freq == 5745 ||\n+\t ndp->sched.chans[0].chan.freq == 5220) {\n+\t\tint dw_bit, byte_idx, bit_in_byte;\n+\n+\t\tdw_bit = 128 / wpa_s->nan_capa.slot_duration;\n+\t\tdw_bit += !!(wpa_s->nan_capa.slot_duration == 16);\n+\t\tbyte_idx = dw_bit / 8;\n+\t\tbit_in_byte = dw_bit % 8;\n+\n+\t\tif (ndp->sched.chans[0].committed.bitmap[byte_idx] &\n+\t\t BIT(bit_in_byte)) {\n+\t\t\tndp->sched.ndc.bitmap[byte_idx] = BIT(bit_in_byte);\n+\t\t\treturn 0;\n+\t\t}\n+\t} else if (ndp->sched.chans[0].chan.freq == 2437 &&\n+\t\t (wpa_s->nan_capa.slot_duration == 16)) {\n+\t\tif (ndp->sched.chans[0].committed.bitmap[0] & 0x02) {\n+\t\t\tndp->sched.ndc.bitmap[0] = 0x02;\n+\t\t\treturn 0;\n+\t\t}\n+\t}\n+\n+\t/* For other cases, select first available slot */\n+\tfor (i = 0; i < NAN_TIME_BITMAP_MAX_LEN; i++) {\n+\t\tif (ndp->sched.chans[0].committed.bitmap[i]) {\n+\t\t\tndp->sched.ndc.bitmap[i] =\n+\t\t\t\tndp->sched.chans[0].committed.bitmap[i] &\n+\t\t\t\t(~ndp->sched.chans[0].committed.bitmap[i] + 1);\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+\n+static int wpas_nan_set_ndp_schedule(struct wpa_supplicant *wpa_s,\n+\t\t\t\t struct nan_ndp_params *ndp)\n+{\n+\t/* Set schedule for request or successful response */\n+\tif (ndp->type != NAN_NDP_ACTION_REQ &&\n+\t ndp->u.resp.status == NAN_NDP_STATUS_REJECTED)\n+\t\treturn 0;\n+\n+\twpas_nan_fill_ndp_schedule(wpa_s, &ndp->sched);\n+\n+\tif (!ndp->sched.n_chans) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: No channels configured for NDP schedule\");\n+\t\treturn -1;\n+\t}\n+\n+\t/* Set sequence ID */\n+\tndp->sched.sequence_id = wpa_s->schedule_sequence_id;\n+\n+\t/* Add additional elements */\n+\tndp->sched.elems = wpas_nan_build_ndp_elems(wpa_s);\n+\n+\t/* Mark schedule as valid */\n+\tndp->sched_valid = true;\n+\n+\treturn wpas_nan_select_ndc(wpa_s, ndp);\n+}\n+\n+\n+/* Command format NAN_NDP_REQUEST handle=<id> ndi=<ifname> peer_nmi=<nmi>\n+ peer_id=<peer_instance_id> ssi=<hexdata> qos=<slots:latency> */\n+int wpas_nan_ndp_request(struct wpa_supplicant *wpa_s, char *cmd)\n+{\n+\tstruct nan_ndp_params ndp;\n+\tstruct wpabuf *ssi_buf = NULL;\n+\tchar *token, *context = NULL;\n+\tchar *pos;\n+\tint handle = -1;\n+\tint ret = -1;\n+\n+\tos_memset(&ndp, 0, sizeof(ndp));\n+\n+\tif (!wpas_nan_ready(wpa_s))\n+\t\treturn -1;\n+\n+\tndp.type = NAN_NDP_ACTION_REQ;\n+\tndp.qos.min_slots = NAN_QOS_MIN_SLOTS_NO_PREF;\n+\tndp.qos.max_latency = NAN_QOS_MAX_LATENCY_NO_PREF;\n+\n+\t/* Parse command parameters */\n+\twhile ((token = str_token(cmd, \" \", &context))) {\n+\t\tpos = os_strchr(token, '=');\n+\t\tif (!pos) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: Invalid parameter format: %s\",\n+\t\t\t\t token);\n+\t\t\tgoto fail;\n+\t\t}\n+\t\t*pos++ = '\\0';\n+\n+\t\tif (os_strcmp(token, \"handle\") == 0) {\n+\t\t\thandle = atoi(pos);\n+\n+\t\t\t/* Get service ID from the local handle */\n+\t\t\tif (!nan_de_is_valid_instance_id(wpa_s->nan_de,\n+\t\t\t\t\t\t\t handle,\n+\t\t\t\t\t\t\t false,\n+\t\t\t\t\t\t\t ndp.u.req.service_id)) {\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t \"NAN: Invalid subscribe handle: %d\",\n+\t\t\t\t\t handle);\n+\t\t\t\tgoto fail;\n+\t\t\t}\n+\t\t} else if (os_strcmp(token, \"ndi\") == 0) {\n+\t\t\tstruct wpa_supplicant *ndi_wpa_s;\n+\n+\t\t\tndi_wpa_s = wpa_supplicant_get_iface(wpa_s->global, pos);\n+\t\t\tif (!ndi_wpa_s) {\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t \"NAN: NDI interface not found: %s\",\n+\t\t\t\t\t pos);\n+\t\t\t\tgoto fail;\n+\t\t\t}\n+\n+\t\t\tif (!ndi_wpa_s->nan_data) {\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t \"NAN: Interface %s is not a NAN data interface\",\n+\t\t\t\t\t pos);\n+\t\t\t\tgoto fail;\n+\t\t\t}\n+\n+\t\t\tos_memcpy(ndp.ndp_id.init_ndi, ndi_wpa_s->own_addr,\n+\t\t\t\t ETH_ALEN);\n+\n+\t\t} else if (os_strcmp(token, \"peer_nmi\") == 0) {\n+\t\t\tif (hwaddr_aton(pos, ndp.ndp_id.peer_nmi) < 0) {\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t \"NAN: Invalid peer NMI address: %s\",\n+\t\t\t\t\t pos);\n+\t\t\t\tgoto fail;\n+\t\t\t}\n+\n+\t\t} else if (os_strcmp(token, \"peer_id\") == 0) {\n+\t\t\tndp.u.req.publish_inst_id = atoi(pos);\n+\t\t} else if (os_strcmp(token, \"ssi\") == 0) {\n+\t\t\tssi_buf = wpabuf_parse_bin(pos);\n+\t\t\tif (!ssi_buf) {\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t \"NAN: Invalid SSI data: %s\", pos);\n+\t\t\t\tgoto fail;\n+\t\t\t}\n+\n+\t\t\tndp.ssi_len = wpabuf_len(ssi_buf);\n+\t\t\tndp.ssi = wpabuf_head(ssi_buf);\n+\n+\t\t} else if (os_strcmp(token, \"qos\") == 0) {\n+\t\t\tif (sscanf(pos, \"%hhu:%hu\",\n+\t\t\t\t &ndp.qos.min_slots,\n+\t\t\t\t &ndp.qos.max_latency) != 2) {\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t \"NAN: Invalid QoS parameter: %s\",\n+\t\t\t\t\t pos);\n+\t\t\t\tgoto fail;\n+\t\t\t}\n+\n+\t\t} else {\n+\t\t\twpa_printf(MSG_DEBUG, \"NAN: Unknown parameter: %s\",\n+\t\t\t\t token);\n+\t\t\tgoto fail;\n+\t\t}\n+\t}\n+\n+\t/* Validate required parameters */\n+\tif (handle < 0) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Missing required parameter: handle\");\n+\t\tgoto fail;\n+\t}\n+\n+\tif (!ndp.u.req.publish_inst_id) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Missing required parameter: peer_id\");\n+\t\tgoto fail;\n+\t}\n+\n+\tif (is_zero_ether_addr(ndp.ndp_id.init_ndi)) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Missing required parameter: ndi\");\n+\t\tgoto fail;\n+\t}\n+\n+\tif (is_zero_ether_addr(ndp.ndp_id.peer_nmi)) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Missing required parameter: peer_nmi\");\n+\t\tgoto fail;\n+\t}\n+\n+\tif (wpas_nan_set_ndp_schedule(wpa_s, &ndp)) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Failed to set NDP schedule\");\n+\t\tgoto fail;\n+\t}\n+\n+\twpa_printf(MSG_DEBUG, \"NAN: Requesting NDP with peer \" MACSTR\n+\t\t \" using handle %d\", MAC2STR(ndp.ndp_id.peer_nmi),\n+\t\t ndp.u.req.publish_inst_id);\n+\tret = nan_handle_ndp_setup(wpa_s->nan, &ndp);\n+fail:\n+\twpabuf_free(ndp.sched.elems);\n+\twpabuf_free(ssi_buf);\n+\n+\treturn ret;\n+}\n+\n+\n void wpas_nan_cluster_join(struct wpa_supplicant *wpa_s,\n \t\t\t const u8 *cluster_id,\n \t\t\t bool new_cluster)\ndiff --git a/wpa_supplicant/nan_supplicant.h b/wpa_supplicant/nan_supplicant.h\nindex f7502e3ec8..9306e296e5 100644\n--- a/wpa_supplicant/nan_supplicant.h\n+++ b/wpa_supplicant/nan_supplicant.h\n@@ -25,6 +25,7 @@ void wpas_nan_cluster_join(struct wpa_supplicant *wpa_s,\n \t\t\t bool new_cluster);\n void wpas_nan_next_dw(struct wpa_supplicant *wpa_s, u32 freq);\n int wpas_nan_sched_config_map(struct wpa_supplicant *wpa_s, const char *cmd);\n+int wpas_nan_ndp_request(struct wpa_supplicant *wpa_s, char *cmd);\n \n #else /* CONFIG_NAN */\n \n", "prefixes": [ "11/71" ] }