diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2011-02-25 20:49:42 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-02-25 20:49:42 +0100 |
| commit | 7d51957bffcd0099b3e5e7cfc06463c5a805d9be (patch) | |
| tree | b9e1abd6fd1e7ad719664440639a474355fef502 /src | |
| parent | b26c668fd1ffbd32961a6c23e852ee346de4fa1a (diff) | |
| download | connman-7d51957bffcd0099b3e5e7cfc06463c5a805d9be.tar.gz connman-7d51957bffcd0099b3e5e7cfc06463c5a805d9be.tar.bz2 connman-7d51957bffcd0099b3e5e7cfc06463c5a805d9be.zip | |
connection: Do not move to DISCONNECT when removing a gateway
The state change should be handled by the caller.
Diffstat (limited to 'src')
| -rw-r--r-- | src/connection.c | 8 | ||||
| -rw-r--r-- | src/network.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/connection.c b/src/connection.c index fb2e4319..8ca1f7a0 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 babb28ba..77b58897 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, |