Imported Upstream connman version 1.38

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

diff --git a/src/network.c b/src/network.c
index 243b502..870749f 100755 (executable)
--- a/src/network.c
+++ b/src/network.c
@@ -735,6 +735,10 @@ static int dhcpv6_set_addresses(struct connman_network *network)
        network->connecting = false;
 
        ipconfig_ipv6 = __connman_service_get_ip6config(service);
+#if defined TIZEN_EXT
+       if (!ipconfig_ipv6)
+               goto err;
+#endif
        err = __connman_ipconfig_address_add(ipconfig_ipv6);
        if (err < 0)
                goto err;
@@ -1165,7 +1169,9 @@ static int network_probe(struct connman_network *network)
                        driver = NULL;
                        continue;
                }
-
+#if defined TIZEN_EXT
+               if (!simplified_log)
+#endif
                DBG("driver %p name %s", driver, driver->name);
 
                if (driver->probe(network) == 0)
@@ -1348,7 +1354,7 @@ static void network_destruct(struct connman_network *network)
 
 /**
  * connman_network_create:
- * @identifier: network identifier (for example an unqiue name)
+ * @identifier: network identifier (for example an unique name)
  *
  * Allocate a new network and assign the #identifier to it.
  *
@@ -2106,7 +2112,9 @@ int __connman_network_connect(struct connman_network *network)
 int __connman_network_disconnect(struct connman_network *network)
 {
        int err = 0;
-
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("network %p", network);
 
        remove_ipv4ll_timeout(network);
@@ -2337,7 +2345,9 @@ int connman_network_set_bssid(struct connman_network *network,
 
        if (bssid == NULL)
                return -EINVAL;
-
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("network %p bssid %02x:%02x:%02x:%02x:%02x:%02x", network,
                        bssid[0], bssid[1], bssid[2],
                        bssid[3], bssid[4], bssid[5]);
@@ -2429,6 +2439,9 @@ int connman_network_set_enc_mode(struct connman_network *network,
        if (encryption_mode == NULL)
                return -EINVAL;
 
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("network %p encryption mode %s", network, encryption_mode);
 
        g_strlcpy(network->wifi.encryption_mode, encryption_mode,
@@ -2522,6 +2535,9 @@ int connman_network_set_countrycode(struct connman_network *network,
        if (country_code == NULL)
                return -EINVAL;
 
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("network %p Country Code %02x:%02x",network,
            country_code[0],country_code[1]);
 
@@ -2548,6 +2564,9 @@ int connman_network_set_bssid_list(struct connman_network *network,
 int connman_network_set_phy_mode(struct connman_network *network,
                                    ieee80211_modes_e mode)
 {
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("network %p phy mode %d", network, mode);
        network->wifi.phy_mode = mode;
 
@@ -2680,6 +2699,9 @@ int connman_network_set_domain(struct connman_network *network,
 int connman_network_set_name(struct connman_network *network,
                                                        const char *name)
 {
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("network %p name %s", network, name);
 
        g_free(network->name);