projects / platform / upstream / connman.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2922923)
service: Use __connman_service_ipconfig_indicate_state()
authorDaniel Wagner <wagi@monom.org>
Thu, 7 Jul 2011 16:47:26 +0000 (19:47 +0300)
committerSamuel Ortiz <sameo@linux.intel.com>
Thu, 7 Jul 2011 17:07:24 +0000 (19:07 +0200)
src/connection.c patch | blob | history
src/connman.h patch | blob | history
src/location.c patch | blob | history
src/network.c patch | blob | history
src/provider.c patch | blob | history
src/service.c patch | blob | history

diff --git a/src/connection.c b/src/connection.c
index a402588..a6ac462 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -477,7 +477,8 @@ int __connman_connection_gateway_add(struct connman_service *service,
                                new_gateway->ipv4_gateway != NULL) {
                __connman_service_nameserver_add_routes(service,
                                        new_gateway->ipv4_gateway->gateway);
-               __connman_service_set_ipconfig_ready(service,
+               __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_READY,
                                                CONNMAN_IPCONFIG_TYPE_IPV4);
        }
 
@@ -485,7 +486,8 @@ int __connman_connection_gateway_add(struct connman_service *service,
                                new_gateway->ipv6_gateway != NULL) {
                __connman_service_nameserver_add_routes(service,
                                        new_gateway->ipv6_gateway->gateway);
-               __connman_service_set_ipconfig_ready(service,
+               __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_READY,
                                                CONNMAN_IPCONFIG_TYPE_IPV6);
        }
 
diff --git a/src/connman.h b/src/connman.h
index c54460b..0294c64 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -495,8 +495,6 @@ int __connman_service_set_immutable(struct connman_service *service,
 
 void __connman_service_set_string(struct connman_service *service,
                                        const char *key, const char *value);
-int __connman_service_set_ipconfig_ready(struct connman_service *service,
-                                       enum connman_ipconfig_type type);
 int __connman_service_ipconfig_indicate_state(struct connman_service *service,
                                        enum connman_service_state state,
                                        enum connman_ipconfig_type type);
diff --git a/src/location.c b/src/location.c
index dece833..2afc640 100644 (file)
--- a/src/location.c
+++ b/src/location.c
@@ -192,7 +192,7 @@ void connman_location_report_result(struct connman_location *location,
                __connman_service_request_login(location->service);
                break;
        case CONNMAN_LOCATION_RESULT_ONLINE:
-               __connman_service_indicate_state(location->service,
+               __connman_service_ipconfig_indicate_state(location->service,
                                                CONNMAN_SERVICE_STATE_ONLINE,
                                                CONNMAN_IPCONFIG_TYPE_IPV4);
                break;
diff --git a/src/network.c b/src/network.c
index ac7bd07..f66acbc 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -654,10 +654,10 @@ int connman_network_set_associating(struct connman_network *network,
                struct connman_service *service;
 
                service = __connman_service_lookup_from_network(network);
-               __connman_service_indicate_state(service,
+               __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_ASSOCIATION,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
-               __connman_service_indicate_state(service,
+               __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_ASSOCIATION,
                                        CONNMAN_IPCONFIG_TYPE_IPV6);
        }
@@ -676,7 +676,7 @@ static void set_associate_error(struct connman_network *network)
 
        service = __connman_service_lookup_from_network(network);
 
-       __connman_service_indicate_state(service,
+       __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_FAILURE,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
 }
@@ -689,7 +689,7 @@ static void set_configure_error(struct connman_network *network)
 
        service = __connman_service_lookup_from_network(network);
 
-       __connman_service_indicate_state(service,
+       __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_FAILURE,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
 }
@@ -804,7 +804,7 @@ static void set_configuration(struct connman_network *network)
        connman_device_set_disconnected(network->device, FALSE);
 
        service = __connman_service_lookup_from_network(network);
-       __connman_service_indicate_state(service,
+       __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_CONFIGURATION,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
 }
@@ -832,7 +832,9 @@ static void dhcp_success(struct connman_network *network)
        if (err < 0)
                goto err;
 
-       __connman_service_set_ipconfig_ready(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+       __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_READY,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
 
        return;
 
@@ -849,8 +851,9 @@ static void dhcp_failure(struct connman_network *network)
        if (service == NULL)
                return;
 
-       __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_IDLE,
-                                               CONNMAN_IPCONFIG_TYPE_IPV4);
+       __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_IDLE,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
 }
 
 static void dhcp_callback(struct connman_network *network,
@@ -890,7 +893,9 @@ static int set_connected_fixed(struct connman_network *network)
        if (err < 0)
                goto err;
 
-       __connman_service_set_ipconfig_ready(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+       __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_READY,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
 
        return 0;
 
@@ -927,7 +932,9 @@ static void set_connected_manual(struct connman_network *network)
 
        connman_network_set_associating(network, FALSE);
 
-       __connman_service_set_ipconfig_ready(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+       __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_READY,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
 
        return;
 
@@ -988,8 +995,9 @@ static int manual_ipv6_set(struct connman_network *network,
 
        network->connecting = FALSE;
 
-       __connman_service_set_ipconfig_ready(service,
-                                               CONNMAN_IPCONFIG_TYPE_IPV6);
+       __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_READY,
+                                       CONNMAN_IPCONFIG_TYPE_IPV6);
 
        return 0;
 }
@@ -1012,7 +1020,9 @@ static void autoconf_ipv6_set(struct connman_network *network)
 
        network->connecting = FALSE;
 
-       __connman_service_set_ipconfig_ready(service, CONNMAN_IPCONFIG_TYPE_IPV6);
+       __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_READY,
+                                       CONNMAN_IPCONFIG_TYPE_IPV6);
 }
 
 static gboolean set_connected(gpointer user_data)
@@ -1090,11 +1100,11 @@ static gboolean set_connected(gpointer user_data)
 
                service = __connman_service_lookup_from_network(network);
 
-               __connman_service_indicate_state(service,
+               __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_DISCONNECT,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
 
-               __connman_service_indicate_state(service,
+               __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_DISCONNECT,
                                        CONNMAN_IPCONFIG_TYPE_IPV6);
 
@@ -1115,11 +1125,11 @@ static gboolean set_connected(gpointer user_data)
                        __connman_ipconfig_enable_ipv6(ipconfig_ipv6);
                }
 
-               __connman_service_indicate_state(service,
+               __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_IDLE,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
 
-               __connman_service_indicate_state(service,
+               __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_IDLE,
                                        CONNMAN_IPCONFIG_TYPE_IPV6);
        }
@@ -1286,7 +1296,9 @@ static int manual_ipv4_set(struct connman_network *network,
 
        __connman_ipconfig_gateway_add(ipconfig);
 
-       __connman_service_set_ipconfig_ready(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+       __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_READY,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
 
        return 0;
 }
@@ -1320,11 +1332,11 @@ int __connman_network_clear_ipconfig(struct connman_network *network,
        }
 
        if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
-               __connman_service_indicate_state(service,
+               __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_CONFIGURATION,
                                        CONNMAN_IPCONFIG_TYPE_IPV6);
        else if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
-               __connman_service_indicate_state(service,
+               __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_CONFIGURATION,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
 
diff --git a/src/provider.c b/src/provider.c
index 1e58b8c..1519cb5 100644 (file)
--- a/src/provider.c
+++ b/src/provider.c
@@ -180,11 +180,11 @@ static int provider_indicate_state(struct connman_provider *provider,
 {
        DBG("state %d", state);
 
-       __connman_service_indicate_state(provider->vpn_service, state,
+       __connman_service_ipconfig_indicate_state(provider->vpn_service, state,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
 
-       return __connman_service_indicate_state(provider->vpn_service, state,
-                                       CONNMAN_IPCONFIG_TYPE_IPV6);
+       return __connman_service_ipconfig_indicate_state(provider->vpn_service,
+                                       state, CONNMAN_IPCONFIG_TYPE_IPV6);
 }
 
 int __connman_provider_disconnect(struct connman_provider *provider)
diff --git a/src/service.c b/src/service.c
index 7361502..cf930cb 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -2679,10 +2679,10 @@ static gboolean connect_timeout(gpointer user_data)
        } else
                autoconnect = TRUE;
 
-       __connman_service_indicate_state(service,
+       __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_FAILURE,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
-       __connman_service_indicate_state(service,
+       __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_FAILURE,
                                        CONNMAN_IPCONFIG_TYPE_IPV6);
 
@@ -3429,32 +3429,6 @@ static void report_error_cb(struct connman_service *service,
        }
 }
 
-int __connman_service_set_ipconfig_ready(struct connman_service *service,
-                                                                                enum connman_ipconfig_type type)
-{
-       enum connman_service_state state;
-       int err = 0;
-
-       DBG("service %p (%s) type %d (%s)",
-               service, service ? service->identifier : NULL,
-               type, __connman_ipconfig_type2string(type));
-
-       if (service == NULL)
-               return -EINVAL;
-
-       state = combine_state(service->state_ipv4, service->state_ipv6);
-
-       if (state == CONNMAN_SERVICE_STATE_READY ||
-               state == CONNMAN_SERVICE_STATE_ONLINE) {
-               err = -EALREADY;
-       } else {
-               err = __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_READY, type);
-       }
-
-       return err;
-}
-
 int __connman_service_indicate_state(struct connman_service *service,
                                        enum connman_service_state new_state,
                                        enum connman_ipconfig_type type)
@@ -3674,7 +3648,7 @@ int __connman_service_indicate_error(struct connman_service *service,
        if (service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY)
                __connman_service_set_passphrase(service, NULL);
 
-       return __connman_service_indicate_state(service,
+       return __connman_service_ipconfig_indicate_state(service,
                                                CONNMAN_SERVICE_STATE_FAILURE,
                                                CONNMAN_IPCONFIG_TYPE_IPV4);
 }
@@ -3700,7 +3674,8 @@ int __connman_service_clear_error(struct connman_service *service)
        if (service->favorite == TRUE)
                set_reconnect_state(service, TRUE);
 
-       __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_IDLE,
+       __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_IDLE,
                                        CONNMAN_IPCONFIG_TYPE_IPV6);
 
        /*
@@ -3711,7 +3686,7 @@ int __connman_service_clear_error(struct connman_service *service)
                        service->state_ipv4 != CONNMAN_SERVICE_STATE_FAILURE)
                return 0;
 
-       return __connman_service_indicate_state(service,
+       return __connman_service_ipconfig_indicate_state(service,
                                                CONNMAN_SERVICE_STATE_IDLE,
                                                CONNMAN_IPCONFIG_TYPE_IPV4);
 }
@@ -3994,10 +3969,10 @@ int __connman_service_connect(struct connman_service *service)
        if (service->userconnect == TRUE)
                reply_pending(service, err);
 
-       __connman_service_indicate_state(service,
+       __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_FAILURE,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
-       __connman_service_indicate_state(service,
+       __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_FAILURE,
                                        CONNMAN_IPCONFIG_TYPE_IPV6);
 
@@ -4514,7 +4489,8 @@ static void service_ip_bound(struct connman_ipconfig *ipconfig)
 
        if (type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
                        method == CONNMAN_IPCONFIG_METHOD_AUTO)
-               __connman_service_set_ipconfig_ready(service,
+               __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_READY,
                                                CONNMAN_IPCONFIG_TYPE_IPV6);
 
        settings_changed(service, ipconfig);
@@ -4536,13 +4512,13 @@ static void service_ip_release(struct connman_ipconfig *ipconfig)
 
        if (type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
                        method == CONNMAN_IPCONFIG_METHOD_OFF)
-               __connman_service_indicate_state(service,
+               __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_DISCONNECT,
                                        CONNMAN_IPCONFIG_TYPE_IPV6);
 
        if (type == CONNMAN_IPCONFIG_TYPE_IPV4 &&
                        method == CONNMAN_IPCONFIG_METHOD_OFF)
-               __connman_service_indicate_state(service,
+               __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_DISCONNECT,
                                        CONNMAN_IPCONFIG_TYPE_IPV4);
 
Domain: Network & Connectivity / Data Network;