diff options
| author | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2023-07-26 23:16:33 +0200 |
|---|---|---|
| committer | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2023-12-08 00:29:40 +0100 |
| commit | 4484a7398482caffdd5e0a74f73f46b162785bf3 (patch) | |
| tree | afdd6470a2e75004dfcdf2c2f9da54a5362ce9fc | |
| parent | d95200e96763e4a7ed02577b1b177c84abb77838 (diff) | |
| download | vyos-1x-4484a7398482caffdd5e0a74f73f46b162785bf3.tar.gz vyos-1x-4484a7398482caffdd5e0a74f73f46b162785bf3.zip | |
dhcp: T3316: Add captive portal v4/v6 options
| -rw-r--r-- | interface-definitions/dhcp-server.xml.in | 1 | ||||
| -rw-r--r-- | interface-definitions/dhcpv6-server.xml.in | 1 | ||||
| -rw-r--r-- | interface-definitions/include/dhcp/captive-portal.xml.i | 11 | ||||
| -rw-r--r-- | python/vyos/kea.py | 6 |
4 files changed, 17 insertions, 2 deletions
diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in index 948f19048..0fa06c534 100644 --- a/interface-definitions/dhcp-server.xml.in +++ b/interface-definitions/dhcp-server.xml.in @@ -145,6 +145,7 @@ </constraint> </properties> </leafNode> + #include <include/dhcp/captive-portal.xml.i> <leafNode name="client-prefix-length"> <properties> <help>Specifies the clients subnet mask as per RFC 950. If unset, subnet declaration is used.</help> diff --git a/interface-definitions/dhcpv6-server.xml.in b/interface-definitions/dhcpv6-server.xml.in index 16d0f9b01..b37f79434 100644 --- a/interface-definitions/dhcpv6-server.xml.in +++ b/interface-definitions/dhcpv6-server.xml.in @@ -135,6 +135,7 @@ </tagNode> </children> </node> + #include <include/dhcp/captive-portal.xml.i> #include <include/dhcp/domain-search.xml.i> <node name="lease-time"> <properties> diff --git a/interface-definitions/include/dhcp/captive-portal.xml.i b/interface-definitions/include/dhcp/captive-portal.xml.i new file mode 100644 index 000000000..643f055a8 --- /dev/null +++ b/interface-definitions/include/dhcp/captive-portal.xml.i @@ -0,0 +1,11 @@ +<!-- include start from dhcp/captive-portal.xml.i --> +<leafNode name="captive-portal"> + <properties> + <help>Captive portal API endpoint</help> + <valueHelp> + <format>txt</format> + <description>Captive portal API endpoint</description> + </valueHelp> + </properties> +</leafNode> +<!-- include end --> diff --git a/python/vyos/kea.py b/python/vyos/kea.py index 0ee6871e7..fa2948233 100644 --- a/python/vyos/kea.py +++ b/python/vyos/kea.py @@ -40,7 +40,8 @@ kea4_options = { 'bootfile_size': 'boot-size', 'time_offset': 'time-offset', 'wpad_url': 'wpad-url', - 'ipv6_only_preferred': 'v6-only-preferred' + 'ipv6_only_preferred': 'v6-only-preferred', + 'captive_portal': 'v4-captive-portal' } kea6_options = { @@ -51,7 +52,8 @@ kea6_options = { 'nis_server': 'nis-servers', 'nisplus_domain': 'nisp-domain-name', 'nisplus_server': 'nisp-servers', - 'sntp_server': 'sntp-servers' + 'sntp_server': 'sntp-servers', + 'captive_portal': 'v6-captive-portal' } def kea_parse_options(config): |