diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-11-05 01:10:36 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-11-05 01:10:36 +0100 |
| commit | 7713fb958f606672804789ff431aa1f691ef4a46 (patch) | |
| tree | c19972185118dfa2c8d2f76974a86e1d44feb7d5 /interface-definitions | |
| parent | af3a5142dce9fb3d6f3fecdbccfd1cae23b31c62 (diff) | |
| parent | d6c39f624a2ced96015d1e915d90e80acda3babb (diff) | |
| download | vyos-1x-7713fb958f606672804789ff431aa1f691ef4a46.tar.gz vyos-1x-7713fb958f606672804789ff431aa1f691ef4a46.zip | |
Merge branch 'current' of https://github.com/vyos/vyos-1x into current
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/dhcp-relay.xml | 13 | ||||
| -rw-r--r-- | interface-definitions/dhcpv6-relay.xml | 13 | ||||
| -rw-r--r-- | interface-definitions/wireguard.xml | 4 |
3 files changed, 2 insertions, 28 deletions
diff --git a/interface-definitions/dhcp-relay.xml b/interface-definitions/dhcp-relay.xml index c918d25a3..f4cb36eea 100644 --- a/interface-definitions/dhcp-relay.xml +++ b/interface-definitions/dhcp-relay.xml @@ -49,19 +49,6 @@ <constraintErrorMessage>max-size must be a value between 64 and 1400</constraintErrorMessage> </properties> </leafNode> - <leafNode name="port"> - <properties> - <help>Port number to listen on</help> - <valueHelp> - <format>1-65535</format> - <description>Port to listen on</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - <constraintErrorMessage>port must be a value between 1 and 65535</constraintErrorMessage> - </properties> - </leafNode> <leafNode name="relay-agents-packets"> <properties> <help>Policy to handle incoming DHCPv4 packets which already contain relay agent options (default: forward)</help> diff --git a/interface-definitions/dhcpv6-relay.xml b/interface-definitions/dhcpv6-relay.xml index d6e6daf51..15c76a098 100644 --- a/interface-definitions/dhcpv6-relay.xml +++ b/interface-definitions/dhcpv6-relay.xml @@ -31,19 +31,6 @@ </leafNode> </children> </tagNode> - <leafNode name="listen-port"> - <properties> - <help>UDP port to listen for requests on</help> - <valueHelp> - <format>1-65535</format> - <description>Port to listen on</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - <constraintErrorMessage>port must be a value between 1 and 65535</constraintErrorMessage> - </properties> - </leafNode> <leafNode name="max-hop-count"> <properties> <help>Maximum hop count for which requests will be processed</help> diff --git a/interface-definitions/wireguard.xml b/interface-definitions/wireguard.xml index 575637ac9..3bf7bcd33 100644 --- a/interface-definitions/wireguard.xml +++ b/interface-definitions/wireguard.xml @@ -34,7 +34,7 @@ <properties> <help>description</help> <constraint> - <regex>.[^ ]{1,100}$</regex> + <regex>[^ ]{1,100}$</regex> </constraint> <constraintErrorMessage>interface description is too long (limit 100 characters)</constraintErrorMessage> </properties> @@ -71,7 +71,7 @@ <properties> <help>peer alias</help> <constraint> - <regex>.[^ ]{1,100}$</regex> + <regex>[^ ]{1,100}$</regex> </constraint> <constraintErrorMessage>peer alias too long (limit 100 characters)</constraintErrorMessage> </properties> |