SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dhcp: store client id as void*, since we dont know what it is

Browse Source
This commit is contained in:
Lennart Poettering
2015-08-26 23:30:27 +02:00
parent 966d74c043
commit 9a0f246fcd
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/dhcp-server-internal.h
+1 -1
View File
@@ -33,7 +33,7 @@
typedef struct DHCPClientId {
size_t length;
uint8_t *data;
void *data;
} DHCPClientId;
typedef struct DHCPLease {
src/libsystemd-network/sd-dhcp-server.c
+10 -10
View File
@@ -617,22 +617,23 @@ static int ensure_sane_request(DHCPRequest *req, DHCPMessage *message) {
/* set client id based on MAC address if client did not send an explicit
one */
if (!req->client_id.data) {
uint8_t *data;
void *data;
data = new0(uint8_t, ETH_ALEN + 1);
data = malloc0(ETH_ALEN + 1);
if (!data)
return -ENOMEM;
((uint8_t*) data)[0] = 0x01;
memcpy((uint8_t*) data + 1, &message->chaddr, ETH_ALEN);
req->client_id.length = ETH_ALEN + 1;
req->client_id.data = data;
req->client_id.data[0] = 0x01;
memcpy(&req->client_id.data[1], &message->chaddr, ETH_ALEN);
}
if (req->max_optlen < DHCP_MIN_OPTIONS_SIZE)
req->max_optlen = DHCP_MIN_OPTIONS_SIZE;
if (!req->lifetime)
if (req->lifetime <= 0)
req->lifetime = DHCP_DEFAULT_LEASE_TIME;
return 0;
@@ -683,8 +684,8 @@ int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message,
&req->client_id);
switch(type) {
case DHCP_DISCOVER:
{
case DHCP_DISCOVER: {
be32_t address = INADDR_ANY;
unsigned i;
@@ -734,9 +735,7 @@ int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message,
return 1;
break;
case DHCP_REQUEST:
{
case DHCP_REQUEST: {
be32_t address;
bool init_reboot = false;
int pool_offset;
@@ -858,6 +857,7 @@ int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message,
break;
}
case DHCP_RELEASE: {
int pool_offset;