change data->gateway to data->ipv4_gateway in src/connection.c

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

diff --git a/src/connection.c b/src/connection.c
index fd029c9..cb0b528 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <net/if.h>
 
 #include <gdbus.h>
@@ -31,7 +32,7 @@
 
 struct gateway_data {
        int index;
-       char *gateway;
+       char *ipv4_gateway;
        struct connman_element *element;
        unsigned int order;
        gboolean active;
@@ -53,11 +54,12 @@ static struct gateway_data *find_gateway(int index, const char *gateway)
        for (list = gateway_list; list; list = list->next) {
                struct gateway_data *data = list->data;
 
-               if (data->gateway == NULL)
+               if (data->ipv4_gateway == NULL)
                        continue;
 
                if (data->index == index &&
-                               g_str_equal(data->gateway, gateway) == TRUE)
+                               g_str_equal(data->ipv4_gateway, gateway)
+                                                               == TRUE)
                        return data;
        }
 
@@ -66,18 +68,19 @@ static struct gateway_data *find_gateway(int index, const char *gateway)
 
 static int del_routes(struct gateway_data *data)
 {
-       const char *address;
-
        if (data->vpn) {
                if (data->vpn_phy_index >= 0)
                        connman_inet_del_host_route(data->vpn_phy_index,
-                                                       data->gateway);
-               address = data->vpn_ip;
+                                                       data->ipv4_gateway);
+               return connman_inet_clear_gateway_address(data->index,
+                                                       data->vpn_ip);
+       } else if (g_strcmp0(data->ipv4_gateway, "0.0.0.0") == 0) {
+               return connman_inet_clear_gateway_interface(data->index);
        } else {
-               connman_inet_del_host_route(data->index, data->gateway);
-               address = data->gateway;
+               connman_inet_del_host_route(data->index, data->ipv4_gateway);
+               return connman_inet_clear_gateway_address(data->index,
+                                                       data->ipv4_gateway);
        }
-       return connman_inet_clear_gateway_address(data->index, address);
 }
 
 static void find_element(struct connman_element *element, gpointer user_data)
@@ -100,12 +103,15 @@ static struct gateway_data *add_gateway(int index, const char *gateway)
        struct gateway_data *data;
        struct connman_service *service;
 
+       if (strlen(gateway) == 0)
+               return NULL;
+
        data = g_try_new0(struct gateway_data, 1);
        if (data == NULL)
                return NULL;
 
        data->index = index;
-       data->gateway = g_strdup(gateway);
+       data->ipv4_gateway = g_strdup(gateway);
        data->active = FALSE;
        data->element = NULL;
        data->vpn_ip = NULL;
@@ -140,9 +146,8 @@ static void set_default_gateway(struct gateway_data *data)
 {
        struct connman_element *element = data->element;
        struct connman_service *service = NULL;
-       short int ifflags;
 
-       DBG("gateway %s", data->gateway);
+       DBG("gateway %s", data->ipv4_gateway);
 
        if (data->vpn == TRUE) {
                connman_inet_set_gateway_address(data->index, data->vpn_ip);
@@ -151,21 +156,14 @@ static void set_default_gateway(struct gateway_data *data)
                return;
        }
 
-       ifflags = connman_inet_ifflags(element->index);
-       if (ifflags < 0) {
-               connman_error("Fail to get network interface flags");
-               return;
-       }
-
-       if (ifflags & IFF_POINTOPOINT) {
+       if (g_strcmp0(data->ipv4_gateway, "0.0.0.0") == 0) {
                if (connman_inet_set_gateway_interface(element->index) < 0)
                        return;
                goto done;
        }
 
-       connman_inet_add_host_route(element->index, data->gateway);
-
-       if (connman_inet_set_gateway_address(element->index, data->gateway) < 0)
+       if (connman_inet_set_gateway_address(element->index,
+                                       data->ipv4_gateway) < 0)
                return;
 
 done:
@@ -193,20 +191,22 @@ static struct gateway_data *find_default_gateway(void)
 
 static int remove_gateway(struct gateway_data *data)
 {
-       int ret;
+       int err;
 
-       DBG("gateway %s", data->gateway);
+       DBG("gateway %s", data->ipv4_gateway);
 
        gateway_list = g_slist_remove(gateway_list, data);
 
        if (data->active == TRUE)
-               ret = del_routes(data);
+               err = del_routes(data);
+       else
+               err = 0;
 
-       g_free(data->gateway);
+       g_free(data->ipv4_gateway);
        g_free(data->vpn_ip);
        g_free(data);
 
-       return ret;
+       return err;
 }
 
 static void connection_delgateway(int index, const char *gateway)
@@ -238,6 +238,7 @@ static struct gateway_data *find_active_gateway(void)
 
        for (list = gateway_list; list; list = list->next) {
                struct gateway_data *data = list->data;
+
                if (data->active == TRUE)
                        return data;
        }
@@ -270,17 +271,30 @@ static int connection_probe(struct connman_element *element)
 
        DBG("gateway %s", gateway);
 
-       service = __connman_element_get_service(element);
-       __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_READY);
+       /*
+        * If gateway is NULL, it's a point to point link and the default
+        * gateway is 0.0.0.0, meaning the interface.
+        */
+       if (gateway == NULL) {
+               gateway = "0.0.0.0";
+               element->ipv4.gateway = g_strdup(gateway);
+       }
 
        connman_element_set_enabled(element, TRUE);
 
-       if (gateway == NULL)
-               return 0;
-
        active_gateway = find_active_gateway();
        new_gateway = add_gateway(element->index, gateway);
+       if (new_gateway == NULL)
+               return 0;
+
+       service = __connman_element_get_service(element);
+
+       connman_inet_add_host_route(element->index,
+                                       new_gateway->ipv4_gateway, NULL);
+       __connman_service_nameserver_add_routes(service,
+                                               new_gateway->ipv4_gateway);
+
+       __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_READY);
 
        if (service == NULL) {
                new_gateway->vpn = TRUE;
@@ -298,9 +312,9 @@ static int connection_probe(struct connman_element *element)
        }
 
        if (new_gateway->vpn == TRUE) {
-               connman_inet_add_host_route_vpn(active_gateway->index,
-                                               active_gateway->gateway,
-                                               new_gateway->gateway);
+               connman_inet_add_host_route(active_gateway->index,
+                                               new_gateway->ipv4_gateway,
+                                               active_gateway->ipv4_gateway);
        }
 
        if (new_gateway->order >= active_gateway->order) {
@@ -317,11 +331,12 @@ static void connection_remove(struct connman_element *element)
        const char *gateway = NULL;
        struct gateway_data *data = NULL;
        gboolean set_default = FALSE;
-       int ret;
+       int err;
 
        DBG("element %p name %s", element, element->name);
 
        service = __connman_element_get_service(element);
+       __connman_service_nameserver_del_routes(service);
        __connman_service_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_DISCONNECT);
 
@@ -342,16 +357,16 @@ static void connection_remove(struct connman_element *element)
        set_default = data->vpn;
 
        if (data->vpn == TRUE && data->vpn_phy_index >= 0)
-               connman_inet_del_host_route(data->vpn_phy_index, data->gateway);
-
-       ret = remove_gateway(data);
+               connman_inet_del_host_route(data->vpn_phy_index,
+                                               data->ipv4_gateway);
+       err = remove_gateway(data);
 
        /* with vpn this will be called after the network was deleted,
         * we need to call set_default here because we will not recieve any
         * gateway delete notification.
         * We hit the same issue if remove_gateway() fails.
         */
-       if (set_default || ret) {
+       if (set_default || err < 0) {
                data = find_default_gateway();
                if (data != NULL)
                        set_default_gateway(data);
@@ -389,9 +404,9 @@ void __connman_connection_cleanup(void)
        for (list = gateway_list; list; list = list->next) {
                struct gateway_data *data = list->data;
 
-               DBG("index %d gateway %s", data->index, data->gateway);
+               DBG("index %d gateway %s", data->index, data->ipv4_gateway);
 
-               g_free(data->gateway);
+               g_free(data->ipv4_gateway);
                g_free(data);
                list->data = NULL;
        }