diff options
29 files changed, 58 insertions, 58 deletions
diff --git a/docs/left-right-xml b/docs/left-right-xml index 5a6d58a9..68e3b751 100644 --- a/docs/left-right-xml +++ b/docs/left-right-xml @@ -81,8 +81,8 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <bsc action="create" bsc_id="17"> - <pkcs10_cert_request>req</pkcs10_cert_request> + <bsc action="create" self_id="42" bsc_id="17"> + <pkcs10_cert_request>cmVxdWVzdAo=</pkcs10_cert_request> </bsc> </msg> @@ -93,7 +93,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <bsc action="set" bsc_id="17"/> + <bsc action="set" self_id="42" bsc_id="17"/> </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> @@ -101,7 +101,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <bsc action="get" bsc_id="17"> + <bsc action="get" self_id="42" bsc_id="17"> <signing_cert>Y2VydDEK</signing_cert> <signing_cert>Y2VydDIK</signing_cert> <public_key>cHVibGljX2tleQo=</public_key> @@ -113,7 +113,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <bsc action="list" bsc_id="17"> + <bsc action="list" self_id="42" bsc_id="17"> <signing_cert>Y2VydDEK</signing_cert> <signing_cert>Y2VydDIK</signing_cert> <public_key>cHVibGljX2tleQo=</public_key> @@ -125,7 +125,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <bsc action="destroy" bsc_id="17"/> + <bsc action="destroy" self_id="42" bsc_id="17"/> </msg> <!-- ==== --> @@ -141,7 +141,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <parent action="create" parent_id="666"/> + <parent action="create" self_id="42" parent_id="666"/> </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> @@ -158,7 +158,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <parent action="set" parent_id="666"/> + <parent action="set" self_id="42" parent_id="666"/> </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> @@ -166,7 +166,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <parent action="get" parent_id="666"> + <parent action="get" self_id="42" parent_id="666"> <peer_ta>cGVlcl90YQo=</peer_ta> <peer_contact uri="https://re.bar.example/bandicoot/"/> <sia_base uri="rsync://repo.foo.example/wombat/"/> @@ -180,7 +180,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <parent action="list" parent_id="666"> + <parent action="list" self_id="42" parent_id="666"> <peer_ta>cGVlcl90YQo=</peer_ta> <peer_contact uri="https://re.bar.example/bandicoot/"/> <sia_base uri="rsync://repo.foo.example/wombat/"/> @@ -194,7 +194,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <parent action="destroy" parent_id="666"/> + <parent action="destroy" self_id="42" parent_id="666"/> </msg> <!-- ==== --> @@ -208,7 +208,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <child action="create" child_id="3"/> + <child action="create" self_id="42" child_id="3"/> </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> @@ -221,7 +221,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <child action="set" child_id="3"/> + <child action="set" self_id="42" child_id="3"/> </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> @@ -229,7 +229,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <child action="get" child_id="3"> + <child action="get" self_id="42" child_id="3"> <peer_ta>cGVlcl90YQo=</peer_ta> <bsc_link id="17"/> <child_db_id id="child_db_id"/> @@ -241,7 +241,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <child action="list" child_id="3"> + <child action="list" self_id="42" child_id="3"> <peer_ta>cGVlcl90YQo=</peer_ta> <bsc_link id="17"/> <child_db_id id="child_db_id"/> @@ -253,7 +253,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <child action="destroy" child_id="3"/> + <child action="destroy" self_id="42" child_id="3"/> </msg> <!-- ==== --> @@ -267,7 +267,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <repository action="create" repository_id="120"/> + <repository action="create" self_id="42" repository_id="120"/> </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> @@ -279,7 +279,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <repository action="set" repository_id="120"/> + <repository action="set" self_id="42" repository_id="120"/> </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> @@ -287,7 +287,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <repository action="get" repository_id="120"> + <repository action="get" self_id="42" repository_id="120"> <peer_contact uri="https://re.bar.example/bandicoot/"/> <peer_ta>cGVlcl90YQo=</peer_ta> <bsc_link id="17"/> @@ -299,7 +299,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <repository action="list" repository_id="120"> + <repository action="list" self_id="42" repository_id="120"> <peer_contact uri="https://re.bar.example/bandicoot/"/> <peer_ta>cGVlcl90YQo=</peer_ta> <bsc_link id="17"/> @@ -311,7 +311,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <repository action="destroy" repository_id="120"/> + <repository action="destroy" self_id="42" repository_id="120"/> </msg> <!-- ==== --> @@ -321,7 +321,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <route_origin action="create" route_origin_id="88"/> + <route_origin action="create" self_id="42" route_origin_id="88"/> </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> @@ -332,7 +332,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <route_origin action="set" route_origin_id="88"/> + <route_origin action="set" self_id="42" route_origin_id="88"/> </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_request"> @@ -340,7 +340,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <route_origin action="get" route_origin_id="88"> + <route_origin action="get" self_id="42" route_origin_id="88"> <resources asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/> </route_origin> </msg> @@ -350,7 +350,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <route_origin action="list" route_origin_id="88"> + <route_origin action="list" self_id="42" route_origin_id="88"> <resources asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/> </route_origin> </msg> @@ -360,7 +360,7 @@ </msg> <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" type="control_response"> - <route_origin action="destroy" route_origin_id="88"/> + <route_origin action="destroy" self_id="42" route_origin_id="88"/> </msg> <!-- ==== --> @@ -376,8 +376,8 @@ as="666"/> <resource_class subject_name="wombats are us" req_ipv4="10.0.0.0/8" - ipv4="10.2..0.6/32" - ipv6="fe80:dead:beef::/48,fe80:dead:beef::-fe80:dead:beef::49" + ipv4="10.2.0.6/32" + ipv6="fe80:deed:f00d::/48,fe80:dead:beef:2::-fe80:dead:beef:2::49" as="666"/> </list_resources> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.012.xml b/scripts/left-right-protocol-samples/pdu.012.xml index cb7d900e..88286caa 100644 --- a/scripts/left-right-protocol-samples/pdu.012.xml +++ b/scripts/left-right-protocol-samples/pdu.012.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <bsc action="create" bsc_id="17"> - <pkcs10_cert_request>req</pkcs10_cert_request> + <bsc action="create" self_id="42" bsc_id="17"> + <pkcs10_cert_request>cmVxdWVzdAo=</pkcs10_cert_request> </bsc> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.014.xml b/scripts/left-right-protocol-samples/pdu.014.xml index b0d6f4e1..128099af 100644 --- a/scripts/left-right-protocol-samples/pdu.014.xml +++ b/scripts/left-right-protocol-samples/pdu.014.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <bsc action="set" bsc_id="17"/> + <bsc action="set" self_id="42" bsc_id="17"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.016.xml b/scripts/left-right-protocol-samples/pdu.016.xml index ee998af7..3f039496 100644 --- a/scripts/left-right-protocol-samples/pdu.016.xml +++ b/scripts/left-right-protocol-samples/pdu.016.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <bsc action="get" bsc_id="17"> + <bsc action="get" self_id="42" bsc_id="17"> <signing_cert>Y2VydDEK</signing_cert> <signing_cert>Y2VydDIK</signing_cert> <public_key>cHVibGljX2tleQo=</public_key> diff --git a/scripts/left-right-protocol-samples/pdu.018.xml b/scripts/left-right-protocol-samples/pdu.018.xml index 9bd7383c..ed1c2242 100644 --- a/scripts/left-right-protocol-samples/pdu.018.xml +++ b/scripts/left-right-protocol-samples/pdu.018.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <bsc action="list" bsc_id="17"> + <bsc action="list" self_id="42" bsc_id="17"> <signing_cert>Y2VydDEK</signing_cert> <signing_cert>Y2VydDIK</signing_cert> <public_key>cHVibGljX2tleQo=</public_key> diff --git a/scripts/left-right-protocol-samples/pdu.020.xml b/scripts/left-right-protocol-samples/pdu.020.xml index 152e940a..f71c0d39 100644 --- a/scripts/left-right-protocol-samples/pdu.020.xml +++ b/scripts/left-right-protocol-samples/pdu.020.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <bsc action="destroy" bsc_id="17"/> + <bsc action="destroy" self_id="42" bsc_id="17"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.022.xml b/scripts/left-right-protocol-samples/pdu.022.xml index 2f237e7b..cb984560 100644 --- a/scripts/left-right-protocol-samples/pdu.022.xml +++ b/scripts/left-right-protocol-samples/pdu.022.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <parent action="create" parent_id="666"/> + <parent action="create" self_id="42" parent_id="666"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.024.xml b/scripts/left-right-protocol-samples/pdu.024.xml index 9b5afaeb..4a452e7c 100644 --- a/scripts/left-right-protocol-samples/pdu.024.xml +++ b/scripts/left-right-protocol-samples/pdu.024.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <parent action="set" parent_id="666"/> + <parent action="set" self_id="42" parent_id="666"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.026.xml b/scripts/left-right-protocol-samples/pdu.026.xml index abb8c8de..4cc1d527 100644 --- a/scripts/left-right-protocol-samples/pdu.026.xml +++ b/scripts/left-right-protocol-samples/pdu.026.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <parent action="get" parent_id="666"> + <parent action="get" self_id="42" parent_id="666"> <peer_ta>cGVlcl90YQo=</peer_ta> <peer_contact uri="https://re.bar.example/bandicoot/"/> <sia_base uri="rsync://repo.foo.example/wombat/"/> diff --git a/scripts/left-right-protocol-samples/pdu.028.xml b/scripts/left-right-protocol-samples/pdu.028.xml index 890b9966..639fac9b 100644 --- a/scripts/left-right-protocol-samples/pdu.028.xml +++ b/scripts/left-right-protocol-samples/pdu.028.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <parent action="list" parent_id="666"> + <parent action="list" self_id="42" parent_id="666"> <peer_ta>cGVlcl90YQo=</peer_ta> <peer_contact uri="https://re.bar.example/bandicoot/"/> <sia_base uri="rsync://repo.foo.example/wombat/"/> diff --git a/scripts/left-right-protocol-samples/pdu.030.xml b/scripts/left-right-protocol-samples/pdu.030.xml index 2961e1a4..2b3491d0 100644 --- a/scripts/left-right-protocol-samples/pdu.030.xml +++ b/scripts/left-right-protocol-samples/pdu.030.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <parent action="destroy" parent_id="666"/> + <parent action="destroy" self_id="42" parent_id="666"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.032.xml b/scripts/left-right-protocol-samples/pdu.032.xml index a3191081..d249239a 100644 --- a/scripts/left-right-protocol-samples/pdu.032.xml +++ b/scripts/left-right-protocol-samples/pdu.032.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <child action="create" child_id="3"/> + <child action="create" self_id="42" child_id="3"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.034.xml b/scripts/left-right-protocol-samples/pdu.034.xml index e8b92a64..702f9058 100644 --- a/scripts/left-right-protocol-samples/pdu.034.xml +++ b/scripts/left-right-protocol-samples/pdu.034.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <child action="set" child_id="3"/> + <child action="set" self_id="42" child_id="3"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.036.xml b/scripts/left-right-protocol-samples/pdu.036.xml index e3fb9544..d2729feb 100644 --- a/scripts/left-right-protocol-samples/pdu.036.xml +++ b/scripts/left-right-protocol-samples/pdu.036.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <child action="get" child_id="3"> + <child action="get" self_id="42" child_id="3"> <peer_ta>cGVlcl90YQo=</peer_ta> <bsc_link id="17"/> <child_db_id id="child_db_id"/> diff --git a/scripts/left-right-protocol-samples/pdu.038.xml b/scripts/left-right-protocol-samples/pdu.038.xml index 040d3d25..4426db32 100644 --- a/scripts/left-right-protocol-samples/pdu.038.xml +++ b/scripts/left-right-protocol-samples/pdu.038.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <child action="list" child_id="3"> + <child action="list" self_id="42" child_id="3"> <peer_ta>cGVlcl90YQo=</peer_ta> <bsc_link id="17"/> <child_db_id id="child_db_id"/> diff --git a/scripts/left-right-protocol-samples/pdu.040.xml b/scripts/left-right-protocol-samples/pdu.040.xml index db10a5e7..7713f6c7 100644 --- a/scripts/left-right-protocol-samples/pdu.040.xml +++ b/scripts/left-right-protocol-samples/pdu.040.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <child action="destroy" child_id="3"/> + <child action="destroy" self_id="42" child_id="3"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.042.xml b/scripts/left-right-protocol-samples/pdu.042.xml index a787c1fc..0c0eabed 100644 --- a/scripts/left-right-protocol-samples/pdu.042.xml +++ b/scripts/left-right-protocol-samples/pdu.042.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <repository action="create" repository_id="120"/> + <repository action="create" self_id="42" repository_id="120"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.044.xml b/scripts/left-right-protocol-samples/pdu.044.xml index bccdb4e0..15286500 100644 --- a/scripts/left-right-protocol-samples/pdu.044.xml +++ b/scripts/left-right-protocol-samples/pdu.044.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <repository action="set" repository_id="120"/> + <repository action="set" self_id="42" repository_id="120"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.046.xml b/scripts/left-right-protocol-samples/pdu.046.xml index 06a14eac..5647370d 100644 --- a/scripts/left-right-protocol-samples/pdu.046.xml +++ b/scripts/left-right-protocol-samples/pdu.046.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <repository action="get" repository_id="120"> + <repository action="get" self_id="42" repository_id="120"> <peer_contact uri="https://re.bar.example/bandicoot/"/> <peer_ta>cGVlcl90YQo=</peer_ta> <bsc_link id="17"/> diff --git a/scripts/left-right-protocol-samples/pdu.048.xml b/scripts/left-right-protocol-samples/pdu.048.xml index f2ebad64..93e02635 100644 --- a/scripts/left-right-protocol-samples/pdu.048.xml +++ b/scripts/left-right-protocol-samples/pdu.048.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <repository action="list" repository_id="120"> + <repository action="list" self_id="42" repository_id="120"> <peer_contact uri="https://re.bar.example/bandicoot/"/> <peer_ta>cGVlcl90YQo=</peer_ta> <bsc_link id="17"/> diff --git a/scripts/left-right-protocol-samples/pdu.050.xml b/scripts/left-right-protocol-samples/pdu.050.xml index f0db43e6..c6f190f5 100644 --- a/scripts/left-right-protocol-samples/pdu.050.xml +++ b/scripts/left-right-protocol-samples/pdu.050.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <repository action="destroy" repository_id="120"/> + <repository action="destroy" self_id="42" repository_id="120"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.052.xml b/scripts/left-right-protocol-samples/pdu.052.xml index 44194720..41d8c9d3 100644 --- a/scripts/left-right-protocol-samples/pdu.052.xml +++ b/scripts/left-right-protocol-samples/pdu.052.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <route_origin action="create" route_origin_id="88"/> + <route_origin action="create" self_id="42" route_origin_id="88"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.054.xml b/scripts/left-right-protocol-samples/pdu.054.xml index f37452d3..e1aa65b6 100644 --- a/scripts/left-right-protocol-samples/pdu.054.xml +++ b/scripts/left-right-protocol-samples/pdu.054.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <route_origin action="set" route_origin_id="88"/> + <route_origin action="set" self_id="42" route_origin_id="88"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.056.xml b/scripts/left-right-protocol-samples/pdu.056.xml index 15f51ccb..2fa85016 100644 --- a/scripts/left-right-protocol-samples/pdu.056.xml +++ b/scripts/left-right-protocol-samples/pdu.056.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <route_origin action="get" route_origin_id="88"> + <route_origin action="get" self_id="42" route_origin_id="88"> <resources asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/> </route_origin> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.058.xml b/scripts/left-right-protocol-samples/pdu.058.xml index 86dae56f..7f07fa77 100644 --- a/scripts/left-right-protocol-samples/pdu.058.xml +++ b/scripts/left-right-protocol-samples/pdu.058.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <route_origin action="list" route_origin_id="88"> + <route_origin action="list" self_id="42" route_origin_id="88"> <resources asn="12345" ipv4="10.0.0.44/32,10.2.0.6-10.2.0.77" ipv6="2002:a00::/48,2002:a02:6::-2002:a02:4d::"/> </route_origin> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.060.xml b/scripts/left-right-protocol-samples/pdu.060.xml index f602b529..ccd179ce 100644 --- a/scripts/left-right-protocol-samples/pdu.060.xml +++ b/scripts/left-right-protocol-samples/pdu.060.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> <!--Automatically generated, do not edit.--> <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="control_response"> - <route_origin action="destroy" route_origin_id="88"/> + <route_origin action="destroy" self_id="42" route_origin_id="88"/> </msg> diff --git a/scripts/left-right-protocol-samples/pdu.062.xml b/scripts/left-right-protocol-samples/pdu.062.xml index 3ef65c6d..8003dacc 100644 --- a/scripts/left-right-protocol-samples/pdu.062.xml +++ b/scripts/left-right-protocol-samples/pdu.062.xml @@ -3,6 +3,6 @@ <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="data_response"> <list_resources self_id="42" child_id="id" valid_until="2008_04_01T00:00:00Z"> <resource_class ipv4="10.0.0.44/32,10.3.0.44/32" ipv6="fe80:dead:beef::/48" as="666"/> - <resource_class subject_name="wombats are us" req_ipv4="10.0.0.0/8" ipv4="10.2..0.6/32" ipv6="fe80:dead:beef::/48,fe80:dead:beef::-fe80:dead:beef::49" as="666"/> + <resource_class subject_name="wombats are us" req_ipv4="10.0.0.0/8" ipv4="10.2.0.6/32" ipv6="fe80:deed:f00d::/48,fe80:dead:beef:2::-fe80:dead:beef:2::49" as="666"/> </list_resources> </msg> diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index a0ca63fe..02d20b22 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -123,7 +123,7 @@ class parent_elt(base_elt): class child_elt(base_elt): ids = ("bsc_link", "child_db_id") - booleans = ("reissue") + booleans = ("reissue", ) rekey = False reissue = False diff --git a/scripts/rpki/resource_set.py b/scripts/rpki/resource_set.py index 1d2b9c9c..57900d10 100644 --- a/scripts/rpki/resource_set.py +++ b/scripts/rpki/resource_set.py @@ -76,7 +76,7 @@ class resource_set(list): self.sort() if __debug__: for i in range(0, len(self) - 1): - assert self[i].max < self[i + 1].min, 'Resource overlap "%s"' % (s) + assert self[i].max < self[i+1].min, "Resource overlap: %s %s" % (self[i], self[i+1]) def __str__(self): return ",".join(map(str, self)) @@ -120,7 +120,7 @@ class resource_set_ip(resource_set): prefixlen = int(r.group(2)) mask = (1 << (self.addr_type.bits - prefixlen)) - 1 assert (min & mask) == 0, "Resource not in canonical form: %s" % (x) - max = min | mask + max = self.addr_type(min | mask) return self.range_type(min, max) raise RuntimeError, 'Bad IP resource "%s"' % (x) |