1 files changed, 101 insertions, 1 deletions

diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index d59085d0..759e165b 100755
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -69,7 +69,11 @@
 
 static DBusConnection *connection;
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+static GSupplicantCallbacks *callbacks_pointer;
+#else /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
 static const GSupplicantCallbacks *callbacks_pointer;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
 
 static dbus_bool_t system_available = FALSE;
 static dbus_bool_t system_ready = FALSE;
@@ -906,6 +910,19 @@ static void callback_sta_deauthorized(GSupplicantInterface *interface,
 	callbacks_pointer->sta_deauthorized(interface, addr);
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+static void callback_eap(GSupplicantInterface *interface, bool status)
+{
+	if (!callbacks_pointer)
+		return;
+
+	if (!callbacks_pointer->eap)
+		return;
+
+	callbacks_pointer->eap(interface, status);
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
 static void callback_peer_found(GSupplicantPeer *peer)
 {
 	if (!callbacks_pointer)
@@ -3441,6 +3458,21 @@ static void wps_property(const char *key, DBusMessageIter *iter,
 
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+void g_supplicant_replace_config_file(const char *ifname, const char *config_file)
+{
+	if (!ifname)
+	       return;
+
+	if (!config_file)
+		return;
+
+	SUPPLICANT_DBG("New {%s, %s}", ifname, config_file);
+	g_hash_table_replace(config_file_table,
+			g_strdup(ifname), g_strdup(config_file));
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
 static void interface_property(const char *key, DBusMessageIter *iter,
 							void *user_data)
 {
@@ -4015,6 +4047,40 @@ static void signal_sta_deauthorized(const char *path, DBusMessageIter *iter)
 	callback_sta_deauthorized(interface, addr);
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+static void signal_eap(const char *path, DBusMessageIter *iter)
+{
+	GSupplicantInterface *interface;
+	const char *str = NULL;
+
+	SUPPLICANT_DBG("EAPOL_DEBUG callback eap signal");
+
+	interface = g_hash_table_lookup(interface_table, path);
+	if (!interface)
+		return;
+
+	// TODO: Identify EAP fail condition, currently timeout is used for failure.
+
+	dbus_message_iter_get_basic(iter, &str);
+	if (!str)
+		return;
+
+	if (g_strcmp0("completion", str))
+		return;
+
+	dbus_message_iter_next(iter);
+
+	dbus_message_iter_get_basic(iter, &str);
+	if (!str)
+		return;
+
+	if (!g_strcmp0("success", str))
+		callback_eap(interface, true);
+	else
+		callback_eap(interface, false);
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
 static void signal_bss_changed(const char *path, DBusMessageIter *iter)
 {
 	GSupplicantInterface *interface;
@@ -5090,6 +5156,10 @@ static struct {
 		signal_mesh_peer_disconnected },
 #endif
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+	{ SUPPLICANT_INTERFACE ".Interface", "EAP", signal_eap },
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
 	{ }
 };
 
@@ -5764,7 +5834,6 @@ static void interface_remove_params(DBusMessageIter *iter, void *user_data)
 							&data->interface->path);
 }
 
-
 int g_supplicant_interface_remove(GSupplicantInterface *interface,
 			GSupplicantInterfaceCallback callback,
 							void *user_data)
@@ -8221,7 +8290,37 @@ void g_supplicant_set_ins_settings(GSupplicantINSPreferredFreq preferred_freq_bs
 }
 #endif
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+void g_supplicant_register_eap_callback(g_supplicant_eap_callback cb)
+{
+	SUPPLICANT_DBG("g_supplicant_register_eap_callback %p", cb);
+
+	if (!callbacks_pointer) {
+		SUPPLICANT_DBG("callbacks_pointer is NULL");
+		return;
+	}
+
+	callbacks_pointer->eap = cb;
+}
+
+void g_supplicant_unregister_eap_callback(void)
+{
+	SUPPLICANT_DBG("g_supplicant_unregister_eap_callback");
+
+	if (!callbacks_pointer) {
+		SUPPLICANT_DBG("callbacks_pointer is NULL");
+		return;
+	}
+
+	callbacks_pointer->eap = NULL;
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+int g_supplicant_register(GSupplicantCallbacks *callbacks)
+#else /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
 int g_supplicant_register(const GSupplicantCallbacks *callbacks)
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
 {
 	connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
 	if (!connection)
@@ -8283,6 +8382,7 @@ int g_supplicant_register(const GSupplicantCallbacks *callbacks)
 	} else
 		invoke_introspect_method();
 
+	SUPPLICANT_DBG("supplicant dbus setup completed");
 	return 0;
 }