diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-08 21:29:15 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-08 21:29:15 +0200 |
| commit | a9ad4ad88ff3aabc5053d42c1595d78290f39b2b (patch) | |
| tree | a9159248fd44dd5ac6912af1e1ff104c7ffb778e /interface-definitions | |
| parent | b184a5700f22bac01aa937fa3d8321f003d6ca14 (diff) | |
| parent | 3f44a6e920100d9530b653fa08d18ec09d1c8231 (diff) | |
| download | vyos-1x-a9ad4ad88ff3aabc5053d42c1595d78290f39b2b.tar.gz vyos-1x-a9ad4ad88ff3aabc5053d42c1595d78290f39b2b.zip | |
Merge branch 't2244-wireguard' of github.com:c-po/vyos-1x into current
* 't2244-wireguard' of github.com:c-po/vyos-1x:
wireguard: T2244: split port configuration to XML include file
wireguard: T2247: add VRF support
wireguard: T2244: use xml include for mtu
wireguard: T2244: rewrite to match code structure of other interfaces
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/port-number.xml.i | 12 | ||||
| -rw-r--r-- | interface-definitions/interfaces-wireguard.xml.in | 36 |
2 files changed, 16 insertions, 32 deletions
diff --git a/interface-definitions/include/port-number.xml.i b/interface-definitions/include/port-number.xml.i new file mode 100644 index 000000000..78eb4b7af --- /dev/null +++ b/interface-definitions/include/port-number.xml.i @@ -0,0 +1,12 @@ +<leafNode name="port">
+ <properties>
+ <help>Port number used to establish connection</help>
+ <valueHelp>
+ <format>1-65535</format>
+ <description>Numeric IP port</description>
+ </valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 1-65535"/>
+ </constraint>
+ </properties>
+</leafNode>
diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in index d3f084774..9db608afb 100644 --- a/interface-definitions/interfaces-wireguard.xml.in +++ b/interface-definitions/interfaces-wireguard.xml.in @@ -19,26 +19,9 @@ #include <include/address-ipv4-ipv6.xml.i> #include <include/interface-description.xml.i> #include <include/interface-disable.xml.i> - <leafNode name="port"> - <properties> - <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 1-65535"/> - </constraint> - </properties> - </leafNode> - <leafNode name="mtu"> - <properties> - <help>interface mtu size(default: 1420)</help> - <constraint> - <validator name="numeric" argument="--range 68-9000"/> - </constraint> - </properties> - </leafNode> + #include <include/interface-vrf.xml.i> + #include <include/port-number.xml.i> + #include <include/interface-mtu-68-9000.xml.i> <leafNode name="fwmark"> <properties> <help>A 32-bit fwmark value set on all outgoing packets</help> @@ -113,18 +96,7 @@ </constraint> </properties> </leafNode> - <leafNode name="port"> - <properties> - <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> + #include <include/port-number.xml.i> <leafNode name="persistent-keepalive"> <properties> <help>how often send keep alives in seconds</help> |