cfg80211: add add_nan_func / del_nan_func

A NAN function can be either publish, subscribe or follow
up. Make all the necessary verifications and just pass the
request to the driver.
Allow the user space application that starts NAN to
forbid any other socket to add or remove functions.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Ayala Beker <ayala.beker@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 150 insertions, 0 deletions

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 98fd3ec8598d..e4935d963061 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -847,6 +847,21 @@
  *      After this command NAN functions can be added.
  * @NL80211_CMD_STOP_NAN: Stop the NAN operation, identified by
  *      its %NL80211_ATTR_WDEV interface.
+ * @NL80211_CMD_ADD_NAN_FUNCTION: Add a NAN function. The function is defined
+ *      with %NL80211_ATTR_NAN_FUNC nested attribute. When called, this
+ *      operation returns the strictly positive and unique instance id
+ *      (%NL80211_ATTR_NAN_FUNC_INST_ID) and a cookie (%NL80211_ATTR_COOKIE)
+ *      of the function upon success.
+ *      Since instance ID's can be re-used, this cookie is the right
+ *      way to identify the function. This will avoid races when a termination
+ *      event is handled by the user space after it has already added a new
+ *      function that got the same instance id from the kernel as the one
+ *      which just terminated.
+ *      This cookie may be used in NAN events even before the command
+ *      returns, so userspace shouldn't process NAN events until it processes
+ *      the response to this command.
+ *      Look at %NL80211_ATTR_SOCKET_OWNER as well.
+ * @NL80211_CMD_DEL_NAN_FUNCTION: Delete a NAN function by cookie.
  *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
@@ -1038,6 +1053,8 @@ enum nl80211_commands {
 
         NL80211_CMD_START_NAN,
         NL80211_CMD_STOP_NAN,
+        NL80211_CMD_ADD_NAN_FUNCTION,
+        NL80211_CMD_DEL_NAN_FUNCTION,
 
         /* add new commands above here */
 
@@ -1899,6 +1916,9 @@ enum nl80211_commands {
  * @NL80211_ATTR_NAN_DUAL: NAN dual band operation config (see
  *      &enum nl80211_nan_dual_band_conf). This attribute is used with
  *      %NL80211_CMD_START_NAN.
+ * @NL80211_ATTR_NAN_FUNC: a function that can be added to NAN. See
+ *      &enum nl80211_nan_func_attributes for description of this nested
+ *      attribute.
  *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
@@ -2296,6 +2316,7 @@ enum nl80211_attrs {
 
         NL80211_ATTR_NAN_MASTER_PREF,
         NL80211_ATTR_NAN_DUAL,
+        NL80211_ATTR_NAN_FUNC,
 
         /* add attributes here, update the policy in nl80211.c */
 
@@ -4917,4 +4938,133 @@ enum nl80211_nan_dual_band_conf {
         NL80211_NAN_BAND_5GHZ           = 1 << 2,
 };
 
+/**
+ * enum nl80211_nan_function_type - NAN function type
+ *
+ * Defines the function type of a NAN function
+ *
+ * @NL80211_NAN_FUNC_PUBLISH: function is publish
+ * @NL80211_NAN_FUNC_SUBSCRIBE: function is subscribe
+ * @NL80211_NAN_FUNC_FOLLOW_UP: function is follow-up
+ */
+enum nl80211_nan_function_type {
+        NL80211_NAN_FUNC_PUBLISH,
+        NL80211_NAN_FUNC_SUBSCRIBE,
+        NL80211_NAN_FUNC_FOLLOW_UP,
+
+        /* keep last */
+        __NL80211_NAN_FUNC_TYPE_AFTER_LAST,
+        NL80211_NAN_FUNC_MAX_TYPE = __NL80211_NAN_FUNC_TYPE_AFTER_LAST - 1,
+};
+
+/**
+ * enum nl80211_nan_publish_type - NAN publish tx type
+ *
+ * Defines how to send publish Service Discovery Frames
+ *
+ * @NL80211_NAN_SOLICITED_PUBLISH: publish function is solicited
+ * @NL80211_NAN_UNSOLICITED_PUBLISH: publish function is unsolicited
+ */
+enum nl80211_nan_publish_type {
+        NL80211_NAN_SOLICITED_PUBLISH = 1 << 0,
+        NL80211_NAN_UNSOLICITED_PUBLISH = 1 << 1,
+};
+
+#define NL80211_NAN_FUNC_SERVICE_ID_LEN 6
+#define NL80211_NAN_FUNC_SERVICE_SPEC_INFO_MAX_LEN 0xff
+#define NL80211_NAN_FUNC_SRF_MAX_LEN 0xff
+
+/**
+ * enum nl80211_nan_func_attributes - NAN function attributes
+ * @__NL80211_NAN_FUNC_INVALID: invalid
+ * @NL80211_NAN_FUNC_TYPE: &enum nl80211_nan_function_type (u8).
+ * @NL80211_NAN_FUNC_SERVICE_ID: 6 bytes of the service ID hash as
+ *      specified in NAN spec. This is a binary attribute.
+ * @NL80211_NAN_FUNC_PUBLISH_TYPE: relevant if the function's type is
+ *      publish. Defines the transmission type for the publish Service Discovery
+ *      Frame, see &enum nl80211_nan_publish_type. Its type is u8.
+ * @NL80211_NAN_FUNC_PUBLISH_BCAST: relevant if the function is a solicited
+ *      publish. Should the solicited publish Service Discovery Frame be sent to
+ *      the NAN Broadcast address. This is a flag.
+ * @NL80211_NAN_FUNC_SUBSCRIBE_ACTIVE: relevant if the function's type is
+ *      subscribe. Is the subscribe active. This is a flag.
+ * @NL80211_NAN_FUNC_FOLLOW_UP_ID: relevant if the function's type is follow up.
+ *      The instance ID for the follow up Service Discovery Frame. This is u8.
+ * @NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID: relevant if the function's type
+ *      is follow up. This is a u8.
+ *      The requestor instance ID for the follow up Service Discovery Frame.
+ * @NL80211_NAN_FUNC_FOLLOW_UP_DEST: the MAC address of the recipient of the
+ *      follow up Service Discovery Frame. This is a binary attribute.
+ * @NL80211_NAN_FUNC_CLOSE_RANGE: is this function limited for devices in a
+ *      close range. The range itself (RSSI) is defined by the device.
+ *      This is a flag.
+ * @NL80211_NAN_FUNC_TTL: strictly positive number of DWs this function should
+ *      stay active. If not present infinite TTL is assumed. This is a u32.
+ * @NL80211_NAN_FUNC_SERVICE_INFO: array of bytes describing the service
+ *      specific info. This is a binary attribute.
+ * @NL80211_NAN_FUNC_SRF: Service Receive Filter. This is a nested attribute.
+ *      See &enum nl80211_nan_srf_attributes.
+ * @NL80211_NAN_FUNC_RX_MATCH_FILTER: Receive Matching filter. This is a nested
+ *      attribute. It is a list of binary values.
+ * @NL80211_NAN_FUNC_TX_MATCH_FILTER: Transmit Matching filter. This is a
+ *      nested attribute. It is a list of binary values.
+ * @NL80211_NAN_FUNC_INSTANCE_ID: The instance ID of the function.
+ *      Its type is u8 and it cannot be 0.
+ * @NL80211_NAN_FUNC_TERM_REASON: NAN function termination reason.
+ *      See &enum nl80211_nan_func_term_reason.
+ *
+ * @NUM_NL80211_NAN_FUNC_ATTR: internal
+ * @NL80211_NAN_FUNC_ATTR_MAX: highest NAN function attribute
+ */
+enum nl80211_nan_func_attributes {
+        __NL80211_NAN_FUNC_INVALID,
+        NL80211_NAN_FUNC_TYPE,
+        NL80211_NAN_FUNC_SERVICE_ID,
+        NL80211_NAN_FUNC_PUBLISH_TYPE,
+        NL80211_NAN_FUNC_PUBLISH_BCAST,
+        NL80211_NAN_FUNC_SUBSCRIBE_ACTIVE,
+        NL80211_NAN_FUNC_FOLLOW_UP_ID,
+        NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID,
+        NL80211_NAN_FUNC_FOLLOW_UP_DEST,
+        NL80211_NAN_FUNC_CLOSE_RANGE,
+        NL80211_NAN_FUNC_TTL,
+        NL80211_NAN_FUNC_SERVICE_INFO,
+        NL80211_NAN_FUNC_SRF,
+        NL80211_NAN_FUNC_RX_MATCH_FILTER,
+        NL80211_NAN_FUNC_TX_MATCH_FILTER,
+        NL80211_NAN_FUNC_INSTANCE_ID,
+        NL80211_NAN_FUNC_TERM_REASON,
+
+        /* keep last */
+        NUM_NL80211_NAN_FUNC_ATTR,
+        NL80211_NAN_FUNC_ATTR_MAX = NUM_NL80211_NAN_FUNC_ATTR - 1
+};
+
+/**
+ * enum nl80211_nan_srf_attributes - NAN Service Response filter attributes
+ * @__NL80211_NAN_SRF_INVALID: invalid
+ * @NL80211_NAN_SRF_INCLUDE: present if the include bit of the SRF set.
+ *      This is a flag.
+ * @NL80211_NAN_SRF_BF: Bloom Filter. Present if and only if
+ *      &NL80211_NAN_SRF_MAC_ADDRS isn't present. This attribute is binary.
+ * @NL80211_NAN_SRF_BF_IDX: index of the Bloom Filter. Mandatory if
+ *      &NL80211_NAN_SRF_BF is present. This is a u8.
+ * @NL80211_NAN_SRF_MAC_ADDRS: list of MAC addresses for the SRF. Present if
+ *      and only if &NL80211_NAN_SRF_BF isn't present. This is a nested
+ *      attribute. Each nested attribute is a MAC address.
+ * @NUM_NL80211_NAN_SRF_ATTR: internal
+ * @NL80211_NAN_SRF_ATTR_MAX: highest NAN SRF attribute
+ */
+enum nl80211_nan_srf_attributes {
+        __NL80211_NAN_SRF_INVALID,
+        NL80211_NAN_SRF_INCLUDE,
+        NL80211_NAN_SRF_BF,
+        NL80211_NAN_SRF_BF_IDX,
+        NL80211_NAN_SRF_MAC_ADDRS,
+
+        /* keep last */
+        NUM_NL80211_NAN_SRF_ATTR,
+        NL80211_NAN_SRF_ATTR_MAX = NUM_NL80211_NAN_SRF_ATTR - 1,
+};
+
 #endif /* __LINUX_NL80211_H */