X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fprovider.c;h=f1e4a0671f00eb06c85460322890096b1c41503f;hb=bcdfc3a44989365b0c05fb1f1e9f856f40556854;hp=ca868803769dd33fc1beb33b6509f80a27837bb6;hpb=37451c7ccab6a04214ef4671feb7b778c66868b1;p=platform%2Fupstream%2Fconnman.git diff --git a/src/provider.c b/src/provider.c old mode 100644 new mode 100755 index ca86880..f1e4a06 --- a/src/provider.c +++ b/src/provider.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2013 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -40,6 +40,7 @@ static GSList *driver_list = NULL; struct connman_provider { int refcount; + bool immutable; struct connman_service *vpn_service; int index; char *identifier; @@ -53,22 +54,22 @@ void __connman_provider_append_properties(struct connman_provider *provider, { const char *host, *domain, *type; - if (provider->driver == NULL || provider->driver->get_property == NULL) + if (!provider->driver || !provider->driver->get_property) return; host = provider->driver->get_property(provider, "Host"); domain = provider->driver->get_property(provider, "Domain"); type = provider->driver->get_property(provider, "Type"); - if (host != NULL) + if (host) connman_dbus_dict_append_basic(iter, "Host", DBUS_TYPE_STRING, &host); - if (domain != NULL) + if (domain) connman_dbus_dict_append_basic(iter, "Domain", DBUS_TYPE_STRING, &domain); - if (type != NULL) + if (type) connman_dbus_dict_append_basic(iter, "Type", DBUS_TYPE_STRING, &type); } @@ -87,7 +88,7 @@ connman_provider_ref_debug(struct connman_provider *provider, static void provider_remove(struct connman_provider *provider) { - if (provider->driver != NULL) { + if (provider->driver) { provider->driver->remove(provider); provider->driver = NULL; } @@ -131,34 +132,48 @@ int connman_provider_disconnect(struct connman_provider *provider) DBG("provider %p", provider); - if (provider->driver != NULL && provider->driver->disconnect != NULL) + if (provider->driver && provider->driver->disconnect) err = provider->driver->disconnect(provider); else return -EOPNOTSUPP; - if (provider->vpn_service != NULL) + if (provider->vpn_service) provider_indicate_state(provider, CONNMAN_SERVICE_STATE_DISCONNECT); - if (err < 0) { - if (err != -EINPROGRESS) - return err; + if (err < 0) + return err; - return -EINPROGRESS; - } + if (provider->vpn_service) + provider_indicate_state(provider, + CONNMAN_SERVICE_STATE_IDLE); + + return 0; +} + +int connman_provider_remove(struct connman_provider *provider) +{ + DBG("Removing VPN %s", provider->identifier); + + provider_remove(provider); + + connman_provider_set_state(provider, CONNMAN_PROVIDER_STATE_IDLE); + + g_hash_table_remove(provider_hash, provider->identifier); return 0; } -int __connman_provider_connect(struct connman_provider *provider) +int __connman_provider_connect(struct connman_provider *provider, + const char *dbus_sender) { int err; DBG("provider %p", provider); - if (provider->driver != NULL && provider->driver->connect != NULL) { - err = provider->driver->connect(provider); - } else + if (provider->driver && provider->driver->connect) + err = provider->driver->connect(provider, dbus_sender); + else return -EOPNOTSUPP; if (err < 0) { @@ -174,7 +189,7 @@ int __connman_provider_connect(struct connman_provider *provider) return 0; } -int __connman_provider_remove(const char *path) +int __connman_provider_remove_by_path(const char *path) { struct connman_provider *provider; GHashTableIter iter; @@ -183,11 +198,11 @@ int __connman_provider_remove(const char *path) DBG("path %s", path); g_hash_table_iter_init(&iter, provider_hash); - while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) { + while (g_hash_table_iter_next(&iter, &key, &value)) { const char *srv_path; provider = value; - if (provider->vpn_service == NULL) + if (!provider->vpn_service) continue; srv_path = __connman_service_get_path(provider->vpn_service); @@ -210,35 +225,39 @@ int __connman_provider_remove(const char *path) } static int set_connected(struct connman_provider *provider, - connman_bool_t connected) + bool connected) { struct connman_service *service = provider->vpn_service; struct connman_ipconfig *ipconfig; - if (service == NULL) + if (!service) return -ENODEV; ipconfig = __connman_service_get_ipconfig(service, provider->family); - if (connected == TRUE) { - if (ipconfig == NULL) { + if (connected) { + if (!ipconfig) { provider_indicate_state(provider, CONNMAN_SERVICE_STATE_FAILURE); return -EIO; } __connman_ipconfig_address_add(ipconfig); +#if defined TIZEN_EXT + __connman_ipconfig_gateway_add(ipconfig, service); +#else __connman_ipconfig_gateway_add(ipconfig); +#endif provider_indicate_state(provider, CONNMAN_SERVICE_STATE_READY); - if (provider->driver != NULL && provider->driver->set_routes) + if (provider->driver && provider->driver->set_routes) provider->driver->set_routes(provider, CONNMAN_PROVIDER_ROUTE_ALL); } else { - if (ipconfig != NULL) { + if (ipconfig) { provider_indicate_state(provider, CONNMAN_SERVICE_STATE_DISCONNECT); __connman_ipconfig_gateway_remove(ipconfig); @@ -254,19 +273,19 @@ static int set_connected(struct connman_provider *provider, int connman_provider_set_state(struct connman_provider *provider, enum connman_provider_state state) { - if (provider == NULL || provider->vpn_service == NULL) + if (!provider || !provider->vpn_service) return -EINVAL; switch (state) { case CONNMAN_PROVIDER_STATE_UNKNOWN: return -EINVAL; case CONNMAN_PROVIDER_STATE_IDLE: - return set_connected(provider, FALSE); + return set_connected(provider, false); case CONNMAN_PROVIDER_STATE_CONNECT: return provider_indicate_state(provider, CONNMAN_SERVICE_STATE_ASSOCIATION); case CONNMAN_PROVIDER_STATE_READY: - return set_connected(provider, TRUE); + return set_connected(provider, true); case CONNMAN_PROVIDER_STATE_DISCONNECT: return provider_indicate_state(provider, CONNMAN_SERVICE_STATE_DISCONNECT); @@ -304,17 +323,17 @@ int connman_provider_indicate_error(struct connman_provider *provider, int connman_provider_create_service(struct connman_provider *provider) { - if (provider->vpn_service != NULL) { - connman_bool_t connected; + if (provider->vpn_service) { + bool connected; connected = __connman_service_is_connected_state( provider->vpn_service, CONNMAN_IPCONFIG_TYPE_IPV4); - if (connected == TRUE) + if (connected) return -EALREADY; connected = __connman_service_is_connected_state( provider->vpn_service, CONNMAN_IPCONFIG_TYPE_IPV6); - if (connected == TRUE) + if (connected) return -EALREADY; return 0; @@ -323,7 +342,7 @@ int connman_provider_create_service(struct connman_provider *provider) provider->vpn_service = __connman_service_create_from_provider(provider); - if (provider->vpn_service == NULL) { + if (!provider->vpn_service) { connman_warn("service creation failed for provider %s", provider->identifier); @@ -334,17 +353,24 @@ int connman_provider_create_service(struct connman_provider *provider) return 0; } +bool __connman_provider_is_immutable(struct connman_provider *provider) + +{ + if (provider) + return provider->immutable; + + return false; +} + int connman_provider_set_immutable(struct connman_provider *provider, - connman_bool_t immutable) + bool immutable) { - if (provider == NULL) + if (!provider) return -EINVAL; - if (provider->vpn_service == NULL) - return -ESRCH; + provider->immutable = immutable; - return __connman_service_set_immutable(provider->vpn_service, - immutable); + return 0; } static struct connman_provider *provider_lookup(const char *identifier) @@ -361,15 +387,15 @@ static void connection_ready(DBusMessage *msg, int error_code, void *user_data) if (error_code != 0) { reply = __connman_error_failed(msg, -error_code); - if (g_dbus_send_message(connection, reply) == FALSE) + if (!g_dbus_send_message(connection, reply)) DBG("reply %p send failed", reply); } else { const char *path; struct connman_provider *provider; provider = provider_lookup(identifier); - if (provider == NULL) { - reply = __connman_error_failed(msg, -EINVAL); + if (!provider) { + reply = __connman_error_failed(msg, EINVAL); g_dbus_send_message(connection, reply); return; } @@ -386,11 +412,11 @@ int __connman_provider_create_and_connect(DBusMessage *msg) { struct connman_provider_driver *driver; - if (driver_list == NULL) + if (!driver_list) return -EINVAL; driver = driver_list->data; - if (driver == NULL || driver->create == NULL) + if (!driver || !driver->create) return -EINVAL; DBG("msg %p", msg); @@ -398,9 +424,9 @@ int __connman_provider_create_and_connect(DBusMessage *msg) return driver->create(msg, connection_ready); } -const char * __connman_provider_get_ident(struct connman_provider *provider) +const char *__connman_provider_get_ident(struct connman_provider *provider) { - if (provider == NULL) + if (!provider) return NULL; return provider->identifier; @@ -409,7 +435,7 @@ const char * __connman_provider_get_ident(struct connman_provider *provider) int connman_provider_set_string(struct connman_provider *provider, const char *key, const char *value) { - if (provider->driver != NULL && provider->driver->set_property) + if (provider->driver && provider->driver->set_property) return provider->driver->set_property(provider, key, value); return 0; @@ -418,22 +444,22 @@ int connman_provider_set_string(struct connman_provider *provider, const char *connman_provider_get_string(struct connman_provider *provider, const char *key) { - if (provider->driver != NULL && provider->driver->get_property) + if (provider->driver && provider->driver->get_property) return provider->driver->get_property(provider, key); return NULL; } -connman_bool_t +bool __connman_provider_check_routes(struct connman_provider *provider) { - if (provider == NULL) - return FALSE; + if (!provider) + return false; - if (provider->driver != NULL && provider->driver->check_routes) + if (provider->driver && provider->driver->check_routes) return provider->driver->check_routes(provider); - return FALSE; + return false; } void *connman_provider_get_data(struct connman_provider *provider) @@ -453,16 +479,16 @@ void connman_provider_set_index(struct connman_provider *provider, int index) DBG(""); - if (service == NULL) + if (!service) return; ipconfig = __connman_service_get_ip4config(service); - if (ipconfig == NULL) { + if (!ipconfig) { connman_service_create_ip4config(service, index); ipconfig = __connman_service_get_ip4config(service); - if (ipconfig == NULL) { + if (!ipconfig) { DBG("Couldnt create ipconfig"); goto done; } @@ -473,11 +499,11 @@ void connman_provider_set_index(struct connman_provider *provider, int index) ipconfig = __connman_service_get_ip6config(service); - if (ipconfig == NULL) { + if (!ipconfig) { connman_service_create_ip6config(service, index); ipconfig = __connman_service_get_ip6config(service); - if (ipconfig == NULL) { + if (!ipconfig) { DBG("Couldnt create ipconfig for IPv6"); goto done; } @@ -502,7 +528,7 @@ int connman_provider_set_ipaddress(struct connman_provider *provider, ipconfig = __connman_service_get_ipconfig(provider->vpn_service, ipaddress->family); - if (ipconfig == NULL) + if (!ipconfig) return -EINVAL; provider->family = ipaddress->family; @@ -539,26 +565,26 @@ int connman_provider_set_domain(struct connman_provider *provider, } int connman_provider_set_nameservers(struct connman_provider *provider, - const char *nameservers) + char * const *nameservers) { int i; - char **nameservers_array = NULL; - DBG("provider %p nameservers %s", provider, nameservers); + DBG("provider %p nameservers %p", provider, nameservers); __connman_service_nameserver_clear(provider->vpn_service); - if (nameservers == NULL) + if (!nameservers) return 0; - nameservers_array = g_strsplit(nameservers, " ", 0); - - for (i = 0; nameservers_array[i] != NULL; i++) { + for (i = 0; nameservers[i]; i++) +#if defined TIZEN_EXT __connman_service_nameserver_append(provider->vpn_service, - nameservers_array[i], FALSE); - } - - g_strfreev(nameservers_array); + nameservers[i], false, + CONNMAN_IPCONFIG_TYPE_ALL); +#else + __connman_service_nameserver_append(provider->vpn_service, + nameservers[i], false); +#endif return 0; } @@ -569,7 +595,7 @@ static void unregister_provider(gpointer data) DBG("provider %p service %p", provider, provider->vpn_service); - if (provider->vpn_service != NULL) { + if (provider->vpn_service) { connman_service_unref(provider->vpn_service); provider->vpn_service = NULL; } @@ -612,11 +638,11 @@ static void provider_disconnect_all(gpointer key, gpointer value, connman_provider_disconnect(provider); } -static void provider_offline_mode(connman_bool_t enabled) +static void provider_offline_mode(bool enabled) { DBG("enabled %d", enabled); - if (enabled == TRUE) + if (enabled) g_hash_table_foreach(provider_hash, provider_disconnect_all, NULL); @@ -635,7 +661,7 @@ static struct connman_provider *provider_new(void) struct connman_provider *provider; provider = g_try_new0(struct connman_provider, 1); - if (provider == NULL) + if (!provider) return NULL; provider->refcount = 1; @@ -651,11 +677,11 @@ struct connman_provider *connman_provider_get(const char *identifier) struct connman_provider *provider; provider = g_hash_table_lookup(provider_hash, identifier); - if (provider != NULL) + if (provider) return provider; provider = provider_new(); - if (provider == NULL) + if (!provider) return NULL; DBG("provider %p", provider); @@ -679,7 +705,7 @@ static struct connman_provider *provider_get(int index) g_hash_table_iter_init(&iter, provider_hash); - while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) { + while (g_hash_table_iter_next(&iter, &key, &value)) { struct connman_provider *provider = value; if (provider->index == index) @@ -695,7 +721,7 @@ static void provider_service_changed(struct connman_service *service, struct connman_provider *provider; int vpn_index, service_index; - if (service == NULL) + if (!service) return; switch (state) { @@ -716,24 +742,22 @@ static void provider_service_changed(struct connman_service *service, vpn_index = __connman_connection_get_vpn_index(service_index); DBG("service %p %s state %d index %d/%d", service, - __connman_service_get_ident(service), + connman_service_get_identifier(service), state, service_index, vpn_index); if (vpn_index < 0) return; provider = provider_get(vpn_index); - if (provider == NULL) + if (!provider) return; DBG("disconnect %p index %d", provider, vpn_index); connman_provider_disconnect(provider); - - return; } -static struct connman_notifier provider_notifier = { +static const struct connman_notifier provider_notifier = { .name = "provider", .offline_mode = provider_offline_mode, .service_state_changed = provider_service_changed,