2
0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 14:25:41 +00:00

pull up rt19436: client -D option

This commit is contained in:
Paul Selkirk
2009-05-27 20:11:38 +00:00
parent 350576c5d4
commit a41d7a251e
5 changed files with 48 additions and 8 deletions

View File

@@ -57,6 +57,7 @@ struct in_addr inaddr_any;
struct sockaddr_in sockaddr_broadcast;
struct in_addr giaddr;
struct data_string default_duid;
int duid_type = 0;
/* ASSERT_STATE() does nothing now; it used to be
assert (state_is == state_shouldbe). */
@@ -268,6 +269,21 @@ main(int argc, char **argv) {
wanted_ia_na = 0;
}
wanted_ia_pd++;
} else if (!strcmp(argv[i], "-D")) {
if (local_family_set && (local_family == AF_INET)) {
usage();
}
local_family_set = 1;
local_family = AF_INET6;
if (++i == argc)
usage();
if (!strcasecmp(argv[i], "LL")) {
duid_type = DUID_LL;
} else if (!strcasecmp(argv[i], "LLT")) {
duid_type = DUID_LLT;
} else {
usage();
}
#endif /* DHCPv6 */
} else if (!strcmp(argv[i], "-v")) {
quiet = 0;
@@ -651,7 +667,7 @@ static void usage()
log_error("Usage: dhclient %s %s",
#ifdef DHCPv6
"[-4|-6] [-SNTP1dvrx] [-nw] [-p <port>]",
"[-4|-6] [-SNTP1dvrx] [-nw] [-p <port>] [-D LL|LLT]",
#else /* DHCPv6 */
"[-1dvrx] [-nw] [-p <port>]",
#endif /* DHCPv6 */