fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-10 12:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

sd-dhcp-lease: load/save client ID

Browse source 
The lease is intimately tied to the client ID in use, so when loading
and renewing a lease, the same client ID should be used.
This commit is contained in:
Dan Williams 2014-10-31 14:58:12 -05:00
parent 7c9db27a2e
commit 0c14c88745
4 changed files with 80 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h
View file

@ -70,6 +70,8 @@ struct sd_dhcp_lease {
char *domainname;
char *hostname;
char *root_path;
uint8_t *client_id;
size_t client_id_len;
};
int dhcp_lease_new(sd_dhcp_lease **ret);
@ -81,5 +83,8 @@ int dhcp_lease_load(const char *lease_file, sd_dhcp_lease **ret);
int dhcp_lease_set_default_subnet_mask(sd_dhcp_lease *lease);
int dhcp_lease_set_client_id(sd_dhcp_lease *lease, const uint8_t *client_id,
size_t client_id_len);
DEFINE_TRIVIAL_CLEANUP_FUNC(sd_dhcp_lease*, sd_dhcp_lease_unref);
#define _cleanup_dhcp_lease_unref_ _cleanup_(sd_dhcp_lease_unrefp)

16
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c
View file

@ -1032,6 +1032,14 @@ static int client_handle_offer(sd_dhcp_client *client, DHCPMessage *offer,
if (r < 0)
return r;
if (client->client_id_len) {
r = dhcp_lease_set_client_id(lease,
(uint8_t *) &client->client_id,
client->client_id_len);
if (r < 0)
return r;
}
r = dhcp_option_parse(offer, len, dhcp_lease_parse_options, lease);
if (r != DHCP_OFFER) {
log_dhcp_client(client, "received message was not an OFFER, ignoring");
@ -1091,6 +1099,14 @@ static int client_handle_ack(sd_dhcp_client *client, DHCPMessage *ack,
if (r < 0)
return r;
if (client->client_id_len) {
r = dhcp_lease_set_client_id(lease,
(uint8_t *) &client->client_id,
client->client_id_len);
if (r < 0)
return r;
}
r = dhcp_option_parse(ack, len, dhcp_lease_parse_options, lease);
if (r == DHCP_NAK) {
log_dhcp_client(client, "NAK");

58
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c
View file

@ -198,6 +198,7 @@ sd_dhcp_lease *sd_dhcp_lease_unref(sd_dhcp_lease *lease) {
free(lease->dns);
free(lease->ntp);
free(lease->static_route);
free(lease->client_id);
free(lease);
}
@ -605,6 +606,8 @@ int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) {
_cleanup_fclose_ FILE *f = NULL;
struct in_addr address;
const struct in_addr *addresses;
const uint8_t *client_id;
size_t client_id_len;
const char *string;
uint16_t mtu;
struct sd_dhcp_route *routes;
@ -678,6 +681,18 @@ int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) {
if (r >= 0)
serialize_dhcp_routes(f, "ROUTES", routes, r);
r = sd_dhcp_lease_get_client_id(lease, &client_id, &client_id_len);
if (r >= 0) {
_cleanup_free_ char *client_id_hex;
client_id_hex = hexmem (client_id, client_id_len);
if (!client_id_hex) {
r = -ENOMEM;
goto finish;
}
fprintf(f, "CLIENTID=%s\n", client_id_hex);
}
r = 0;
fflush(f);
@ -699,7 +714,8 @@ int dhcp_lease_load(const char *lease_file, sd_dhcp_lease **ret) {
_cleanup_dhcp_lease_unref_ sd_dhcp_lease *lease = NULL;
_cleanup_free_ char *address = NULL, *router = NULL, *netmask = NULL,
*server_address = NULL, *next_server = NULL,
*dns = NULL, *ntp = NULL, *mtu = NULL, *routes = NULL;
*dns = NULL, *ntp = NULL, *mtu = NULL,
*routes = NULL, *client_id_hex = NULL;
struct in_addr addr;
int r;
@ -723,6 +739,7 @@ int dhcp_lease_load(const char *lease_file, sd_dhcp_lease **ret) {
"HOSTNAME", &lease->hostname,
"ROOT_PATH", &lease->root_path,
"ROUTES", &routes,
"CLIENTID", &client_id_hex,
NULL);
if (r < 0) {
if (r == -ENOENT)
@ -797,6 +814,16 @@ int dhcp_lease_load(const char *lease_file, sd_dhcp_lease **ret) {
return r;
}
if (client_id_hex) {
if (strlen (client_id_hex) % 2)
return -EINVAL;
lease->client_id = unhexmem (client_id_hex, strlen (client_id_hex));
if (!lease->client_id)
return -ENOMEM;
lease->client_id_len = strlen (client_id_hex) / 2;
}
*ret = lease;
lease = NULL;
@ -821,3 +848,32 @@ int dhcp_lease_set_default_subnet_mask(sd_dhcp_lease *lease) {
return 0;
}
int sd_dhcp_lease_get_client_id(sd_dhcp_lease *lease, const uint8_t **client_id,
size_t *client_id_len) {
assert_return(lease, -EINVAL);
assert_return(client_id, -EINVAL);
assert_return(client_id_len, -EINVAL);
*client_id = lease->client_id;
*client_id_len = lease->client_id_len;
return 0;
}
int dhcp_lease_set_client_id(sd_dhcp_lease *lease, const uint8_t *client_id,
size_t client_id_len) {
assert_return(lease, -EINVAL);
assert_return((!client_id && !client_id_len) ||
(client_id && client_id_len), -EINVAL);
free (lease->client_id);
lease->client_id = NULL;
lease->client_id_len = 0;
if (client_id) {
lease->client_id = memdup (client_id, client_id_len);
lease->client_id_len = client_id_len;
}
return 0;
}

2
src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h
View file

@ -45,5 +45,7 @@ int sd_dhcp_lease_get_domainname(sd_dhcp_lease *lease, const char **domainname);
int sd_dhcp_lease_get_hostname(sd_dhcp_lease *lease, const char **hostname);
int sd_dhcp_lease_get_root_path(sd_dhcp_lease *lease, const char **root_path);
int sd_dhcp_lease_get_routes(sd_dhcp_lease *lease, struct sd_dhcp_route **routesgn);
int sd_dhcp_lease_get_client_id(sd_dhcp_lease *lease, const uint8_t **client_id,
size_t *client_id_len);
#endif