* [PATCH 10/17] netconfig: Add getters for DNS addresses and domain names
@ 2022-05-13 22:47 Andrew Zaborowski
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Zaborowski @ 2022-05-13 22:47 UTC (permalink / raw)
To: ell
[-- Attachment #1: Type: text/plain, Size: 3299 bytes --]
---
ell/ell.sym | 2 ++
ell/netconfig.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
ell/netconfig.h | 2 ++
3 files changed, 68 insertions(+)
diff --git a/ell/ell.sym b/ell/ell.sym
index 0f9f884..0ce604b 100644
--- a/ell/ell.sym
+++ b/ell/ell.sym
@@ -755,6 +755,8 @@ global:
l_netconfig_apply_rtnl;
l_netconfig_get_addresses;
l_netconfig_get_routes;
+ l_netconfig_get_dns_list;
+ l_netconfig_get_domain_names;
local:
*;
};
diff --git a/ell/netconfig.c b/ell/netconfig.c
index 4af2fe7..60962ce 100644
--- a/ell/netconfig.c
+++ b/ell/netconfig.c
@@ -1420,3 +1420,67 @@ LIB_EXPORT const struct l_queue_entry *l_netconfig_get_routes(
return l_queue_get_entries(netconfig->routes.current);
}
+
+/* Returns a new strv array to be freed by the caller */
+LIB_EXPORT char **l_netconfig_get_dns_list(struct l_netconfig *netconfig)
+{
+ char **ret = NULL;
+ const struct l_dhcp_lease *v4_lease;
+ const struct l_dhcp6_lease *v6_lease;
+
+#define CONCAT(dest, src, free) \
+ do { \
+ char **tmp = src; \
+ tmp = free ? tmp : l_strv_copy(tmp); \
+ if (!dest) \
+ dest = tmp; \
+ else if (tmp) { \
+ unsigned int destlen = l_strv_length(dest); \
+ unsigned int srclen = l_strv_length(tmp); \
+ dest = l_realloc(dest, sizeof(char *) * \
+ (destlen + srclen + 1)); \
+ memcpy(dest + destlen, tmp, sizeof(char *) * \
+ (srclen + 1)); \
+ l_free(tmp); \
+ } \
+ } while (0)
+
+ if (netconfig->v4_dns_override)
+ CONCAT(ret, netconfig->v4_dns_override, false);
+ else if ((v4_lease =
+ l_dhcp_client_get_lease(netconfig->dhcp_client)))
+ CONCAT(ret, l_dhcp_lease_get_dns(v4_lease), true);
+
+ if (netconfig->v6_dns_override)
+ CONCAT(ret, netconfig->v6_dns_override, false);
+ else if ((v6_lease =
+ l_dhcp6_client_get_lease(netconfig->dhcp6_client)))
+ CONCAT(ret, l_dhcp6_lease_get_dns(v6_lease), true);
+
+ return ret;
+}
+
+/* Returns a new strv array to be freed by the caller */
+LIB_EXPORT char **l_netconfig_get_domain_names(struct l_netconfig *netconfig)
+{
+ char **ret = NULL;
+ const struct l_dhcp_lease *v4_lease;
+ const struct l_dhcp6_lease *v6_lease;
+
+ if (netconfig->v4_domain_names_override)
+ CONCAT(ret, netconfig->v4_domain_names_override, false);
+ else if ((v4_lease =
+ l_dhcp_client_get_lease(netconfig->dhcp_client)) &&
+ l_dhcp_lease_get_domain_name(v4_lease)) {
+ ret = l_new(char *, 2);
+ ret[0] = l_dhcp_lease_get_domain_name(v4_lease);
+ }
+
+ if (netconfig->v6_dns_override)
+ CONCAT(ret, netconfig->v6_domain_names_override, false);
+ else if ((v6_lease =
+ l_dhcp6_client_get_lease(netconfig->dhcp6_client)))
+ CONCAT(ret, l_dhcp6_lease_get_domains(v6_lease), true);
+
+ return ret;
+}
diff --git a/ell/netconfig.h b/ell/netconfig.h
index 69100a2..0b1182d 100644
--- a/ell/netconfig.h
+++ b/ell/netconfig.h
@@ -98,6 +98,8 @@ const struct l_queue_entry *l_netconfig_get_routes(
const struct l_queue_entry **out_updated,
const struct l_queue_entry **out_removed,
const struct l_queue_entry **out_expired);
+char **l_netconfig_get_dns_list(struct l_netconfig *netconfig);
+char **l_netconfig_get_domain_names(struct l_netconfig *netconfig);
#ifdef __cplusplus
}
--
2.32.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 10/17] netconfig: Add getters for DNS addresses and domain names
@ 2022-05-13 14:55 Andrew Zaborowski
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Zaborowski @ 2022-05-13 14:55 UTC (permalink / raw)
To: ell
[-- Attachment #1: Type: text/plain, Size: 3299 bytes --]
---
ell/ell.sym | 2 ++
ell/netconfig.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
ell/netconfig.h | 2 ++
3 files changed, 68 insertions(+)
diff --git a/ell/ell.sym b/ell/ell.sym
index 0f9f884..0ce604b 100644
--- a/ell/ell.sym
+++ b/ell/ell.sym
@@ -755,6 +755,8 @@ global:
l_netconfig_apply_rtnl;
l_netconfig_get_addresses;
l_netconfig_get_routes;
+ l_netconfig_get_dns_list;
+ l_netconfig_get_domain_names;
local:
*;
};
diff --git a/ell/netconfig.c b/ell/netconfig.c
index 8bb000e..4d11c75 100644
--- a/ell/netconfig.c
+++ b/ell/netconfig.c
@@ -1415,3 +1415,67 @@ LIB_EXPORT const struct l_queue_entry *l_netconfig_get_routes(
return l_queue_get_entries(netconfig->routes.current);
}
+
+/* Returns a new strv array to be freed by the caller */
+LIB_EXPORT char **l_netconfig_get_dns_list(struct l_netconfig *netconfig)
+{
+ char **ret = NULL;
+ const struct l_dhcp_lease *v4_lease;
+ const struct l_dhcp6_lease *v6_lease;
+
+#define CONCAT(dest, src, free) \
+ do { \
+ char **tmp = src; \
+ tmp = free ? tmp : l_strv_copy(tmp); \
+ if (!dest) \
+ dest = tmp; \
+ else if (tmp) { \
+ unsigned int destlen = l_strv_length(dest); \
+ unsigned int srclen = l_strv_length(tmp); \
+ dest = l_realloc(dest, sizeof(char *) * \
+ (destlen + srclen + 1)); \
+ memcpy(dest + destlen, tmp, sizeof(char *) * \
+ (srclen + 1)); \
+ l_free(tmp); \
+ } \
+ } while (0)
+
+ if (netconfig->v4_dns_override)
+ CONCAT(ret, netconfig->v4_dns_override, false);
+ else if ((v4_lease =
+ l_dhcp_client_get_lease(netconfig->dhcp_client)))
+ CONCAT(ret, l_dhcp_lease_get_dns(v4_lease), true);
+
+ if (netconfig->v6_dns_override)
+ CONCAT(ret, netconfig->v6_dns_override, false);
+ else if ((v6_lease =
+ l_dhcp6_client_get_lease(netconfig->dhcp6_client)))
+ CONCAT(ret, l_dhcp6_lease_get_dns(v6_lease), true);
+
+ return ret;
+}
+
+/* Returns a new strv array to be freed by the caller */
+LIB_EXPORT char **l_netconfig_get_domain_names(struct l_netconfig *netconfig)
+{
+ char **ret = NULL;
+ const struct l_dhcp_lease *v4_lease;
+ const struct l_dhcp6_lease *v6_lease;
+
+ if (netconfig->v4_domain_names_override)
+ CONCAT(ret, netconfig->v4_domain_names_override, false);
+ else if ((v4_lease =
+ l_dhcp_client_get_lease(netconfig->dhcp_client)) &&
+ l_dhcp_lease_get_domain_name(v4_lease)) {
+ ret = l_new(char *, 2);
+ ret[0] = l_dhcp_lease_get_domain_name(v4_lease);
+ }
+
+ if (netconfig->v6_dns_override)
+ CONCAT(ret, netconfig->v6_domain_names_override, false);
+ else if ((v6_lease =
+ l_dhcp6_client_get_lease(netconfig->dhcp6_client)))
+ CONCAT(ret, l_dhcp6_lease_get_domains(v6_lease), true);
+
+ return ret;
+}
diff --git a/ell/netconfig.h b/ell/netconfig.h
index 69100a2..0b1182d 100644
--- a/ell/netconfig.h
+++ b/ell/netconfig.h
@@ -98,6 +98,8 @@ const struct l_queue_entry *l_netconfig_get_routes(
const struct l_queue_entry **out_updated,
const struct l_queue_entry **out_removed,
const struct l_queue_entry **out_expired);
+char **l_netconfig_get_dns_list(struct l_netconfig *netconfig);
+char **l_netconfig_get_domain_names(struct l_netconfig *netconfig);
#ifdef __cplusplus
}
--
2.32.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-13 22:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-13 22:47 [PATCH 10/17] netconfig: Add getters for DNS addresses and domain names Andrew Zaborowski
-- strict thread matches above, loose matches on Subject: below --
2022-05-13 14:55 Andrew Zaborowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).