opensourcemirror
/
opnsense-src
mirror of https://github.com/opnsense/src.git
1
0
Fork 0
Code Issues Releases Wiki Activity

dhclient: support supersede statement for option 54 

Submitted by: Fabian Kurtz <fabian.kurtz@udo.edu>
This commit is contained in:
Franco Fichtner 2017-03-24 08:22:27 +01:00
parent 8cc85af241
commit f98928cd33
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sbin/dhclient/dhclient.c
View File

@ -923,6 +923,8 @@ void
state_bound(void *ipp)
{
struct interface_info *ip = ipp;
u_int8_t *dp = NULL;
int len;
ASSERT_STATE(state, S_BOUND);
@ -930,10 +932,17 @@ state_bound(void *ipp)
make_request(ip, ip->client->active);
ip->client->xid = ip->client->packet.xid;
if (ip->client->active->options[DHO_DHCP_SERVER_IDENTIFIER].len == 4) {
memcpy(ip->client->destination.iabuf, ip->client->active->
options[DHO_DHCP_SERVER_IDENTIFIER].data, 4);
ip->client->destination.len = 4;
if (ip->client->config->default_actions[DHO_DHCP_SERVER_IDENTIFIER] ==
ACTION_SUPERSEDE) {
dp = ip->client->config->defaults[DHO_DHCP_SERVER_IDENTIFIER].data;
len = ip->client->config->defaults[DHO_DHCP_SERVER_IDENTIFIER].len;
} else {
dp = ip->client->active->options[DHO_DHCP_SERVER_IDENTIFIER].data;
len = ip->client->active->options[DHO_DHCP_SERVER_IDENTIFIER].len;
}
if (len == 4) {
memcpy(ip->client->destination.iabuf, dp, len);
ip->client->destination.len = len;
} else
ip->client->destination = iaddr_broadcast;