From 810145a81b7d81f186d5d5dbe9a0c92b33d3d862 Mon Sep 17 00:00:00 2001 From: Niraj Kumar Goit Date: Mon, 9 Nov 2020 20:57:37 +0530 Subject: [PATCH] Rename EAPoL configuration file path and g_eap_supported. 1. Rename EAPoL configuration file path storage directory. 2. Rename g_eap_supported variable to g_eap_enabled to sync with CAPI. Change-Id: Icc80b1b1363fb67ba9a5adfe25005913e7d59994 Signed-off-by: Niraj Kumar Goit --- src/ethernet.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ethernet.c b/src/ethernet.c index 51ed97a..d055ece 100644 --- a/src/ethernet.c +++ b/src/ethernet.c @@ -29,7 +29,7 @@ #include "wifi-power.h" #include "netsupplicant.h" -#define EAPOL_STORAGEDIR "/opt/usr/data/network/" +#define EAPOL_STORAGEDIR "/var/lib/connman/" #define ETH_IFNAME "eth0" #define CONNMAN_CONFIG_FIELD_EAP_METHOD "EAP" @@ -45,7 +45,7 @@ #define CONNMAN_CONFIG_FIELD_PHASE1 "Phase1" static Ethernet *ethernet_object = NULL; -static gboolean g_eap_supported = FALSE; +static gboolean g_eap_enabled = FALSE; netconfig_eapol_s eapol; Ethernet *get_ethernet_object(void) @@ -263,7 +263,7 @@ gboolean handle_enable_eap(Ethernet *object, GDBusMethodInvocation *invocation, /* TODO: Make below variable interface specific and set connMan profile associated with this interface as EAP enabled. */ - g_eap_supported = enable; + g_eap_enabled = enable; if (enable == false) { int err = __netconfig_set_eapol_property(service, false); @@ -285,7 +285,7 @@ gboolean handle_is_eap_supported(Ethernet *object, GDBusMethodInvocation *invoca DBG("handle_is_eap_supported"); gboolean value = FALSE; - value = g_eap_supported; + value = g_eap_enabled; ethernet_complete_is_eap_supported(object, invocation, value); return TRUE; @@ -303,7 +303,7 @@ gboolean handle_set_eap_config(Ethernet *object, GDBusMethodInvocation *invocati return TRUE; } - if (g_eap_supported == FALSE) { + if (g_eap_enabled == FALSE) { netconfig_error_dbus_method_return(invocation, NETCONFIG_ERROR_INTERNAL, "EapNotEnabled"); -- 2.34.1