Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

import of dnsmasq-2.44.tar.gz

Browse Source
This commit is contained in:
Simon Kelley
2008-07-20 15:10:39 +01:00
parent 1a6bca81f6
commit 3927da46aa
19 changed files with 339 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/rfc2131.c
View File

@@ -1040,12 +1040,15 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
context->netid.next = netid;
netid = &context->netid;
}
if (lease && override.s_addr != 0)
lease->override = override;
else
override = lease->override;
if (lease)
{
if (override.s_addr != 0)
lease->override = override;
else
override = lease->override;
}
clear_packet(mess, end, agent_id);
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(server_id(context, override).s_addr));
@@ -1123,9 +1126,9 @@ static unsigned int calc_time(struct dhcp_context *context, struct dhcp_config *
static struct in_addr server_id(struct dhcp_context *context, struct in_addr override)
{
if (override.s_addr != 0)
if (override.s_addr != 0 || !context)
return override;
else
else
return context->local;
}