DPP: Advertise Configurator connectivity on Relay automatically

Instead of requiring explicit configuration through
dpp_configurator_connectivity=1, advertise Configurator connectivity
automatically if a Relay is configured with a Controller that can
operate as a Responder.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/src/ap/dpp_hostapd.c b/src/ap/dpp_hostapd.c
index a0c6ab15b1a00b3b9b89d1d39e7204dc141960e2..c1732ca4040ed670707742aee5b01c9666b72aff 100644 (file)
--- a/src/ap/dpp_hostapd.c
+++ b/src/ap/dpp_hostapd.c
@@ -3869,3 +3869,13 @@ void hostapd_dpp_push_button_stop(struct hostapd_data *hapd)
 }
 
 #endif /* CONFIG_DPP3 */
+
+
+#ifdef CONFIG_DPP2
+bool hostapd_dpp_configurator_connectivity(struct hostapd_data *hapd)
+{
+       return hapd->conf->dpp_configurator_connectivity ||
+               (hapd->iface->interfaces &&
+                dpp_relay_controller_available(hapd->iface->interfaces->dpp));
+}
+#endif /* CONFIG_DPP2 */

diff --git a/src/ap/dpp_hostapd.h b/src/ap/dpp_hostapd.h
index e7276e889e62877d96e887c0407f39b464feff26..d462a1a6a39080eeefa070f78b80427631f8a992 100644 (file)
--- a/src/ap/dpp_hostapd.h
+++ b/src/ap/dpp_hostapd.h
@@ -47,5 +47,6 @@ void hostapd_dpp_chirp_stop(struct hostapd_data *hapd);
 void hostapd_dpp_remove_bi(void *ctx, struct dpp_bootstrap_info *bi);
 int hostapd_dpp_push_button(struct hostapd_data *hapd, const char *cmd);
 void hostapd_dpp_push_button_stop(struct hostapd_data *hapd);
+bool hostapd_dpp_configurator_connectivity(struct hostapd_data *hapd);
 
 #endif /* DPP_HOSTAPD_H */

diff --git a/src/ap/ieee802_11_shared.c b/src/ap/ieee802_11_shared.c
index 4e7c33eea9a34dba2ae9923655f4c9c1c6b94f42..74c8d4439f1bd826ec19c239913c13f0caf4fe4b 100644 (file)
--- a/src/ap/ieee802_11_shared.c
+++ b/src/ap/ieee802_11_shared.c
@@ -17,6 +17,7 @@
 #include "ap_config.h"
 #include "ap_drv_ops.h"
 #include "wpa_auth.h"
+#include "dpp_hostapd.h"
 #include "ieee802_11.h"
 
 
@@ -873,7 +874,7 @@ u8 * hostapd_eid_owe_trans(struct hostapd_data *hapd, u8 *eid,
 size_t hostapd_eid_dpp_cc_len(struct hostapd_data *hapd)
 {
 #ifdef CONFIG_DPP2
-       if (hapd->conf->dpp_configurator_connectivity)
+       if (hostapd_dpp_configurator_connectivity(hapd))
                return 6;
 #endif /* CONFIG_DPP2 */
        return 0;
@@ -885,7 +886,7 @@ u8 * hostapd_eid_dpp_cc(struct hostapd_data *hapd, u8 *eid, size_t len)
        u8 *pos = eid;
 
 #ifdef CONFIG_DPP2
-       if (!hapd->conf->dpp_configurator_connectivity || len < 6)
+       if (!hostapd_dpp_configurator_connectivity(hapd) || len < 6)
                return pos;
 
        *pos++ = WLAN_EID_VENDOR_SPECIFIC;

diff --git a/src/common/dpp.h b/src/common/dpp.h
index 8eae58d732e038de7ca64325558f034131ebe9ae..3b5f08967b4c08e0210e978bbec96d1646258919 100644 (file)
--- a/src/common/dpp.h
+++ b/src/common/dpp.h
@@ -758,6 +758,7 @@ int dpp_relay_rx_action(struct dpp_global *dpp, const u8 *src, const u8 *hdr,
                        void *cb_ctx);
 int dpp_relay_rx_gas_req(struct dpp_global *dpp, const u8 *src, const u8 *data,
                         size_t data_len);
+bool dpp_relay_controller_available(struct dpp_global *dpp);
 int dpp_controller_start(struct dpp_global *dpp,
                         struct dpp_controller_config *config);
 int dpp_controller_set_params(struct dpp_global *dpp,

diff --git a/src/common/dpp_tcp.c b/src/common/dpp_tcp.c
index 84eab997a14525520e0d5cf15d1a73ce872790d9..6c5f3bf8381d5b45840db4ee0ddb48bcfb0cc6ed 100644 (file)
--- a/src/common/dpp_tcp.c
+++ b/src/common/dpp_tcp.c
@@ -694,6 +694,12 @@ int dpp_relay_rx_gas_req(struct dpp_global *dpp, const u8 *src, const u8 *data,
 }
 
 
+bool dpp_relay_controller_available(struct dpp_global *dpp)
+{
+       return dpp && dl_list_len(&dpp->controllers) > 0;
+}
+
+
 static void dpp_controller_free(struct dpp_controller *ctrl)
 {
        struct dpp_connection *conn, *tmp;