mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 09:57:20 +00:00
Code Issues Releases Wiki Activity

[master] dhclient -6 now supports option expressions such as prepend

Browse Source 
Merges in rt39952.
This commit is contained in:
Thomas Markwalder 2016-01-18 08:46:17 -05:00
parent 4ced250f58
commit a3471269e6
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RELNOTES
View File

@ -150,6 +150,12 @@ by Eric Young (eay@cryptsoft.com).
Thanks to Andrey Jr. Melnikov for the bug report.
[ISC-Bugs #41217]
- Option expressions, such as prepend and append, are now supported when
running dhclient for IPv6. Prior to this such statements in the
client configuration file would be parsed but have no affect. Thanks
to Jiri Popelka at Red Hat for reporting the issue.
[ISC-Bugs #39952]
Changes since 4.3.3b1
- None

21
client/dhc6.c
View File

@ -1,7 +1,7 @@
/* dhc6.c - DHCPv6 client routines. */
/*
* Copyright (c) 2012-2015 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2012-2016 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2006-2010 by Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and distribute this software for any
@ -572,7 +572,7 @@ dhc6_dup_addr(struct dhc6_addr *addr, const char *file, int line)
*
*/
static struct dhc6_lease *
dhc6_leaseify(struct packet *packet)
dhc6_leaseify(struct packet *packet, struct client_state* client)
{
struct data_string ds;
struct dhc6_lease *lease;
@ -681,6 +681,11 @@ dhc6_leaseify(struct packet *packet)
lease->server_id.data, 52));
}
execute_statements_in_scope(NULL, (struct packet *)packet, NULL,
client, lease->options, lease->options,
&global_scope, client->config->on_receipt,
NULL, NULL);
return lease;
}
@ -3114,7 +3119,7 @@ init_handler(struct packet *packet, struct client_state *client)
return;
}
lease = dhc6_leaseify(packet);
lease = dhc6_leaseify(packet, client);
/* Out of memory or corrupt packet condition...hopefully a temporary
* problem. Returning now makes us try to retransmit later.
@ -3204,6 +3209,12 @@ info_request_handler(struct packet *packet, struct client_state *client)
option_state_reference(&client->active_lease->options,
packet->options, MDL);
execute_statements_in_scope(NULL, (struct packet *)packet, NULL, client,
client->active_lease->options,
client->active_lease->options,
&global_scope, client->config->on_receipt,
NULL, NULL);
start_informed(client);
}
@ -3238,7 +3249,7 @@ rapid_commit_handler(struct packet *packet, struct client_state *client)
return;
}
lease = dhc6_leaseify(packet);
lease = dhc6_leaseify(packet, client);
/* Out of memory or corrupt packet condition...hopefully a temporary
* problem. Returning now makes us try to retransmit later.
@ -4179,7 +4190,7 @@ reply_handler(struct packet *packet, struct client_state *client)
return;
}
lease = dhc6_leaseify(packet);
lease = dhc6_leaseify(packet, client);
/* Out of memory or corrupt packet condition...hopefully a temporary
* problem. Returning now makes us try to retransmit later.