*/
#include "manager.h"
+#include "common/dbus-error.h"
#include "common/log.h"
#include "dbus-manager.h"
#include "dbus-service.h"
+#include "utils.h"
G_DEFINE_TYPE (MsgPortManager, msgport_manager, G_TYPE_OBJECT)
struct _MsgPortManagerPrivate {
/*
- * Key : const gchar * - object_path of the service
+ * Key : guint - Id of the service
* Value : MsgPortDbusService * (transfe full)
*/
- GHashTable *path_service_map; /* {object_path,MsgPortDbusService} */
+ GHashTable *service_cache; /* {service_id,MsgPortDbusService} */
/*
* Holds services owned by a client
* Key : MsgPortDbusManager *
* Value : GList<MsgPortDbusService *> (tranfer none)
*/
- GHashTable *owner_service_map; /* {app_id,GList[MsgPortDbusService]} */
+ GHashTable *owner_service_map; /* {MsgPortDbusManager*,GList[MsgPortDbusService]} */
};
static void
g_hash_table_unref (manager->priv->owner_service_map);
manager->priv->owner_service_map = NULL;
- g_hash_table_unref (manager->priv->path_service_map);
- manager->priv->path_service_map = NULL;
+ g_hash_table_unref (manager->priv->service_cache);
+ manager->priv->service_cache = NULL;
G_OBJECT_CLASS (msgport_manager_parent_class)->dispose (self);
}
{
MsgPortManagerPrivate *priv = MSGPORT_MANAGER_GET_PRIV (self);
- priv->path_service_map = g_hash_table_new_full (
- g_str_hash, g_str_equal, NULL, g_object_unref);
+ priv->service_cache = g_hash_table_new_full (
+ g_direct_hash, g_direct_equal, NULL, g_object_unref);
priv->owner_service_map = g_hash_table_new_full (
g_direct_hash, g_direct_equal,
NULL, (GDestroyNotify) g_list_free);
gboolean is_trusted,
GError **error)
{
- GList *service_list = NULL; /* services list by app_id */
- gboolean was_empty = TRUE;
+ GList *service_list = NULL; /* services list owned by a client */
+ gboolean list_was_empty = TRUE;
MsgPortDbusService *dbus_service = NULL;
- g_return_val_if_fail (manager && MSGPORT_IS_MANAGER (manager), NULL);
- g_return_val_if_fail (owner && MSGPORT_IS_DBUS_MANAGER (owner), NULL);
+ msgport_return_val_if_fail_with_error (manager && MSGPORT_IS_MANAGER (manager), NULL, error);
+ msgport_return_val_if_fail_with_error (owner && MSGPORT_IS_DBUS_MANAGER (owner), NULL, error);
+ msgport_return_val_if_fail_with_error (port_name && port_name[0], NULL, error);
if ((service_list = (GList *)g_hash_table_lookup (manager->priv->owner_service_map, owner)) != NULL) {
GList *list = NULL;
for (list = service_list; list != NULL; list = list->next) {
MsgPortDbusService *dbus_service = (MsgPortDbusService *)list->data;
- if ( !g_strcmp0 (port_name, msgport_dbus_service_get_port_name (dbus_service))) {
- /* FIXME: return EALREADY error */
+ if ( !g_strcmp0 (port_name, msgport_dbus_service_get_port_name (dbus_service)) &&
+ msgport_dbus_service_get_is_trusted (dbus_service) == is_trusted ) {
+ if (error) {
+ const gchar *app_id = msgport_dbus_service_get_app_id (dbus_service);
+ *error = msgport_error_port_existing_new (app_id, port_name);
+ }
return NULL;
}
}
}
- was_empty = (service_list == NULL);
-
- dbus_service = msgport_dbus_service_new (owner, port_name, is_trusted);
+ dbus_service = msgport_dbus_service_new (owner, port_name, is_trusted, error);
+ if (!dbus_service) {
+ return NULL;
+ }
/* cache newly created service */
- g_hash_table_insert (manager->priv->path_service_map,
- (gpointer)msgport_dbus_service_get_object_path (dbus_service),
+ g_hash_table_insert (manager->priv->service_cache,
+ GINT_TO_POINTER (msgport_dbus_service_get_id (dbus_service)),
(gpointer)dbus_service);
- /* append to list of services */
+ list_was_empty = (service_list == NULL);
+
+ /* append to list of services */
service_list = g_list_append (service_list, dbus_service);
- if (was_empty) {
+ if (list_was_empty) {
g_hash_table_insert (manager->priv->owner_service_map, owner, service_list);
}
GError **error)
{
GList *service_list = NULL;
- g_return_val_if_fail (manager && MSGPORT_IS_MANAGER (manager), NULL);
+
+ msgport_return_val_if_fail_with_error (manager && MSGPORT_IS_MANAGER (manager), NULL, error);
+ msgport_return_val_if_fail_with_error (owner && MSGPORT_IS_DBUS_MANAGER (owner), NULL, error);
+ msgport_return_val_if_fail_with_error (remote_port_name && remote_port_name[0], NULL, error);
service_list = g_hash_table_lookup (manager->priv->owner_service_map, owner);
while (service_list != NULL) {
MsgPortDbusService *dbus_service = MSGPORT_DBUS_SERVICE (service_list->data);
+ DBG ("Owner : %p - Port : %s, Is_trusted : %d", owner,
+ msgport_dbus_service_get_port_name (dbus_service),
+ msgport_dbus_service_get_is_trusted (dbus_service));
+
if ( !g_strcmp0 (remote_port_name, msgport_dbus_service_get_port_name (dbus_service)) &&
is_trusted == msgport_dbus_service_get_is_trusted (dbus_service)) {
return dbus_service ;
service_list = service_list->next;
}
- /* FIXME: return ENOTFOUND */
+ if (error) *error = msgport_error_port_not_found (msgport_dbus_manager_get_app_id (owner), remote_port_name);
+
return NULL;
}
MsgPortDbusService *
-msgport_manager_get_service_by_path (
+msgport_manager_get_service_by_id (
MsgPortManager *manager,
- const gchar *service_object_path,
+ guint service_id,
GError **error)
{
MsgPortDbusService *dbus_service = NULL;
- g_return_val_if_fail (manager && MSGPORT_IS_MANAGER (manager), NULL);
- dbus_service = g_hash_table_lookup (manager->priv->path_service_map, service_object_path);
+ msgport_return_val_if_fail_with_error (manager && MSGPORT_IS_MANAGER (manager), NULL, error);
+ msgport_return_val_if_fail_with_error (service_id != 0, NULL, error);
- if (!dbus_service) {
- /* FIXME: return ENOTFOUND error */
- }
+ dbus_service = MSGPORT_DBUS_SERVICE (g_hash_table_lookup (
+ manager->priv->service_cache, GINT_TO_POINTER(service_id)));
return dbus_service;
}
{
MsgPortDbusService *service = MSGPORT_DBUS_SERVICE (data);
MsgPortManager *manager = MSGPORT_MANAGER (user_data);
- const gchar *object_path = NULL;
-
- g_assert (manager);
- g_assert (service);
- object_path = msgport_dbus_service_get_object_path (service);
+ guint id = msgport_dbus_service_get_id (service);
- DBG ("Unregistering service %s:%s(%s)",
+ DBG ("Unregistering service %s:%s(%d)",
msgport_dbus_manager_get_app_id (msgport_dbus_service_get_owner (service)),
- msgport_dbus_service_get_port_name (service),
- object_path);
- /* remove the service from object_path:service map,
+ msgport_dbus_service_get_port_name (service), id);
+ /* remove the service from id:service map,
* as its being unregisted */
- g_hash_table_remove (manager->priv->path_service_map, object_path);
+ g_hash_table_remove (manager->priv->service_cache, GINT_TO_POINTER(id));
}
/*
- * unregister all the services owned by a client
- */
-gboolean
-msgport_manager_unregister_services (
- MsgPortManager *manager,
- MsgPortDbusManager *owner)
-{
-DBG("{");
- GList *service_list = NULL;
- g_return_val_if_fail (manager && MSGPORT_IS_MANAGER (manager), FALSE);
-
- /* fetch sevice list owned by the client */
- service_list = g_hash_table_lookup (manager->priv->owner_service_map, owner);
- if (!service_list) {
- DBG(" No service found");
- return FALSE;
- }
-
- /* remove all the service from the list */
- g_list_foreach (service_list, _unref_dbus_manager_cb, manager);
- g_hash_table_remove (manager->priv->owner_service_map, owner);
-DBG("}");
- return TRUE;
-}
-
-/*
- * unregister a signle service for given object path
+ * unregister a signle service for given service id
*/
gboolean
msgport_manager_unregister_service (
MsgPortManager *manager,
- const gchar *service_object_path)
+ gint service_id,
+ GError **error)
{
MsgPortDbusService *service = NULL;
MsgPortDbusManager *owner = NULL;
GList *service_list = NULL, *new_service_list = NULL;
- g_return_val_if_fail (manager && MSGPORT_IS_MANAGER (manager), FALSE);
-DBG ("{");
- service = g_hash_table_lookup (manager->priv->path_service_map, service_object_path);
- if (!service) return FALSE;
+ msgport_return_val_if_fail_with_error (manager && MSGPORT_IS_MANAGER (manager), FALSE, error);
+
+ service = g_hash_table_lookup (manager->priv->service_cache, GINT_TO_POINTER (service_id));
+
+ if (!service) {
+ if (error) *error = msgport_error_port_id_not_found_new (service_id);
+ return FALSE;
+ }
owner = msgport_dbus_service_get_owner (service);
g_hash_table_insert (manager->priv->owner_service_map, owner, new_service_list);
}
- /* remove from the object_path:servcie table */
- g_hash_table_remove (manager->priv->path_service_map, service_object_path);
-DBG("}");
+ /* remove from the service_id:servcie table */
+ g_hash_table_remove (manager->priv->service_cache, GINT_TO_POINTER(service_id));
+
return TRUE;
}
+/*
+ * unregister all the services owned by a client
+ */
+gboolean
+msgport_manager_unregister_services (
+ MsgPortManager *manager,
+ MsgPortDbusManager *owner,
+ GError **error)
+{
+
+ GList *service_list = NULL;
+
+ msgport_return_val_if_fail_with_error (manager && MSGPORT_IS_MANAGER (manager), FALSE, error);
+
+ /* fetch sevice list owned by the client */
+ service_list = g_hash_table_lookup (manager->priv->owner_service_map, owner);
+ if (!service_list) {
+ DBG("no services found on client '%p'", owner);
+ return TRUE;
+ }
+
+ /* remove all the service from the list */
+ g_list_foreach (service_list, _unref_dbus_manager_cb, manager);
+ g_hash_table_remove (manager->priv->owner_service_map, owner);
+
+ return TRUE;
+}
+
+
projects / profile / ivi / message-port.git / blobdiff