OSDN Git Service

alert: Update new alert characteristic value
authorAnderson Lizardo <anderson.lizardo@openbossa.org>
Tue, 2 Oct 2012 20:24:38 +0000 (16:24 -0400)
committerJohan Hedberg <johan.hedberg@intel.com>
Wed, 3 Oct 2012 19:27:03 +0000 (22:27 +0300)
Update the attribute value when a new alert is reported to BlueZ.

profiles/alert/server.c

index c4d3be7..40b1b05 100644 (file)
@@ -64,6 +64,8 @@
 
 /* Maximum length for "Text String Information" */
 #define NEW_ALERT_MAX_INFO_SIZE                18
+/* Maximum length for New Alert Characteristic Value */
+#define NEW_ALERT_CHR_MAX_VALUE_SIZE   (NEW_ALERT_MAX_INFO_SIZE + 2)
 
 enum {
        ENABLE_NEW_INCOMING,
@@ -91,6 +93,7 @@ struct alert_adapter {
        struct btd_adapter *adapter;
        uint16_t supp_new_alert_cat_handle;
        uint16_t supp_unread_alert_cat_handle;
+       uint16_t new_alert_handle;
 };
 
 static GSList *registered_alerts = NULL;
@@ -318,6 +321,16 @@ static DBusMessage *register_alert(DBusConnection *conn, DBusMessage *msg,
        return dbus_message_new_method_return(msg);
 }
 
+static void update_new_alert(gpointer data, gpointer user_data)
+{
+       struct alert_adapter *al_adapter = data;
+       struct btd_adapter *adapter = al_adapter->adapter;
+       uint8_t *value = user_data;
+
+       attrib_db_update(adapter, al_adapter->new_alert_handle, NULL, &value[1],
+                                                               value[0], NULL);
+}
+
 static DBusMessage *new_alert(DBusConnection *conn, DBusMessage *msg,
                                                                void *data)
 {
@@ -325,6 +338,7 @@ static DBusMessage *new_alert(DBusConnection *conn, DBusMessage *msg,
        const char *category, *description;
        struct alert_data *alert;
        uint16_t count;
+       unsigned int i;
 
        if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &category,
                        DBUS_TYPE_UINT16, &count, DBUS_TYPE_STRING,
@@ -354,6 +368,29 @@ static DBusMessage *new_alert(DBusConnection *conn, DBusMessage *msg,
                return btd_error_invalid_args(msg);
        }
 
+       for (i = 0; i < G_N_ELEMENTS(anp_categories); i++) {
+               if (g_str_equal(anp_categories[i], category)) {
+                       uint8_t value[NEW_ALERT_CHR_MAX_VALUE_SIZE + 1];
+                       size_t dlen = strlen(description);
+                       uint8_t *ptr = value;
+
+                       memset(value, 0, sizeof(value));
+
+                       *ptr++ = 2; /* Attribute value size */
+                       *ptr++ = i; /* Category ID (mandatory) */
+                       *ptr++ = count; /* Number of New Alert (mandatory) */
+                       /* Text String Information (optional) */
+                       strncpy((char *) ptr, description,
+                                               NEW_ALERT_MAX_INFO_SIZE - 1);
+
+                       if (dlen > 0)
+                               *value += dlen + 1;
+
+                       g_slist_foreach(alert_adapters, update_new_alert,
+                                                                       value);
+               }
+       }
+
        DBG("NewAlert(\"%s\", %d, \"%s\")", category, count, description);
 
        return dbus_message_new_method_return(msg);
@@ -538,6 +575,8 @@ static void register_alert_notif_service(struct alert_adapter *al_adapter)
                        /* New Alert */
                        GATT_OPT_CHR_UUID, NEW_ALERT_CHR_UUID,
                        GATT_OPT_CHR_PROPS, ATT_CHAR_PROPER_NOTIFY,
+                       GATT_OPT_CHR_VALUE_GET_HANDLE,
+                       &al_adapter->new_alert_handle,
                        /* Supported Unread Alert Category */
                        GATT_OPT_CHR_UUID, SUPP_UNREAD_ALERT_CAT_CHR_UUID,
                        GATT_OPT_CHR_PROPS, ATT_CHAR_PROPER_READ,