#include "wifi-passpoint.h"
#if defined TIZEN_WLAN_PASSPOINT
-static gboolean netconfig_wifi_get_passpoint(gint32 *enabled)
+static gboolean netconfig_wifi_get_passpoint(const char *interface_name, gint32 *enabled)
{
- GVariant *reply;
+ GVariant *reply, *var = NULL;
gboolean value;
gboolean result = FALSE;
- reply = netconfig_supplicant_invoke_dbus_interface_property_get(SUPPLICANT_IFACE_INTERFACE,
- "Passpoint");
+ reply = netconfig_supplicant_invoke_dbus_interface_property_get(interface_name, "Passpoint");
if (reply == NULL) {
ERR("Error!!! Failed to get passpoint property");
return FALSE;
}
- if (g_variant_is_of_type(reply, G_VARIANT_TYPE_INT32)) {
- value = g_variant_get_int32(reply);
+ g_variant_get(reply, "(v)", &var);
+
+ if (g_variant_is_of_type(var, G_VARIANT_TYPE_INT32)) {
+ value = g_variant_get_int32(var);
if (value == TRUE)
*enabled = 1;
else
result = TRUE;
}
+ if (var)
+ g_variant_unref(var);
+
g_variant_unref(reply);
return result;
}
-static gboolean netconfig_wifi_set_passpoint(gint32 enable)
+static gboolean netconfig_wifi_set_passpoint(const char *interface_name, gint32 enable)
{
gint32 value = enable ? 1 : 0;
gboolean result = FALSE;
- GVariant *input_args = NULL;
- input_args = g_variant_new_int32(value);
-
- result = netconfig_supplicant_invoke_dbus_interface_property_set(
- SUPPLICANT_IFACE_INTERFACE, "Passpoint", input_args, NULL);
+ result = netconfig_supplicant_invoke_dbus_interface_property_set(interface_name,
+ "Passpoint", g_variant_new_int32(value), NULL);
if (result == FALSE)
ERR("Fail to set passpoint enable[%d]", enable);
}
#endif
-gboolean handle_get_passpoint(Wifi *wifi, GDBusMethodInvocation *context)
+gboolean handle_get_passpoint(Wifi *wifi, GDBusMethodInvocation *context,
+ const char *ifname)
{
gint32 enable = 0;
- g_return_val_if_fail(wifi != NULL, FALSE);
+ g_return_val_if_fail(wifi != NULL, TRUE);
#if defined TIZEN_WLAN_PASSPOINT
- if (netconfig_wifi_get_passpoint(&enable)) {
- wifi_complete_get_passpoint(wifi, context, enable);
- return TRUE;
- }
- wifi_complete_get_passpoint(wifi, context, enable);
- return FALSE;
+ netconfig_wifi_get_passpoint(ifname, &enable);;
#else
enable = 0;
+#endif
wifi_complete_get_passpoint(wifi, context, enable);
return TRUE;
-#endif
}
-gboolean handle_set_passpoint(Wifi *wifi, GDBusMethodInvocation *context, gint enable)
+gboolean handle_set_passpoint(Wifi *wifi, GDBusMethodInvocation *context,
+ const char *ifname, gint enable)
{
- gboolean result = FALSE;
- g_return_val_if_fail(wifi != NULL, FALSE);
+ g_return_val_if_fail(wifi != NULL, TRUE);
#if defined TIZEN_WLAN_PASSPOINT
- result = netconfig_wifi_set_passpoint(enable);
- wifi_complete_set_passpoint(wifi, context);
- return result;
-#else
- wifi_complete_set_passpoint(wifi, context);
- return result;
+ netconfig_wifi_set_passpoint(ifname, enable);
#endif
+ wifi_complete_set_passpoint(wifi, context);
+ return TRUE;
}