#include <config.h>
#endif
+#include <string.h>
#include <net/if.h>
#include <gdbus.h>
struct gateway_data {
int index;
- char *gateway;
+ char *ipv4_gateway;
struct connman_element *element;
unsigned int order;
gboolean active;
/* VPN extra data */
gboolean vpn;
char *vpn_ip;
+ int vpn_phy_index;
};
static GSList *gateway_list = NULL;
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;
}
static int del_routes(struct gateway_data *data)
{
- const char *address;
-
- connman_inet_del_host_route(data->index, data->gateway);
-
- if (data->vpn)
- address = data->vpn_ip;
- else
- address = data->gateway;
-
- return connman_inet_clear_gateway_address(data->index, address);
+ if (data->vpn) {
+ if (data->vpn_phy_index >= 0)
+ connman_inet_del_host_route(data->vpn_phy_index,
+ 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->ipv4_gateway);
+ return connman_inet_clear_gateway_address(data->index,
+ data->ipv4_gateway);
+ }
}
static void find_element(struct connman_element *element, gpointer user_data)
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;
data->vpn = FALSE;
+ data->vpn_phy_index = -1;
__connman_element_foreach(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION,
find_element, 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);
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:
return found;
}
-static void remove_gateway(struct gateway_data *data)
+static int remove_gateway(struct gateway_data *data)
{
- DBG("gateway %s", data->gateway);
+ int err;
+
+ DBG("gateway %s", data->ipv4_gateway);
gateway_list = g_slist_remove(gateway_list, data);
if (data->active == TRUE)
- 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 err;
}
static void connection_delgateway(int index, const char *gateway)
for (list = gateway_list; list; list = list->next) {
struct gateway_data *data = list->data;
+
if (data->active == TRUE)
return data;
}
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;
new_gateway->vpn_ip = g_strdup(vpn_ip);
/* make sure vpn gateway are at higher priority */
new_gateway->order = 10;
+ if (active_gateway)
+ new_gateway->vpn_phy_index = active_gateway->index;
} else
new_gateway->vpn = FALSE;
}
if (new_gateway->vpn == TRUE) {
- connman_inet_add_host_route_vpn(active_gateway->index,
- active_gateway->gateway,
- new_gateway->gateway);
-
- connman_inet_set_gateway_address(new_gateway->index,
- 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) {
const char *gateway = NULL;
struct gateway_data *data = NULL;
gboolean set_default = FALSE;
+ 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);
set_default = data->vpn;
- if (data->vpn == TRUE)
- connman_inet_del_host_route(data->index, data->gateway);
-
- remove_gateway(data);
+ if (data->vpn == TRUE && data->vpn_phy_index >= 0)
+ 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) {
+ if (set_default || err < 0) {
data = find_default_gateway();
if (data != NULL)
set_default_gateway(data);
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;
}