DPP2: Report received ssid_charset as DPP-CONFOBJ-SSID-CHARSET event

This provides the SSID character set, if specified, to upper layers on
station Enrollee.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>

diff --git a/src/common/wpa_ctrl.h b/src/common/wpa_ctrl.h
index 70ecf5d82720f8fb1e703cc81f4f100988366cd5..5258189693dfa797990315da1854e9927c0ba0ef 100644 (file)
--- a/src/common/wpa_ctrl.h
+++ b/src/common/wpa_ctrl.h
@@ -171,6 +171,7 @@ extern "C" {
 #define DPP_EVENT_CONN_STATUS_RESULT "DPP-CONN-STATUS-RESULT "
 #define DPP_EVENT_CONFOBJ_AKM "DPP-CONFOBJ-AKM "
 #define DPP_EVENT_CONFOBJ_SSID "DPP-CONFOBJ-SSID "
+#define DPP_EVENT_CONFOBJ_SSID_CHARSET "DPP-CONFOBJ-SSID-CHARSET "
 #define DPP_EVENT_CONFOBJ_PASS "DPP-CONFOBJ-PASS "
 #define DPP_EVENT_CONFOBJ_PSK "DPP-CONFOBJ-PSK "
 #define DPP_EVENT_CONNECTOR "DPP-CONNECTOR "

diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
index 425eff97207e7099ca1e0c8c47389abab8d0541f..78adab61386c589ef494ad5069439d6014744a19 100644 (file)
--- a/wpa_supplicant/dpp_supplicant.c
+++ b/wpa_supplicant/dpp_supplicant.c
@@ -1114,6 +1114,9 @@ static int wpas_dpp_handle_config_obj(struct wpa_supplicant *wpa_s,
        if (conf->ssid_len)
                wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CONFOBJ_SSID "%s",
                        wpa_ssid_txt(conf->ssid, conf->ssid_len));
+       if (conf->ssid_charset)
+               wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CONFOBJ_SSID_CHARSET "%d",
+                       conf->ssid_charset);
        if (conf->connector) {
                /* TODO: Save the Connector and consider using a command
                 * to fetch the value instead of sending an event with