From 7d51957bffcd0099b3e5e7cfc06463c5a805d9be Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Fri, 25 Feb 2011 20:49:42 +0100 Subject: [PATCH] connection: Do not move to DISCONNECT when removing a gateway The state change should be handled by the caller. --- src/connection.c | 8 -------- src/network.c | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/connection.c b/src/connection.c index fb2e431..8ca1f7a 100644 --- a/src/connection.c +++ b/src/connection.c @@ -348,14 +348,6 @@ void __connman_connection_gateway_remove(struct connman_service *service) __connman_service_nameserver_del_routes(service); - __connman_service_indicate_state(service, - CONNMAN_SERVICE_STATE_DISCONNECT, - CONNMAN_IPCONFIG_TYPE_IPV4); - - __connman_service_indicate_state(service, - CONNMAN_SERVICE_STATE_DISCONNECT, - CONNMAN_IPCONFIG_TYPE_IPV6); - data = g_hash_table_lookup(gateway_hash, service); if (data == NULL) return; diff --git a/src/network.c b/src/network.c index babb28b..77b5889 100644 --- a/src/network.c +++ b/src/network.c @@ -923,6 +923,14 @@ static gboolean set_connected(gpointer user_data) service = __connman_service_lookup_from_network(network); + __connman_service_indicate_state(service, + CONNMAN_SERVICE_STATE_DISCONNECT, + CONNMAN_IPCONFIG_TYPE_IPV4); + + __connman_service_indicate_state(service, + CONNMAN_SERVICE_STATE_DISCONNECT, + CONNMAN_IPCONFIG_TYPE_IPV6); + __connman_connection_gateway_remove(service); __connman_service_indicate_state(service, -- 2.7.4