commit a641b6fa2a25e1b5382945d13c4fa49d36084a78
author Jakub Pawlowski <jpawlowski@google.com> Sat Mar 26 00:47:23 2016 -0700
committer Jakub Pawlowski <jpawlowski@google.com> Fri Jul 29 00:30:58 2016 -0700
tree f6a09d85c83334666022b3b67ad5d0de0713145b
parent e39e5ae5527fcee25cb17cea70c8ebf9d331678e

GATT Server refactoring (4/4)

Right now in order to add gatt service, we need to add it piece by
piece - each characteristic and descriptor separately. This causes lots
of concurrency errors in higher layers. Instead accept whole service
definition and start whole service at once.

Also, use handles to identify GATT server attributes. It's already done
on clinet side.

Bug: 27999121
Change-Id: I42c796809423d116fe6755ef8b1c40da270427a5

stack/gatt/gatt_sr.c

diff --git a/stack/gatt/gatt_sr.c b/stack/gatt/gatt_sr.c
index e55b6bb..58d28b7 100644
--- a/stack/gatt/gatt_sr.c
+++ b/stack/gatt/gatt_sr.c
@@ -1038,7 +1038,8 @@
 **
 *******************************************************************************/
 void gatts_process_write_req (tGATT_TCB *p_tcb, UINT8 i_rcb, UINT16 handle,
-                              UINT8 op_code, UINT16 len, UINT8 *p_data)
+                              UINT8 op_code, UINT16 len, UINT8 *p_data,
+                              bt_gatt_db_attribute_type_t gatt_type)
 {
     tGATTS_DATA     sr_data;
     UINT32          trans_id;
@@ -1101,12 +1102,22 @@
         {
             p_sreg = &gatt_cb.sr_reg[i_rcb];
             conn_id = GATT_CREATE_CONN_ID(p_tcb->tcb_idx, p_sreg->gatt_if);
-            gatt_sr_send_req_callback(conn_id,
-                                      trans_id,
-                                      GATTS_REQ_TYPE_WRITE,
-                                      &sr_data);
 
-            status = GATT_PENDING;
+            UINT8 opcode = 0;
+            if (gatt_type == BTGATT_DB_DESCRIPTOR) {
+                opcode = GATTS_REQ_TYPE_WRITE_DESCRIPTOR;
+            } else if (gatt_type == BTGATT_DB_CHARACTERISTIC) {
+                opcode = GATTS_REQ_TYPE_WRITE_CHARACTERISTIC;
+            } else {
+                GATT_TRACE_ERROR("%s: Attempt to write attribute that's not tied with"
+                                 " characteristic or descriptor value.", __func__);
+                status = GATT_ERROR;
+            }
+
+            if (opcode) {
+                gatt_sr_send_req_callback(conn_id, trans_id, opcode, &sr_data);
+                status = GATT_PENDING;
+            }
         }
         else
         {
@@ -1248,7 +1259,8 @@
                             case GATT_CMD_WRITE:
                             case GATT_SIGN_CMD_WRITE:
                             case GATT_REQ_PREPARE_WRITE:
-                                gatts_process_write_req(p_tcb, i, handle, op_code, len, p);
+                                gatts_process_write_req(p_tcb, i, handle, op_code, len, p,
+                                                        p_attr->gatt_type);
                                 break;
                             default:
                                 break;