device: Add btd_ prefix to device_is_trusted
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Tue, 2 Aug 2022 16:31:04 +0000 (09:31 -0700)
committerAyush Garg <ayush.garg@samsung.com>
Mon, 15 May 2023 09:25:54 +0000 (14:55 +0530)
This adds btd_ prefix to device_is_trusted so it can be used by
plugins.

Signed-off-by: Manika Shrivastava <manika.sh@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>
src/adapter.c
src/device.c
src/device.h
src/gatt-database.c

index f30f5c5..8828985 100644 (file)
@@ -12702,9 +12702,9 @@ static gboolean process_auth_queue(gpointer user_data)
                }
 
 #ifndef TIZEN_FEATURE_BLUEZ_MODIFY
-               if (device_is_trusted(device) == TRUE) {
+               if (btd_device_is_trusted(device) == TRUE) {
 #else
-               if (device_is_trusted(device) == TRUE
+               if (btd_device_is_trusted(device) == TRUE
                                || device_is_profile_trusted(device, auth->uuid)
                                || btd_opts.pin_code) {
                        /* In headless device(pin_code is existing),
index 3389240..d00a95a 100644 (file)
@@ -308,7 +308,7 @@ struct btd_device {
        time_t          le_seen;
 #endif
 
-       gboolean        trusted;
+       bool            trusted;
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
        struct trusted_profile_t trusted_profiles;
 #endif
@@ -1118,7 +1118,7 @@ bool device_is_bonded(struct btd_device *device, uint8_t bdaddr_type)
        return state->bonded;
 }
 
-gboolean device_is_trusted(struct btd_device *device)
+bool btd_device_is_trusted(struct btd_device *device)
 {
        return device->trusted;
 }
@@ -1526,7 +1526,7 @@ static gboolean dev_property_get_trusted(const GDBusPropertyTable *property,
                                        DBusMessageIter *iter, void *data)
 {
        struct btd_device *device = data;
-       gboolean val = device_is_trusted(device);
+       gboolean val = btd_device_is_trusted(device);
 
        dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &val);
 
@@ -9323,7 +9323,7 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,
                 * treated as a newly discovered device.
                 */
                if (!device_is_paired(device, bdaddr_type) &&
-                               !device_is_trusted(device))
+                               !btd_device_is_trusted(device))
                        btd_device_set_temporary(device, true);
 
                device_bonding_failed(device, status);
index 1d16b84..ad92087 100644 (file)
@@ -132,7 +132,7 @@ gboolean device_is_temporary(struct btd_device *device);
 bool device_is_connectable(struct btd_device *device);
 bool device_is_paired(struct btd_device *device, uint8_t bdaddr_type);
 bool device_is_bonded(struct btd_device *device, uint8_t bdaddr_type);
-gboolean device_is_trusted(struct btd_device *device);
+bool btd_device_is_trusted(struct btd_device *device);
 void device_set_paired(struct btd_device *dev, uint8_t bdaddr_type);
 void device_set_unpaired(struct btd_device *dev, uint8_t bdaddr_type);
 void btd_device_set_temporary(struct btd_device *device, bool temporary);
index 44940c9..ba2d2d5 100644 (file)
@@ -3649,7 +3649,7 @@ static void desc_write_cb(struct gatt_db_attribute *attrib,
        }
 
        if (opcode == BT_ATT_OP_PREP_WRITE_REQ) {
-               if (!device_is_trusted(device) && !desc->prep_authorized &&
+               if (!btd_device_is_trusted(device) && !desc->prep_authorized &&
                                                desc->req_prep_authorization)
                        send_write(att, attrib, desc->proxy,
                                        desc->pending_writes, id, value, len,
@@ -3787,7 +3787,7 @@ static void chrc_write_cb(struct gatt_db_attribute *attrib,
                queue = NULL;
 
        if (opcode == BT_ATT_OP_PREP_WRITE_REQ) {
-               if (!device_is_trusted(device) && !chrc->prep_authorized &&
+               if (!btd_device_is_trusted(device) && !chrc->prep_authorized &&
                                                chrc->req_prep_authorization)
                        send_write(att, attrib, chrc->proxy, queue,
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY