summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dhcp.c29
-rw-r--r--dhcpcd.8.in7
2 files changed, 34 insertions, 2 deletions
diff --git a/dhcp.c b/dhcp.c
index c5feccad..8f59cb38 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -161,10 +161,39 @@ static const struct dhcp_opt const dhcp_opts[] = {
{ 0, 0, NULL }
};
+static const char *if_params[] = {
+ "interface",
+ "reason",
+ "pid",
+ "ifmetric",
+ "ifwireless",
+ "ifflags",
+y "profile",
+ "interface_order",
+ NULL
+};
+
+static const char *dhcp_params[] = {
+ "ip_address",
+ "subnet_cidr",
+ "network_number",
+ "ssid",
+ "filename",
+ "server_name",
+ NULL
+};
+
void
print_options(void)
{
const struct dhcp_opt *opt;
+ const char **p;
+
+ for (p = if_params; *p; p++)
+ printf(" - %s\n", *p);
+
+ for (p = dhcp_params; *p; p++)
+ printf(" %s\n", *p);
for (opt = dhcp_opts; opt->option; opt++)
if (opt->var)
diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index 21c5313c..c3fff0c9 100644
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd March 23, 2009
+.Dd April 24, 2009
.Dt DHCPCD 8 SMM
.Os
.Sh NAME
@@ -462,6 +462,9 @@ files.
.It Fl V, -variables
Display a list of option codes and the associated variable for use in
.Xr dhcpcd-run-hooks 8 .
+Variables are prefixed with new_ and old_ unless the option number is -.
+Variables without an option are part of the DHCP message and cannot be
+directly requested.
.It Fl X, -blacklist Ar address Ns Op Ar /cidr
Ignore all packets from
.Ar address Ns Op Ar /cidr .
@@ -530,5 +533,5 @@ Please report them to http://roy.marples.name/projects/dhcpcd
does not wait for commands to complete when sending them to the master
.Nm
process, nor does it echo its progress to stderr.
-This is a behaviour change dhcpcd-4 and may need to be addressed if
+This is a behaviour change from dhcpcd-4 and may need to be addressed if
there is sufficient need.