}
//LCOV_EXCL_STOP
+static void __p2p_enabled_cfm_cb(GObject *source_object, GAsyncResult *res,
+ gpointer user_data)
+{
+ DBG("+\n");
+
+ _retm_if(user_data == NULL, "parameter(user_data) is NULL\n");
+ __tethering_h *th = (__tethering_h *)user_data;
+ GError *g_error = NULL;
+ GVariant *g_var;
+ guint info;
+ tethering_error_e error;
+ tethering_enabled_cb ecb = th->enabled_cb[TETHERING_TYPE_P2P];
+ void *data = th->enabled_user_data[TETHERING_TYPE_P2P];
+
+ g_var = g_dbus_proxy_call_finish(th->client_bus_proxy, res, &g_error);
+ if (g_error) {
+ ERR("DBus error [%s]\n", g_error->message);
+ if (g_error->code == G_DBUS_ERROR_NO_REPLY &&
+ ++retry < TETHERING_ERROR_RECOVERY_MAX) {
+ g_error_free(g_error);
+ tethering_enable((tethering_h)th, TETHERING_TYPE_P2P);
+ DBG("-\n");
+ return;
+ }
+ if (g_error->code == G_DBUS_ERROR_ACCESS_DENIED)
+ error = TETHERING_ERROR_PERMISSION_DENIED;
+ else
+ error = TETHERING_ERROR_OPERATION_FAILED;
+ g_error_free(g_error);
+ } else {
+ g_variant_get(g_var, "(u)", &info);
+ g_variant_unref(g_var);
+ error = __get_error(info);
+ }
+ retry = 0;
+
+ if (!ecb) {
+ DBG("-\n");
+ return;
+ }
+
+ ecb(error, TETHERING_TYPE_P2P, true, data);
+ DBG("-\n");
+}
+
static void __disabled_cfm_cb(GObject *source_object, GAsyncResult *res,
gpointer user_data)
{
break;
//LCOV_EXCL_STOP
+ case MOBILE_AP_DISABLE_P2P_TETHERING_CFM:
+ type = TETHERING_TYPE_P2P;
+ dcb = th->disabled_cb[type];
+ data = th->disabled_user_data[type];
+ if (dcb)
+ dcb(error, type, code, data);
+ break;
+
case MOBILE_AP_DISABLE_CFM:
sigs[E_SIGNAL_WIFI_TETHER_OFF].sig_id = g_dbus_connection_signal_subscribe(th->client_bus,
g_dbus_connection_signal_unsubscribe(connection,
sigs[E_SIGNAL_BT_TETHER_ON].sig_id);
- g_dbus_proxy_call(proxy, "enable_bt_tethering", NULL,
+ g_dbus_proxy_call(proxy, "enable_bt_tethering",
+ g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV4),
G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
(GAsyncReadyCallback) __bt_enabled_cfm_cb, (gpointer)tethering);
break;
- //LCOV_EXCL_START
+ case TETHERING_TYPE_P2P: {
+ _softap_settings_t p2p_set = {"", "", "", 0, false};
+ ret = __prepare_wifi_settings(tethering, &p2p_set);
+ if (ret != TETHERING_ERROR_NONE) {
+ ERR("p2p settings initialization failed\n");
+ DBG("-\n");
+ return TETHERING_ERROR_OPERATION_FAILED;
+ }
+
+ g_dbus_proxy_call(proxy, "enable_p2p_tethering",
+ g_variant_new("(ssi)", p2p_set.ssid, p2p_set.key, p2p_set.channel),
+ G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+ (GAsyncReadyCallback) __p2p_enabled_cfm_cb, (gpointer)tethering);
+ break;
+ }
+
case TETHERING_TYPE_ALL: {
_softap_settings_t set = {"", "", "", 0, false};
sigs[E_SIGNAL_WIFI_TETHER_ON].sig_id);
g_dbus_proxy_call(proxy, "enable_wifi_tethering",
- g_variant_new("(ssii)", set.ssid, set.key, set.visibility, set.sec_type),
+ g_variant_new("(sssiiiiii)", set.ssid, set.key, set.mode,
+ set.channel, set.visibility, set.mac_filter, set.max_connected,
+ set.sec_type, TETHERING_ADDRESS_FAMILY_IPV4),
G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
(GAsyncReadyCallback) __wifi_enabled_cfm_cb, (gpointer)tethering);
g_dbus_connection_signal_unsubscribe(connection,
sigs[E_SIGNAL_BT_TETHER_ON].sig_id);
- g_dbus_proxy_call(proxy, "enable_usb_tethering", NULL,
+ g_dbus_proxy_call(proxy, "enable_bt_tethering",
+ g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV4),
G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
(GAsyncReadyCallback) __bt_enabled_cfm_cb, (gpointer)tethering);
break;
(GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
break;
+ case TETHERING_TYPE_P2P:
+ g_dbus_proxy_call(proxy, "disable_p2p_tethering",
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+ (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
+ break;
+
case TETHERING_TYPE_ALL:
g_dbus_connection_signal_unsubscribe(connection,
sigs[E_SIGNAL_USB_TETHER_OFF].sig_id);
vconf_type = VCONFKEY_MOBILE_HOTSPOT_MODE_BT;
break;
+ case TETHERING_TYPE_P2P:
+ vconf_type = VCONFKEY_MOBILE_HOTSPOT_MODE_P2P;
+ break;
+
default:
ERR("Not supported type : %d\n", type);
break;
}
/* TETHERING_TYPE_ALL */
- for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_BT; ti++) {
+ for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_P2P; ti++) {
th->enabled_cb[ti] = callback;
th->enabled_user_data[ti] = user_data;
}
}
/* TETHERING_TYPE_ALL */
- for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_BT; ti++) {
+ for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_P2P; ti++) {
th->enabled_cb[ti] = NULL;
th->enabled_user_data[ti] = NULL;
}
}
/* TETHERING_TYPE_ALL */
- for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_BT; ti++) {
+ for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_P2P; ti++) {
th->disabled_cb[ti] = callback;
th->disabled_user_data[ti] = user_data;
}
}
/* TETHERING_TYPE_ALL */
- for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_BT; ti++) {
+ for (ti = TETHERING_TYPE_USB; ti <= TETHERING_TYPE_P2P; ti++) {
th->disabled_cb[ti] = NULL;
th->disabled_user_data[ti] = NULL;
}