From 994c1a4b5a7a3bf842c0ac1a00c282191de8ff32 Mon Sep 17 00:00:00 2001 From: Tim Kourt Date: Tue, 10 Dec 2019 15:38:33 -0800 Subject: [PATCH] netconfig: Use CamelCase for IPv4 gateway setting --- src/netconfig.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/netconfig.c b/src/netconfig.c index df9d7ce4..0d5f9464 100644 --- a/src/netconfig.c +++ b/src/netconfig.c @@ -204,12 +204,18 @@ static struct netconfig_ifaddr *netconfig_ipv4_get_ifaddr( static char *netconfig_ipv4_get_gateway(struct netconfig *netconfig) { const struct l_dhcp_lease *lease; + char *gateway; switch (netconfig->rtm_protocol) { case RTPROT_STATIC: + gateway = l_settings_get_string(netconfig->active_settings, + "IPv4", "Gateway"); + if (!gateway) + gateway = l_settings_get_string( + netconfig->active_settings, + "IPv4", "gateway"); - return l_settings_get_string(netconfig->active_settings, - "IPv4", "gateway"); + return gateway; case RTPROT_DHCP: lease = l_dhcp_client_get_lease(netconfig->dhcp_client);