10:38 a.m.
---
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
10:38 a.m.
New subject: [PATCH 2/6] 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);
--
2.13.6
10:38 a.m.
New subject: [PATCH 3/6] netconfig: Use CamelCase for IPv4 DNS setting
---
src/netconfig.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/netconfig.c b/src/netconfig.c
index 0d5f9464..58a08b35 100644
--- a/src/netconfig.c
+++ b/src/netconfig.c
@@ -233,12 +233,18 @@ static char **netconfig_ipv4_get_dns(struct netconfig *netconfig,
uint8_t proto)
const struct l_dhcp_lease *lease;
struct in_addr in_addr;
char **dns_list;
- char **p;
- p = dns_list = l_settings_get_string_list(netconfig->active_settings,
- "IPv4", "dns", ' ');
+ dns_list = l_settings_get_string_list(netconfig->active_settings,
+ "IPv4", "DNS", ' ');
+ if (!dns_list)
+ dns_list = l_settings_get_string_list(
+ netconfig->active_settings,
+ "IPv4", "dns", ' ');
+
if (dns_list && *dns_list) {
- for (; *p; p++) {
+ char **p;
+
+ for (p = dns_list; *p; p++) {
if (inet_pton(AF_INET, *p, &in_addr) == 1)
continue;
--
2.13.6
10:38 a.m.
New subject: [PATCH 4/6] netconfig: Use CamelCase for IPv6 address settings
---
src/netconfig.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/netconfig.c b/src/netconfig.c
index 58a08b35..7776f6e1 100644
--- a/src/netconfig.c
+++ b/src/netconfig.c
@@ -290,9 +290,13 @@ static struct netconfig_ifaddr *netconfig_ipv6_get_ifaddr(
switch (proto) {
case RTPROT_STATIC:
ip = l_settings_get_string(netconfig->active_settings, "IPv6",
- "ip");
- if (!ip)
- return NULL;
+ "Address");
+ if (!ip) {
+ ip = l_settings_get_string(netconfig->active_settings,
+ "IPv6", "ip");
+ if (!ip)
+ return NULL;
+ }
ifaddr = l_new(struct netconfig_ifaddr, 1);
ifaddr->ip = ip;
--
2.13.6
10:38 a.m.
New subject: [PATCH 5/6] netconfig: Use CamelCase for IPv6 gateway setting
---
src/netconfig.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/netconfig.c b/src/netconfig.c
index 7776f6e1..d91f4120 100644
--- a/src/netconfig.c
+++ b/src/netconfig.c
@@ -351,7 +351,11 @@ static char *netconfig_ipv6_get_gateway(struct netconfig *netconfig)
switch (netconfig->rtm_v6_protocol) {
case RTPROT_STATIC:
gateway = l_settings_get_string(netconfig->active_settings,
- "IPv6", "gateway");
+ "IPv6", "Gateway");
+ if (!gateway)
+ gateway = l_settings_get_string(
+ netconfig->active_settings,
+ "IPv6", "gateway");
if (inet_pton(AF_INET6, gateway, &in6_addr) < 1) {
l_error("netconfig: Invalid IPv6 gateway address %s is "
--
2.13.6
10:38 a.m.
New subject: [PATCH 6/6] netconfig: Use CamelCase for IPv6 DNS setting
---
src/netconfig.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/netconfig.c b/src/netconfig.c
index d91f4120..c7e9f934 100644
--- a/src/netconfig.c
+++ b/src/netconfig.c
@@ -382,12 +382,19 @@ static char **netconfig_ipv6_get_dns(struct netconfig *netconfig,
uint8_t proto)
{
struct in6_addr in6_addr;
char **dns_list;
- char **p;
- p = dns_list = l_settings_get_string_list(netconfig->active_settings,
- "IPv6", "dns", ' ');
+ dns_list = l_settings_get_string_list(netconfig->active_settings,
+ "IPv6", "DNS", ' ');
+
+ if (!dns_list)
+ dns_list = l_settings_get_string_list(
+ netconfig->active_settings,
+ "IPv6", "dns", ' ');
+
if (dns_list && *dns_list) {
- for (; *p; p++) {
+ char **p;
+
+ for (p = dns_list; *p; p++) {
if (inet_pton(AF_INET6, *p, &in6_addr) == 1)
continue;
--
2.13.6
1012
days inactive
1013
days old
6 comments
2 participants
participants (2)
-
Denis Kenzior -
Tim Kourt