From daffee2cbf001dab13799f5b2b69330162491214 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Sun, 7 Jan 2024 09:24:10 +0100
Subject: dhcp: T3316: Move options to separate node and extend scopes
---
interface-definitions/include/dhcp/option-v4.xml.i | 257 ++++++++++++++++++++
.../include/version/dhcp-server-version.xml.i | 2 +-
interface-definitions/service_dhcp-server.xml.in | 258 +--------------------
3 files changed, 264 insertions(+), 253 deletions(-)
create mode 100644 interface-definitions/include/dhcp/option-v4.xml.i
(limited to 'interface-definitions')
diff --git a/interface-definitions/include/dhcp/option-v4.xml.i b/interface-definitions/include/dhcp/option-v4.xml.i
new file mode 100644
index 000000000..bd6fc6043
--- /dev/null
+++ b/interface-definitions/include/dhcp/option-v4.xml.i
@@ -0,0 +1,257 @@
+
+
+
+ DHCP option
+
+
+ #include
+ #include
+ #include
+ #include
+ #include
+
+
+ Bootstrap file name
+
+ [[:ascii:]]{1,253}
+
+
+
+
+
+ Server from which the initial boot file is to be loaded
+
+ ipv4
+ Bootfile server IPv4 address
+
+
+ hostname
+ Bootfile server FQDN
+
+
+
+
+
+
+
+
+
+ Bootstrap file size
+
+ u32:1-16
+ Bootstrap file size in 512 byte blocks
+
+
+
+
+
+
+
+
+ Specifies the clients subnet mask as per RFC 950. If unset, subnet declaration is used.
+
+ u32:0-32
+ DHCP client prefix length must be 0 to 32
+
+
+
+
+ DHCP client prefix length must be 0 to 32
+
+
+
+
+ IP address of default router
+
+ ipv4
+ Default router IPv4 address
+
+
+
+
+
+
+
+
+ Enable IP forwarding on client
+
+
+
+
+
+ Disable IPv4 on IPv6 only hosts (RFC 8925)
+
+ u32
+ Seconds
+
+
+
+
+ Seconds must be between 0 and 4294967295 (49 days)
+
+
+
+
+ IP address of POP3 server
+
+ ipv4
+ POP3 server IPv4 address
+
+
+
+
+
+
+
+
+
+ Address for DHCP server identifier
+
+ ipv4
+ DHCP server identifier IPv4 address
+
+
+
+
+
+
+
+
+ IP address of SMTP server
+
+ ipv4
+ SMTP server IPv4 address
+
+
+
+
+
+
+
+
+
+ Classless static route destination subnet
+
+ ipv4net
+ IPv4 address and prefix length
+
+
+
+
+
+
+
+
+ IP address of router to be used to reach the destination subnet
+
+ ipv4
+ IPv4 address of router
+
+
+
+
+
+
+
+
+
+
+ TFTP server name
+
+ ipv4
+ TFTP server IPv4 address
+
+
+ hostname
+ TFTP server FQDN
+
+
+
+
+
+
+
+
+
+ Client subnet offset in seconds from Coordinated Universal Time (UTC)
+
+ [-]N
+ Time offset (number, may be negative)
+
+
+ -?[0-9]+
+
+ Invalid time offset value
+
+
+
+
+ IP address of time server
+
+ ipv4
+ Time server IPv4 address
+
+
+
+
+
+
+
+
+
+ Time zone to send to clients. Uses RFC4833 options 100 and 101
+
+
+
+
+
+
+
+
+
+
+ Vendor Specific Options
+
+
+
+
+ Ubiquiti specific parameters
+
+
+
+
+ Address of UniFi controller
+
+ ipv4
+ IP address of UniFi controller
+
+
+
+
+
+
+
+
+
+
+
+
+ IP address for Windows Internet Name Service (WINS) server
+
+ ipv4
+ WINS server IPv4 address
+
+
+
+
+
+
+
+
+
+ Web Proxy Autodiscovery (WPAD) URL
+
+
+
+
+
diff --git a/interface-definitions/include/version/dhcp-server-version.xml.i b/interface-definitions/include/version/dhcp-server-version.xml.i
index cc84ea8b9..d83172e72 100644
--- a/interface-definitions/include/version/dhcp-server-version.xml.i
+++ b/interface-definitions/include/version/dhcp-server-version.xml.i
@@ -1,3 +1,3 @@
-
+
diff --git a/interface-definitions/service_dhcp-server.xml.in b/interface-definitions/service_dhcp-server.xml.in
index 8e13f9372..a5cee62d1 100644
--- a/interface-definitions/service_dhcp-server.xml.in
+++ b/interface-definitions/service_dhcp-server.xml.in
@@ -89,12 +89,9 @@
- #include
- #include
- #include
+ #include
#include
#include
- #include
DHCP subnet for shared network
@@ -108,73 +105,9 @@
Invalid IPv4 subnet definition
-
-
- Bootstrap file name
-
- [[:ascii:]]{1,253}
-
-
-
-
-
- Server from which the initial boot file is to be loaded
-
- ipv4
- Bootfile server IPv4 address
-
-
- hostname
- Bootfile server FQDN
-
-
-
-
-
-
-
-
-
- Bootstrap file size
-
- u32:1-16
- Bootstrap file size in 512 byte blocks
-
-
-
-
-
-
- #include
-
-
- Specifies the clients subnet mask as per RFC 950. If unset, subnet declaration is used.
-
- u32:0-32
- DHCP client prefix length must be 0 to 32
-
-
-
-
- DHCP client prefix length must be 0 to 32
-
-
-
-
- IP address of default router
-
- ipv4
- Default router IPv4 address
-
-
-
-
-
-
- #include
- #include
+ #include
#include
- #include
+ #include
IP address to exclude from DHCP lease range
@@ -188,12 +121,6 @@
-
-
- Enable IP forwarding on client
-
-
-
Lease timeout in seconds
@@ -208,45 +135,6 @@
86400
- #include
-
-
- IP address of POP3 server
-
- ipv4
- POP3 server IPv4 address
-
-
-
-
-
-
-
-
-
- Address for DHCP server identifier
-
- ipv4
- DHCP server identifier IPv4 address
-
-
-
-
-
-
-
-
- IP address of SMTP server
-
- ipv4
- SMTP server IPv4 address
-
-
-
-
-
-
-
DHCP lease range
@@ -256,6 +144,7 @@
Invalid range name, may only be alphanumeric, dot and hyphen
+ #include
First IP address for DHCP lease range
@@ -291,6 +180,8 @@
Invalid static mapping hostname
+ #include
+ #include
#include
@@ -308,143 +199,6 @@
#include
-
-
- Classless static route destination subnet
-
- ipv4net
- IPv4 address and prefix length
-
-
-
-
-
-
-
-
- IP address of router to be used to reach the destination subnet
-
- ipv4
- IPv4 address of router
-
-
-
-
-
-
-
-
-
-
- Disable IPv4 on IPv6 only hosts (RFC 8925)
-
- u32
- Seconds
-
-
-
-
- Seconds must be between 0 and 4294967295 (49 days)
-
-
-
-
- TFTP server name
-
- ipv4
- TFTP server IPv4 address
-
-
- hostname
- TFTP server FQDN
-
-
-
-
-
-
-
-
-
- Client subnet offset in seconds from Coordinated Universal Time (UTC)
-
- [-]N
- Time offset (number, may be negative)
-
-
- -?[0-9]+
-
- Invalid time offset value
-
-
-
-
- IP address of time server
-
- ipv4
- Time server IPv4 address
-
-
-
-
-
-
-
-
-
- Time zone to send to clients. Uses RFC4833 options 100 and 101
-
-
-
-
-
-
-
-
-
-
- Vendor Specific Options
-
-
-
-
- Ubiquiti specific parameters
-
-
-
-
- Address of UniFi controller
-
- ipv4
- IP address of UniFi controller
-
-
-
-
-
-
-
-
-
-
-
-
- IP address for Windows Internet Name Service (WINS) server
-
- ipv4
- WINS server IPv4 address
-
-
-
-
-
-
-
-
-
- Web Proxy Autodiscovery (WPAD) URL
-
-
--
cgit v1.2.3