diff options
| author | Rob Austein <sra@hactrn.net> | 2015-10-16 04:56:43 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-10-16 04:56:43 +0000 |
| commit | a89d88e2503368e0d662c57d7c0827d6d064b7b9 (patch) | |
| tree | 8e5c9eff3bbe29cd2ce9c2d075ec51955d37f93d /schemas | |
| parent | aedcb72ef383dd9c2a146903f9fbdac9915e9af0 (diff) | |
Replace RRDP wired-in-URL kludge with proper support in OOB and
left-right protocol and irdb and rpkidb models.
Not fully working yet, RRDP URI isn't yet showing up everywhere it
should, but this is probably more an indication that the previous hack
was incomplete than that the replacement broke something.
svn path=/branches/tk705/; revision=6120
Diffstat (limited to 'schemas')
| -rw-r--r-- | schemas/relaxng/left-right.rnc | 5 | ||||
| -rw-r--r-- | schemas/relaxng/left-right.rng | 9 | ||||
| -rw-r--r-- | schemas/sql/rpkid.sql | 5 |
3 files changed, 13 insertions, 6 deletions
diff --git a/schemas/relaxng/left-right.rnc b/schemas/relaxng/left-right.rnc index 22d971f0..b5ab56a7 100644 --- a/schemas/relaxng/left-right.rnc +++ b/schemas/relaxng/left-right.rnc @@ -162,8 +162,8 @@ parent_payload = (attribute peer_contact_uri { uri }?, repository_handle?, attribute sender_name { up_down_name }?, attribute recipient_name { up_down_name }?, - element bpki_cms_cert { base64 }?, - element bpki_cms_glue { base64 }?) + element bpki_cert { base64 }?, + element bpki_glue { base64 }?) parent_query |= element parent { ctl_create, self_handle, parent_handle, parent_bool, parent_payload } parent_reply |= element parent { ctl_create, self_handle, parent_handle } @@ -206,6 +206,7 @@ repository_bool = attribute clear_replay_protection { "yes" }? repository_payload = (attribute peer_contact_uri { uri }?, bsc_handle?, + attribute rrdp_notification_uri { uri }?, element bpki_cert { base64 }?, element bpki_glue { base64 }?) diff --git a/schemas/relaxng/left-right.rng b/schemas/relaxng/left-right.rng index bd63410e..24804af2 100644 --- a/schemas/relaxng/left-right.rng +++ b/schemas/relaxng/left-right.rng @@ -546,12 +546,12 @@ </attribute> </optional> <optional> - <element name="bpki_cms_cert"> + <element name="bpki_cert"> <ref name="base64"/> </element> </optional> <optional> - <element name="bpki_cms_glue"> + <element name="bpki_glue"> <ref name="base64"/> </element> </optional> @@ -762,6 +762,11 @@ <ref name="bsc_handle"/> </optional> <optional> + <attribute name="rrdp_notification_uri"> + <ref name="uri"/> + </attribute> + </optional> + <optional> <element name="bpki_cert"> <ref name="base64"/> </element> diff --git a/schemas/sql/rpkid.sql b/schemas/sql/rpkid.sql index f3b899ee..14499091 100644 --- a/schemas/sql/rpkid.sql +++ b/schemas/sql/rpkid.sql @@ -67,6 +67,7 @@ CREATE TABLE repository ( repository_id SERIAL NOT NULL, repository_handle VARCHAR(255) NOT NULL, peer_contact_uri TEXT, + rrdp_notification_uri TEXT, bpki_cert LONGBLOB, bpki_glue LONGBLOB, last_cms_timestamp DATETIME, @@ -83,8 +84,8 @@ CREATE TABLE repository ( CREATE TABLE parent ( parent_id SERIAL NOT NULL, parent_handle VARCHAR(255) NOT NULL, - bpki_cms_cert LONGBLOB, - bpki_cms_glue LONGBLOB, + bpki_cert LONGBLOB, + bpki_glue LONGBLOB, peer_contact_uri TEXT, sia_base TEXT, sender_name TEXT, |