From 9db01465e57b119e2c95fe77035c674550bfd61c Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@us.ibm.com>
Date: Fri, 23 Apr 2010 11:42:39 -0400
Subject: [PATCH] nwfilter: extend schema + add testcase w/ connlimit-above

I am extending the schema with the recently added connlimit-above
attribute and adding a test case for it to the test suite.
---
 docs/schemas/nwfilter.rng                   |  5 +++++
 tests/nwfilterxml2xmlin/conntrack-test.xml  | 12 ++++++++++++
 tests/nwfilterxml2xmlout/conntrack-test.xml | 12 ++++++++++++
 tests/nwfilterxml2xmltest.c                 |  2 ++
 4 files changed, 31 insertions(+)
 create mode 100644 tests/nwfilterxml2xmlin/conntrack-test.xml
 create mode 100644 tests/nwfilterxml2xmlout/conntrack-test.xml

diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng
index e553bccc16..0497d275ce 100644
--- a/docs/schemas/nwfilter.rng
+++ b/docs/schemas/nwfilter.rng
@@ -387,6 +387,11 @@
           <ref name="sixbitrange"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="connlimit-above">
+          <ref name="uint16range"/>
+        </attribute>
+      </optional>
     </interleave>
   </define>
 
diff --git a/tests/nwfilterxml2xmlin/conntrack-test.xml b/tests/nwfilterxml2xmlin/conntrack-test.xml
new file mode 100644
index 0000000000..1a49e693fa
--- /dev/null
+++ b/tests/nwfilterxml2xmlin/conntrack-test.xml
@@ -0,0 +1,12 @@
+<filter name='testcase' chain='root'>
+  <uuid>0a5288ea-612c-834a-6bbf-82a03a1a3244</uuid>
+  <rule action='drop' direction='out' priority='500'>
+    <icmp connlimit-above='1'/>
+  </rule>
+  <rule action='drop' direction='out' priority='500'>
+    <tcp connlimit-above='2'/>
+  </rule>
+  <rule action='accept' direction='out' priority='500'>
+    <all/>
+  </rule>
+</filter>
diff --git a/tests/nwfilterxml2xmlout/conntrack-test.xml b/tests/nwfilterxml2xmlout/conntrack-test.xml
new file mode 100644
index 0000000000..1a49e693fa
--- /dev/null
+++ b/tests/nwfilterxml2xmlout/conntrack-test.xml
@@ -0,0 +1,12 @@
+<filter name='testcase' chain='root'>
+  <uuid>0a5288ea-612c-834a-6bbf-82a03a1a3244</uuid>
+  <rule action='drop' direction='out' priority='500'>
+    <icmp connlimit-above='1'/>
+  </rule>
+  <rule action='drop' direction='out' priority='500'>
+    <tcp connlimit-above='2'/>
+  </rule>
+  <rule action='accept' direction='out' priority='500'>
+    <all/>
+  </rule>
+</filter>
diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c
index 4dcda26315..d653a9a71f 100644
--- a/tests/nwfilterxml2xmltest.c
+++ b/tests/nwfilterxml2xmltest.c
@@ -119,6 +119,8 @@ mymain(int argc, char **argv)
     DO_TEST("icmp-direction2-test");
     DO_TEST("icmp-direction3-test");
 
+    DO_TEST("conntrack-test");
+
     return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }