[1/4] ofono: Add additional 'DBG' statements.

Commit Message

Grant Erickson Feb. 12, 2025, 11:39 p.m. UTC

Adds additional 'DBG' statements to make debugging current and future
ofono integration and interactions easier.
---
 plugins/ofono.c | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

Patch

diff --git a/plugins/ofono.c b/plugins/ofono.c
index 062905c8a3a6..47f289f605e0 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -289,7 +289,7 @@  static void set_connected(struct modem_data *modem,
 	char *nameservers;
 	int index;
 
-	DBG("%s", modem->path);
+	DBG("modem %p path %s context %p path %s", modem, modem->path, context, context->path);
 
 	index = context->index;
 
@@ -300,10 +300,14 @@  static void set_connected(struct modem_data *modem,
 		return;
 	}
 
+	DBG("context->network %p", context->network);
+
 	service = connman_service_lookup_from_network(context->network);
 	if (!service)
 		return;
 
+	DBG("service %p", service);
+
 	connman_service_create_ip4config(service, index);
 	connman_network_set_ipv4_method(context->network, method);
 
@@ -1054,7 +1058,9 @@  static void add_network(struct modem_data *modem,
 {
 	const char *group;
 
-	DBG("%s", modem->path);
+	DBG("modem %p path %s context %p path %s network %p",
+		modem, modem->path,
+		context, context->path, context->network);
 
 	if (context->network)
 		return;
@@ -1295,10 +1301,14 @@  static gboolean context_changed(DBusConnection *conn,
 	if (!modem)
 		return TRUE;
 
+	DBG("modem %p", modem);
+
 	context = get_context_with_path(modem->context_list, context_path);
 	if (!context)
 		return TRUE;
 
+	DBG("context %p", context);
+
 	if (!dbus_message_iter_init(message, &iter))
 		return TRUE;
 
@@ -1371,6 +1381,8 @@  static gboolean context_changed(DBusConnection *conn,
 
 		dbus_message_iter_get_basic(&value, &ip_protocol);
 
+		DBG("%s Protocol %s", modem->path, ip_protocol);
+
 		set_context_ipconfig(context, ip_protocol);
 	}
 
@@ -1520,7 +1532,12 @@  static gboolean cm_context_removed(DBusConnection *conn,
 	if (!modem)
 		return TRUE;
 
+	DBG("modem %p", modem);
+
 	context = get_context_with_path(modem->context_list, context_path);
+
+	DBG("context %p", context);
+
 	remove_cm_context(modem, context);
 
 	return TRUE;
@@ -1772,10 +1789,14 @@  static gboolean cm_changed(DBusConnection *conn, DBusMessage *message,
 	DBusMessageIter iter, value;
 	const char *key;
 
+	DBG("");
+
 	modem = g_hash_table_lookup(modem_hash, path);
 	if (!modem)
 		return TRUE;
 
+	DBG("modem %p modem->ignore %u", modem, modem->ignore);
+
 	if (modem->ignore)
 		return TRUE;
 
@@ -1849,6 +1870,8 @@  static gboolean sim_changed(DBusConnection *conn, DBusMessage *message,
 	if (!modem)
 		return TRUE;
 
+	DBG("modem %p modem->ignore %u", modem, modem->ignore);
+
 	if (modem->ignore)
 		return TRUE;
 
@@ -1860,6 +1883,8 @@  static gboolean sim_changed(DBusConnection *conn, DBusMessage *message,
 	dbus_message_iter_next(&iter);
 	dbus_message_iter_recurse(&iter, &value);
 
+	DBG("key %s", key);
+
 	if (g_str_equal(key, "SubscriberIdentity")) {
 		sim_update_imsi(modem, &value);
 		try_create_device(modem);
@@ -1943,9 +1968,10 @@  static void modem_update_interfaces(struct modem_data *modem,
 				uint8_t old_ifaces,
 				uint8_t new_ifaces)
 {
-	DBG("%s", modem->path);
+	DBG("modem %p path %s", modem, modem->path);
 
 	if (api_added(old_ifaces, new_ifaces, OFONO_API_SIM)) {
+		DBG("modem->imsi %p modem->set_powered %u", modem->imsi, modem->set_powered);
 		if (!modem->imsi &&
 				!modem->set_powered) {
 			/*
@@ -1957,6 +1983,7 @@  static void modem_update_interfaces(struct modem_data *modem,
 	}
 
 	if (api_added(old_ifaces, new_ifaces, OFONO_API_CM)) {
+		DBG("modem->device %p", modem->device);
 		if (modem->device) {
 			cm_get_properties(modem);
 			cm_get_contexts(modem);