Fix an issue where the log option is applied incorrectly

[platform/upstream/connman.git] / src / ipconfig.c

diff --git a/src/ipconfig.c b/src/ipconfig.c
index ded1c11..6d8ba05 100755 (executable)
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -48,7 +48,6 @@ struct connman_ipconfig {
        const struct connman_ipconfig_ops *ops;
        void *ops_data;
 
-       bool enabled;
        enum connman_ipconfig_method method;
        struct connman_ipaddress *address;
        struct connman_ipaddress *system;
@@ -413,40 +412,6 @@ static void free_ipdevice(gpointer data)
        g_free(ipdevice);
 }
 
-static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice)
-{
-       DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4,
-                       ipdevice->config_ipv6);
-#if defined TIZEN_EXT
-       if (ipdevice->config_ipv6 != NULL &&
-                       ipdevice->config_ipv6->enabled == TRUE)
-               return;
-
-       char *ifname = connman_inet_ifname(ipdevice->index);
-
-       if (__connman_device_isfiltered(ifname) == FALSE) {
-               ipdevice->ipv6_enabled = get_ipv6_state(ifname);
-               set_ipv6_state(ifname, FALSE);
-       }
-       g_free(ifname);
-#endif
-}
-
-static void __connman_ipconfig_lower_down(struct connman_ipdevice *ipdevice)
-{
-       DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4,
-                                       ipdevice->config_ipv6);
-
-       if (ipdevice->config_ipv4)
-               connman_inet_clear_address(ipdevice->index,
-                                       ipdevice->config_ipv4->address);
-
-       if (ipdevice->config_ipv6)
-               connman_inet_clear_ipv6_address(ipdevice->index,
-                               ipdevice->config_ipv6->address->local,
-                               ipdevice->config_ipv6->address->prefixlen);
-}
-
 static void update_stats(struct connman_ipdevice *ipdevice,
                        const char *ifname, struct rtnl_link_stats *stats)
 {
@@ -606,11 +571,6 @@ update:
 
        g_list_free(ipconfig_copy);
 
-       if (lower_up)
-               __connman_ipconfig_lower_up(ipdevice);
-       if (lower_down)
-               __connman_ipconfig_lower_down(ipdevice);
-
 out:
        g_free(ifname);
 }
@@ -651,8 +611,6 @@ void __connman_ipconfig_dellink(int index, struct rtnl_link_stats *stats)
 
        g_free(ifname);
 
-       __connman_ipconfig_lower_down(ipdevice);
-
        g_hash_table_remove(ipdevice_hash, GINT_TO_POINTER(index));
 }
 
@@ -1178,8 +1136,6 @@ static struct connman_ipconfig *create_ipv6config(int index)
        struct connman_ipconfig *ipv6config;
        struct connman_ipdevice *ipdevice;
 
-       DBG("index %d", index);
-
        ipv6config = g_try_new0(struct connman_ipconfig, 1);
        if (!ipv6config)
                return NULL;
@@ -1187,7 +1143,6 @@ static struct connman_ipconfig *create_ipv6config(int index)
        ipv6config->refcount = 1;
 
        ipv6config->index = index;
-       ipv6config->enabled = false;
        ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
 
        if (!is_ipv6_supported)
@@ -1197,7 +1152,11 @@ static struct connman_ipconfig *create_ipv6config(int index)
 
        ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index));
        if (ipdevice)
+#if !defined TIZEN_EXT
                ipv6config->ipv6_privacy_config = ipdevice->ipv6_privacy;
+#else
+               ipv6config->ipv6_privacy_config = ipdevice->ipv6_privacy = 2;
+#endif
 
        ipv6config->address = connman_ipaddress_alloc(AF_INET6);
        if (!ipv6config->address) {
@@ -1207,7 +1166,7 @@ static struct connman_ipconfig *create_ipv6config(int index)
 
        ipv6config->system = connman_ipaddress_alloc(AF_INET6);
 
-       DBG("ipconfig %p method %s", ipv6config,
+       DBG("ipconfig %p index %d method %s", ipv6config, index,
                __connman_ipconfig_method2string(ipv6config->method));
 
        return ipv6config;
@@ -1228,8 +1187,6 @@ struct connman_ipconfig *__connman_ipconfig_create(int index,
        if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
                return create_ipv6config(index);
 
-       DBG("index %d", index);
-
        ipconfig = g_try_new0(struct connman_ipconfig, 1);
        if (!ipconfig)
                return NULL;
@@ -1237,7 +1194,6 @@ struct connman_ipconfig *__connman_ipconfig_create(int index,
        ipconfig->refcount = 1;
 
        ipconfig->index = index;
-       ipconfig->enabled = false;
        ipconfig->type = CONNMAN_IPCONFIG_TYPE_IPV4;
 
        ipconfig->address = connman_ipaddress_alloc(AF_INET);
@@ -1247,8 +1203,10 @@ struct connman_ipconfig *__connman_ipconfig_create(int index,
        }
 
        ipconfig->system = connman_ipaddress_alloc(AF_INET);
-
-       DBG("ipconfig %p", ipconfig);
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
+       DBG("ipconfig %p index %d", ipconfig, index);
 
        return ipconfig;
 }
@@ -1283,7 +1241,9 @@ void __connman_ipconfig_unref_debug(struct connman_ipconfig *ipconfig,
 {
        if (!ipconfig)
                return;
-
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("%p ref %d by %s:%d:%s()", ipconfig, ipconfig->refcount - 1,
                file, line, caller);
 
@@ -1381,8 +1341,6 @@ enum connman_ipconfig_method __connman_ipconfig_get_method(
 
 int __connman_ipconfig_address_add(struct connman_ipconfig *ipconfig)
 {
-       DBG("");
-
        switch (ipconfig->method) {
        case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
        case CONNMAN_IPCONFIG_METHOD_OFF:
@@ -1406,13 +1364,9 @@ int __connman_ipconfig_address_remove(struct connman_ipconfig *ipconfig)
 {
        int err;
 
-       DBG("");
-
        if (!ipconfig)
                return 0;
 
-       DBG("method %d", ipconfig->method);
-
        switch (ipconfig->method) {
        case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
        case CONNMAN_IPCONFIG_METHOD_OFF:
@@ -1434,12 +1388,14 @@ int __connman_ipconfig_address_unset(struct connman_ipconfig *ipconfig)
 {
        int err;
 
-       DBG("");
-
        if (!ipconfig)
                return 0;
 
+#if defined TIZEN_EXT
+       DBG("ipconfig method %d type %d", ipconfig->method, ipconfig->type);
+#else
        DBG("method %d", ipconfig->method);
+#endif
 
        switch (ipconfig->method) {
        case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
@@ -1471,8 +1427,6 @@ int __connman_ipconfig_set_proxy_autoconfig(struct connman_ipconfig *ipconfig,
 {
        struct connman_ipdevice *ipdevice;
 
-       DBG("ipconfig %p", ipconfig);
-
        if (!ipconfig || ipconfig->index < 0)
                return -ENODEV;
 
@@ -1491,8 +1445,6 @@ const char *__connman_ipconfig_get_proxy_autoconfig(struct connman_ipconfig *ipc
 {
        struct connman_ipdevice *ipdevice;
 
-       DBG("ipconfig %p", ipconfig);
-
        if (!ipconfig || ipconfig->index < 0)
                return NULL;
 
@@ -1645,8 +1597,6 @@ int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig)
        } else
                return -EINVAL;
 
-       ipconfig->enabled = true;
-
        if (type == CONNMAN_IPCONFIG_TYPE_IPV4 &&
                                        ipdevice->config_ipv4) {
                ipconfig_list = g_list_remove(ipconfig_list,
@@ -1707,7 +1657,9 @@ int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig)
 int __connman_ipconfig_disable(struct connman_ipconfig *ipconfig)
 {
        struct connman_ipdevice *ipdevice;
-
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("ipconfig %p", ipconfig);
 
        if (!ipconfig || ipconfig->index < 0)
@@ -1721,8 +1673,6 @@ int __connman_ipconfig_disable(struct connman_ipconfig *ipconfig)
        if (!ipdevice->config_ipv4 && !ipdevice->config_ipv6)
                return -EINVAL;
 
-       ipconfig->enabled = false;
-
        if (ipdevice->config_ipv4 == ipconfig) {
                ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
 
@@ -1836,8 +1786,6 @@ int __connman_ipconfig_ipv6_set_privacy(struct connman_ipconfig *ipconfig,
        if (!ipconfig)
                return -EINVAL;
 
-       DBG("ipconfig %p privacy %s", ipconfig, value);
-
        privacy = string2privacy(value);
 
        ipconfig->ipv6_privacy_config = privacy;
@@ -1852,9 +1800,6 @@ void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig,
 {
        struct connman_ipaddress *append_addr = NULL;
        const char *str;
-#if defined TIZEN_EXT
-       DBG("");
-#endif
 
        if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4)
                return;
@@ -1868,13 +1813,13 @@ void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig,
        switch (ipconfig->method) {
        case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
        case CONNMAN_IPCONFIG_METHOD_OFF:
-       case CONNMAN_IPCONFIG_METHOD_AUTO:
                return;
 
        case CONNMAN_IPCONFIG_METHOD_FIXED:
                append_addr = ipconfig->address;
                break;
 
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
        case CONNMAN_IPCONFIG_METHOD_MANUAL:
        case CONNMAN_IPCONFIG_METHOD_DHCP:
                append_addr = ipconfig->system;
@@ -1929,9 +1874,6 @@ void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig,
 {
        struct connman_ipaddress *append_addr = NULL;
        const char *str, *privacy;
-#if defined TIZEN_EXT
-       DBG("");
-#endif
 
        if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
                return;
@@ -1993,9 +1935,6 @@ void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig,
                                                        DBusMessageIter *iter)
 {
        const char *str, *privacy;
-#if defined TIZEN_EXT
-       DBG("");
-#endif
 
        str = __connman_ipconfig_method2string(ipconfig->method);
        if (!str)
@@ -2038,9 +1977,6 @@ void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig,
                                                        DBusMessageIter *iter)
 {
        const char *str;
-#if defined TIZEN_EXT
-       DBG("");
-#endif
 
        str = __connman_ipconfig_method2string(ipconfig->method);
        if (!str)
@@ -2092,8 +2028,6 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
        DBusMessageIter dict;
        int type = -1;
 
-       DBG("ipconfig %p", ipconfig);
-
        if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
                return -EINVAL;
 
@@ -2177,6 +2111,7 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
                if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
                        disable_ipv6(ipconfig);
 #endif
+
                break;
 
        case CONNMAN_IPCONFIG_METHOD_AUTO:
@@ -2189,6 +2124,7 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
 #if defined TIZEN_EXT
                enable_ipv6(ipconfig);
 #endif
+
                break;
 
        case CONNMAN_IPCONFIG_METHOD_MANUAL:
@@ -2368,6 +2304,20 @@ int __connman_ipconfig_load(struct connman_ipconfig *ipconfig,
                g_free(key);
                break;
 
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+
+               if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4)
+                       break;
+
+               /*
+                * If the last used method for IPv4 was AUTO then we
+                * try first DHCP. We will try also to use the last
+                * used DHCP address, if exits.
+                */
+               __connman_ipconfig_set_method(ipconfig,
+                                       CONNMAN_IPCONFIG_METHOD_DHCP);
+               /* fall through */
+
        case CONNMAN_IPCONFIG_METHOD_DHCP:
 
                key = g_strdup_printf("%sDHCP.LastAddress", prefix);
@@ -2379,9 +2329,6 @@ int __connman_ipconfig_load(struct connman_ipconfig *ipconfig,
                g_free(key);
 
                break;
-
-       case CONNMAN_IPCONFIG_METHOD_AUTO:
-               break;
        }
 
        return 0;
@@ -2481,6 +2428,8 @@ int __connman_ipconfig_save(struct connman_ipconfig *ipconfig,
        if (ipconfig->address->gateway)
                g_key_file_set_string(keyfile, identifier,
                        key, ipconfig->address->gateway);
+       else
+               g_key_file_remove_key(keyfile, identifier, key, NULL);
        g_free(key);
 
        return 0;