diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-08-27 01:05:13 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-08-27 01:05:13 +0200 |
commit | 0339cd7707ac40c29d51ee6933d06bc87ed140a4 (patch) | |
tree | a19e2ded6bb57090a8ef6c3ac234e600f99967ad /src/libsystemd-network/dhcp-lease-internal.h | |
parent | b3ec603ce8053ba3f95da1d36f15ea762c83d1e1 (diff) | |
download | systemd-0339cd7707ac40c29d51ee6933d06bc87ed140a4.tar.gz systemd-0339cd7707ac40c29d51ee6933d06bc87ed140a4.tar.bz2 systemd-0339cd7707ac40c29d51ee6933d06bc87ed140a4.zip |
dhcp: clean up dhcp4 lease object
a) drop handling of obsolete or unused DHCP options time_offset,
mtu_aging_timeout, policy filter, mdr, ttl, ip forwarding settings.
Should this become useful one day we can readd support for this.
b) For subnet mask and broadcast it is not always clear whether 0 or
255.255.255.255 might be valid, hence maintain a boolean indicating
validity next to it.
c) serialize/deserialize broadcast address, lifetime, T1 and T2 together
with the rest of the fields in dhcp_lease_save() and
dhcp_lease_load().
d) consistently return ENODATA from getter functions for data that is
missing in the lease.
e) add missing getter calls for broadcast, lifetime, T1, T2.
f) when decoding DHCP options, generate debug messages on parse
failures, but try to proceed if possible.
g) Similar, when deserializing a lease in dhcp_lease_load(), make sure
we deal nicely with unparsable fields, to provide upgrade compat.
h) fix some memory allocations
Diffstat (limited to 'src/libsystemd-network/dhcp-lease-internal.h')
-rw-r--r-- | src/libsystemd-network/dhcp-lease-internal.h | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/src/libsystemd-network/dhcp-lease-internal.h b/src/libsystemd-network/dhcp-lease-internal.h index ebe6c2f7e7..95c2375d48 100644 --- a/src/libsystemd-network/dhcp-lease-internal.h +++ b/src/libsystemd-network/dhcp-lease-internal.h @@ -49,56 +49,60 @@ struct sd_dhcp_raw_option { struct sd_dhcp_lease { int n_ref; - int32_t time_offset; + /* each 0 if unset */ uint32_t t1; uint32_t t2; uint32_t lifetime; - uint32_t mtu_aging_timeout; + + /* each 0 if unset */ be32_t address; be32_t server_address; - be32_t subnet_mask; be32_t router; be32_t next_server; + + bool have_subnet_mask; + be32_t subnet_mask; + + bool have_broadcast; be32_t broadcast; + struct in_addr *dns; size_t dns_size; + struct in_addr *ntp; size_t ntp_size; - struct in_addr *policy_filter; - size_t policy_filter_size; + struct sd_dhcp_route *static_route; - size_t static_route_size; - size_t static_route_allocated; - uint16_t boot_file_size; - uint16_t mdr; - uint16_t mtu; - uint8_t ttl; - bool ip_forward; - bool ip_forward_non_local; + size_t static_route_size, static_route_allocated; + + uint16_t mtu; /* 0 if unset */ + char *domainname; char *hostname; char *root_path; + void *client_id; size_t client_id_len; + void *vendor_specific; size_t vendor_specific_len; + char *timezone; + LIST_HEAD(struct sd_dhcp_raw_option, private_options); }; int dhcp_lease_new(sd_dhcp_lease **ret); -int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, - void *userdata); -int dhcp_lease_insert_private_option(sd_dhcp_lease *lease, uint8_t tag, - const void *data, uint8_t len); -int dhcp_lease_set_default_subnet_mask(sd_dhcp_lease *lease); +int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void *userdata); +int dhcp_lease_insert_private_option(sd_dhcp_lease *lease, uint8_t tag, const void *data, uint8_t len); -int dhcp_lease_set_client_id(sd_dhcp_lease *lease, const void *client_id, - size_t client_id_len); +int dhcp_lease_set_default_subnet_mask(sd_dhcp_lease *lease); -DEFINE_TRIVIAL_CLEANUP_FUNC(sd_dhcp_lease*, sd_dhcp_lease_unref); -#define _cleanup_dhcp_lease_unref_ _cleanup_(sd_dhcp_lease_unrefp) +int dhcp_lease_set_client_id(sd_dhcp_lease *lease, const void *client_id, size_t client_id_len); int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file); int dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file); + +DEFINE_TRIVIAL_CLEANUP_FUNC(sd_dhcp_lease*, sd_dhcp_lease_unref); +#define _cleanup_dhcp_lease_unref_ _cleanup_(sd_dhcp_lease_unrefp) |