connman.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
* [PATCH] Add GetKnownServices api to connaman
@ 2021-10-25 13:26 Michael Trimarchi
  2021-10-26  7:04 ` Daniel Wagner
  0 siblings, 1 reply; 5+ messages in thread
From: Michael Trimarchi @ 2021-10-25 13:26 UTC (permalink / raw)
  To: connman; +Cc: Jan.Ryll, Simon.Holesch

Add a way to retrieve all the networks that were configured
using connman and not all the ones visible

Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
---
 client/commands.c    | 14 ++++++++++
 src/connman.h        |  1 +
 src/manager.c        | 23 +++++++++++++++++
 src/service.c        | 61 ++++++++++++++++++++++++++++++++++++++++++++
 tools/manager-api.c  | 33 ++++++++++++++++++++++++
 tools/session-test.h |  1 +
 6 files changed, 133 insertions(+)

diff --git a/client/commands.c b/client/commands.c
index 53cc14c8..f4366e8c 100644
--- a/client/commands.c
+++ b/client/commands.c
@@ -420,6 +420,18 @@ static int cmd_services(char *args[], int num, struct connman_option *options)
 			object_properties, path, NULL, NULL);
 }
 
+static int cmd_known_services(char *args[], int num, struct connman_option *options)
+{
+	if (num > 1)
+		return -E2BIG;
+
+	return __connmanctl_dbus_method_call(connection,
+			 CONNMAN_SERVICE, CONNMAN_PATH,
+			 "net.connman.Manager",
+			 "GetKnownServices",
+			 services_list, NULL, NULL, NULL);
+}
+
 static int cmd_peers(char *args[], int num, struct connman_option *options)
 {
 	char *peer_name = NULL;
@@ -2808,6 +2820,8 @@ static const struct {
 	  "Display tethering clients", NULL },
 	{ "services",     "[<service>]",  service_options, cmd_services,
 	  "Display services", lookup_service_arg },
+	{ "known-services", NULL,  NULL, cmd_known_services,
+	  "Display known services", NULL },
 	{ "peers",        "[peer]",       NULL,            cmd_peers,
 	  "Display peers", lookup_peer_arg },
 	{ "scan",         "<technology>", NULL,            cmd_scan,
diff --git a/src/connman.h b/src/connman.h
index 68176086..cdc88532 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -682,6 +682,7 @@ int __connman_service_move(struct connman_service *service,
 				struct connman_service *target, bool before);
 int __connman_service_load_modifiable(struct connman_service *service);
 
+void __connman_known_service_list_struct(DBusMessageIter *iter);
 void __connman_service_list_struct(DBusMessageIter *iter);
 
 int __connman_service_compare(const struct connman_service *a,
diff --git a/src/manager.c b/src/manager.c
index 892d3a42..b196109a 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -175,6 +175,11 @@ static const struct connman_notifier technology_notifier = {
 	.idle_state	= idle_state,
 };
 
+static void append_known_service_structs(DBusMessageIter *iter, void *user_data)
+{
+	__connman_known_service_list_struct(iter);
+}
+
 static void append_service_structs(DBusMessageIter *iter, void *user_data)
 {
 	__connman_service_list_struct(iter);
@@ -195,6 +200,21 @@ static DBusMessage *get_services(DBusConnection *conn,
 	return reply;
 }
 
+static DBusMessage *get_known_services(DBusConnection *conn,
+				   DBusMessage *msg, void *data)
+{
+	DBusMessage *reply;
+
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
+
+	__connman_dbus_append_objpath_dict_array(reply,
+				 append_known_service_structs, NULL);
+
+	return reply;
+}
+
 static void append_peer_structs(DBusMessageIter *iter, void *user_data)
 {
 	__connman_peer_list_struct(iter);
@@ -534,6 +554,9 @@ static const GDBusMethodTable manager_methods[] = {
 	{ GDBUS_DEPRECATED_METHOD("RemoveProvider",
 			GDBUS_ARGS({ "provider", "o" }), NULL,
 			remove_provider) },
+	{ GDBUS_METHOD("GetKnownServices",
+			NULL, GDBUS_ARGS({"knownServices", "a(oa{sv})" }),
+			get_known_services) },
 	{ GDBUS_METHOD("GetServices",
 			NULL, GDBUS_ARGS({ "services", "a(oa{sv})" }),
 			get_services) },
diff --git a/src/service.c b/src/service.c
index 8d3c75a5..52f64005 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2705,6 +2705,67 @@ static void append_struct(gpointer value, gpointer user_data)
 	append_struct_service(iter, append_dict_properties, service);
 }
 
+void __connman_known_service_list_struct(DBusMessageIter *iter)
+{
+	gchar **services = NULL;
+	gchar **service_id_parts = NULL;
+	guint i = 0;
+	struct connman_service *service = NULL;
+
+	DBG("listing known services");
+
+	services = connman_storage_get_services();
+	if (services == NULL)
+		return;
+
+	for (i = 0; i < g_strv_length(services); i++) {
+		service = connman_service_create();
+		if (service == NULL) {
+			connman_error("connman_service_create() allocation failed");
+			return;
+		}
+
+		service->identifier = g_strdup(services[i]);
+		service_id_parts = g_strsplit(services[i], "_", -1);
+
+		if (service_id_parts == NULL) {
+			g_free(service);
+			continue;
+		}
+
+		service->type = __connman_service_string2type(service_id_parts[0]);
+		service->path = g_strdup_printf("%s/service/%s", CONNMAN_PATH, service->identifier);
+		if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
+		service->security = __connman_service_string2security(service_id_parts[g_strv_length(service_id_parts) - 1]);
+
+		if (service->path == NULL) {
+			g_strfreev(service_id_parts);
+			continue;
+		}
+
+		if (find_service(service->path) != NULL)
+			service->state = (find_service(service->path))->state;
+
+		if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET &&
+		    find_service(service->path) != NULL)
+			service->name = (find_service(service->path))->name;
+
+		if (0 != service_load(service)) {
+			connman_error("service_load() returned error");
+			g_free(service);
+			g_strfreev(service_id_parts);
+			g_strfreev(services);
+			return;
+		}
+
+		append_struct_service(iter, append_dict_properties, service);
+		g_strfreev(service_id_parts);
+		g_free(service);
+	}
+
+	g_strfreev(services);
+}
+
 void __connman_service_list_struct(DBusMessageIter *iter)
 {
 	g_list_foreach(service_list, append_struct, iter);
diff --git a/tools/manager-api.c b/tools/manager-api.c
index e082962d..99035988 100644
--- a/tools/manager-api.c
+++ b/tools/manager-api.c
@@ -64,6 +64,39 @@ static DBusMessage *set_property(DBusConnection *connection,
 	return reply;
 }
 
+DBusMessage *manager_get_known_services(DBusConnection *connection)
+{
+	DBusMessage *message, *reply;
+	DBusError error;
+
+	message = dbus_message_new_method_call(CONNMAN_SERVICE,
+				   CONNMAN_MANAGER_PATH,
+				   CONNMAN_MANAGER_INTERFACE,
+				   "GetKnownServices");
+
+	if (!message)
+		return NULL;
+
+	dbus_error_init(&error);
+
+	reply = dbus_connection_send_with_reply_and_block(connection,
+				  message, -1, &error);
+	if (!reply) {
+		if (dbus_error_is_set(&error)) {
+			LOG("%s", error.message);
+			dbus_error_free(&error);
+		} else {
+			LOG("Failed to get known services");
+		}
+		dbus_message_unref(message);
+		return NULL;
+	}
+
+	dbus_message_unref(message);
+
+	return reply;
+}
+
 DBusMessage *manager_get_services(DBusConnection *connection)
 {
 	DBusMessage *message, *reply;
diff --git a/tools/session-test.h b/tools/session-test.h
index 2c068bd7..ab89f8c5 100644
--- a/tools/session-test.h
+++ b/tools/session-test.h
@@ -114,6 +114,7 @@ DBusMessage *session_disconnect(DBusConnection *connection,
 					struct test_session *session);
 
 /* manager-api.c */
+DBusMessage *manager_get_known_services(DBusConnection *connection);
 DBusMessage *manager_get_services(DBusConnection *connection);
 DBusMessage *manager_get_properties(DBusConnection *connection);
 DBusMessage *manager_create_session(DBusConnection *connection,
-- 
2.25.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Add GetKnownServices api to connaman
  2021-10-25 13:26 [PATCH] Add GetKnownServices api to connaman Michael Trimarchi
@ 2021-10-26  7:04 ` Daniel Wagner
  2021-10-26  7:09   ` Michael Nazzareno Trimarchi
  0 siblings, 1 reply; 5+ messages in thread
From: Daniel Wagner @ 2021-10-26  7:04 UTC (permalink / raw)
  To: Michael Trimarchi; +Cc: connman, Jan.Ryll, Simon.Holesch

Hi Michael,

On Mon, Oct 25, 2021 at 01:26:43PM +0000, Michael Trimarchi wrote:
> Add a way to retrieve all the networks that were configured
> using connman and not all the ones visible
> 
> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>

We don't do the SoB in this project.

> +void __connman_known_service_list_struct(DBusMessageIter *iter)
> +{
> +	gchar **services = NULL;
> +	gchar **service_id_parts = NULL;
> +	guint i = 0;
> +	struct connman_service *service = NULL;

All pre-initialization are not needed.

> +
> +	DBG("listing known services");

Please remove the DBG(). We have way to many these kind of tracing DBGs
in the code which fill the log pretty unnecessary.

> +
> +	services = connman_storage_get_services();
> +	if (services == NULL)

	if (!service)

> +		return;
> +
> +	for (i = 0; i < g_strv_length(services); i++) {
> +		service = connman_service_create();
> +		if (service == NULL) {

	if (!service)

> +			connman_error("connman_service_create() allocation failed");
> +			return;
> +		}
> +
> +		service->identifier = g_strdup(services[i]);
> +		service_id_parts = g_strsplit(services[i], "_", -1);
> +
> +		if (service_id_parts == NULL) {
> +			g_free(service);
> +			continue;
> +		}

IIRC, this check will always be false, as g_strsplit() will return a
valid array or call abort() if allocation fails.

> +
> +		service->type = __connman_service_string2type(service_id_parts[0]);
> +		service->path = g_strdup_printf("%s/service/%s", CONNMAN_PATH, service->identifier);

Do we really have to do this kind of path/identifier string generation
here. Prefixing the path I understand but for the rest I thought we had
do this in config.c/storage.c.

> +		if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
> +		service->security = __connman_service_string2security(service_id_parts[g_strv_length(service_id_parts) - 1]);
> +

This looks a bit wierd formatted. Maybe introduce a local variable for
the (...) bit and get it correctly indented.

> +		if (service->path == NULL) {
> +			g_strfreev(service_id_parts);
> +			continue;
> +		}

Same here, g_strdup_printf() will either succeed or call abort() in the
ENOMEM case.

> +
> +		if (find_service(service->path) != NULL)

Just do a

	if (find_service())

> +			service->state = (find_service(service->path))->state;
> +
> +		if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET &&
> +		    find_service(service->path) != NULL)

same here

> +			service->name = (find_service(service->path))->name;
> +
> +		if (0 != service_load(service)) {

Please the other way around, we don't do Misra or whatever standard this
recommends.

> +			connman_error("service_load() returned error");
> +			g_free(service);
> +			g_strfreev(service_id_parts);
> +			g_strfreev(services);
> +			return;
> +		}
> +
> +		append_struct_service(iter, append_dict_properties, service);
> +		g_strfreev(service_id_parts);
> +		g_free(service);
> +	}
> +
> +	g_strfreev(services);
> +}
> +
>  void __connman_service_list_struct(DBusMessageIter *iter)
>  {
>  	g_list_foreach(service_list, append_struct, iter);
> diff --git a/tools/manager-api.c b/tools/manager-api.c
> index e082962d..99035988 100644
> --- a/tools/manager-api.c
> +++ b/tools/manager-api.c
> @@ -64,6 +64,39 @@ static DBusMessage *set_property(DBusConnection *connection,
>  	return reply;
>  }
>  
> +DBusMessage *manager_get_known_services(DBusConnection *connection)
> +{
> +	DBusMessage *message, *reply;
> +	DBusError error;
> +
> +	message = dbus_message_new_method_call(CONNMAN_SERVICE,
> +				   CONNMAN_MANAGER_PATH,
> +				   CONNMAN_MANAGER_INTERFACE,
> +				   "GetKnownServices");
> +
> +	if (!message)
> +		return NULL;
> +
> +	dbus_error_init(&error);
> +
> +	reply = dbus_connection_send_with_reply_and_block(connection,
> +				  message, -1, &error);
> +	if (!reply) {
> +		if (dbus_error_is_set(&error)) {
> +			LOG("%s", error.message);
> +			dbus_error_free(&error);
> +		} else {
> +			LOG("Failed to get known services");
> +		}

Drop these LOG() entries.

> +		dbus_message_unref(message);
> +		return NULL;
> +	}
> +
> +	dbus_message_unref(message);
> +
> +	return reply;
> +}
> +

Please also update the documentation.

Thanks,
Daniel

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Add GetKnownServices api to connaman
  2021-10-26  7:04 ` Daniel Wagner
@ 2021-10-26  7:09   ` Michael Nazzareno Trimarchi
  2021-10-26  7:37     ` Daniel Wagner
  0 siblings, 1 reply; 5+ messages in thread
From: Michael Nazzareno Trimarchi @ 2021-10-26  7:09 UTC (permalink / raw)
  To: Daniel Wagner; +Cc: connman, Jan.Ryll, Simon.Holesch

Hi

On Tue, Oct 26, 2021 at 9:04 AM Daniel Wagner <wagi@monom.org> wrote:
>
> Hi Michael,
>
> On Mon, Oct 25, 2021 at 01:26:43PM +0000, Michael Trimarchi wrote:
> > Add a way to retrieve all the networks that were configured
> > using connman and not all the ones visible
> >
> > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
>
> We don't do the SoB in this project.
>
> > +void __connman_known_service_list_struct(DBusMessageIter *iter)
> > +{
> > +     gchar **services = NULL;
> > +     gchar **service_id_parts = NULL;
> > +     guint i = 0;
> > +     struct connman_service *service = NULL;
>
> All pre-initialization are not needed.

Right

>
> > +
> > +     DBG("listing known services");
>
> Please remove the DBG(). We have way to many these kind of tracing DBGs
> in the code which fill the log pretty unnecessary.
>

Ok

> > +
> > +     services = connman_storage_get_services();
> > +     if (services == NULL)
>
>         if (!service)
>
> > +             return;
> > +
> > +     for (i = 0; i < g_strv_length(services); i++) {
> > +             service = connman_service_create();
> > +             if (service == NULL) {
>
>         if (!service)

Ok

>
> > +                     connman_error("connman_service_create() allocation failed");
> > +                     return;
> > +             }
> > +
> > +             service->identifier = g_strdup(services[i]);
> > +             service_id_parts = g_strsplit(services[i], "_", -1);
> > +
> > +             if (service_id_parts == NULL) {
> > +                     g_free(service);
> > +                     continue;
> > +             }
>
> IIRC, this check will always be false, as g_strsplit() will return a
> valid array or call abort() if allocation fails.
>

I don't want an abort to be called, I will adjust it.

> > +
> > +             service->type = __connman_service_string2type(service_id_parts[0]);
> > +             service->path = g_strdup_printf("%s/service/%s", CONNMAN_PATH, service->identifier);
>
> Do we really have to do this kind of path/identifier string generation
> here. Prefixing the path I understand but for the rest I thought we had
> do this in config.c/storage.c.

Ok, I will take a look

>
> > +             if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
> > +             service->security = __connman_service_string2security(service_id_parts[g_strv_length(service_id_parts) - 1]);
> > +
>
> This looks a bit wierd formatted. Maybe introduce a local variable for
> the (...) bit and get it correctly indented.

Ok

>
> > +             if (service->path == NULL) {
> > +                     g_strfreev(service_id_parts);
> > +                     continue;
> > +             }
>
> Same here, g_strdup_printf() will either succeed or call abort() in the
> ENOMEM case.

Ok

I will adjust the rest. I have the patch to remove entries already
tested and prepared. That one
will be an RFC because I have too much open questions

Michael

>
> > +
> > +             if (find_service(service->path) != NULL)
>
> Just do a
>
>         if (find_service())
>
> > +                     service->state = (find_service(service->path))->state;
> > +
> > +             if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET &&
> > +                 find_service(service->path) != NULL)
>
> same here
>
> > +                     service->name = (find_service(service->path))->name;
> > +
> > +             if (0 != service_load(service)) {
>
> Please the other way around, we don't do Misra or whatever standard this
> recommends.
>
> > +                     connman_error("service_load() returned error");
> > +                     g_free(service);
> > +                     g_strfreev(service_id_parts);
> > +                     g_strfreev(services);
> > +                     return;
> > +             }
> > +
> > +             append_struct_service(iter, append_dict_properties, service);
> > +             g_strfreev(service_id_parts);
> > +             g_free(service);
> > +     }
> > +
> > +     g_strfreev(services);
> > +}
> > +
> >  void __connman_service_list_struct(DBusMessageIter *iter)
> >  {
> >       g_list_foreach(service_list, append_struct, iter);
> > diff --git a/tools/manager-api.c b/tools/manager-api.c
> > index e082962d..99035988 100644
> > --- a/tools/manager-api.c
> > +++ b/tools/manager-api.c
> > @@ -64,6 +64,39 @@ static DBusMessage *set_property(DBusConnection *connection,
> >       return reply;
> >  }
> >
> > +DBusMessage *manager_get_known_services(DBusConnection *connection)
> > +{
> > +     DBusMessage *message, *reply;
> > +     DBusError error;
> > +
> > +     message = dbus_message_new_method_call(CONNMAN_SERVICE,
> > +                                CONNMAN_MANAGER_PATH,
> > +                                CONNMAN_MANAGER_INTERFACE,
> > +                                "GetKnownServices");
> > +
> > +     if (!message)
> > +             return NULL;
> > +
> > +     dbus_error_init(&error);
> > +
> > +     reply = dbus_connection_send_with_reply_and_block(connection,
> > +                               message, -1, &error);
> > +     if (!reply) {
> > +             if (dbus_error_is_set(&error)) {
> > +                     LOG("%s", error.message);
> > +                     dbus_error_free(&error);
> > +             } else {
> > +                     LOG("Failed to get known services");
> > +             }
>
> Drop these LOG() entries.
>
> > +             dbus_message_unref(message);
> > +             return NULL;
> > +     }
> > +
> > +     dbus_message_unref(message);
> > +
> > +     return reply;
> > +}
> > +
>
> Please also update the documentation.
>
> Thanks,
> Daniel



-- 
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
michael@amarulasolutions.com
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
info@amarulasolutions.com
www.amarulasolutions.com

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Add GetKnownServices api to connaman
  2021-10-26  7:09   ` Michael Nazzareno Trimarchi
@ 2021-10-26  7:37     ` Daniel Wagner
  2021-10-26  7:42       ` Michael Nazzareno Trimarchi
  0 siblings, 1 reply; 5+ messages in thread
From: Daniel Wagner @ 2021-10-26  7:37 UTC (permalink / raw)
  To: Michael Nazzareno Trimarchi; +Cc: connman, Jan.Ryll, Simon.Holesch

On Tue, Oct 26, 2021 at 09:09:06AM +0200, Michael Nazzareno Trimarchi wrote:
> > > +             service->identifier = g_strdup(services[i]);
> > > +             service_id_parts = g_strsplit(services[i], "_", -1);
> > > +
> > > +             if (service_id_parts == NULL) {
> > > +                     g_free(service);
> > > +                     continue;
> > > +             }
> >
> > IIRC, this check will always be false, as g_strsplit() will return a
> > valid array or call abort() if allocation fails.
> >
> 
> I don't want an abort to be called, I will adjust it.

Sorry, I didn't express it clearly, g_strsplit() will call abort(). This
means the return value of g_str*() function always succeed, thus you
don't have to check for NULL.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Add GetKnownServices api to connaman
  2021-10-26  7:37     ` Daniel Wagner
@ 2021-10-26  7:42       ` Michael Nazzareno Trimarchi
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Nazzareno Trimarchi @ 2021-10-26  7:42 UTC (permalink / raw)
  To: Daniel Wagner; +Cc: connman, Jan.Ryll, Simon.Holesch

Hi Daniel

On Tue, Oct 26, 2021 at 9:37 AM Daniel Wagner <wagi@monom.org> wrote:
>
> On Tue, Oct 26, 2021 at 09:09:06AM +0200, Michael Nazzareno Trimarchi wrote:
> > > > +             service->identifier = g_strdup(services[i]);
> > > > +             service_id_parts = g_strsplit(services[i], "_", -1);
> > > > +
> > > > +             if (service_id_parts == NULL) {
> > > > +                     g_free(service);
> > > > +                     continue;
> > > > +             }
> > >
> > > IIRC, this check will always be false, as g_strsplit() will return a
> > > valid array or call abort() if allocation fails.
> > >
> >
> > I don't want an abort to be called, I will adjust it.
>
> Sorry, I didn't express it clearly, g_strsplit() will call abort(). This
> means the return value of g_str*() function always succeed, thus you
> don't have to check for NULL.

Sorry, I have already checked the code in the project in the meantime
. I understand

Michael



-- 
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
michael@amarulasolutions.com
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
info@amarulasolutions.com
www.amarulasolutions.com

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-10-26  7:42 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-25 13:26 [PATCH] Add GetKnownServices api to connaman Michael Trimarchi
2021-10-26  7:04 ` Daniel Wagner
2021-10-26  7:09   ` Michael Nazzareno Trimarchi
2021-10-26  7:37     ` Daniel Wagner
2021-10-26  7:42       ` Michael Nazzareno Trimarchi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).