commit 4ae6cfca554d704053dc3a4c02f0bc3eca9f77ab
author Andre Dieb Martins <andre.dieb@signove.com> Wed Feb 23 12:14:19 2011 -0300
committer Johan Hedberg <johan.hedberg@nokia.com> Thu Feb 24 15:43:32 2011 -0300
tree 36dce00f3ca02ae6e598d6743ee269d43b881955
parent 34d6f0e397265e41bbce687bdee68f9c27ac950e

Check properties before setting client configs

Only enable notification/indication if the descriptor allows it.

src/attrib-server.c

diff --git a/src/attrib-server.c b/src/attrib-server.c
index 47ca5d9..21da17e 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -199,13 +199,14 @@
 	struct gatt_channel *channel = user_data;
 	struct attribute *last_chr_val = NULL;
 	uint16_t cfg_val;
+	uint8_t props;
 	uuid_t uuid;
 	GSList *l;
 
 	cfg_val = att_get_u16(attr->data);
 
 	sdp_uuid16_create(&uuid, GATT_CHARAC_UUID);
-	for (l = database; l != NULL; l = l->next) {
+	for (l = database, props = 0; l != NULL; l = l->next) {
 		struct attribute *a = l->data;
 		static uint16_t handle = 0;
 
@@ -213,6 +214,7 @@
 			break;
 
 		if (sdp_uuid_cmp(&a->uuid, &uuid) == 0) {
+			props = att_get_u8(&a->data[0]);
 			handle = att_get_u16(&a->data[1]);
 			continue;
 		}
@@ -224,8 +226,11 @@
 	if (last_chr_val == NULL)
 		return 0;
 
-	/* FIXME: Characteristic properties shall be checked for
-	 * Notification/Indication permissions. */
+	if ((cfg_val & 0x0001) && !(props & ATT_CHAR_PROPER_NOTIFY))
+		return ATT_ECODE_WRITE_NOT_PERM;
+
+	if ((cfg_val & 0x0002) && !(props & ATT_CHAR_PROPER_INDICATE))
+		return ATT_ECODE_WRITE_NOT_PERM;
 
 	if (cfg_val & 0x0001)
 		channel->notify = g_slist_append(channel->notify, last_chr_val);