2022-10-18 21:29:34

by Luiz Augusto von Dentz

Subject: [PATCH BlueZ 1/2] settings: Fix scan-build warning

From: Luiz Augusto von Dentz <[email protected]>

This fixes the following warning:

src/settings.c:281:7: warning: Branch condition evaluates to a garbage
value [core.uninitialized.Branch]
if (ret) {
^~~
---
src/settings.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/src/settings.c b/src/settings.c
index 0f053000610b..85534f2c7aca 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -269,6 +269,7 @@ static int gatt_db_load(struct gatt_db *db, GKeyFile *key_file, char **keys)
&primary, &uuid);

bt_uuid_to_string(&uuid, uuid_str, sizeof(uuid_str));
+ ret = 0;
} else if (g_str_equal(type, GATT_INCLUDE_UUID_STR)) {
ret = load_incl(db, *handle, value, current_service);
} else if (g_str_equal(type, GATT_CHARAC_UUID_STR)) {
--
2.37.3

2022-10-18 21:29:34

by Luiz Augusto von Dentz

Subject: [PATCH BlueZ 2/2] monitor/att: Detect cache changes

From: Luiz Augusto von Dentz <[email protected]>

This attempts to detect if the were any changes on cache files since
they were last loaded and then attempt to reload them.
---
monitor/att.c | 39 +++++++++++++++++++++++++++------------
1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/monitor/att.c b/monitor/att.c
index 491f196bf38d..6143b79b58ae 100644
--- a/monitor/att.c
+++ b/monitor/att.c
@@ -22,6 +22,7 @@
#include <stdbool.h>
#include <errno.h>
#include <linux/limits.h>
+#include <sys/stat.h>

#include <glib.h>

@@ -2426,7 +2427,9 @@ struct att_read {

struct att_conn_data {
struct gatt_db *ldb;
+ struct timespec ldb_mtim;
struct gatt_db *rdb;
+ struct timespec rdb_mtim;
struct queue *reads;
};

@@ -2440,6 +2443,26 @@ static void att_conn_data_free(void *data)
free(att_data);
}

+static void gatt_load_db(struct gatt_db *db, const char *filename,
+ struct timespec *mtim)
+{
+ if (!gatt_db_isempty(db)) {
+ struct stat st;
+
+ if (lstat(filename, &st))
+ return;
+
+ /* Check if file has been modified since last time */
+ if (st.st_mtim.tv_sec == mtim->tv_sec &&
+ st.st_mtim.tv_nsec == mtim->tv_nsec)
+ return;
+
+ *mtim = st.st_mtim;
+ }
+
+ btd_settings_gatt_db_load(db, filename);
+}
+
static void load_gatt_db(struct packet_conn_data *conn)
{
struct att_conn_data *data = conn->data;
@@ -2455,22 +2478,14 @@ static void load_gatt_db(struct packet_conn_data *conn)
conn->destroy = att_conn_data_free;
}

- if (!gatt_db_isempty(data->ldb) && !gatt_db_isempty(data->rdb))
- return;
-
ba2str((bdaddr_t *)conn->src, local);
ba2str((bdaddr_t *)conn->dst, peer);

- if (gatt_db_isempty(data->ldb)) {
- create_filename(filename, PATH_MAX, "/%s/attributes", local);
- btd_settings_gatt_db_load(data->ldb, filename);
- }
+ create_filename(filename, PATH_MAX, "/%s/attributes", local);
+ gatt_load_db(data->ldb, filename, &data->ldb_mtim);

- if (gatt_db_isempty(data->rdb)) {
- create_filename(filename, PATH_MAX, "/%s/cache/%s", local,
- peer);
- btd_settings_gatt_db_load(data->rdb, filename);
- }
+ create_filename(filename, PATH_MAX, "/%s/cache/%s", local, peer);
+ gatt_load_db(data->rdb, filename, &data->rdb_mtim);
}

static struct gatt_db_attribute *get_attribute(const struct l2cap_frame *frame,
--
2.37.3

2022-10-18 22:44:25

by bluez.test.bot

Subject: RE: [BlueZ,1/2] settings: Fix scan-build warning

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=686460

---Test result---

Test Summary:
CheckPatch PASS 2.22 seconds
GitLint PASS 1.56 seconds
Prep - Setup ELL PASS 32.57 seconds
Build - Prep PASS 0.82 seconds
Build - Configure PASS 10.55 seconds
Build - Make PASS 992.64 seconds
Make Check PASS 12.63 seconds
Make Check w/Valgrind PASS 351.85 seconds
Make Distcheck PASS 293.36 seconds
Build w/ext ELL - Configure PASS 10.54 seconds
Build w/ext ELL - Make PASS 103.89 seconds
Incremental Build w/ patches PASS 248.67 seconds
Scan Build PASS 631.14 seconds



---
Regards,
Linux Bluetooth