Remove the hard-coded AP global address in ipsp 70/135170/1
authorHyuk Lee <hyuk0512.lee@samsung.com>
Wed, 21 Jun 2017 06:03:20 +0000 (15:03 +0900)
committerHyuk Lee <hyuk0512.lee@samsung.com>
Wed, 21 Jun 2017 06:03:20 +0000 (15:03 +0900)
Change-Id: I7c4a2e8c17e0b33a730ba1d5af0cc2105d5ec882
Signed-off-by: Hyuk Lee <hyuk0512.lee@samsung.com>
bt-ipsp/bt-ipsp.c

index faf9256..abf6b39 100644 (file)
@@ -706,6 +706,7 @@ static void __bt_ipsp_dbus_method(GDBusConnection *connection,
                char *ifname = NULL;
                char *address = NULL;
                char *ip6;
+               gchar *network_ipv6_address = NULL;
 
                char *remote_ipv6_address = NULL;
                //char *network_ipv6_address = NULL;
@@ -728,49 +729,20 @@ static void __bt_ipsp_dbus_method(GDBusConnection *connection,
                        BT_DBG("failed to create remote device ipv6 address");
 
                __bt_ipsp_get_network_interface_name(&network_interface);
+               __bt_ipsp_get_network_ipv6_address(network_interface, MOBILE_AP_IPV6_SCOPE_GLOBAL, &network_ipv6_address);
 
                /* Add the Routing Rule */
                __bt_ipsp_add_ipv6_neigh_proxy(network_interface, remote_ipv6_address);
-               __bt_ipsp_add_ipv6_neigh_proxy(ifname, "fd23:8172:c17a:1:7a54:2eff:fe4d:c88");
+               __bt_ipsp_add_ipv6_neigh_proxy(ifname, network_ipv6_address);
 
 
+               __bt_ipsp_add_ipv6_route(ifname, remote_ipv6_address, 128);
+               __bt_ipsp_add_ipv6_route(network_interface, network_ipv6_address, 64);
 
+               g_free(network_ipv6_address);
 
-               __bt_ipsp_add_ipv6_route(ifname, remote_ipv6_address, 128);
-               __bt_ipsp_add_ipv6_route(network_interface, "fd23:8172:c17a:1:7a54:2eff:fe4d:c88", 64);
-
-       }
-#if 0
-       else if (g_strcmp0(method_name, "RecoverAdapter") == 0) {
-               ret = _bt_core_recover_adapter();
-       } else if (g_strcmp0(method_name, "ResetAdapter") == 0) {
-               ret = __bt_core_reset_adapter();
-       } else if (g_strcmp0(method_name, "EnableAdapterLe") == 0) {
-               ret = _bt_core_enable_adapter_le();
-       } else if (g_strcmp0(method_name, "DisableAdapterLe") == 0) {
-               ret = _bt_core_disable_adapter_le();
-       } else if (g_strcmp0(method_name, "EnableCore") == 0) {
-               ret = _bt_core_enable_core();
-       } else if (g_strcmp0(method_name, "SetTransferValue") == 0) {
-               gboolean value = FALSE;
-
-               g_variant_get(parameters, "(b)", &value);
-               BT_DBG("Transfer value: %d", value);
-
-               ret = _bt_core_set_transfer_value(value);
-       } else if (g_strcmp0(method_name, "FactoryTestMode") == 0) {
-               const char *type = NULL;
-               const char *arg = NULL;
-
-               g_variant_get(parameters, "(&s&s)", &type, &arg);
-               ret = _bt_core_factory_test_mode(type, arg);
-               g_dbus_method_invocation_return_value(invocation,
-                               g_variant_new("(i)", ret));
-                return;
-       } else {
-               ret = FALSE;
        }
-#endif
+
        BT_DBG("-");
 }