projects
/
platform
/
upstream
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Fix][src/service] Add 'fall through' comment when break statement is not needed
[platform/upstream/connman.git]
/
src
/
provider.c
diff --git
a/src/provider.c
b/src/provider.c
index
521346b
..
f1e4a06
100755
(executable)
--- a/
src/provider.c
+++ b/
src/provider.c
@@
-141,12
+141,12
@@
int connman_provider_disconnect(struct connman_provider *provider)
provider_indicate_state(provider,
CONNMAN_SERVICE_STATE_DISCONNECT);
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;
}
return 0;
}
@@
-164,14
+164,15
@@
int connman_provider_remove(struct connman_provider *provider)
return 0;
}
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 && provider->driver->connect)
{
int err;
DBG("provider %p", provider);
if (provider->driver && provider->driver->connect)
- err = provider->driver->connect(provider);
+ err = provider->driver->connect(provider
, dbus_sender
);
else
return -EOPNOTSUPP;
else
return -EOPNOTSUPP;
@@
-741,7
+742,7
@@
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,
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)
state, service_index, vpn_index);
if (vpn_index < 0)
@@
-754,11
+755,9
@@
static void provider_service_changed(struct connman_service *service,
DBG("disconnect %p index %d", provider, vpn_index);
connman_provider_disconnect(provider);
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,
.name = "provider",
.offline_mode = provider_offline_mode,
.service_state_changed = provider_service_changed,