From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/busybox/udhcpc.script: support RFC3442 static routes
Date: Mon, 21 Sep 2020 18:20:02 +0200 [thread overview]
Message-ID: <20200921162002.22197-1-peter@korsgaard.com> (raw)
RFC3442 specifies a DHCP extension to provide the client with a list of
static routes to use. This is already handled by udhcpc and exposed as the
"staticroutes" environment variable, but currently not handled by the action
script.
Extend the script to do so. The RFC specifies that if this option is
provided by the server then the normal "routes" (3) option should be
ignored, so ensure that is done.
As we may now have more than just a default route on the interface, extend
the route cleanup logic to handle all routes for the interface (except for
the implied local 0.0.0.0 one).
Notice that this option is only sent by servers if explicitly requested by
the client, E.G. using the -O staticroutes option to udhcpc.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/busybox/udhcpc.script | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/package/busybox/udhcpc.script b/package/busybox/udhcpc.script
index 0196351cd5..ec4d9f6185 100755
--- a/package/busybox/udhcpc.script
+++ b/package/busybox/udhcpc.script
@@ -61,7 +61,23 @@ case "$1" in
wait_for_ipv6_default_route
fi
- if [ -n "$router" ] ; then
+ # RFC3442: If the DHCP server returns both a Classless
+ # Static Routes option and a Router option, the DHCP
+ # client MUST ignore the Router option.
+ if [ -n "$staticroutes" ]; then
+ echo "deleting routers"
+ route -n | while read dest gw mask flags metric ref use iface; do
+ [ "$iface" != "$interface" -o "$gw" = "0.0.0.0" ] || \
+ route del -net "$dest" netmask "$mask" gw "$gw" dev "$interface"
+ done
+
+ # format: dest1/mask gw1 ... destn/mask gwn
+ set -- $staticroutes
+ while [ -n "$1" -a -n "$2" ]; do
+ route add -net "$1" gw "$2" dev "$interface"
+ shift 2
+ done
+ elif [ -n "$router" ] ; then
echo "deleting routers"
while route del default gw 0.0.0.0 dev $interface 2> /dev/null; do
:
--
2.20.1
next reply other threads:[~2020-09-21 16:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 16:20 Peter Korsgaard [this message]
2020-09-21 20:43 ` [Buildroot] [PATCH] package/busybox/udhcpc.script: support RFC3442 static routes Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200921162002.22197-1-peter@korsgaard.com \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox