X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fodhcp6c.c;h=1e8e2bc9a4023da3381578b7d56f304d959bf858;hb=6bc0cfdb63197040a0f40e4323b3e3c48f3ed6cb;hp=fdfc3278840443e82f0249ca9981a14f0ca41cdb;hpb=b146f9adc80cc2c2cdf2b04bfeec4c861a2a0e23;p=odhcp6c.git

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index fdfc327..1e8e2bc 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -71,10 +71,12 @@ int main(_unused int argc, char* const argv[])
 	int bfd_interval = 0, bfd_loss = 3;
 #endif
 
-	bool help = false, daemonize = false, strict_options = false;
+	bool help = false, daemonize = false;
 	int logopt = LOG_PID;
 	int c;
-	while ((c = getopt(argc, argv, "S::N:P:FB:c:i:r:Rs:kt:hedp:")) != -1) {
+	unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE;
+
+	while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Rs:kt:hedp:fa")) != -1) {
 		switch (c) {
 		case 'S':
 			allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -93,6 +95,14 @@ int main(_unused int argc, char* const argv[])
 			}
 			break;
 
+		case 'V':
+			l = script_unhexlify(buf, sizeof(buf), optarg);
+			if (!l)
+				help=true;
+
+			odhcp6c_add_state(STATE_VENDORCLASS, buf, l);
+
+			break;
 		case 'P':
 			if (allow_slaac_only >= 0 && allow_slaac_only < 10)
 				allow_slaac_only = 10;
@@ -160,7 +170,7 @@ int main(_unused int argc, char* const argv[])
 			break;
 
 		case 'R':
-			strict_options = true;
+			client_options |= DHCPV6_STRICT_OPTIONS;
 			break;
 
 		case 's':
@@ -187,6 +197,14 @@ int main(_unused int argc, char* const argv[])
 			pidfile = optarg;
 			break;
 
+		case 'f':
+			client_options &= ~DHCPV6_CLIENT_FQDN;
+			break;
+
+		case 'a':
+			client_options &= ~DHCPV6_ACCEPT_RECONFIGURE;
+			break;
+
 		default:
 			help = true;
 			break;
@@ -208,7 +226,7 @@ int main(_unused int argc, char* const argv[])
 	signal(SIGUSR2, sighandler);
 
 	if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
-			init_dhcpv6(ifname, strict_options, sol_timeout) ||
+			init_dhcpv6(ifname, client_options, sol_timeout) ||
 			ra_init(ifname, &ifid) || script_init(script, ifname)) {
 		syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
 		return 3;
@@ -404,6 +422,7 @@ static int usage(void)
 	"	-N <mode>	Mode for requesting addresses [try|force|none]\n"
 	"	-P <length>	Request IPv6-Prefix (0 = auto)\n"
 	"	-F		Force IPv6-Prefix\n"
+	"	-V <hex-string>	Set vendor-class option. string length must be a multiple of 2\n"
 #ifdef EXT_BFD_PING
 	"	-B <interval>	Enable BFD ping check\n"
 #endif
@@ -412,6 +431,8 @@ static int usage(void)
 	"	-r <options>	Options to be requested (comma-separated)\n"
 	"	-R		Do not request any options except those specified with -r\n"
 	"	-s <script>	Status update script (/usr/sbin/odhcp6c-update)\n"
+	"	-a		Don't send Accept Reconfigure option\n"
+	"	-f		Don't send Client FQDN option\n"
 	"	-k		Don't send a RELEASE when stopping\n"
 	"	-t <seconds>	Maximum timeout for DHCPv6-SOLICIT (120)\n"
 	"\nInvocation options:\n"