summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2010-05-13 14:24:32 +0200
committerMarcel Holtmann <marcel@holtmann.org>2010-05-13 14:24:32 +0200
commit83a6632160cc24de958206623264772e532b254a (patch)
tree28dc6d47e7fbdd1ab7295a205c4897ced4c8fe6b /src
parent4b4d04c50a07db309b03e8000a4a165a102c97d6 (diff)
downloadconnman-83a6632160cc24de958206623264772e532b254a.tar.gz
connman-83a6632160cc24de958206623264772e532b254a.tar.bz2
connman-83a6632160cc24de958206623264772e532b254a.zip
Add initial support for LookupService helper method
Diffstat (limited to 'src')
-rw-r--r--src/connman.h1
-rw-r--r--src/manager.c20
-rw-r--r--src/service.c28
3 files changed, 49 insertions, 0 deletions
diff --git a/src/connman.h b/src/connman.h
index 9cdd71e8..0ddb3ade 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -413,6 +413,7 @@ int __connman_service_indicate_error(struct connman_service *service,
enum connman_service_error error);
int __connman_service_indicate_default(struct connman_service *service);
+int __connman_service_lookup(const char *pattern, const char **path);
int __connman_service_connect(struct connman_service *service);
int __connman_service_disconnect(struct connman_service *service);
int __connman_service_create_and_connect(DBusMessage *msg);
diff --git a/src/manager.c b/src/manager.c
index 6561a78c..b806ba29 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -413,6 +413,25 @@ static DBusMessage *disable_technology(DBusConnection *conn,
return NULL;
}
+static DBusMessage *lookup_service(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ const char *pattern, *path;
+ int err;
+
+ DBG("conn %p", conn);
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &pattern,
+ DBUS_TYPE_INVALID);
+
+ err = __connman_service_lookup(pattern, &path);
+ if (err < 0)
+ return __connman_error_failed(msg, -err);
+
+ return g_dbus_create_reply(msg, DBUS_TYPE_STRING, &path,
+ DBUS_TYPE_INVALID);
+}
+
static DBusMessage *connect_service(DBusConnection *conn,
DBusMessage *msg, void *data)
{
@@ -596,6 +615,7 @@ static GDBusMethodTable manager_methods[] = {
G_DBUS_METHOD_FLAG_ASYNC },
{ "DisableTechnology", "s", "", disable_technology,
G_DBUS_METHOD_FLAG_ASYNC },
+ { "LookupService", "s", "o", lookup_service, },
{ "ConnectService", "a{sv}", "o", connect_service,
G_DBUS_METHOD_FLAG_ASYNC },
{ "ConnectProvider", "a{sv}", "o", connect_provider,
diff --git a/src/service.c b/src/service.c
index 7c349236..c3338186 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2115,6 +2115,34 @@ int __connman_service_disconnect(struct connman_service *service)
}
/**
+ * __connman_service_lookup:
+ * @pattern: search pattern
+ * @path: return object path
+ *
+ * Look up a service path from a search pattern
+ */
+int __connman_service_lookup(const char *pattern, const char **path)
+{
+ GHashTableIter iter;
+ gpointer key, value;
+
+ g_hash_table_iter_init(&iter, service_hash);
+
+ while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
+ GSequenceIter *iter = value;
+ struct connman_service *service = g_sequence_get(iter);
+
+ if (g_strcmp0(service->identifier, pattern) == 0 ||
+ g_strcmp0(service->name, pattern) == 0) {
+ *path = (const char *) service->path;
+ return 0;
+ }
+ }
+
+ return -ENXIO;
+}
+
+/**
* lookup_by_identifier:
* @identifier: service identifier
*