[v2,3/8] connection: Introduce and leverage 'gateway_{config,data}_debug'.

Message ID	20231129192106.1295868-4-gerickson@nuovations.com (mailing list archive)
State	Not Applicable, archived
Headers	show Received: from mohas.pair.com (mohas.pair.com [209.68.5.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 609A45DF34 for <connman@lists.linux.dev>; Wed, 29 Nov 2023 19:21:10 +0000 (UTC) From: Grant Erickson <gerickson@nuovations.com> To: connman@lists.linux.dev Subject: [PATCH v2 3/8] connection: Introduce and leverage 'gateway_{config,data}_debug'. Date: Wed, 29 Nov 2023 11:21:01 -0800 Message-ID: <20231129192106.1295868-4-gerickson@nuovations.com> In-Reply-To: <20231129192106.1295868-1-gerickson@nuovations.com> References: <20231128230847.1224497-1-gerickson@nuovations.com> <20231129192106.1295868-1-gerickson@nuovations.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[v2,1/8] log: Refactor debugging preprocessor macros. \| expand [v2,1/8] log: Refactor debugging preprocessor macros. [v2,2/8] log: Document debugging preprocessor macros. [v2,3/8] connection: Introduce and leverage 'gateway_{config,data}_debug'. [v2,4/8] connection: Document 'gateway_{config,data}_debug'. [v2,5/8] connection: Expand, Enhance, and Refactor 'DBG'. [v2,6/8] connection: Document 'connection_{add,del}gateway'. [v2,7/8] connection: Document '__connman_connection_gateway_{add,remove}'. [v2,8/8] connection: Document '__connman_connection_update_gateway'.

diff --git a/src/connection.c b/src/connection.c index 9d2c6961306d..586c44330e89 100644 --- a/src/connection.c +++ b/src/connection.c @@ -32,6 +32,12 @@ #include "connman.h" +#define GATEWAY_CONFIG_DBG(description, config) \ + gateway_config_debug(__func__, description, config) + +#define GATEWAY_DATA_DBG(description, data) \ + gateway_data_debug(__func__, description, data) + struct gateway_config { bool active; char *gateway; @@ -53,6 +59,79 @@ struct gateway_data { static GHashTable *gateway_hash = NULL; +static const char *maybe_null(const void *pointer) +{ + return pointer ? pointer : "<null>"; +} + +static void gateway_config_debug(const char *function, + const char *description, + const struct gateway_config *config) +{ + g_autofree char *vpn_phy_interface = NULL; + + if (!function || !description) + return; + + if (!config) + DBG("from %s %s %p", function, description, config); + else { + if (config->vpn_phy_index >= 0) + vpn_phy_interface = + connman_inet_ifname(config->vpn_phy_index); + + DBG("from %s %s %p: { active: %u, gateway: %p (%s), " + "vpn: %u, vpn_ip: %p (%s), vpn_phy_index: %d (%s), " + "vpn_phy_ip: %p (%s) }", + function, + description, + config, + config->active, + config->gateway, maybe_null(config->gateway), + config->vpn, + config->vpn_ip, maybe_null(config->vpn_ip), + config->vpn_phy_index, maybe_null(vpn_phy_interface), + config->vpn_phy_ip, maybe_null(config->vpn_phy_ip)); + } +} + +static void gateway_data_debug(const char *function, + const char *description, + const struct gateway_data *data) +{ + g_autofree char *interface = NULL; + + if (!function || !description) + return; + + if (!data) + DBG("from %s %s %p", function, description, data); + else { + interface = connman_inet_ifname(data->index); + + DBG("from %s %s %p: { index: %d (%s), service: %p (%s), " + "ipv4_gateway: %p, ipv6_gateway: %p, default_checked: %u }", + function, + description, + data, + data->index, + maybe_null(interface), + data->service, + connman_service_get_identifier(data->service), + data->ipv4_gateway, + data->ipv6_gateway, + data->default_checked); + + if (data->ipv4_gateway) + gateway_config_debug(function, "ipv4_gateway", + data->ipv4_gateway); + + if (data->ipv6_gateway) + gateway_config_debug(function, "ipv6_gateway", + data->ipv6_gateway); + } +} + static struct gateway_config *find_gateway(int index, const char *gateway) { GHashTableIter iter; @@ -282,6 +361,8 @@ static int del_routes(struct gateway_data *data, int status4 = 0, status6 = 0; bool do_ipv4 = false, do_ipv6 = false; + GATEWAY_DATA_DBG("data", data); + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) do_ipv4 = true; else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) @@ -334,6 +415,8 @@ static int disable_gateway(struct gateway_data *data, { bool active = false; + GATEWAY_DATA_DBG("data", data); + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { if (data->ipv4_gateway) active = data->ipv4_gateway->active; @@ -426,6 +509,8 @@ static void set_default_gateway(struct gateway_data *data, int status4 = 0, status6 = 0; bool do_ipv4 = false, do_ipv6 = false; + GATEWAY_DATA_DBG("data", data); + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) do_ipv4 = true; else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) @@ -507,6 +592,8 @@ static void unset_default_gateway(struct gateway_data *data, int index; bool do_ipv4 = false, do_ipv6 = false; + GATEWAY_DATA_DBG("data", data); + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) do_ipv4 = true; else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) @@ -586,6 +673,9 @@ static bool choose_default_gateway(struct gateway_data *data, { bool downgraded = false; + GATEWAY_DATA_DBG("data", data); + GATEWAY_DATA_DBG("candidate", candidate); + /* * If the current default is not active, then we mark * this one as default. If the other one is already active @@ -641,6 +731,8 @@ static void connection_newgateway(int index, const char *gateway) if (!config) return; + GATEWAY_CONFIG_DBG("config", config); + config->active = true; /* @@ -652,6 +744,8 @@ static void connection_newgateway(int index, const char *gateway) if (!data) return; + GATEWAY_DATA_DBG("data", data); + if (data->default_checked) return; @@ -690,6 +784,8 @@ static void remove_gateway(gpointer user_data) DBG("gateway ipv4 %p ipv6 %p", data->ipv4_gateway, data->ipv6_gateway); + GATEWAY_DATA_DBG("data", data); + if (data->ipv4_gateway) { g_free(data->ipv4_gateway->gateway); g_free(data->ipv4_gateway->vpn_ip); @@ -717,12 +813,18 @@ static void connection_delgateway(int index, const char *gateway) DBG("index %d gateway %s", index, gateway); config = find_gateway(index, gateway); - if (config) + if (config) { + GATEWAY_CONFIG_DBG("config", config); + config->active = false; + } data = find_default_gateway(); - if (data) + if (data) { + GATEWAY_DATA_DBG("data", data); + set_default_gateway(data, CONNMAN_IPCONFIG_TYPE_ALL); + } } static struct connman_rtnl connection_rtnl = { @@ -836,11 +938,15 @@ int __connman_connection_gateway_add(struct connman_service *service, if (!new_gateway) return -EINVAL; + GATEWAY_DATA_DBG("new_gateway", new_gateway); + active_gateway = find_active_gateway(); DBG("active %p index %d new %p", active_gateway, active_gateway ? active_gateway->index : -1, new_gateway); + GATEWAY_DATA_DBG("active_gateway", active_gateway); + if (type == CONNMAN_IPCONFIG_TYPE_IPV4 && new_gateway->ipv4_gateway) { add_host_route(AF_INET, index, gateway, service_type); @@ -931,6 +1037,8 @@ void __connman_connection_gateway_remove(struct connman_service *service, if (!data) return; + GATEWAY_DATA_DBG("service_data", data); + if (do_ipv4 && data->ipv4_gateway) set_default4 = data->ipv4_gateway->vpn; @@ -977,6 +1085,9 @@ void __connman_connection_gateway_remove(struct connman_service *service, */ if (set_default4 || set_default6 || err < 0) { data = find_default_gateway(); + + GATEWAY_DATA_DBG("default_data", data); + if (data) set_default_gateway(data, type); } @@ -996,6 +1107,8 @@ bool __connman_connection_update_gateway(void) DBG("default %p", default_gateway); + GATEWAY_DATA_DBG("default_gateway", default_gateway); + /* * There can be multiple active gateways so we need to * check them all. @@ -1005,6 +1118,8 @@ bool __connman_connection_update_gateway(void) while (g_hash_table_iter_next(&iter, &key, &value)) { struct gateway_data *active_gateway = value; + GATEWAY_DATA_DBG("active_gateway", active_gateway); + if (active_gateway == default_gateway) continue;

[v2,3/8] connection: Introduce and leverage 'gateway_{config,data}_debug'.

Commit Message

Patch