From 756e36da2cf41694981a43f6fed0d558d80eaac2 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 15 May 2020 18:28:04 +0200
Subject: nat: T2198: add protocol completion helper and regex constraint

---
 interface-definitions/include/nat-rule.xml.i | 233 +++++++++++++++++++++++++--
 1 file changed, 224 insertions(+), 9 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/nat-rule.xml.i b/interface-definitions/include/nat-rule.xml.i
index 183692664..b52eb86c3 100644
--- a/interface-definitions/include/nat-rule.xml.i
+++ b/interface-definitions/include/nat-rule.xml.i
@@ -47,32 +47,247 @@
       <properties>
         <help>Protocol to NAT</help>
         <completionHelp>
-          <list>tcp udp tcp_udp all</list>
+          <list>all ip hopopt icmp igmp ggp ipencap st tcp egp igp pup udp tcp_udp hmp xns-idp rdp iso-tp4 dccp xtp ddp idpr-cmtp ipv6 ipv6-route ipv6-frag idrp rsvp gre esp ah skip ipv6-icmp ipv6-nonxt ipv6-opts rspf vmtp eigrp ospf ax.25 ipip etherip encap 99 pim ipcomp vrrp l2tp isis sctp fc mobility-header udplite mpls-in-ip manet hip shim6 wesp rohc</list>
         </completionHelp>
+        <valueHelp>
+          <format>all</format>
+          <description>All IP protocols</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ip</format>
+          <description>Internet Protocol, pseudo protocol number</description>
+        </valueHelp>
+        <valueHelp>
+          <format>hopopt</format>
+          <description>IPv6 Hop-by-Hop Option [RFC1883]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>icmp</format>
+          <description>internet control message protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>igmp</format>
+          <description>Internet Group Management</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ggp</format>
+          <description>gateway-gateway protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipencap</format>
+          <description>IP encapsulated in IP (officially IP)</description>
+        </valueHelp>
+        <valueHelp>
+          <format>st</format>
+          <description>ST datagram mode</description>
+        </valueHelp>
         <valueHelp>
           <format>tcp</format>
-          <description>Transmission Control Protocol</description>
+          <description>transmission control protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>egp</format>
+          <description>exterior gateway protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>igp</format>
+          <description>any private interior gateway (Cisco)</description>
+        </valueHelp>
+        <valueHelp>
+          <format>pup</format>
+          <description>PARC universal packet protocol</description>
         </valueHelp>
         <valueHelp>
           <format>udp</format>
-          <description>User Datagram Protocol</description>
+          <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>
+          <format>hmp</format>
+          <description>host monitoring protocol</description>
         </valueHelp>
         <valueHelp>
-          <format>0-255</format>
-          <description>IP protocol number</description>
+          <format>xns-idp</format>
+          <description>Xerox NS IDP</description>
+        </valueHelp>
+        <valueHelp>
+          <format>rdp</format>
+          <description>"reliable datagram" protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>iso-tp4</format>
+          <description>ISO Transport Protocol class 4 [RFC905]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>dccp</format>
+          <description>Datagram Congestion Control Prot. [RFC4340]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>xtp</format>
+          <description>Xpress Transfer Protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ddp</format>
+          <description>Datagram Delivery Protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>idpr-cmtp</format>
+          <description>IDPR Control Message Transport</description>
+        </valueHelp>
+        <valueHelp>
+          <format>Ipv6</format>
+          <description>Internet Protocol, version 6</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv6-route</format>
+          <description>Routing Header for IPv6</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv6-frag</format>
+          <description>Fragment Header for IPv6</description>
+        </valueHelp>
+        <valueHelp>
+          <format>idrp</format>
+          <description>Inter-Domain Routing Protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>rsvp</format>
+          <description>Reservation Protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>gre</format>
+          <description>General Routing Encapsulation</description>
+        </valueHelp>
+        <valueHelp>
+          <format>esp</format>
+          <description>Encap Security Payload [RFC2406]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ah</format>
+          <description>Authentication Header [RFC2402]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>skip</format>
+          <description>SKIP</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv6-icmp</format>
+          <description>ICMP for IPv6</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv6-nonxt</format>
+          <description>No Next Header for IPv6</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv6-opts</format>
+          <description>Destination Options for IPv6</description>
+        </valueHelp>
+        <valueHelp>
+          <format>rspf</format>
+          <description>Radio Shortest Path First (officially CPHB)</description>
+        </valueHelp>
+        <valueHelp>
+          <format>vmtp</format>
+          <description>Versatile Message Transport</description>
+        </valueHelp>
+        <valueHelp>
+          <format>eigrp</format>
+          <description>Enhanced Interior Routing Protocol (Cisco)</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ospf</format>
+          <description>Open Shortest Path First IGP</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ax.25</format>
+          <description>AX.25 frames</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipip</format>
+          <description>IP-within-IP Encapsulation Protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>etherip</format>
+          <description>Ethernet-within-IP Encapsulation [RFC3378]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>encap</format>
+          <description>Yet Another IP encapsulation [RFC1241]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>99</format>
+          <description>Any private encryption scheme</description>
+        </valueHelp>
+        <valueHelp>
+          <format>pim</format>
+          <description>Protocol Independent Multicast</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipcomp</format>
+          <description>IP Payload Compression Protocol</description>
         </valueHelp>
         <valueHelp>
-          <format>!&lt;protocol&gt;</format>
-          <description>All IP protocols except for the specified name or number (negation)</description>
+          <format>vrrp</format>
+          <description>Virtual Router Redundancy Protocol [RFC5798]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>l2tp</format>
+          <description>Layer Two Tunneling Protocol [RFC2661]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>isis</format>
+          <description>IS-IS over IPv4</description>
+        </valueHelp>
+        <valueHelp>
+          <format>sctp</format>
+          <description>Stream Control Transmission Protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>fc</format>
+          <description>Fibre Channel</description>
+        </valueHelp>
+        <valueHelp>
+          <format>mobility-header</format>
+          <description>Mobility Support for IPv6 [RFC3775]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>udplite</format>
+          <description>UDP-Lite [RFC3828]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>mpls-in-ip</format>
+          <description>MPLS-in-IP [RFC4023]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>manet</format>
+          <description>MANET Protocols [RFC5498]</description>
+        </valueHelp>
+        <valueHelp>
+          <format>hip</format>
+          <description>Host Identity Protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>shim6</format>
+          <description>Shim6 Protocol</description>
+        </valueHelp>
+        <valueHelp>
+          <format>wesp</format>
+          <description>Wrapped Encapsulating Security Payload</description>
+        </valueHelp>
+        <valueHelp>
+          <format>rohc</format>
+          <description>Robust Header Compression</description>
+        </valueHelp>
+        <valueHelp>
+          <format>0-255</format>
+          <description>IP protocol number</description>
         </valueHelp>
+        <constraint>
+          <regex>!?(all|ip|hopopt|icmp|igmp|ggp|ipencap|st|tcp|egp|igp|pup|udp|tcp_udp|hmp|xns-idp|rdp|iso-tp4|dccp|xtp|ddp|idpr-cmtp|ipv6|ipv6-route|ipv6-frag|idrp|rsvp|gre|esp|ah|skip|ipv6-icmp|ipv6-nonxt|ipv6-opts|rspf|vmtp|eigrp|ospf|ax.25|ipip|etherip|encap|99|pim|ipcomp|vrrp|l2tp|isis|sctp|fc|mobility-header|udplite|mpls-in-ip|manet|hip|shim6|wesp|rohc|[01]?[0-9][0-9]?)</regex>
+        </constraint>
       </properties>
     </leafNode>
     <node name="source">
-- 
cgit v1.2.3