{"id":2198453,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2198453/?format=json","project":{"id":22,"url":"http://patchwork.ozlabs.org/api/1.0/projects/22/?format=json","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-48-andrei.otcheretianski@intel.com>","date":"2026-02-19T20:25:03","name":"[47/58] NAN: Add a callback to allow verifying publish instance ID","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"73b7ba611e276829253eba80453e5a3fcaae83a5","submitter":{"id":62065,"url":"http://patchwork.ozlabs.org/api/1.0/people/62065/?format=json","name":"Andrei Otcheretianski","email":"andrei.otcheretianski@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/hostap/patch/20260219202514.5781-48-andrei.otcheretianski@intel.com/mbox/","series":[{"id":492721,"url":"http://patchwork.ozlabs.org/api/1.0/series/492721/?format=json","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/2198453/checks/","tags":{},"headers":{"Return-Path":"\n ","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=iOuZH2li;\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=aOENlRBP;\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 4fH4l16S2gz1xvS\n\tfor ; Fri, 20 Feb 2026 07:30:37 +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 1vtAey-0000000C1Uo-2G8t;\n\tThu, 19 Feb 2026 20:30:04 +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 1vtAdT-0000000Bwog-1vVq\n\tfor hostap@lists.infradead.org;\n\tThu, 19 Feb 2026 20:28:40 +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:43 -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:27:40 -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=spgRrod3H4fT5IFc32SakX3dfjKSWF3uuWcKnfdK3L0=; b=iOuZH2liyz7fMo\n\tcCzq9x3FfDIxERBBN3uoJ8WYIFIsBZHzF5b1wDCfOoVnU1+FzmV0YA+qcbEq2YdAmYYW1IwRkul73\n\t/ehVHRqqQcgds8rzcpeAHqCuXx4DxUhhxdwE/jeoFn1xG4wSmoPrUf/FjEXnCxGDj1etHJBEHi8PK\n\tYOIPMb9LORv/xmoWwOE+AlKlnNR8Kk8D3Kg8iNmyFxAW1piOApBuEtaYeRh/B9d3XQBgM32jAj28m\n\tXX0cL7wT2k//3ijjzn2uHOjbQ4NxAEEvnH1kIowWVAFihOh05Un7ChUOqwDRrGhZhYt8B7Av2Cckq\n\tCKIdHyNH1FBm8GMRfhkg==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1771532912; x=1803068912;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=6QfORaAr1m8z1/+MCIEtCVqyAQcl91SXpTUlHZwlC4Q=;\n b=aOENlRBPOLK5354bNAe59xw6O95Es51U8DySUgOIN4mxbmX9HQRY1jmk\n 7nKFUyX040RjbO3Bflj7Hh7PTscIfx1DtJ4nL/aYljDh8H9k22wbWU6yj\n SVWQBdAdzlM/E9bM2mFHvO0ldPZoYwLElds7QNsKfb4Zax4Bz4C+YlDjl\n 49q4k5E1oVQdHGjE+yb2au4Hrn93wi1BvAfFzMtXQhmsuWxert5BOnL8R\n IKgHLl1IvL+jM9PUNI2Z3qIhZq8F1eQ2uOIdfAc6w0+53vFMt2uYxEjvG\n GwwgCm29T2pWjPYht/jBZzGVfV9j9S5cx8Hx0oo6kOevbidg8+w0fOCcv\n A==;"],"X-CSE-ConnectionGUID":["nQbXKCCbQmyVXahxn06gGQ==","EMIINNYMRMaW3U5Sc/wKJA=="],"X-CSE-MsgGUID":["r5+XT5XWR9OFHMjqO6petA==","IoNao3ufQ2SwLrvw7xq09w=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11706\"; a=\"90040157\"","E=Sophos;i=\"6.21,300,1763452800\";\n d=\"scan'208\";a=\"90040157\"","E=Sophos;i=\"6.21,300,1763452800\";\n d=\"scan'208\";a=\"219154067\""],"X-ExtLoop1":"1","From":"Andrei Otcheretianski ","To":"hostap@lists.infradead.org,\n\tvamsin@qti.qualcomm.com,\n\tvganneva@qti.qualcomm.com,\n\tmaheshkkv@google.com","Cc":"Ilan Peer ","Subject":"[PATCH 47/58] NAN: Add a callback to allow verifying publish instance\n ID","Date":"Thu, 19 Feb 2026 22:25:03 +0200","Message-ID":"<20260219202514.5781-48-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_122831_652080_2B7F5F56 ","X-CRM114-Status":"GOOD ( 14.16 )","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 Add a callback API\n that\n allows the NDP state machine to validate that a given publish instance ID\n is indeed valid and to retrieve the corresponding service ID.\n Signed-off-by:\n Ilan Peer --- src/common/nan_de.c | 22\n ++++++++++++++++++++++\n src/common/nan_de.h | 2 ++ src/nan/nan.c | 15 ++++++++++-----\n src/nan/nan.h\n | 9 +++++++++ 4 files cha [...]\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":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"Hostap\" ","Errors-To":"hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"From: Ilan Peer \n\nAdd a callback API that allows the NDP state machine to validate\nthat a given publish instance ID is indeed valid and to retrieve\nthe corresponding service ID.\n\nSigned-off-by: Ilan Peer \n---\n src/common/nan_de.c | 22 ++++++++++++++++++++++\n src/common/nan_de.h | 2 ++\n src/nan/nan.c | 15 ++++++++++-----\n src/nan/nan.h | 9 +++++++++\n 4 files changed, 43 insertions(+), 5 deletions(-)","diff":"diff --git a/src/common/nan_de.c b/src/common/nan_de.c\nindex 1a8bd45d36..3d558da2c8 100644\n--- a/src/common/nan_de.c\n+++ b/src/common/nan_de.c\n@@ -2167,3 +2167,25 @@ void nan_de_set_cluster_id(struct nan_de *de, const u8 *cluster_id)\n \t\tde->cluster_id_set = false;\n \t}\n }\n+\n+\n+bool nan_de_is_valid_instance_id(struct nan_de *de, int handle,\n+\t\t\t\t bool publish, u8 *service_id)\n+{\n+\tstruct nan_de_service *srv;\n+\n+\tif (handle < 1 || handle > NAN_DE_MAX_SERVICE)\n+\t\treturn false;\n+\n+\tsrv = de->service[handle - 1];\n+\tif (!srv)\n+\t\treturn false;\n+\n+\tif (publish && srv->type != NAN_DE_PUBLISH)\n+\t\treturn false;\n+\tif (!publish && srv->type != NAN_DE_SUBSCRIBE)\n+\t\treturn false;\n+\n+\tos_memcpy(service_id, srv->service_id, NAN_SERVICE_ID_LEN);\n+\treturn true;\n+}\ndiff --git a/src/common/nan_de.h b/src/common/nan_de.h\nindex f1e99aec73..620158efac 100644\n--- a/src/common/nan_de.h\n+++ b/src/common/nan_de.h\n@@ -209,6 +209,8 @@ int nan_de_transmit(struct nan_de *de, int handle,\n \t\t const u8 *peer_addr, u8 req_instance_id);\n void nan_de_dw_trigger(struct nan_de *de, int freq);\n void nan_de_set_cluster_id(struct nan_de *de, const u8 *cluster_id);\n+bool nan_de_is_valid_instance_id(struct nan_de *de, int handle,\n+\t\t\t\t bool publish, u8 *service_id);\n \n int nan_de_stop_listen(struct nan_de *de, int handle);\n \ndiff --git a/src/nan/nan.c b/src/nan/nan.c\nindex 0720749070..3be4e49c3c 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -1128,7 +1128,8 @@ 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 nan->cfg->send_naf && nan->cfg->get_chans &&\n+\t nan->cfg->is_valid_publish_id)\n \t\treturn true;\n \n \twpa_printf(MSG_DEBUG, \"NAN: NDP operations are not supported\");\n@@ -1475,10 +1476,14 @@ done:\n bool nan_publish_instance_id_valid(struct nan_data *nan, u8 instance_id,\n \t\t\t\t u8 *service_id)\n {\n-\t/* TODO: Need implement this logic */\n-\twpa_printf(MSG_DEBUG,\n-\t\t \"NAN: TODO: Publish instance ID validation not implemented\");\n-\treturn true;\n+\tif (!nan->cfg->is_valid_publish_id) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: is_valid_publish_id callback not defined\");\n+\t\treturn false;\n+\t}\n+\n+\treturn nan->cfg->is_valid_publish_id(nan->cfg->cb_ctx, instance_id,\n+\t\t\t\t\t service_id);\n }\n \n \ndiff --git a/src/nan/nan.h b/src/nan/nan.h\nindex 2957f0c398..1d2b0af834 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -419,6 +419,15 @@ struct nan_config {\n \t */\n \tint (*send_naf)(void *ctx, const u8 *dst, const u8 *src,\n \t\t\tconst u8 *cluster_id, struct wpabuf *buf);\n+\n+\t/**\n+\t * is_valid_publish_id - Check if a publish instance ID is valid\n+\t * @ctx: Callback context from cb_ctx\n+\t * @instance_id: the instance ID to check\n+\t * Return true iff there is a local publish service ID with the given\n+\t * instance ID\n+\t */\n+\tbool (*is_valid_publish_id)(void *ctx, u8 instance_id, u8 *service_id);\n };\n \n struct nan_data * nan_init(const struct nan_config *cfg);\n","prefixes":["47/58"]}