DA: Add exception check for time logic

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

diff --git a/src/network.c b/src/network.c
index b1643e7..ca73910 100755 (executable)
--- a/src/network.c
+++ b/src/network.c
@@ -30,6 +30,12 @@
 #include <connman/acd.h>
 #include "src/shared/arp.h"
 
+#if defined TIZEN_EXT
+#include <gdbus.h>
+
+static DBusConnection *connection;
+#endif
+
 /*
  * How many times to send RS with the purpose of
  * refreshing RDNSS entries before they actually expire.
@@ -122,6 +128,7 @@ struct connman_network {
                unsigned int keymgmt;
                char *keymgmt_type;
                bool rsn_mode;
+               bool pmf_required;
                int disconnect_reason;
                int assoc_status_code;
                GSList *vsie_list;
@@ -146,8 +153,11 @@ struct connman_network {
                int transition_mode_ssid_len;
                unsigned char transition_mode_bssid[WIFI_BSSID_LEN_MAX];
                bool roaming_progress;
+               bool roaming_dhcp;
                char *roaming_cur_bssid;
                char *roaming_dst_bssid;
+               __time_t roam_scan_time;
+               unsigned int max_bssid_count;
                int snr;
 #endif
        } wifi;
@@ -559,6 +569,10 @@ static int set_connected_manual(struct connman_network *network)
        ipconfig = __connman_service_get_ip4config(service);
        __connman_ipconfig_enable(ipconfig);
 
+#if defined TIZEN_EXT
+       if (!service || !ipconfig)
+               return -EINVAL;
+#endif
        if (!__connman_ipconfig_get_local(ipconfig))
                __connman_service_read_ip4config(service);
 
@@ -594,7 +608,11 @@ static void remove_dhcp_timeout(struct connman_network *network)
        }
 }
 
+#if defined TIZEN_EXT
+int set_connected_dhcp(struct connman_network *network)
+#else
 static int set_connected_dhcp(struct connman_network *network)
+#endif
 {
        struct connman_service *service;
        struct connman_ipconfig *ipconfig_ipv4;
@@ -1344,6 +1362,7 @@ static void network_destruct(struct connman_network *network)
 #if defined TIZEN_EXT
        g_slist_free_full(network->wifi.vsie_list, g_free);
        g_slist_free_full(network->wifi.bssid_list, g_free);
+       g_hash_table_destroy(network->wifi.assoc_reject_table);
 #endif
        g_free(network->path);
        g_free(network->group);
@@ -1408,6 +1427,9 @@ struct connman_network *
 connman_network_ref_debug(struct connman_network *network,
                        const char *file, int line, const char *caller)
 {
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("%p name %s ref %d by %s:%d:%s()", network, network->name,
                network->refcount + 1, file, line, caller);
 
@@ -1425,6 +1447,9 @@ connman_network_ref_debug(struct connman_network *network,
 void connman_network_unref_debug(struct connman_network *network,
                                const char *file, int line, const char *caller)
 {
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("%p name %s ref %d by %s:%d:%s()", network, network->name,
                network->refcount - 1, file, line, caller);
 
@@ -1792,6 +1817,22 @@ int connman_network_set_associating(struct connman_network *network,
        return 0;
 }
 
+#if defined TIZEN_EXT
+static void set_authenticate_error(struct connman_network *network)
+{
+       struct connman_service *service;
+
+       service = connman_service_lookup_from_network(network);
+
+       if (!service)
+               return;
+
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_AUTH_FAILED);
+}
+#endif
+
+
 static void set_associate_error(struct connman_network *network)
 {
        struct connman_service *service;
@@ -1799,8 +1840,11 @@ static void set_associate_error(struct connman_network *network)
        service = connman_service_lookup_from_network(network);
 
 #if defined TIZEN_EXT
+       if (!service)
+               return;
+
        __connman_service_indicate_error(service,
-                                       CONNMAN_SERVICE_ERROR_AUTH_FAILED);
+                                       CONNMAN_SERVICE_ERROR_ASSOC_FAILED);
 #else
        __connman_service_indicate_error(service,
                                        CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
@@ -1922,6 +1966,9 @@ void connman_network_set_error(struct connman_network *network,
                set_connect_error(network);
                break;
 #if defined TIZEN_EXT
+       case CONNMAN_NETWORK_ERROR_AUTHENTICATE_FAIL:
+               set_authenticate_error(network);
+               break;
        case CONNMAN_NETWORK_ERROR_DHCP_FAIL:
                set_dhcp_error(network);
                break;
@@ -2040,6 +2087,37 @@ out:
        return err;
 }
 
+#if defined TIZEN_EXT
+dbus_bool_t __connman_network_notify_dhcp_changed(const char *key, void *val)
+{
+       int *value = (int *) val;
+       DBusMessage *signal;
+       DBusMessageIter iter;
+       dbus_bool_t result = FALSE;
+
+       DBG("key %s, val %d", key, *value);
+
+       signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+                       CONNMAN_MANAGER_INTERFACE, "DhcpChanged");
+
+       if (!signal)
+               return result;
+
+       dbus_message_iter_init_append(signal, &iter);
+       connman_dbus_property_append_basic(&iter, key, DBUS_TYPE_INT32, val);
+
+       result = dbus_connection_send(connection, signal, NULL);
+       if (result)
+               DBG("Successfuly sent signal");
+       else
+               DBG("Fail to send signal");
+
+       dbus_message_unref(signal);
+
+       return result;
+}
+#endif
+
 /**
  * __connman_network_connect:
  * @network: network structure
@@ -2351,9 +2429,6 @@ int connman_network_set_bssid(struct connman_network *network,
        if (bssid == NULL)
                return -EINVAL;
 
-       if (network->connected)
-               return -EPERM;
-
        if (!simplified_log)
                DBG("network %p bssid %02x:%02x:%02x:%02x:%02x:%02x", network,
                                bssid[0], bssid[1], bssid[2],
@@ -2572,9 +2647,15 @@ unsigned char *connman_network_get_countrycode(struct connman_network *network)
 int connman_network_set_bssid_list(struct connman_network *network,
                                        GSList *bssids)
 {
+       unsigned int max_bssid_count;
+
        g_slist_free_full(network->wifi.bssid_list, g_free);
        network->wifi.bssid_list = bssids;
 
+       max_bssid_count = g_slist_length(bssids);
+       if (network->wifi.max_bssid_count < max_bssid_count)
+               network->wifi.max_bssid_count = max_bssid_count;
+
        return 0;
 }
 
@@ -2612,6 +2693,11 @@ void *connman_network_get_bssid_list(struct connman_network *network)
        return network->wifi.bssid_list;
 }
 
+unsigned int connman_network_get_max_bssid_count(struct connman_network *network)
+{
+       return network->wifi.max_bssid_count;
+}
+
 int connman_network_set_last_connected_bssid(struct connman_network *network,
                                const unsigned char *bssid)
 {
@@ -2640,6 +2726,8 @@ void connman_network_set_assoc_reject_table(struct connman_network *network,
        if (!assoc_reject_table)
                return;
 
+       g_hash_table_destroy(network->wifi.assoc_reject_table);
+
        network->wifi.assoc_reject_table = assoc_reject_table;
 }
 
@@ -2651,6 +2739,17 @@ GHashTable *connman_network_get_assoc_reject_table(struct connman_network *netwo
        return network->wifi.assoc_reject_table;
 }
 
+__time_t connman_network_get_roam_scan_time(struct connman_network *network)
+{
+       return network->wifi.roam_scan_time;
+}
+
+void connman_network_set_roam_scan_time(struct connman_network *network,
+                                               __time_t roam_scan_time)
+{
+       network->wifi.roam_scan_time = roam_scan_time;
+}
+
 int connman_network_get_snr(struct connman_network *network)
 {
        return network->wifi.snr;
@@ -2780,6 +2879,21 @@ int connman_network_set_wifi_channel(struct connman_network *network,
        return 0;
 }
 
+int connman_network_set_autoconnect(struct connman_network *network,
+                               bool autoconnect)
+{
+       if (!network->driver || !network->driver->set_autoconnect)
+               return 0;
+       return network->driver->set_autoconnect(network, autoconnect);
+}
+
+bool __connman_network_native_autoconnect(struct connman_network *network)
+{
+       if (!network->driver || !network->driver->set_autoconnect)
+               return false;
+       return true;
+}
+
 uint16_t connman_network_get_wifi_channel(struct connman_network *network)
 {
        return network->wifi.channel;
@@ -2975,9 +3089,12 @@ int connman_network_set_bool(struct connman_network *network,
                network->wifi.isHS20AP = value;
        else if (g_strcmp0(key, "WiFi.TRANSITION_MODE") == 0)
                network->wifi.owe_transition_mode = value;
-       else if (g_strcmp0(key, "WiFi.Roaming") == 0) {
+       else if (g_strcmp0(key, "WiFi.Roaming") == 0)
                network->wifi.roaming_progress = value;
-       }
+       else if (g_strcmp0(key, "WiFi.RoamingDHCP") == 0)
+               network->wifi.roaming_dhcp = value;
+       else if (g_strcmp0(key, "WiFi.PMFRequired") == 0)
+               network->wifi.pmf_required = value;
 #endif
 
        return -EINVAL;
@@ -3010,6 +3127,10 @@ bool connman_network_get_bool(struct connman_network *network,
                return network->wifi.owe_transition_mode;
        else if (g_str_equal(key, "WiFi.Roaming"))
                return network->wifi.roaming_progress;
+       else if (g_str_equal(key, "WiFi.RoamingDHCP"))
+               return network->wifi.roaming_dhcp;
+       else if (g_str_equal(key, "WiFi.PMFRequired"))
+               return network->wifi.pmf_required;
 #endif
 
        return false;
@@ -3100,6 +3221,7 @@ const void *connman_network_get_blob(struct connman_network *network,
                return network->wifi.transition_mode_ssid;
 #endif
        }
+
        return NULL;
 }
 
@@ -3174,6 +3296,9 @@ void connman_network_update(struct connman_network *network)
 int __connman_network_init(void)
 {
        DBG("");
+#if defined TIZEN_EXT
+       connection = connman_dbus_get_connection();
+#endif
 
        return 0;
 }
@@ -3181,4 +3306,7 @@ int __connman_network_init(void)
 void __connman_network_cleanup(void)
 {
        DBG("");
+#if defined TIZEN_EXT
+       dbus_connection_unref(connection);
+#endif
 }