From b12e0ca96137430012205458866b0a8b388935a3 Mon Sep 17 00:00:00 2001 From: Thomas Markwalder Date: Mon, 7 Mar 2016 14:48:28 -0500 Subject: [master] Changed dhcrelay v4 command line arg from -u to -U Changed the new uplink command line argument for v4 dhcrelay from -u to -U to distinguish it from v6. --- relay/dhcrelay.8 | 7 +++++-- relay/dhcrelay.c | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'relay') diff --git a/relay/dhcrelay.8 b/relay/dhcrelay.8 index 675ed01d..67065663 100644 --- a/relay/dhcrelay.8 +++ b/relay/dhcrelay.8 @@ -80,6 +80,9 @@ dhcrelay - Dynamic Host Configuration Protocol Relay Agent .B -l .I interface ] +.B -U +.I interface +] .I server0 [ .I ...serverN @@ -217,7 +220,7 @@ packet, leaving the supplied option field intact; it may \fIreplace\fR the existing agent option field; it may \fIforward\fR the packet unchanged; or, it may \fIdiscard\fR it. .TP --u \fIifname\fR +-U \fIifname\fR Enables the addition of a RFC 3527 compliant link selection suboption for clients directly connected to the relay. This RFC allows a relay to specify two different IP addresses: one for the server to use when @@ -242,7 +245,7 @@ This option is off by default. Note that enabling this option automatically enables the \fB-a\fR option. Keep in mind that using options such as \fB-m replace\fR or \fB-m discard\fR -on relays upstream from one using \fB-u\fR can pose problems. The upstream +on relays upstream from one using \fB-U\fR can pose problems. The upstream relay will wipe out the initial agent option containing the link selection while leaving the re-purposed giaddr value in place, causing packets to go astray. diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c index 4113789a..5ecd2656 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -153,7 +153,7 @@ char *progname; " [-pf ] [--no-pid]\n"\ " [-m append|replace|forward|discard]\n" \ " [-i interface0 [ ... -i interfaceN]\n" \ -" [-u interface]\n" \ +" [-U interface]\n" \ " server0 [ ... serverN]\n\n" \ " %s -6 [-d] [-q] [-I] [-c ] [-p ]\n" \ " [-pf ] [--no-pid]\n" \ @@ -168,7 +168,7 @@ char *progname; " [-pf ] [--no-pid]\n" \ " [-m append|replace|forward|discard]\n" \ " [-i interface0 [ ... -i interfaceN]\n" \ -" [-u interface]\n" \ +" [-U interface]\n" \ " server0 [ ... serverN]\n\n" #endif @@ -373,7 +373,7 @@ main(int argc, char **argv) { agent_relay_mode = discard; } else usage("Unknown argument to -m: %s", argv[i]); - } else if (!strcmp(argv [i], "-u")) { + } else if (!strcmp(argv [i], "-U")) { if (++i == argc) usage(use_noarg, argv[i-1]); -- cgit v1.2.1