aboutsummaryrefslogtreecommitdiff
path: root/rpkid/left-right-schema.rng
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2008-05-18 00:11:59 +0000
committerRob Austein <sra@hactrn.net>2008-05-18 00:11:59 +0000
commitb13d25453d202ad346e5f962370979b737aeeb39 (patch)
tree6f259c75a9298843cb34de2a83f42fcc5554e818 /rpkid/left-right-schema.rng
parent1527adaab13a386bb0cee7dcc4257044bd5880bd (diff)
Convert to generating new ROA format
svn path=/rpkid/left-right-schema.rnc; revision=1800
Diffstat (limited to 'rpkid/left-right-schema.rng')
-rw-r--r--rpkid/left-right-schema.rng31
1 files changed, 9 insertions, 22 deletions
diff --git a/rpkid/left-right-schema.rng b/rpkid/left-right-schema.rng
index 93f79d32..6c5b9d6b 100644
--- a/rpkid/left-right-schema.rng
+++ b/rpkid/left-right-schema.rng
@@ -160,32 +160,19 @@
<define name="asn_list">
<data type="string">
<param name="maxLength">512000</param>
- <param name="pattern">[\-,/0-9]*</param>
+ <param name="pattern">[\-,0-9]*</param>
</data>
</define>
- <define name="ipv4_address_list">
+ <define name="ipv4_list">
<data type="string">
<param name="maxLength">512000</param>
- <param name="pattern">[\-,/.0-9]*</param>
+ <param name="pattern">[\-,0-9/.]*</param>
</data>
</define>
- <define name="ipv6_address_list">
+ <define name="ipv6_list">
<data type="string">
<param name="maxLength">512000</param>
- <param name="pattern">[\-,/:0-9a-fA-F]*</param>
- </data>
- </define>
- <!-- Prefix resource lists, same as address resource lists not no ranges allowed -->
- <define name="ipv4_prefix_list">
- <data type="string">
- <param name="maxLength">512000</param>
- <param name="pattern">[,/.0-9]*</param>
- </data>
- </define>
- <define name="ipv6_prefix_list">
- <data type="string">
- <param name="maxLength">512000</param>
- <param name="pattern">[,/:0-9a-fA-F]*</param>
+ <param name="pattern">[\-,0-9/:a-fA-F]*</param>
</data>
</define>
<!-- <self/> element -->
@@ -838,12 +825,12 @@
</optional>
<optional>
<attribute name="ipv4">
- <ref name="ipv4_prefix_list"/>
+ <ref name="ipv4_list"/>
</attribute>
</optional>
<optional>
<attribute name="ipv6">
- <ref name="ipv6_prefix_list"/>
+ <ref name="ipv6_list"/>
</attribute>
</optional>
</define>
@@ -959,12 +946,12 @@
</optional>
<optional>
<attribute name="ipv4">
- <ref name="ipv4_address_list"/>
+ <ref name="ipv4_list"/>
</attribute>
</optional>
<optional>
<attribute name="ipv6">
- <ref name="ipv6_address_list"/>
+ <ref name="ipv6_list"/>
</attribute>
</optional>
</group>