提交 44ae2279 编写于 作者: S Stefan Berger

nwfilter: Extend nwfilter schema to accept comment attrib.

Extend the nwfilter.rng schema to accept comment attributes for all protocol
types.
上级 b00f41a1
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="common-l2-attributes"/> <ref name="common-l2-attributes"/>
<ref name="mac-attributes"/> <ref name="mac-attributes"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -33,6 +34,7 @@ ...@@ -33,6 +34,7 @@
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="common-l2-attributes"/> <ref name="common-l2-attributes"/>
<ref name="arp-attributes"/> <ref name="arp-attributes"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -42,6 +44,7 @@ ...@@ -42,6 +44,7 @@
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="common-l2-attributes"/> <ref name="common-l2-attributes"/>
<ref name="arp-attributes"/> <!-- same as arp --> <ref name="arp-attributes"/> <!-- same as arp -->
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -54,6 +57,7 @@ ...@@ -54,6 +57,7 @@
<ref name="common-port-attributes"/> <ref name="common-port-attributes"/>
<ref name="ip-attributes"/> <ref name="ip-attributes"/>
<ref name="dscp-attribute"/> <ref name="dscp-attribute"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -65,6 +69,7 @@ ...@@ -65,6 +69,7 @@
<ref name="common-ipv6-attributes-p1"/> <ref name="common-ipv6-attributes-p1"/>
<ref name="common-port-attributes"/> <ref name="common-port-attributes"/>
<ref name="ip-attributes"/> <ref name="ip-attributes"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -76,6 +81,7 @@ ...@@ -76,6 +81,7 @@
<ref name="common-port-attributes"/> <ref name="common-port-attributes"/>
<ref name="common-ip-attributes-p1"/> <ref name="common-ip-attributes-p1"/>
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -87,6 +93,7 @@ ...@@ -87,6 +93,7 @@
<ref name="common-port-attributes"/> <ref name="common-port-attributes"/>
<ref name="common-ip-attributes-p1"/> <ref name="common-ip-attributes-p1"/>
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -98,6 +105,7 @@ ...@@ -98,6 +105,7 @@
<ref name="common-port-attributes"/> <ref name="common-port-attributes"/>
<ref name="common-ip-attributes-p1"/> <ref name="common-ip-attributes-p1"/>
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -109,6 +117,7 @@ ...@@ -109,6 +117,7 @@
<ref name="common-ip-attributes-p1"/> <ref name="common-ip-attributes-p1"/>
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="icmp-attributes"/> <ref name="icmp-attributes"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -119,6 +128,7 @@ ...@@ -119,6 +128,7 @@
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
<ref name="common-ip-attributes-p1"/> <ref name="common-ip-attributes-p1"/>
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -129,6 +139,7 @@ ...@@ -129,6 +139,7 @@
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
<ref name="common-ip-attributes-p1"/> <ref name="common-ip-attributes-p1"/>
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -139,6 +150,7 @@ ...@@ -139,6 +150,7 @@
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
<ref name="common-ip-attributes-p1"/> <ref name="common-ip-attributes-p1"/>
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -149,6 +161,7 @@ ...@@ -149,6 +161,7 @@
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
<ref name="common-ip-attributes-p1"/> <ref name="common-ip-attributes-p1"/>
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -159,6 +172,7 @@ ...@@ -159,6 +172,7 @@
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
<ref name="common-ip-attributes-p1"/> <ref name="common-ip-attributes-p1"/>
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -170,6 +184,7 @@ ...@@ -170,6 +184,7 @@
<ref name="common-port-attributes"/> <ref name="common-port-attributes"/>
<ref name="common-ipv6-attributes-p1"/> <ref name="common-ipv6-attributes-p1"/>
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -181,6 +196,7 @@ ...@@ -181,6 +196,7 @@
<ref name="common-port-attributes"/> <ref name="common-port-attributes"/>
<ref name="common-ipv6-attributes-p1"/> <ref name="common-ipv6-attributes-p1"/>
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -192,6 +208,7 @@ ...@@ -192,6 +208,7 @@
<ref name="common-port-attributes"/> <ref name="common-port-attributes"/>
<ref name="common-ipv6-attributes-p1"/> <ref name="common-ipv6-attributes-p1"/>
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -203,6 +220,7 @@ ...@@ -203,6 +220,7 @@
<ref name="common-ipv6-attributes-p1"/> <ref name="common-ipv6-attributes-p1"/>
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="icmp-attributes"/> <ref name="icmp-attributes"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -213,6 +231,7 @@ ...@@ -213,6 +231,7 @@
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
<ref name="common-ipv6-attributes-p1"/> <ref name="common-ipv6-attributes-p1"/>
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -223,6 +242,7 @@ ...@@ -223,6 +242,7 @@
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
<ref name="common-ipv6-attributes-p1"/> <ref name="common-ipv6-attributes-p1"/>
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -233,6 +253,7 @@ ...@@ -233,6 +253,7 @@
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
<ref name="common-ipv6-attributes-p1"/> <ref name="common-ipv6-attributes-p1"/>
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -243,6 +264,7 @@ ...@@ -243,6 +264,7 @@
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
<ref name="common-ipv6-attributes-p1"/> <ref name="common-ipv6-attributes-p1"/>
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </zeroOrMore>
</optional> </optional>
...@@ -571,6 +593,14 @@ ...@@ -571,6 +593,14 @@
</optional> </optional>
</define> </define>
<define name="comment-attribute">
<optional>
<attribute name="comment">
<ref name="comment-type"/>
</attribute>
</optional>
</define>
<!-- ################ type library ################ --> <!-- ################ type library ################ -->
<define name="UUID"> <define name="UUID">
...@@ -826,4 +856,8 @@ ...@@ -826,4 +856,8 @@
<param name="pattern">([Ff][Aa][Ll][Ss][Ee]|0)</param> <param name="pattern">([Ff][Aa][Ll][Ss][Ee]|0)</param>
</data> </data>
</define> </define>
<define name='comment-type'>
<data type="string"/>
</define>
</grammar> </grammar>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册