summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Surett <surettcharles@gmail.com>2021-04-02 17:40:02 -0400
committerCharles Surett <surettcharles@gmail.com>2021-04-02 19:14:28 -0400
commite8535616aae2bf0c20aacee6a4d0761183bae6d9 (patch)
tree1f259ab5b8a7b97ab3072c48f361f5c86b0a6115
parent810f4700acc9816178dc9a7f5f555bbde71a141d (diff)
downloadvyos-1x-e8535616aae2bf0c20aacee6a4d0761183bae6d9.tar.gz
vyos-1x-e8535616aae2bf0c20aacee6a4d0761183bae6d9.zip
interfaces: dhcp-client: T3454: add reject option
Sometimes a modem might give a local IP before it retrieves a WAN IP. This can be an issue with failover routes, since the default route will get overridden.
-rw-r--r--data/templates/dhcp-client/ipv4.tmpl4
-rw-r--r--interface-definitions/include/interface/dhcp-options.xml.i18
2 files changed, 22 insertions, 0 deletions
diff --git a/data/templates/dhcp-client/ipv4.tmpl b/data/templates/dhcp-client/ipv4.tmpl
index 71b429db6..c934b7cdb 100644
--- a/data/templates/dhcp-client/ipv4.tmpl
+++ b/data/templates/dhcp-client/ipv4.tmpl
@@ -20,5 +20,9 @@ interface "{{ ifname }}" {
# The require statement lists options that must be sent in order for an offer to be
# accepted. Offers that do not contain all the listed options will be ignored!
require subnet-mask;
+{% if dhcp_options.reject is defined and dhcp_options.reject is not none %}
+ # Block addresses coming from theses dhcp servers if configured.
+ reject {{ dhcp_options.reject | join(', ') }};
+{% endif %}
}
diff --git a/interface-definitions/include/interface/dhcp-options.xml.i b/interface-definitions/include/interface/dhcp-options.xml.i
index bd327da2d..b65b0802a 100644
--- a/interface-definitions/include/interface/dhcp-options.xml.i
+++ b/interface-definitions/include/interface/dhcp-options.xml.i
@@ -37,6 +37,24 @@
</constraint>
</properties>
</leafNode>
+ <leafNode name="reject">
+ <properties>
+ <help>IP addresses or subnets from which to reject DHCP leases</help>
+ <valueHelp>
+ <format>ipv4</format>
+ <description>IPv4 address to match</description>
+ </valueHelp>
+ <valueHelp>
+ <format>ipv4net</format>
+ <description>IPv4 prefix to match</description>
+ </valueHelp>
+ <constraint>
+ <validator name="ipv4-address"/>
+ <validator name="ipv4-prefix"/>
+ </constraint>
+ <multi/>
+ </properties>
+ </leafNode>
</children>
</node>
<!-- include end -->