[RFC PATCH 5/6] NAN: Permit entirely silent services

[Benjamin Berg]

From: Benjamin Berg <benjamin.berg at intel.com>

If the service is published by a proxy, then it is not necessary to
announce it. So permit an entirely silent configuration where neither
solicited nor unsolicited discovery is enabled.

type=feature
ticket=none

Signed-off-by: Benjamin Berg <benjamin.berg at intel.com>
---
 src/common/nan_de.c         |  2 +-
 tests/hwsim/test_nan_usd.py | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/common/nan_de.c b/src/common/nan_de.c
index 396b5fa5bc..40d3926fca 100644
--- a/src/common/nan_de.c
+++ b/src/common/nan_de.c
@@ -1670,7 +1670,7 @@ int nan_de_publish(struct nan_de *de, const char *service_name,
 		return -1;
 	}
 
-	if (!params->unsolicited && !params->solicited) {
+	if (p2p && !params->unsolicited && !params->solicited) {
 		wpa_printf(MSG_INFO,
 			   "NAN: Publish() - both unsolicited and solicited disabled is invalid");
 		return -1;
diff --git a/tests/hwsim/test_nan_usd.py b/tests/hwsim/test_nan_usd.py
index ce6c503708..705b5bd388 100644
--- a/tests/hwsim/test_nan_usd.py
+++ b/tests/hwsim/test_nan_usd.py
@@ -18,16 +18,6 @@ def check_nan_usd_capab(dev):
     if "USD" not in capa:
         raise HwsimSkip("NAN USD not supported")
 
-def test_nan_usd_publish_invalid_param(dev):
-    """NAN USD Publish with invalid parameters"""
-    check_nan_usd_capab(dev[0])
-
-    # Both solicited and unsolicited disabled is invalid
-    cmd = "NAN_PUBLISH service_name=_test solicited=0 unsolicited=0"
-    id0 = dev[0].request(cmd)
-    if "FAIL" not in id0:
-        raise Exception("NAN_PUBLISH accepts both solicited=0 and unsolicited=0")
-
 def test_nan_usd_publish(dev, apdev):
     """NAN USD Publish"""
     check_nan_usd_capab(dev[0])
-- 
2.53.0