From 181bf93363c46398b413960f8fdf99796255ec8a Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 28 Nov 2019 15:21:58 +0200 Subject: [PATCH] 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 --- src/common/wpa_ctrl.h | 1 + wpa_supplicant/dpp_supplicant.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/common/wpa_ctrl.h b/src/common/wpa_ctrl.h index 70ecf5d82..525818969 100644 --- 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 425eff972..78adab613 100644 --- 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