sd-network: add sd_network_linkg_get_domains()

For now this only exposes the domain name (DHCP Option 15), and not
the search string (DHCP Option 119), which will be implemented in
a follow-up patch.

diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index 97d041ae7fe65ccbb24e7983049d8bec6cb363ad..4d8b7e7b2c17da0db8eedb63143f47962fc914f4 100644 (file)
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -206,6 +206,10 @@ _public_ int sd_network_link_get_ntp(int ifindex, char ***ret) {
         return network_get_link_strv("NTP", ifindex, ret);
 }
 
         return network_get_link_strv("NTP", ifindex, ret);
 }
 

+_public_ int sd_network_link_get_domains(int ifindex, char ***ret) {
+        return network_get_link_strv("DOMAINS", ifindex, ret);
+}
+

 static inline int MONITOR_TO_FD(sd_network_monitor *m) {
         return (int) (unsigned long) m - 1;
 }
 static inline int MONITOR_TO_FD(sd_network_monitor *m) {
         return (int) (unsigned long) m - 1;
 }

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 160f507dc937bec70cf7acf01a36aea730a34b0b..6497090bc03d27c9dd9519049767fd038a123930 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1763,6 +1763,15 @@ int link_save(Link *link) {
 
                 fputs("\n", f);
 
 
                 fputs("\n", f);
 

+                if (link->network->dhcp_domainname &&
+                    link->dhcp_lease) {
+                        const char *domainname;
+
+                        r = sd_dhcp_lease_get_domainname(link->dhcp_lease, &domainname);
+                        if (r >= 0)
+                                fprintf(f, "DOMAINS=%s\n", domainname);
+                }
+

                 fprintf(f, "LLMNR=%s\n",
                         llmnr_support_to_string(link->network->llmnr));
         }
                 fprintf(f, "LLMNR=%s\n",
                         llmnr_support_to_string(link->network->llmnr));
         }

diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h
index 47731c2620cf4a75bf011b8964543c040deaa8d6..db785077ff4ac28fc33cd135843bba2ad2a59bd9 100644 (file)
--- a/src/systemd/sd-network.h
+++ b/src/systemd/sd-network.h
@@ -104,6 +104,9 @@ int sd_network_link_get_ntp(int ifindex, char ***addr);
  *   -ENODATA: networkd is not aware of the link*/
 int sd_network_link_get_llmnr(int ifindex, char **llmnr);
 
  *   -ENODATA: networkd is not aware of the link*/
 int sd_network_link_get_llmnr(int ifindex, char **llmnr);
 

+/* Get the DNS domain names for a given link. */
+int sd_network_link_get_domains(int ifindex, char ***domains);
+

 /* Monitor object */
 typedef struct sd_network_monitor sd_network_monitor;
 
 /* Monitor object */
 typedef struct sd_network_monitor sd_network_monitor;