Release tizen_2.0_beta

[profile/ivi/connman.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index f9dfada..3b98372 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -73,6 +73,11 @@ struct connman_network {
                connman_bool_t wps;
                connman_bool_t use_wps;
                char *pin_wps;
+#if defined TIZEN_EXT
+               char encryption_mode[6];
+               unsigned char bssid[6];
+               unsigned int maxrate;
+#endif
        } wifi;
 
        struct {
@@ -655,9 +660,8 @@ static void set_associate_error(struct connman_network *network)
 
        service = __connman_service_lookup_from_network(network);
 
-       __connman_service_ipconfig_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_FAILURE,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
 }
 
 static void set_configure_error(struct connman_network *network)
@@ -666,9 +670,8 @@ static void set_configure_error(struct connman_network *network)
 
        service = __connman_service_lookup_from_network(network);
 
-       __connman_service_ipconfig_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_FAILURE,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
 }
 
 static void set_invalid_key_error(struct connman_network *network)
@@ -683,6 +686,12 @@ static void set_invalid_key_error(struct connman_network *network)
 
 static void set_connect_error(struct connman_network *network)
 {
+
+#if defined TIZEN_EXT
+       if (network->associating != FALSE)
+               network->associating = FALSE;
+#endif
+
        struct connman_service *service;
 
        service = __connman_service_lookup_from_network(network);
@@ -807,7 +816,14 @@ static void dhcp_success(struct connman_network *network)
        if (err < 0)
                goto err;
 
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv4, service);
+#else
        err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
+#endif
        if (err < 0)
                goto err;
 
@@ -864,7 +880,14 @@ static int set_connected_fixed(struct connman_network *network)
        if (err < 0)
                goto err;
 
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv4, service);
+#else
        err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
+#endif
        if (err < 0)
                goto err;
 
@@ -898,7 +921,14 @@ static void set_connected_manual(struct connman_network *network)
        if (err < 0)
                goto err;
 
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+       err = __connman_ipconfig_gateway_add(ipconfig, service);
+#else
        err = __connman_ipconfig_gateway_add(ipconfig);
+#endif
        if (err < 0)
                goto err;
 
@@ -953,7 +983,14 @@ static int manual_ipv6_set(struct connman_network *network,
                return err;
        }
 
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv6, service);
+#else
        err = __connman_ipconfig_gateway_add(ipconfig_ipv6);
+#endif
        if (err < 0)
                return err;
 
@@ -1104,6 +1141,13 @@ static gboolean set_connected(gpointer user_data)
                        __connman_ipconfig_enable_ipv6(ipconfig_ipv6);
                }
 
+#if defined TIZEN_EXT
+               if (connman_service_get_type(service) ==
+                               CONNMAN_SERVICE_TYPE_CELLULAR) {
+                       network->connecting = FALSE;
+                       connman_network_set_associating(network, FALSE);
+               }
+#endif
                __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_IDLE,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
@@ -1111,6 +1155,11 @@ static gboolean set_connected(gpointer user_data)
                __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_IDLE,
                                        CONNMAN_IPCONFIG_TYPE_IPV6);
+#if defined TIZEN_EXT
+               if (connman_service_get_type(service) ==
+                               CONNMAN_SERVICE_TYPE_CELLULAR)
+                       return FALSE;
+#endif
        }
 
        network->connecting = FALSE;
@@ -1200,6 +1249,9 @@ int __connman_network_connect(struct connman_network *network)
 
        network->connecting = TRUE;
 
+#if defined TIZEN_EXT
+       if (network->type != CONNMAN_NETWORK_TYPE_CELLULAR)
+#endif
        __connman_device_disconnect(network->device);
 
        err = network->driver->connect(network);
@@ -1269,7 +1321,14 @@ static int manual_ipv4_set(struct connman_network *network,
                return err;
        }
 
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+       return __connman_ipconfig_gateway_add(ipconfig, service);
+#else
        return __connman_ipconfig_gateway_add(ipconfig);
+#endif
 }
 
 int __connman_network_clear_ipconfig(struct connman_network *network,
@@ -1390,11 +1449,112 @@ int connman_network_set_ipaddress(struct connman_network *network,
        return 0;
 }
 
+#if defined TIZEN_EXT
+/*
+ * Description: Telephony plug-in requires manual PROXY setting function
+ */
+int connman_network_set_proxy(struct connman_network *network,
+                               const char *proxies)
+{
+       struct connman_service *service;
+
+       DBG("network %p proxies %s", network, proxies);
+
+       service = __connman_service_lookup_from_network(network);
+       if (service == NULL)
+               return -EINVAL;
+
+       __connman_service_set_proxy(service, proxies);
+
+       connman_service_set_proxy_method(service, CONNMAN_SERVICE_PROXY_METHOD_MANUAL);
+
+       return 0;
+}
+
+/*
+ * Description: Network client requires additional wifi specific info
+ */
+int connman_network_set_bssid(struct connman_network *network,
+                               const unsigned char *bssid)
+{
+       if (bssid == NULL)
+               return -EINVAL;
+
+       DBG("network %p bssid %02x:%02x:%02x:%02x:%02x:%02x", network,
+                       bssid[0], bssid[1], bssid[2],
+                       bssid[3], bssid[4], bssid[5]);
+
+       int i = 0;
+       for (;i < 6;i++)
+               network->wifi.bssid[i] = bssid[i];
+
+       return 0;
+}
+
+unsigned char *connman_network_get_bssid(struct connman_network *network)
+{
+       return (unsigned char *)network->wifi.bssid;
+}
+
+int connman_network_set_maxrate(struct connman_network *network,
+                               unsigned int maxrate)
+{
+       DBG("network %p maxrate %d", network, maxrate);
+
+       network->wifi.maxrate = maxrate;
+
+       return 0;
+}
+
+unsigned int connman_network_get_maxrate(struct connman_network *network)
+{
+       return network->wifi.maxrate;
+}
+
+int connman_network_set_enc_mode(struct connman_network *network,
+                               const char *encryption_mode)
+{
+       if (encryption_mode == NULL)
+               return -EINVAL;
+
+       DBG("network %p encryption mode %s", network, encryption_mode);
+
+       g_strlcpy(network->wifi.encryption_mode, encryption_mode, 6);
+
+       return 0;
+}
+
+const char *connman_network_get_enc_mode(struct connman_network *network)
+{
+       return (const char *)network->wifi.encryption_mode;
+}
+
+const char *connman_network_get_ifname(struct connman_network *network)
+{
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig;
+       const char *ifname = NULL;
+
+       service = __connman_service_lookup_from_network(network);
+       if (service == NULL)
+               return NULL;
+
+       ipconfig = __connman_service_get_ip4config(service);
+
+       if (ipconfig != NULL)
+               ifname = connman_ipconfig_get_ifname(ipconfig);
+
+       DBG("index %d, service %p ip4config %p ifname %s",
+                       network->index, service, ipconfig, ifname);
+       return ifname;
+}
+#endif
+
 int connman_network_set_nameservers(struct connman_network *network,
                                const char *nameservers)
 {
        struct connman_service *service;
-       char **nameservers_array = NULL;
+       char **nameservers_array;
        int i;
 
        DBG("network %p nameservers %s", network, nameservers);
@@ -1405,12 +1565,14 @@ int connman_network_set_nameservers(struct connman_network *network,
 
        __connman_service_nameserver_clear(service);
 
-       if (nameservers != NULL)
-               nameservers_array = g_strsplit(nameservers, " ", 0);
+       if (nameservers == NULL)
+               return 0;
+
+       nameservers_array = g_strsplit(nameservers, " ", 0);
 
        for (i = 0; nameservers_array[i] != NULL; i++) {
                __connman_service_nameserver_append(service,
-                                               nameservers_array[i]);
+                                               nameservers_array[i], FALSE);
        }
 
        g_strfreev(nameservers_array);