The network_change() function called when a network error is set will
disconnect a network driver identical to __connman_network_disconnect()
but without any error handling. Therefore the specific network_change()
function is better replaced with __connman_network_disconnect(). With
connman_network_set_error() now calling __connman_network_disconnect(),
the additional function call can now be removed from
connman_network_set_connected().
Also let the associating and connecting variables be handled by the
normal code paths and don't forcefully unset them when an error happens.
too early, leave
---
src/network.c | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/src/network.c b/src/network.c
index 7945cb4..d70cfdb 100644
--- a/src/network.c
+++ b/src/network.c
@@ -798,21 +798,6 @@ static void network_remove(struct connman_network *network)
network->driver = NULL;
}
-static void network_change(struct connman_network *network)
-{
- DBG("network %p name %s", network, network->name);
-
- if (!network->connected)
- return;
-
- if (network->driver && network->driver->disconnect) {
- network->driver->disconnect(network);
- return;
- }
-
- network->connected = false;
-}
-
static void probe_driver(struct connman_network_driver *driver)
{
GSList *list;
@@ -1301,9 +1286,6 @@ void connman_network_set_error(struct connman_network
*network,
{
DBG("network %p error %d", network, error);
- network->connecting = false;
- network->associating = false;
-
switch (error) {
case CONNMAN_NETWORK_ERROR_UNKNOWN:
return;
@@ -1321,7 +1303,7 @@ void connman_network_set_error(struct connman_network
*network,
break;
}
- network_change(network);
+ __connman_network_disconnect(network);
}
/**
@@ -1342,8 +1324,7 @@ int connman_network_set_connected(struct connman_network
*network,
!connected) {
connman_network_set_error(network,
CONNMAN_NETWORK_ERROR_CONNECT_FAIL);
- if (__connman_network_disconnect(network) == 0)
- return 0;
+ return 0;
}
if (network->connected == connected)
--
2.1.4
_______________________________________________
connman mailing list
connman@connman.net
https://lists.connman.net/mailman/listinfo/connman
