diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-01-31 21:57:08 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-01-31 21:57:08 +0100 |
| commit | 2ac8376ca1b79ba05bcf83d77c8e9d903e9b50f0 (patch) | |
| tree | 6420692393dc078df0046fd80380ce4de11d6a83 | |
| parent | 3dc698f18bc83149ab9044bcf18d60a9332685d2 (diff) | |
| download | vyos-1x-2ac8376ca1b79ba05bcf83d77c8e9d903e9b50f0.tar.gz vyos-1x-2ac8376ca1b79ba05bcf83d77c8e9d903e9b50f0.zip | |
upnpd: T3420: use proper include directives
| -rw-r--r-- | interface-definitions/service_upnp.xml.in | 44 |
1 files changed, 11 insertions, 33 deletions
diff --git a/interface-definitions/service_upnp.xml.in b/interface-definitions/service_upnp.xml.in index 8d0a14d4e..7cfe1f02e 100644 --- a/interface-definitions/service_upnp.xml.in +++ b/interface-definitions/service_upnp.xml.in @@ -19,7 +19,7 @@ </leafNode> <leafNode name="wan-interface"> <properties> - <help>WAN network interface (REQUIRE)</help> + <help>WAN network interface</help> <completionHelp> <script>${vyos_completion_dir}/list_interfaces.py</script> </completionHelp> @@ -139,49 +139,27 @@ <format>txt</format> <description>The STUN server host address</description> </valueHelp> - <valueHelp> - <format>stun.stunprotocol.org</format> - <description>stunprotocol</description> - </valueHelp> - <valueHelp> - <format>stun.sipgate.net</format> - <description>sipgate</description> - </valueHelp> - <valueHelp> - <format>stun.xten.com</format> - <description>xten</description> - </valueHelp> - <valueHelp> - <format>txt</format> - <description>other STUN Server</description> - </valueHelp> - </properties> - </leafNode> - <leafNode name="port"> - <properties> - <help>The STUN server port</help> - <valueHelp> - <format>txt</format> - <description>The STUN server port</description> - </valueHelp> + <constraint> + <validator name="fqdn"/> + </constraint> </properties> </leafNode> + #include <include/port-number.xml.i> </children> </node> - <tagNode name="rules"> + <tagNode name="rule"> <properties> <help>UPnP Rule</help> + <valueHelp> + <format>u32:0-65535</format> + <description>Rule number</description> + </valueHelp> <constraint> <validator name="numeric" argument="--range 0-65535"/> </constraint> </properties> <children> - <leafNode name="disable"> - <properties> - <help>Disable Rule</help> - <valueless /> - </properties> - </leafNode> + #include <include/generic-disable-node.xml.i> <leafNode name="external-port-range"> <properties> <help>Port range (REQUIRE)</help> |