Page MenuHomeVyOS Platform
Files F117520863

No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/interface-definitions/include/nat-address-port.xml.i b/interface-definitions/include/nat-address.xml.i
similarity index 66%
rename from interface-definitions/include/nat-address-port.xml.i
rename to interface-definitions/include/nat-address.xml.i
index 8705d31cb..933dae07b 100644
--- a/interface-definitions/include/nat-address-port.xml.i
+++ b/interface-definitions/include/nat-address.xml.i
@@ -1,54 +1,37 @@
<leafNode name="address">
<properties>
<help>IP address, subnet, or range</help>
<valueHelp>
<format>ipv4</format>
<description>IPv4 address to match</description>
</valueHelp>
<valueHelp>
<format>ipv4net</format>
<description>IPv4 prefix to match</description>
</valueHelp>
<valueHelp>
<format>ipv4range</format>
<description>IPv4 address range to match</description>
</valueHelp>
<valueHelp>
<format>!ipv4</format>
<description>Match everything except the specified address</description>
</valueHelp>
<valueHelp>
<format>!ipv4net</format>
<description>Match everything except the specified prefix</description>
</valueHelp>
<valueHelp>
<format>!ipv4range</format>
<description>Match everything except the specified range</description>
</valueHelp>
<constraint>
<validator name="ipv4-address"/>
<validator name="ipv4-prefix"/>
<validator name="ipv4-range"/>
<validator name="ipv4-address-exclude"/>
<validator name="ipv4-prefix-exclude"/>
<validator name="ipv4-range-exclude"/>
</constraint>
</properties>
</leafNode>
-<leafNode name="port">
- <properties>
- <help>Port number</help>
- <valueHelp>
- <format>1-65535</format>
- <description>Numeric IP port</description>
- </valueHelp>
- <valueHelp>
- <format>start-end</format>
- <description>Numbered port range (e.g., 1001-1005)</description>
- </valueHelp>
- <valueHelp>
- <format> </format>
- <description>\n\nMultiple destination ports can be specified as a comma-separated list.\nThe whole list can also be negated using '!'.\nFor example: '!22,telnet,http,123,1001-1005'</description>
- </valueHelp>
- </properties>
-</leafNode>
diff --git a/interface-definitions/include/nat-port.xml.i b/interface-definitions/include/nat-port.xml.i
new file mode 100644
index 000000000..24803ae05
--- /dev/null
+++ b/interface-definitions/include/nat-port.xml.i
@@ -0,0 +1,17 @@
+<leafNode name="port">
+ <properties>
+ <help>Port number</help>
+ <valueHelp>
+ <format>1-65535</format>
+ <description>Numeric IP port</description>
+ </valueHelp>
+ <valueHelp>
+ <format>start-end</format>
+ <description>Numbered port range (e.g., 1001-1005)</description>
+ </valueHelp>
+ <valueHelp>
+ <format> </format>
+ <description>\n\nMultiple destination ports can be specified as a comma-separated list.\nThe whole list can also be negated using '!'.\nFor example: '!22,telnet,http,123,1001-1005'</description>
+ </valueHelp>
+ </properties>
+</leafNode>
diff --git a/interface-definitions/include/nat-rule.xml.i b/interface-definitions/include/nat-rule.xml.i
index fdba4b8bd..183692664 100644
--- a/interface-definitions/include/nat-rule.xml.i
+++ b/interface-definitions/include/nat-rule.xml.i
@@ -1,86 +1,88 @@
<tagNode name="rule">
<properties>
<help>Rule number for NAT</help>
<valueHelp>
<format>1-9999</format>
<description>Number for this NAT rule</description>
</valueHelp>
<constraint>
<validator name="numeric" argument="--range 1-9999"/>
</constraint>
<constraintErrorMessage>NAT rule number must be between 1 and 9999</constraintErrorMessage>
</properties>
<children>
<leafNode name="description">
<properties>
<help>Rule description</help>
</properties>
</leafNode>
<node name="destination">
<properties>
<help>NAT destination parameters</help>
</properties>
<children>
- #include <include/nat-address-port.xml.i>
+ #include <include/nat-address.xml.i>
+ #include <include/nat-port.xml.i>
</children>
</node>
<leafNode name="disable">
<properties>
<help>Disable NAT rule</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="exclude">
<properties>
<help>Exclude packets matching this rule from NAT</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="log">
<properties>
<help>NAT rule logging</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="protocol">
<properties>
<help>Protocol to NAT</help>
<completionHelp>
<list>tcp udp tcp_udp all</list>
</completionHelp>
<valueHelp>
<format>tcp</format>
<description>Transmission Control Protocol</description>
</valueHelp>
<valueHelp>
<format>udp</format>
<description>User Datagram Protocol</description>
</valueHelp>
<valueHelp>
<format>tcp_udp</format>
<description>Both TCP and UDP</description>
</valueHelp>
<valueHelp>
<format>all</format>
<description>All IP protocols</description>
</valueHelp>
<valueHelp>
<format>0-255</format>
<description>IP protocol number</description>
</valueHelp>
<valueHelp>
<format>!&lt;protocol&gt;</format>
<description>All IP protocols except for the specified name or number (negation)</description>
</valueHelp>
</properties>
</leafNode>
<node name="source">
<properties>
<help>NAT source parameters</help>
</properties>
<children>
- #include <include/nat-address-port.xml.i>
+ #include <include/nat-address.xml.i>
+ #include <include/nat-port.xml.i>
</children>
</node>
</children>
</tagNode>

File Metadata

Mime Type
text/x-diff
Expires
Sat, Sep 26, 12:33 PM (1 d, 5 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4285160
Default Alt Text
(6 KB)

Event Timeline