From 1612cee1b8ab5f7e2582ec9ef5b92a72d05048d4 Mon Sep 17 00:00:00 2001 From: Niraj Kumar Goit Date: Fri, 15 Sep 2017 15:24:41 +0530 Subject: [PATCH] Append eap type property in "GetServices" Dbus method. Change-Id: Ie9cdabbddba37fab987ec48402e7d7508949f040 Signed-off-by: Niraj Kumar Goit --- src/service.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/service.c b/src/service.c index ee4ef82..24a7b00 100755 --- a/src/service.c +++ b/src/service.c @@ -3166,6 +3166,7 @@ static void append_wifi_ext_info(DBusMessageIter *dict, unsigned int keymgmt; uint16_t frequency; const char *enc_mode; + const char *str; gboolean passpoint; ssid = connman_network_get_blob(network, "WiFi.SSID", &ssid_len); @@ -3194,6 +3195,41 @@ static void append_wifi_ext_info(DBusMessageIter *dict, DBUS_TYPE_BOOLEAN, &passpoint); connman_dbus_dict_append_basic(dict, "Keymgmt", DBUS_TYPE_UINT32, &keymgmt); + + str = connman_network_get_string(network, "WiFi.Security"); + if (str != NULL && g_str_equal(str, "ieee8021x") == TRUE) { + str = connman_network_get_string(network, "WiFi.EAP"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "EAP", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, "WiFi.Phase2"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "Phase2", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, "WiFi.Identity"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "Identity", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, "WiFi.CACertFile"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "CACertFile", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, + "WiFi.ClientCertFile"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "ClientCertFile", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, + "WiFi.PrivateKeyFile"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "PrivateKeyFile", + DBUS_TYPE_STRING, &str); + } } #endif -- 2.7.4