sd-dhcp-lease: add NTP support

[elogind.git] / src / libsystemd-network / sd-dhcp-lease.c

diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index 159bb502c87cac8975b510cc963313f55ae0e8ed..69418d98eaedec483e73655b3babf7a87058e190 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -72,6 +72,20 @@ int sd_dhcp_lease_get_dns(sd_dhcp_lease *lease, struct in_addr **addr, size_t *a
         return 0;
 }
 
+int sd_dhcp_lease_get_ntp(sd_dhcp_lease *lease, struct in_addr **addr, size_t *addr_size) {
+        assert_return(lease, -EINVAL);
+        assert_return(addr, -EINVAL);
+        assert_return(addr_size, -EINVAL);
+
+        if (lease->ntp_size) {
+                *addr_size = lease->ntp_size;
+                *addr = lease->ntp;
+        } else
+                return -ENOENT;
+
+        return 0;
+}
+
 int sd_dhcp_lease_get_domainname(sd_dhcp_lease *lease, const char **domainname) {
         assert_return(lease, -EINVAL);
         assert_return(domainname, -EINVAL);
@@ -213,6 +227,24 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const uint8_t *option,
 
                 break;
 
+        case DHCP_OPTION_NTP_SERVER:
+                if (len && !(len % 4)) {
+                        unsigned i;
+
+                        lease->ntp_size = len / 4;
+
+                        free(lease->ntp);
+                        lease->ntp = new0(struct in_addr, lease->ntp_size);
+                        if (!lease->ntp)
+                                return -ENOMEM;
+
+                        for (i = 0; i < lease->ntp_size; i++) {
+                                memcpy(&lease->ntp[i].s_addr, option + 4 * i, 4);
+                        }
+                }
+
+                break;
+
         case DHCP_OPTION_INTERFACE_MTU:
                 if (len >= 2) {
                         be16_t mtu;
@@ -271,7 +303,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const uint8_t *option,
 }
 
 int dhcp_lease_new(sd_dhcp_lease **ret) {
-        _cleanup_dhcp_lease_unref_ sd_dhcp_lease *lease = NULL;
+        sd_dhcp_lease *lease;
 
         lease = new0(sd_dhcp_lease, 1);
         if (!lease)
@@ -280,8 +312,6 @@ int dhcp_lease_new(sd_dhcp_lease **ret) {
         lease->n_ref = REFCNT_INIT;
 
         *ret = lease;
-        lease = NULL;
-
         return 0;
 }