From: Christian Fetzer <christian.fetzer@xxxxxxxxxxxx>
---
obexd/client/map.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/obexd/client/map.c b/obexd/client/map.c
index 776f19c..682f97a 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -41,6 +41,7 @@
#include "driver.h"
#include "sdp.h"
#include "sdp_lib.h"
+#include "map-dispatcher.h"
#define OBEX_MAS_UUID \
"\xBB\x58\x2B\x40\x42\x0C\x11\xDB\xB0\xDE\x08\x00\x20\x0C\x9A\x66"
@@ -97,6 +98,7 @@ struct map_data {
GHashTable *messages;
int16_t mas_instance_id;
uint8_t supported_message_types;
+ gboolean mns_acquired;
};
#define MAP_MSG_FLAG_PRIORITY 0x01
@@ -1555,6 +1557,13 @@ fail:
return reply;
}
+static void map_handle_notification(struct map_event *event)
+{
+ DBG("event: type=%x, handle=%s, folder=%s, old_folder=%s, msg_type=%s",
+ event->type, event->handle, event->folder,
+ event->old_folder, event->msg_type);
+}
+
static DBusMessage *map_register_notifications(DBusConnection *connection,
DBusMessage *message, void *user_data)
{
@@ -1573,9 +1582,22 @@ static DBusMessage *map_register_notifications(DBusConnection *connection,
ERROR_INTERFACE ".InvalidArguments",
NULL);
+ if (map->mns_acquired == status)
+ return g_dbus_create_error(message,
+ ERROR_INTERFACE ".InvalidArguments",
+ NULL);
+
apparam = g_obex_apparam_set_uint8(NULL, MAP_AP_NOTIFICATIONSTATUS,
status ? 0x01 : 0x00);
+ if (status) {
+ map->mns_acquired = TRUE;
+ map_acquire_mns(map->mas_instance_id, &map_handle_notification);
+ } else {
+ map->mns_acquired = FALSE;
+ map_release_mns(map->mas_instance_id);
+ }
+
return set_notification_registration(map, message, apparam);
}
@@ -1621,6 +1643,9 @@ static void map_free(void *data)
{
struct map_data *map = data;
+ if (map->mns_acquired)
+ map_release_mns(map->mas_instance_id);
+
obc_session_unref(map->session);
g_hash_table_unref(map->messages);
g_free(map);
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
