/* Manage */
void wifi_direct_process_manage_activation(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
int error_code;
}
void wifi_direct_process_manage_deactivation(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
int error_code;
//LCOV_EXCL_START
void wifi_direct_process_manage_connection(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
int error_code;
}
void wifi_direct_process_manage_disconnection(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
int error_code;
}
void wifi_direct_process_manage_peer_ip_assigned(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
char *get_str = NULL;
}
void wifi_direct_process_manage_listen_started(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
wifi_direct_client_info_s *client = __wfd_get_control();
}
void wifi_direct_process_manage_discovery_started(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
wifi_direct_client_info_s *client = __wfd_get_control();
}
void wifi_direct_process_manage_discovery_finished(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
wifi_direct_client_info_s *client = __wfd_get_control();
}
void wifi_direct_process_manage_peer_found(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
const gchar *peer_mac_address = NULL;
}
void wifi_direct_process_manage_peer_lost(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
const gchar *peer_mac_address = NULL;
/* Group */
void wifi_direct_process_group_created(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
wifi_direct_client_info_s *client = __wfd_get_control();
}
void wifi_direct_process_group_destroyed(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
wifi_direct_client_info_s *client = __wfd_get_control();
#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
/* Service */
void wifi_direct_process_service_discovery_started(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
wifi_direct_client_info_s *client = __wfd_get_control();
}
void wifi_direct_process_service_discovery_found(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
wifi_direct_service_type_e service_type;
}
void wifi_direct_process_service_discovery_finished(GDBusConnection *connection,
- const gchar *object_path, GVariant *parameters)
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface,
+ const gchar *signal,
+ GVariant *parameters,
+ gpointer user_data)
{
__WDC_LOG_FUNC_START__;
wifi_direct_client_info_s *client = __wfd_get_control();
CHECK_FEATURE_SUPPORTED(WIFIDIRECT_FEATURE);
- if (!type) {
- WDC_LOGE("NULL Param [type]!");
- __WDC_LOG_FUNC_END__;
- return WIFI_DIRECT_ERROR_INVALID_PARAMETER;
- }
+ GError* error = NULL;
+ GVariant *reply = NULL;
+ int ret = WIFI_DIRECT_ERROR_NONE;
+ int primary_device_type = 0;
if (g_client_info.is_registered == false) {
WDC_LOGE("Client is NOT registered");
return WIFI_DIRECT_ERROR_NOT_INITIALIZED;
}
-#ifdef TIZEN_TV
- WDC_LOGD("Current primary_dev_type [%d]", WIFI_DIRECT_PRIMARY_DEVICE_TYPE_DISPLAY);
- *type = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_DISPLAY;
-#else /* TIZEN_TV */
- WDC_LOGD("Current primary_dev_type [%d]", WIFI_DIRECT_PRIMARY_DEVICE_TYPE_TELEPHONE);
- *type = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_TELEPHONE;
-#endif /* TIZEN_TV */
+ if (type == NULL) {
+ WDC_LOGE("NULL Param [type]!");
+ __WDC_LOG_FUNC_END__;
+ return WIFI_DIRECT_ERROR_INVALID_PARAMETER;
+ }
+
+ reply = wifi_direct_dbus_method_call_sync(WFD_MANAGER_CONFIG_INTERFACE,
+ "GetPrimaryDevType",
+ NULL, &error);
+
+ ret = __net_wifidirect_gerror_to_enum(error);
+ if (ret != WIFI_DIRECT_ERROR_NONE)
+ return ret;
+
+ WDC_LOGD("%s() SUCCESS", __func__);
+ g_variant_get(reply, "(ii)", &ret, &primary_device_type);
+ g_variant_unref(reply);
+ *type = primary_device_type;
__WDC_LOG_FUNC_END__;
- return WIFI_DIRECT_ERROR_NONE;
+ return ret;
}
int wifi_direct_get_secondary_device_type(wifi_direct_secondary_device_type_e* type)
CHECK_FEATURE_SUPPORTED(WIFIDIRECT_FEATURE);
+ GError* error = NULL;
+ GVariant *reply = NULL;
+ int ret = WIFI_DIRECT_ERROR_NONE;
+ int secondary_device_type = 0;
+
if (g_client_info.is_registered == false) {
WDC_LOGE("Client is NOT registered");
__WDC_LOG_FUNC_END__;
return WIFI_DIRECT_ERROR_NOT_INITIALIZED;
}
- if (NULL == type) {
+ if (type == NULL) {
WDC_LOGE("NULL Param [type]!");
__WDC_LOG_FUNC_END__;
return WIFI_DIRECT_ERROR_INVALID_PARAMETER;
}
-#ifdef TIZEN_TV
- WDC_LOGD("Current second_dev_type [%d]", WIFI_DIRECT_SECONDARY_DEVICE_TYPE_DISPLAY_TV);
- *type = WIFI_DIRECT_SECONDARY_DEVICE_TYPE_DISPLAY_TV;
-#else /* TIZEN_TV */
- WDC_LOGD("Current second_dev_type [%d]", WIFI_DIRECT_SECONDARY_DEVICE_TYPE_TELEPHONE_SMARTPHONE_DUAL);
- *type = WIFI_DIRECT_SECONDARY_DEVICE_TYPE_TELEPHONE_SMARTPHONE_DUAL; /* smart phone dual mode (wifi and cellular) */
-#endif /* TIZEN_TV */
+ reply = wifi_direct_dbus_method_call_sync(WFD_MANAGER_CONFIG_INTERFACE,
+ "GetSecondaryDevType",
+ NULL, &error);
+
+ ret = __net_wifidirect_gerror_to_enum(error);
+ if (ret != WIFI_DIRECT_ERROR_NONE)
+ return ret;
+
+ WDC_LOGD("%s() SUCCESS", __func__);
+ g_variant_get(reply, "(ii)", &ret, &secondary_device_type);
+ g_variant_unref(reply);
+ *type = secondary_device_type;
__WDC_LOG_FUNC_END__;
- return WIFI_DIRECT_ERROR_NONE;
+ return ret;
}
int wifi_direct_set_autoconnection_mode(bool mode)
peer->device_name = g_strndup(device_name, WIFI_DIRECT_MAX_DEVICE_NAME_LEN+1);
} else if (!g_strcmp0(key, "DeviceAddress")) {
- unsigned char mac_address[MACADDR_LEN] = {0, };
+ unsigned char l_mac_address[MACADDR_LEN] = {0, };
- wifi_direct_dbus_unpack_ay(mac_address, var, MACADDR_LEN);
+ wifi_direct_dbus_unpack_ay(l_mac_address, var, MACADDR_LEN);
peer->mac_address = (char*) g_try_malloc0(MACSTR_LEN);
if (peer->mac_address)
- g_snprintf(peer->mac_address, MACSTR_LEN, MACSTR, MAC2STR(mac_address));
+ g_snprintf(peer->mac_address, MACSTR_LEN, MACSTR, MAC2STR(l_mac_address));
} else if (!g_strcmp0(key, "InterfaceAddress")) {
unsigned char intf_address[MACADDR_LEN] = {0, };