Enable IPv6 tethering for USB

Change-Id: Ib6c61fc9332bd5ea1c6b6bc51a14af292d480621

diff --git a/packaging/capi-network-tethering.spec b/packaging/capi-network-tethering.spec
index 9b3900c25cc7ddbed6d4e697de9f53330a863c6c..02524b1234525a36c8377659236d4a7c132358df 100644 (file)
--- a/packaging/capi-network-tethering.spec
+++ b/packaging/capi-network-tethering.spec
@@ -1,6 +1,6 @@
 Name:          capi-network-tethering
 Summary:       Tethering Framework
-Version:       1.0.56
+Version:       1.0.57
 Release:       1
 Group:         System/Network
 License:       Apache-2.0

diff --git a/src/tethering.c b/src/tethering.c
index 3ffff2624f2ba11927ec8f6fe89e114232d305a1..18a516e4e7bc31079c5a040f16e1f0ece6d134af 100755 (executable)
--- a/src/tethering.c
+++ b/src/tethering.c
@@ -1638,7 +1638,8 @@ API int tethering_enable(tethering_h tethering, tethering_type_e type)
                g_dbus_connection_signal_unsubscribe(connection,
                                sigs[E_SIGNAL_USB_TETHER_ON].sig_id);
 
-               g_dbus_proxy_call(proxy, "enable_usb_tethering", NULL,
+               g_dbus_proxy_call(proxy, "enable_usb_tethering",
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV4),
                                G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __usb_enabled_cfm_cb, (gpointer)tethering);
                break;
@@ -1718,7 +1719,8 @@ API int tethering_enable(tethering_h tethering, tethering_type_e type)
                g_dbus_connection_signal_unsubscribe(connection,
                                sigs[E_SIGNAL_USB_TETHER_ON].sig_id);
 
-               g_dbus_proxy_call(proxy, "enable_usb_tethering", NULL,
+               g_dbus_proxy_call(proxy, "enable_usb_tethering",
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV4),
                                G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __usb_enabled_cfm_cb, (gpointer)tethering);
 
@@ -1784,6 +1786,17 @@ API int tethering_ipv6_enable(tethering_h tethering, tethering_type_e type)
        }
 
        switch (type) {
+       case TETHERING_TYPE_USB: {
+               g_dbus_connection_signal_unsubscribe(connection,
+                               sigs[E_SIGNAL_USB_TETHER_ON].sig_id);
+
+               g_dbus_proxy_call(proxy, "enable_usb_tethering",
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV6),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               (GAsyncReadyCallback) __usb_enabled_cfm_cb, (gpointer)tethering);
+               break;
+       }
+
        case TETHERING_TYPE_WIFI: {
                _softap_settings_t set = {"", "", "", 0, false, false, 0, 0};
 
@@ -1801,12 +1814,13 @@ API int tethering_ipv6_enable(tethering_h tethering, tethering_type_e type)
                                (GAsyncReadyCallback) __wifi_enabled_cfm_cb, (gpointer)tethering);
                break;
         }
+
        case TETHERING_TYPE_BT: {
                g_dbus_connection_signal_unsubscribe(connection,
                                sigs[E_SIGNAL_BT_TETHER_ON].sig_id);
 
-               /* For TEST */
-               g_dbus_proxy_call(proxy, "enable_bt_tethering", g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV6),
+               g_dbus_proxy_call(proxy, "enable_bt_tethering",
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV6),
                                G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __bt_enabled_cfm_cb, (gpointer)tethering);
 
@@ -1844,6 +1858,16 @@ API int tethering_ipv6_disable(tethering_h tethering, tethering_type_e type)
        GDBusConnection *connection = th->client_bus;
 
        switch (type) {
+       case TETHERING_TYPE_USB:
+               g_dbus_connection_signal_unsubscribe(connection,
+                               sigs[E_SIGNAL_USB_TETHER_OFF].sig_id);
+
+               g_dbus_proxy_call(proxy, "disable_usb_tethering",
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV6),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
+               break;
+
        case TETHERING_TYPE_WIFI:
                DBG("Disable wifi tethering..");
                g_dbus_connection_signal_unsubscribe(connection,
@@ -1854,6 +1878,7 @@ API int tethering_ipv6_disable(tethering_h tethering, tethering_type_e type)
                                G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
                break;
+
        case TETHERING_TYPE_BT:
                g_dbus_connection_signal_unsubscribe(connection,
                                sigs[E_SIGNAL_BT_TETHER_OFF].sig_id);
@@ -1909,7 +1934,8 @@ API int tethering_disable(tethering_h tethering, tethering_type_e type)
                                sigs[E_SIGNAL_USB_TETHER_OFF].sig_id);
 
                g_dbus_proxy_call(proxy, "disable_usb_tethering",
-                               NULL, G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV4),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
 
                break;
@@ -1951,7 +1977,8 @@ API int tethering_disable(tethering_h tethering, tethering_type_e type)
                                sigs[E_SIGNAL_USB_TETHER_OFF].sig_id);
 
                g_dbus_proxy_call(proxy, "disable_usb_tethering",
-                               NULL, G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
+                               g_variant_new("(i)", TETHERING_ADDRESS_FAMILY_IPV4),
+                               G_DBUS_CALL_FLAGS_NONE, -1, th->cancellable,
                                (GAsyncReadyCallback) __disabled_cfm_cb, (gpointer)tethering);
 
                g_dbus_connection_signal_unsubscribe(connection,