wispr: Make 'wispr_route_request' route add 'DBG' consistent.

Commit Message

Grant Erickson Dec. 20, 2023, 1:41 a.m. UTC

This makes the route addition 'DBG' in 'wispr_route_request'
consistent with the route deletion 'DBG' in 'free_wispr_route'.
---
 src/wispr.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

Comments

Marcel Holtmann Dec. 23, 2023, 12:21 p.m. UTC | #1

Hi Grant,

> This makes the route addition 'DBG' in 'wispr_route_request'
> consistent with the route deletion 'DBG' in 'free_wispr_route'.
> ---
> src/wispr.c | 30 ++++++++++++++++++------------
> 1 file changed, 18 insertions(+), 12 deletions(-)

patch has been applied.

Regards

Marcel

Patch

diff --git a/src/wispr.c b/src/wispr.c
index efc0ca2fbaa9..b1b0f337d3f8 100644
--- a/src/wispr.c
+++ b/src/wispr.c
@@ -690,24 +690,19 @@  static bool wispr_route_request(const char *address, int ai_family,
 {
 	int result = -1;
 	struct connman_wispr_portal_context *wp_context = user_data;
+	g_autofree char *interface = NULL;
 	const char *gateway;
 	struct wispr_route *route;
 	uint32_t metric = 0;
 
+	interface = connman_inet_ifname(if_index);
+
 	gateway = __connman_ipconfig_get_gateway_from_index(if_index,
 		wp_context->type);
 
-	DBG("address %s if %d gw %s", address, if_index, gateway);
-
 	if (!gateway)
 		return false;
 
-	route = g_try_new0(struct wispr_route, 1);
-	if (route == 0) {
-		DBG("could not create struct");
-		return false;
-	}
-
 	result = __connman_service_get_route_metric(wp_context->service,
 				&metric);
 	if (result < 0) {
@@ -719,10 +714,21 @@  static bool wispr_route_request(const char *address, int ai_family,
 		return false;
 	}
 
-	DBG("service %p (%s) metric %u",
-		wp_context->service,
-		connman_service_get_identifier(wp_context->service),
-		metric);
+	DBG("add route to %s via %s dev %d (%s) metric %u type %d (%s) "
+		"ops %p",
+		address,
+		gateway,
+		if_index, interface,
+		metric,
+		wp_context->type,
+		__connman_ipconfig_type2string(wp_context->type),
+		wp_context->ops);
+
+	route = g_try_new0(struct wispr_route, 1);
+	if (route == 0) {
+		DBG("could not create struct");
+		return false;
+	}
 
 	result = wp_context->ops->add_host_route_with_metric(
 					if_index,