HPS: Fix data_status value for http response. 50/92550/2
authorh.sandeep <h.sandeep@samsung.com>
Mon, 17 Oct 2016 10:16:09 +0000 (15:46 +0530)
committerh.sandeep <h.sandeep@samsung.com>
Mon, 21 Nov 2016 04:59:34 +0000 (10:29 +0530)
Change-Id: Id76dd4b617cb563a14389d6ec5dcf187becb1f6b
Signed-off-by: h.sandeep <h.sandeep@samsung.com>
bt-httpproxy/bt-httpproxy.c

index 2303be2..6d92f76 100644 (file)
@@ -522,7 +522,7 @@ int _bt_hps_read_cb(const char *obj_path, char **value, int *len)
 
        if (!obj_path) {
                BT_ERR("Wrong Obj path");
-               return FALSE;
+               return data_status;
        }
 
        if (!g_strcmp0(http_hdr_obj_path, obj_path))
@@ -547,7 +547,7 @@ int _bt_hps_read_cb(const char *obj_path, char **value, int *len)
                                _bt_hps_set_notify_read_status(obj_path, offset + MAX_ENTITY_LENGTH,
                                                                data_status, notify_read_info->https_status);
                                *value = g_strdup(&info->char_value[offset]);
-                               *len = info->value_length;
+                               *len = MAX_ENTITY_LENGTH;
                        } else if ((info->value_length - offset) > 0 &&
                                (info->value_length - offset) <= MAX_ENTITY_LENGTH) {
                                if (is_header)
@@ -633,9 +633,9 @@ void _bt_hps_head_response_cb(SoupSession *session,
                // Write Data to Status Code Characteristic
 #ifdef HPS_GATT_DB
                data_status = (hdr_len > MAX_ENTITY_LENGTH) ? DS_HEADER_TRUNCATED : DS_HEADER_RECEIVED;
-               if (data_status == DS_BODY_TRUNCATED && SOUP_STATUS_IS_SUCCESSFUL(http_status))
-                       _bt_hps_set_notify_read_status(http_hdr_obj_path, data_status, 0, http_status);
-
+               if (data_status == DS_BODY_TRUNCATED && SOUP_STATUS_IS_SUCCESSFUL(http_status)) {
+                       _bt_hps_set_notify_read_status(http_hdr_obj_path, 0, data_status, http_status);
+               }
                _bt_hps_send_status_notification(http_status, data_status, &addr_hex);
 #else
                status[0] = http_status & 0x0F;
@@ -755,9 +755,9 @@ void _bt_hps_get_response_cb(SoupSession *session,
                // Write Data to Status Code Characteristic
 #ifdef HPS_GATT_DB
                data_status = (body->length > MAX_ENTITY_LENGTH) ? DS_BODY_TRUNCATED : DS_BODY_RECEIVED;
-               if (data_status == DS_BODY_TRUNCATED && SOUP_STATUS_IS_SUCCESSFUL(http_status))
-                       _bt_hps_set_notify_read_status(http_entity_obj_path, data_status, 0, http_status);
-
+               if (data_status == DS_BODY_TRUNCATED && SOUP_STATUS_IS_SUCCESSFUL(http_status)) {
+                       _bt_hps_set_notify_read_status(http_entity_obj_path, 0, data_status, http_status);
+               }
                _bt_hps_send_status_notification(http_status, data_status, &addr_hex);
 
 #else
@@ -806,9 +806,9 @@ void _bt_hps_get_response_cb(SoupSession *session,
                // Write Data to Status Code Characteristic
 #ifdef HPS_GATT_DB
                data_status = (hdr_len > MAX_HEADER_LENGTH) ? DS_HEADER_TRUNCATED : DS_HEADER_RECEIVED;
-               if (data_status == DS_HEADER_TRUNCATED && SOUP_STATUS_IS_SUCCESSFUL(http_status))
-                       _bt_hps_set_notify_read_status(http_hdr_obj_path, data_status, 0, http_status);
-
+               if (data_status == DS_HEADER_TRUNCATED && SOUP_STATUS_IS_SUCCESSFUL(http_status)) {
+                       _bt_hps_set_notify_read_status(http_hdr_obj_path, 0, data_status, http_status);
+               }
                _bt_hps_send_status_notification(http_status, data_status, &addr_hex);
 #else
                status[0] = http_status & 0x0F;