sd-dhcp-lease: move in_addr (de)serialization to shared network code

[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 3e43ab635f00ab787e8c7890f27f1ae38e2040ec..4993fe3641f651cffd888283a0f7195c36ab9b46 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -36,6 +36,7 @@
 #include "dhcp-lease-internal.h"
 #include "sd-dhcp-lease.h"
 #include "sd-dhcp-client.h"
 #include "dhcp-lease-internal.h"
 #include "sd-dhcp-lease.h"
 #include "sd-dhcp-client.h"

+#include "network-internal.h"

 
 int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr) {
         assert_return(lease, -EINVAL);
 
 int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr) {
         assert_return(lease, -EINVAL);


@@ -307,46 +308,6 @@ int dhcp_lease_new(sd_dhcp_lease **ret) {
         return 0;
 }
 
         return 0;
 }
 

-static void serialize_addresses(FILE *f, const char *key, struct in_addr *addresses, size_t size) {
-        unsigned i;
-
-        assert(key);
-        assert(addresses);
-        assert(size);
-
-        fputs("DNS=", f);
-
-        for (i = 0; i < size; i++)
-                fprintf(f, "%s%s", inet_ntoa(addresses[i]),
-                        (i < (size - 1)) ? " ": "");
-
-        fputs("\n", f);
-}
-
-static int deserialize_addresses(struct in_addr **addresses, size_t *size, const char *string) {
-        char *word, *state;
-        size_t len;
-
-        FOREACH_WORD(word, len, string, state) {
-                struct in_addr *new_addresses;
-                int r;
-
-                new_addresses = realloc(*addresses, (*size + 1) * sizeof(struct in_addr));
-                if (!new_addresses)
-                        return -ENOMEM;
-                else
-                        *addresses = new_addresses;
-
-                r = inet_aton(word, &(new_addresses[*size]));
-                if (r < 0)
-                        continue;
-
-                (*size)++;
-        }
-
-        return 0;
-}
-

 int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) {
         _cleanup_free_ char *temp_path = NULL;
         _cleanup_fclose_ FILE *f = NULL;
 int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) {
         _cleanup_free_ char *temp_path = NULL;
         _cleanup_fclose_ FILE *f = NULL;


@@ -399,11 +360,11 @@ int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) {
 
         r = sd_dhcp_lease_get_dns(lease, &addresses, &addresses_size);
         if (r >= 0)
 
         r = sd_dhcp_lease_get_dns(lease, &addresses, &addresses_size);
         if (r >= 0)

-                serialize_addresses(f, "DNS", addresses, addresses_size);
+                serialize_in_addrs(f, "DNS", addresses, addresses_size);

 
         r = sd_dhcp_lease_get_ntp(lease, &addresses, &addresses_size);
         if (r >= 0)
 
         r = sd_dhcp_lease_get_ntp(lease, &addresses, &addresses_size);
         if (r >= 0)

-                serialize_addresses(f, "NTP", addresses, addresses_size);
+                serialize_in_addrs(f, "NTP", addresses, addresses_size);

 
         r = sd_dhcp_lease_get_domainname(lease, &string);
         if (r >= 0)
 
         r = sd_dhcp_lease_get_domainname(lease, &string);
         if (r >= 0)


@@ -507,13 +468,13 @@ int dhcp_lease_load(const char *lease_file, sd_dhcp_lease **ret) {
         }
 
         if (dns) {
         }
 
         if (dns) {

-                r = deserialize_addresses(&lease->dns, &lease->dns_size, dns);
+                r = deserialize_in_addrs(&lease->dns, &lease->dns_size, dns);

                 if (r < 0)
                         return r;
         }
 
         if (ntp) {
                 if (r < 0)
                         return r;
         }
 
         if (ntp) {

-                r = deserialize_addresses(&lease->ntp, &lease->ntp_size, dns);
+                r = deserialize_in_addrs(&lease->ntp, &lease->ntp_size, dns);

                 if (r < 0)
                         return r;
         }
                 if (r < 0)
                         return r;
         }