diff --git a/draft-ietf-sidrops-8210bis.xml b/draft-ietf-sidrops-8210bis.xml
index b982978..296f2bb 100644
--- a/draft-ietf-sidrops-8210bis.xml
+++ b/draft-ietf-sidrops-8210bis.xml
@@ -1188,74 +1188,37 @@
and the session is considered open.
- If a cache which supports version N receives a query with
- Protocol Version Q < N, and the cache does not support
+ If a cache which supports version C receives a query with
+ Protocol Version Q < C, and the cache does not support
versions <= Q, the cache MUST send an Error Report () with Protocol Version N and Error Code 4
- ("Unsupported Protocol Version") and disconnect the transport
- session.
+ target="error"/>) with Protocol Version C and Error Code 4
+ ("Unsupported Protocol Version") and disconnect the transport,
+ as negotiation is hopeless.
- If a cache which supports version N receives a query with
- Protocol Version Q < N, the cache MUST downgrade to protocol
- version Q, or ,
- and respond with a Cache Response () of that Protocol Version and the
- session is considered open.
+ If a cache which supports version C receives a query with
+ Protocol Version Q < C, and the ache can support version Q,
+ the cache MUST downgrade to protocol version Q, or , and respond with
+ a Cache Response () of that
+ Protocol Version, Q, and the RPKI-Rtr session is considered
+ open.
- If the router query has version Q > N, the cache MUST send an
- Error Report () with Protocol Version
- N and Error Code 4 ("Unsupported Protocol Version"), and the
- router SHOULD send another query with a Protocol Version Q of
- the version N in the Error Report, unless it has already
- failed at that version. This MAY repeat with the router
- attempting to negotiate lower and lower versions until they
- agree.
+ If the the cache which supports C as its highest verion receives
+ a query of version Q > C, the cache MUST send an Error Report
+ with Protocol Version C and Error Code 4. The router SHOULD
+ send another query with a Protocol Version Q with Q == the
+ version C in the Error Report; unless it has already failed at
+ that version, which indicates a fatal error in programming of
+ the cache which SHOULD result in transport termination.
If the router requests Q == 0 and it still fails with the cache
- sending an Error Report () with Error Code
- 4 ("Unsupported Protocol Version"), then the router MUST abort
- the transport connection.
+ responding with an Error Report with Error Code 4, then the
+ router MUST abort the transport connection, as negotiation is
+ hopeless.
-
In any of the downgraded combinations above, the new features of
the higher version will not be available, and all PDUs MUST have
@@ -1295,6 +1258,15 @@
discussion of the interaction between Protocol Version and
Session ID.
+
+ The configured transport security, the negotiated RPKI-Rtr
+ version, etc. may not be changed once a session has been
+ established. If one side or the other wishes to try a different
+ transport, protocol version, etc. they MUST terminate the
+ transport and restart the entire transport and version
+ negotiation process, and .
+
If either party receives a PDU for a different Protocol
Version once the above negotiation completes, that party MUST