diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-04-05 14:33:34 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-04-05 14:33:34 +0200 |
commit | 2a16c8e3f9767b1754c14e8f596a74e4bb5de72a (patch) | |
tree | 3f97b6f607a0e4f4733ea466da4ef82c7e6911e5 /interface-definitions | |
parent | 67b968fcec28b544e1982f4847399cbbabd61200 (diff) | |
parent | 792b5dcd5a33785c994065d2c7243c21470b3d29 (diff) | |
download | vyos-1x-2a16c8e3f9767b1754c14e8f596a74e4bb5de72a.tar.gz vyos-1x-2a16c8e3f9767b1754c14e8f596a74e4bb5de72a.zip |
Merge branch 't2206-wireguard' of github.com:c-po/vyos-1x into current
* 't2206-wireguard' of github.com:c-po/vyos-1x:
wireguard: T2228: support ports less then 1024
wireguard: T2206: add valueHelp for listen port
wireguard: T2206: split endpoint node into address and port
wwan: migrate: fix comment
Diffstat (limited to 'interface-definitions')
-rw-r--r-- | interface-definitions/interfaces-wireguard.xml.in | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in index d461156b3..d3f084774 100644 --- a/interface-definitions/interfaces-wireguard.xml.in +++ b/interface-definitions/interfaces-wireguard.xml.in @@ -21,9 +21,13 @@ #include <include/interface-disable.xml.i> <leafNode name="port"> <properties> - <help>Local port number to accept connections</help> + <help>Local port to listen for incoming connections</help> + <valueHelp> + <format>1-65535</format> + <description>Numeric IP port</description> + </valueHelp> <constraint> - <validator name="numeric" argument="--range 1024-65535"/> + <validator name="numeric" argument="--range 1-65535"/> </constraint> </properties> </leafNode> @@ -97,10 +101,28 @@ <multi/> </properties> </leafNode> - <!-- eventually check format IP:port --> - <leafNode name="endpoint"> + <leafNode name="address"> + <properties> + <help>IP address of tunnel remote end</help> + <valueHelp> + <format>ipv4</format> + <description>IP address to listen for incoming connections</description> + </valueHelp> + <constraint> + <validator name="ipv4-address"/> + </constraint> + </properties> + </leafNode> + <leafNode name="port"> <properties> - <help>Remote endpoint (IP:port)</help> + <help>Port number on tunnel remote end</help> + <valueHelp> + <format>1-65535</format> + <description>Numeric IP port</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> </properties> </leafNode> <leafNode name="persistent-keepalive"> |