diff options
| -rw-r--r-- | interface-definitions/bcast-relay.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/flow-accounting-conf.xml.in | 4 | ||||
| -rw-r--r-- | interface-definitions/https.xml.in | 13 | ||||
| -rw-r--r-- | interface-definitions/include/accel-radius-additions.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/include/nat-port.xml.i | 4 | ||||
| -rw-r--r-- | interface-definitions/include/nat-translation-port.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/include/port-number.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/include/radius-server.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/interfaces-vxlan.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/protocols-bgp.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/snmp.xml.in | 6 | ||||
| -rw-r--r-- | interface-definitions/ssh.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/system-proxy.xml.in | 4 | ||||
| -rw-r--r-- | interface-definitions/system-syslog.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/tftp-server.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/vpn_ipsec.xml.in | 8 |
16 files changed, 26 insertions, 33 deletions
diff --git a/interface-definitions/bcast-relay.xml.in b/interface-definitions/bcast-relay.xml.in index 96ce16639..b691f79fa 100644 --- a/interface-definitions/bcast-relay.xml.in +++ b/interface-definitions/bcast-relay.xml.in @@ -63,7 +63,7 @@ <properties> <help>Destination or source port to listen and retransmit on [REQUIRED]</help> <valueHelp> - <format>1-65535</format> + <format>u32:1-65535</format> <description>UDP port to listen on</description> </valueHelp> <constraint> diff --git a/interface-definitions/flow-accounting-conf.xml.in b/interface-definitions/flow-accounting-conf.xml.in index 239269235..904759a56 100644 --- a/interface-definitions/flow-accounting-conf.xml.in +++ b/interface-definitions/flow-accounting-conf.xml.in @@ -242,7 +242,7 @@ <properties> <help>NetFlow port number</help> <valueHelp> - <format>1025-65535</format> + <format>u32:1025-65535</format> <description>NetFlow port number (default 2055)</description> </valueHelp> <constraint> @@ -412,7 +412,7 @@ <properties> <help>sFlow port number</help> <valueHelp> - <format>1025-65535</format> + <format>u32:1025-65535</format> <description>sFlow port number (default 6343)</description> </valueHelp> <constraint> diff --git a/interface-definitions/https.xml.in b/interface-definitions/https.xml.in index 9bb96f1f0..69fe90dab 100644 --- a/interface-definitions/https.xml.in +++ b/interface-definitions/https.xml.in @@ -67,18 +67,7 @@ <priority>1002</priority> </properties> <children> - <leafNode name="port"> - <properties> - <help>Port for HTTP API service</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> <node name="keys"> <properties> <help>HTTP API keys</help> diff --git a/interface-definitions/include/accel-radius-additions.xml.i b/interface-definitions/include/accel-radius-additions.xml.i index bf0f0ac94..3ec0d587e 100644 --- a/interface-definitions/include/accel-radius-additions.xml.i +++ b/interface-definitions/include/accel-radius-additions.xml.i @@ -132,7 +132,7 @@ <properties> <help>Port for Dynamic Authorization Extension server (DM/CoA) (default: 1700)</help> <valueHelp> - <format>number</format> + <format>u32:1-65535</format> <description>TCP port</description> </valueHelp> <constraint> diff --git a/interface-definitions/include/nat-port.xml.i b/interface-definitions/include/nat-port.xml.i index e417d13cc..6465c00e9 100644 --- a/interface-definitions/include/nat-port.xml.i +++ b/interface-definitions/include/nat-port.xml.i @@ -3,12 +3,12 @@ <properties> <help>Port number</help> <valueHelp> - <format>1-65535</format> + <format>u32:1-65535</format> <description>Numeric IP port</description> </valueHelp> <valueHelp> <format>start-end</format> - <description>Numbered port range (e.g., 1001-1005)</description> + <description>Numbered port range (e.g. 1001-1005)</description> </valueHelp> <valueHelp> <format> </format> diff --git a/interface-definitions/include/nat-translation-port.xml.i b/interface-definitions/include/nat-translation-port.xml.i index db8803dac..e3ea42e4d 100644 --- a/interface-definitions/include/nat-translation-port.xml.i +++ b/interface-definitions/include/nat-translation-port.xml.i @@ -3,7 +3,7 @@ <properties> <help>Port number</help> <valueHelp> - <format>1-65535</format> + <format>u32:1-65535</format> <description>Numeric IP port</description> </valueHelp> <valueHelp> diff --git a/interface-definitions/include/port-number.xml.i b/interface-definitions/include/port-number.xml.i index d94523e1e..0d0747811 100644 --- a/interface-definitions/include/port-number.xml.i +++ b/interface-definitions/include/port-number.xml.i @@ -3,7 +3,7 @@ <properties> <help>Port number used to establish connection</help> <valueHelp> - <format>1-65535</format> + <format>u32:1-65535</format> <description>Numeric IP port</description> </valueHelp> <constraint> diff --git a/interface-definitions/include/radius-server.xml.i b/interface-definitions/include/radius-server.xml.i index b78ebb306..fc8fe5248 100644 --- a/interface-definitions/include/radius-server.xml.i +++ b/interface-definitions/include/radius-server.xml.i @@ -43,7 +43,7 @@ <properties> <help>Authentication port</help> <valueHelp> - <format>1-65535</format> + <format>u32:1-65535</format> <description>Numeric IP port (default: 1812)</description> </valueHelp> <constraint> diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index c7725fed3..4426f1157 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -72,7 +72,7 @@ <properties> <help>Destination port of VXLAN tunnel (default: 8472)</help> <valueHelp> - <format>1-65535</format> + <format>u32:1-65535</format> <description>Numeric IP port</description> </valueHelp> <constraint> diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in index 6de8017f2..38a0469bd 100644 --- a/interface-definitions/protocols-bgp.xml.in +++ b/interface-definitions/protocols-bgp.xml.in @@ -507,7 +507,7 @@ <properties> <help>Neighbor BGP port</help> <valueHelp> - <format><1-65535></format> + <format>u32:1-65535</format> <description>Neighbor BGP port number</description> </valueHelp> <constraint> diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in index 2fe8ce583..fb3e82256 100644 --- a/interface-definitions/snmp.xml.in +++ b/interface-definitions/snmp.xml.in @@ -106,7 +106,7 @@ <properties> <help>Port for SNMP service (default: '161')</help> <valueHelp> - <format>1-65535</format> + <format>u32:1-65535</format> <description>Numeric IP port</description> </valueHelp> <constraint> @@ -179,7 +179,7 @@ <properties> <help>Destination port used for trap notification</help> <valueHelp> - <format>1-65535</format> + <format>u32:1-65535</format> <description>Numeric IP port</description> </valueHelp> <constraint> @@ -327,7 +327,7 @@ <properties> <help>Specifies TCP/UDP port of destination SNMP traps/informs (default: '162')</help> <valueHelp> - <format>1-65535</format> + <format>u32:1-65535</format> <description>Numeric IP port</description> </valueHelp> <constraint> diff --git a/interface-definitions/ssh.xml.in b/interface-definitions/ssh.xml.in index 3db740131..d94e29427 100644 --- a/interface-definitions/ssh.xml.in +++ b/interface-definitions/ssh.xml.in @@ -160,7 +160,7 @@ <properties> <help>Port for SSH service</help> <valueHelp> - <format>1-65535</format> + <format>u32:1-65535</format> <description>Numeric IP port</description> </valueHelp> <multi/> diff --git a/interface-definitions/system-proxy.xml.in b/interface-definitions/system-proxy.xml.in index 540fa97e3..791f41f2f 100644 --- a/interface-definitions/system-proxy.xml.in +++ b/interface-definitions/system-proxy.xml.in @@ -18,6 +18,10 @@ <leafNode name="port"> <properties> <help>Proxy port</help> + <valueHelp> + <format>u32:1-65535</format> + <description>Numeric IP port</description> + </valueHelp> <constraint> <validator name="numeric" argument="--range 1-65535"/> </constraint> diff --git a/interface-definitions/system-syslog.xml.in b/interface-definitions/system-syslog.xml.in index b357bb036..c58922a3d 100644 --- a/interface-definitions/system-syslog.xml.in +++ b/interface-definitions/system-syslog.xml.in @@ -199,7 +199,7 @@ <properties> <help>Destination port</help> <valueHelp> - <format>1-65535</format> + <format>u32:1-65535</format> <description>Destination port</description> </valueHelp> <constraint> diff --git a/interface-definitions/tftp-server.xml.in b/interface-definitions/tftp-server.xml.in index abab71abd..e903e8f4e 100644 --- a/interface-definitions/tftp-server.xml.in +++ b/interface-definitions/tftp-server.xml.in @@ -24,7 +24,7 @@ <properties> <help>Port number used to listen for connections</help> <valueHelp> - <format>1-65535</format> + <format>u32:1-65535</format> <description>Numeric IP port</description> </valueHelp> <constraint> diff --git a/interface-definitions/vpn_ipsec.xml.in b/interface-definitions/vpn_ipsec.xml.in index 93eb7e667..e03483a85 100644 --- a/interface-definitions/vpn_ipsec.xml.in +++ b/interface-definitions/vpn_ipsec.xml.in @@ -1084,11 +1084,11 @@ <properties> <help>Any TCP or UDP port</help> <valueHelp> - <format><port name></format> + <format>port name</format> <description>Named port (any name in /etc/services, e.g., http)</description> </valueHelp> <valueHelp> - <format><1-65535></format> + <format>u32:1-65535</format> <description>Numbered port</description> </valueHelp> </properties> @@ -1127,11 +1127,11 @@ <properties> <help>Any TCP or UDP port</help> <valueHelp> - <format><port name></format> + <format>port name</format> <description>Named port (any name in /etc/services, e.g., http)</description> </valueHelp> <valueHelp> - <format><1-65535></format> + <format>u32:1-65535</format> <description>Numbered port</description> </valueHelp> </properties> |