From: Tim Kourt <tim.a.kourt@linux.intel.com>
To: iwd@lists.01.org
Subject: [PATCH 1/6] netconfig: Use CamelCase for IPv4 address settings
Date: Tue, 10 Dec 2019 15:38:32 -0800 [thread overview]
Message-ID: <20191210233837.1499-1-tim.a.kourt@linux.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1528 bytes --]
---
src/netconfig.c | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/netconfig.c b/src/netconfig.c
index 9d32c37a..df9d7ce4 100644
--- a/src/netconfig.c
+++ b/src/netconfig.c
@@ -131,15 +131,24 @@ static struct netconfig_ifaddr *netconfig_ipv4_get_ifaddr(
case RTPROT_STATIC:
ip = l_settings_get_string(netconfig->active_settings, "IPv4",
- "ip");
- if (!ip)
- return NULL;
+ "Address");
+ if (!ip) {
+ ip = l_settings_get_string(netconfig->active_settings,
+ "IPv4", "ip");
+ if (!ip)
+ return NULL;
+ }
ifaddr = l_new(struct netconfig_ifaddr, 1);
ifaddr->ip = ip;
netmask = l_settings_get_string(netconfig->active_settings,
- "IPv4", "netmask");
+ "IPv4", "Netmask");
+ if (!netmask)
+ netmask = l_settings_get_string(
+ netconfig->active_settings,
+ "IPv4", "netmask");
+
if (netmask && inet_pton(AF_INET, netmask, &in_addr) > 0)
ifaddr->prefix_len = __builtin_popcountl(
L_BE32_TO_CPU(in_addr.s_addr));
@@ -150,7 +159,13 @@ static struct netconfig_ifaddr *netconfig_ipv4_get_ifaddr(
ifaddr->broadcast =
l_settings_get_string(netconfig->active_settings,
- "IPv4", "broadcast");
+ "IPv4", "Broadcast");
+ if (!ifaddr->broadcast)
+ ifaddr->broadcast =
+ l_settings_get_string(
+ netconfig->active_settings,
+ "IPv4", "broadcast");
+
ifaddr->family = AF_INET;
return ifaddr;
--
2.13.6
next reply other threads:[~2019-12-10 23:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 23:38 Tim Kourt [this message]
2019-12-10 23:38 ` [PATCH 2/6] netconfig: Use CamelCase for IPv4 gateway setting Tim Kourt
2019-12-10 23:38 ` [PATCH 3/6] netconfig: Use CamelCase for IPv4 DNS setting Tim Kourt
2019-12-10 23:38 ` [PATCH 4/6] netconfig: Use CamelCase for IPv6 address settings Tim Kourt
2019-12-10 23:38 ` [PATCH 5/6] netconfig: Use CamelCase for IPv6 gateway setting Tim Kourt
2019-12-10 23:38 ` [PATCH 6/6] netconfig: Use CamelCase for IPv6 DNS setting Tim Kourt
2019-12-11 6:52 ` [PATCH 1/6] netconfig: Use CamelCase for IPv4 address settings Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191210233837.1499-1-tim.a.kourt@linux.intel.com \
--to=tim.a.kourt@linux.intel.com \
--cc=iwd@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox