10:57 a.m.
Hello,
currently when a service is removed (Remove d-bus method) some of its properties are
cleared but its folder and files in STORAGEDIR are not deleted. This patch removes such
data.
Immutable services have a .config file in STORAGEDIR, and if they have been connected at
least once they also have the same folder of mutable services: the Remove method will
delete the folder and force a re-provision of the service: this will act as a reset of the
service to its default.
Regards,
Marco Maniezzo
10:57 a.m.
New subject: [PATCH 1/2] delete STORAGEDIR folders - documentation
---
doc/service-api.txt | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/doc/service-api.txt b/doc/service-api.txt
index e2e9e84..cb9021c 100644
--- a/doc/service-api.txt
+++ b/doc/service-api.txt
@@ -94,11 +94,14 @@ Methods dict GetProperties() [deprecated]
service is in the State=failure, this method can
also be used to reset the service.
- Calling this method on Ethernet devices, hidden WiFi
- services or provisioned services will cause an error
- message. It is not possible to remove these kind of
- services.
-
+ Calling this method on Ethernet devices and hidden WiFi
+ services will cause an error message. It is not possible
+ to remove these kind of services.
+
+ For the other services the removal will cause the
+ deletion of their folder in STORAGEDIR. Immutable
+ services will be reprovisioned reading their .config file.
+
Possible Errors: [service].Error.InvalidArguments
void MoveBefore(object service)
--
1.9.1
10:57 a.m.
New subject: [PATCH 2/2] delete STORAGEDIR folders - sources
---
include/provision.h | 1 +
src/config.c | 9 +++++++++
src/service.c | 35 +++++++++++++++++++++++++++++++----
3 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/include/provision.h b/include/provision.h
index 3eb80a8..040f152 100644
--- a/include/provision.h
+++ b/include/provision.h
@@ -42,6 +42,7 @@ struct connman_config_entry {
bool hidden;
};
+void reload_config(const char * ident);
int connman_config_provision_mutable_service(GKeyFile *keyfile);
struct connman_config_entry **connman_config_get_entries(const char *type);
void connman_config_free_entries(struct connman_config_entry **entries);
diff --git a/src/config.c b/src/config.c
index 344b8ce..da95817 100644
--- a/src/config.c
+++ b/src/config.c
@@ -942,6 +942,15 @@ static void config_notify_handler(struct inotify_event *event,
g_hash_table_remove(config_table, ident);
}
+void reload_config(const char * ident)
+{
+ struct inotify_event event;
+
+ event.mask = IN_MODIFY;
+
+ config_notify_handler(&event,ident);
+}
+
int __connman_config_init(void)
{
DBG("");
diff --git a/src/service.c b/src/service.c
index 8e07337..a0475f2 100644
--- a/src/service.c
+++ b/src/service.c
@@ -34,7 +34,7 @@
#include <connman/storage.h>
#include <connman/setting.h>
#include <connman/agent.h>
-
+#include <connman/provision.h>
#include "connman.h"
#define CONNECT_TIMEOUT 120
@@ -4081,11 +4081,15 @@ static DBusMessage *disconnect_service(DBusConnection *conn,
bool __connman_service_remove(struct connman_service *service)
{
+ unsigned int *auto_connect_types;
+ char *ident;
+ int i;
+
if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET ||
service->type == CONNMAN_SERVICE_TYPE_GADGET)
return false;
- if (service->immutable || service->hidden ||
+ if (service->hidden ||
__connman_provider_is_immutable(service->provider))
return false;
@@ -4116,9 +4120,32 @@ bool __connman_service_remove(struct connman_service *service)
__connman_ipconfig_ipv6_reset_privacy(service->ipconfig_ipv6);
- service_save(service);
+ __connman_storage_remove_service(service->identifier);
- return true;
+ if (service->immutable == true && service->config_file)
+ {/* force reprovision of immutable services */
+
+ /* reset autoconnect to default, because it is not currently (connman 1.31)
+ * managed by .config files
+ */
+ auto_connect_types =
connman_setting_get_uint_list("DefaultAutoConnectTechnologies");
+ service->autoconnect = false;
+ for (i = 0; auto_connect_types &&
+ auto_connect_types[i] != 0; i++) {
+ if (service->type == auto_connect_types[i]) {
+ service->autoconnect = true;
+ break;
+ }
+ }
+
+ DBG("reloading service %s", service->config_file);
+
+ ident = g_strdup_printf("%s.config", service->config_file);
+ reload_config(ident);
+ g_free(ident);
+ }
+
+ return(true);
}
static DBusMessage *remove_service(DBusConnection *conn,
--
1.9.1
2:57 p.m.
New subject: [PATCH 2/2] delete STORAGEDIR folders - sources
On Fri, 2016-02-26 at 10:57 +0100, Marco Maniezzo wrote:
---
include/provision.h | 1 +
src/config.c | 9 +++++++++
src/service.c | 35 +++++++++++++++++++++++++++++++----
3 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/include/provision.h b/include/provision.h
index 3eb80a8..040f152 100644
--- a/include/provision.h
+++ b/include/provision.h
@@ -42,6 +42,7 @@ struct connman_config_entry {
bool hidden;
};
+void reload_config(const char * ident);
int connman_config_provision_mutable_service(GKeyFile *keyfile);
struct connman_config_entry **connman_config_get_entries(const char *type);
void connman_config_free_entries(struct connman_config_entry **entries);
diff --git a/src/config.c b/src/config.c
index 344b8ce..da95817 100644
--- a/src/config.c
+++ b/src/config.c
@@ -942,6 +942,15 @@ static void config_notify_handler(struct inotify_event *event,
g_hash_table_remove(config_table, ident);
}
+void reload_config(const char * ident)
+{
+ struct inotify_event event;
+
+ event.mask = IN_MODIFY;
+
+ config_notify_handler(&event,ident);
There can be more than one services specified in the same configuration
file. With the above all other services will also be disrupted, which is
not nice if another service is connected while trying to remove the
other one from the same file.
+}
+
int __connman_config_init(void)
{
DBG("");
diff --git a/src/service.c b/src/service.c
index 8e07337..a0475f2 100644
--- a/src/service.c
+++ b/src/service.c
@@ -34,7 +34,7 @@
#include <connman/storage.h>
#include <connman/setting.h>
#include <connman/agent.h>
-
+#include <connman/provision.h>
#include "connman.h"
#define CONNECT_TIMEOUT 120
@@ -4081,11 +4081,15 @@ static DBusMessage *disconnect_service(DBusConnection *conn,
bool __connman_service_remove(struct connman_service *service)
{
+ unsigned int *auto_connect_types;
+ char *ident;
+ int i;
+
if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET ||
service->type == CONNMAN_SERVICE_TYPE_GADGET)
return false;
- if (service->immutable || service->hidden ||
+ if (service->hidden ||
__connman_provider_is_immutable(service->provider))
return false;
@@ -4116,9 +4120,32 @@ bool __connman_service_remove(struct connman_service *service)
__connman_ipconfig_ipv6_reset_privacy(service->ipconfig_ipv6);
- service_save(service);
+ __connman_storage_remove_service(service->identifier);
- return true;
+ if (service->immutable == true && service->config_file)
+ {/* force reprovision of immutable services */
+
+ /* reset autoconnect to default, because it is not currently (connman 1.31)
+ * managed by .config files
+ */
+ auto_connect_types =
connman_setting_get_uint_list("DefaultAutoConnectTechnologies");
+ service->autoconnect = false;
+ for (i = 0; auto_connect_types &&
+ auto_connect_types[i] != 0; i++) {
+ if (service->type == auto_connect_types[i]) {
+ service->autoconnect = true;
+ break;
+ }
+ }
+
All settings added by the user shall be removed. I wonder if the removal
can be combined with refactored parts of service_free(), as the service
is stripped of all extra values there. When adding the service back in a
fresh state, reprovisioning can be impelmented to happen for just this
service, but it may also be easier to do
__connman_service_create_from_network() here.
+ DBG("reloading service %s", service->config_file);
+
+ ident = g_strdup_printf("%s.config", service->config_file);
+ reload_config(ident);
+ g_free(ident);
+ }
+
+ return(true);
}
static DBusMessage *remove_service(DBusConnection *conn,
Let me think about this a while, meanwhile comments are welcome.
Cheers,
Patrik
4:04 p.m.
New subject: R: [PATCH 2/2] delete STORAGEDIR folders - sources
Hello Patrik,
> +void reload_config(const char * ident) {
> +struct inotify_event event;
> +
> +event.mask = IN_MODIFY;
> +
> +config_notify_handler(&event,ident);
There can be more than one services specified in the same
configuration file. With the above all other services will also be disrupted, which is not
nice if another service is connected while trying to remove the other one from the same
file.
You're right, they would be re-provisioned as well, meaning reset to default. And the
same currently happens if the user manually modifies the .config file for one service
only, the config_notify_handler has to be revised
> +if (service->immutable == true &&
service->config_file)
> +{/* force reprovision of immutable services */
> +
> +/* reset autoconnect to default, because it is not currently (connman 1.31)
> + * managed by .config files
> + */
> +auto_connect_types =
connman_setting_get_uint_list("DefaultAutoConnectTechnologies");
> +service->autoconnect = false;
> +for (i = 0; auto_connect_types &&
> +auto_connect_types[i] != 0; i++) {
> +if (service->type == auto_connect_types[i]) {
> +service->autoconnect = true;
> +break;
> +}
> +}
> +
All settings added by the user shall be removed. I wonder if the
removal can be combined with refactored parts of service_free(), as the service is
stripped of all extra values there. When adding the service back in a fresh state,
reprovisioning can be impelmented to happen for just this service, but it may also be
easier to do
__connman_service_create_from_network() here.
Yes it should be completed by clearing all the properties that the re-provision is going
to provide after. Here I kept the clears already present plus I added only autoconnect
which can be modified by d-bus but it is not read from .config files so it would stay at
the last value instead of being reset.
I've done a fast test with __connman_service_create_from_network(service->network)
instead of reload_config(ident) and passphrase at least is not re-read so it would need
some modification more to work.
Marco
________________________________
VISITA IL NOSTRO NUOVO SITO WEB! - VISIT OUR NEW WEB SITE! www.magnetimarelli.com
Confidential Notice: This message - including its attachments - may contain proprietary,
confidential and/or legally protected information and is intended solely for the use of
the designated addressee(s) above. If you are not the intended recipient be aware that any
downloading, copying, disclosure, distribution or use of the contents of the above
information is strictly prohibited.
If you have received this communication by mistake, please forward the message back to the
sender at the email address above, delete the message from all mailboxes and any other
electronic storage medium and destroy all copies.
Disclaimer Notice: Internet communications cannot be guaranteed to be safe or error-free.
Therefore we do not assure that this message is complete or accurate and we do not accept
liability for any errors or omissions in the contents of this message.
1876
days inactive
1876
days old
4 comments
3 participants
participants (3)
-
MANIEZZO Marco (MM) -
Marco Maniezzo -
Patrik Flykt