From 1a2da429b3bbd595f4d7e52c6bbaef03ab2495da Mon Sep 17 00:00:00 2001
From: Randy Bush <randy@psg.com>
Date: Mon, 1 Jul 2024 13:45:10 -0700
Subject: [PATCH] -13 published with AFI Flags removed

---
 draft-ietf-sidrops-8210bis.xml | 46 +++++-----------------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

diff --git a/draft-ietf-sidrops-8210bis.xml b/draft-ietf-sidrops-8210bis.xml
index 4ff4435..c03855e 100644
--- a/draft-ietf-sidrops-8210bis.xml
+++ b/draft-ietf-sidrops-8210bis.xml
@@ -8,7 +8,7 @@
 <?rfc compact="yes"?>
 <?rfc subcompact="no"?>
 
-<rfc category="std" docName="draft-ietf-sidrops-8210bis-12"
+<rfc category="std" docName="draft-ietf-sidrops-8210bis-13"
      submissionType="IETF" ipr="trust200902" version="2" consensus="yes">
 
   <front>
@@ -481,12 +481,6 @@
 	      from a cache remains valid in the absence of a successful
 	      subsequent cache poll.  See <xref target="timing"/>.
 	    </t>
-            <t hangText="AFI Flags:">
-	      An 8-bit field of the ASPA PDU where the low order bit is
-	      set if the AS relationships are for IPv4 (AFI 1), and the
-	      second lowest bit is set for IPv6 (AFI 2).  Currently,
-	      both bits MUST be set.  This field may be removed soon.
-	    </t>
             <t hangText="Provider AS Count:">
 	      A 16-bit count of Provider Autonomous System Numbers in
 	      the PDU.
@@ -1005,7 +999,7 @@
       </section>
 
       <section anchor="aspa" title="ASPA PDU">
-	<!-- protocol "Protocol Version 2:8,PDU Type 11:8,zero:16,Length:32,Flags:8,AFI Flag:8,Provider AS Count:16,Customer Autonomous System Number:32,Provider Autonomous System Numbers:32" -->
+	<!-- protocol "Protocol Version 2:8,PDU Type 11:8,zero:16,Length:32,Flags:8,Zero:8,Provider AS Count:16,Customer Autonomous System Number:32,Provider Autonomous System Numbers:32" -->
         <figure>
           <artwork>
 0          8          16         24        31
@@ -1019,7 +1013,7 @@
 |                                           |
 +-------------------------------------------+
 |          |          |                     |
-|  Flags   | AFI Flags|  Provider AS Count  |
+|  Flags   |   zero   |  Provider AS Count  |
 |          |          |                     |
 +-------------------------------------------+
 |                                           |
@@ -1073,15 +1067,6 @@
 	  router.
 	</t>
 	
-	<t>
-	  The AFI Flags field is defined in <xref target="IANA"/>
-	  Currently, the two low order bits MUST always be set, i.e. 1,
-	  and the rest unset, i.e. 0.  This allows the router to prepare
-	  for less change should the AFIs be separated in a future
-	  version.  This field is likely to be removed before
-	  publication.
-	</t>
-	
         <t>
           The Provider AS Count is the number of 32-bit Provider
           Autonomous System Numbers in the PDU.
@@ -1197,7 +1182,7 @@
       </t>
       <t>
         If a cache which supports version C receives a query with
-        Protocol Version Q &lt; C, and the ache can support version Q,
+        Protocol Version Q &lt; C, and the cache can support version Q,
         the cache MUST downgrade to protocol version Q, <xref
         target="RFC6810"/> or <xref target="RFC8210"/>, and respond with
         a Cache Response (<xref target="cacheresponse"/>) of that
@@ -1842,8 +1827,8 @@ Cache                         Router
           </t>
           <t hangText="4: Unsupported Protocol Version (non-fatal):">
             The Protocol Version is not known by the receiver of the
-            PDU.  A session is not [re-]established, but data learned
-	    need not be deleted.
+            PDU.  A session is not [re-]established, but data previously
+            learned need not be flushed.
           </t>
           <t hangText="5: Unsupported PDU Type (fatal):">
             The PDU Type is not known by the receiver of the PDU.
@@ -1988,24 +1973,6 @@ Cache                         Router
         </artwork>
       </figure>
 
-      <t>
-	This document requests the IANA to create a registry for ASPA
-	AFI Flags 0 to 7.  The name of the registry should be
-	rpki-rtr-afi.  The policy for adding to the registry is Expert
-	Review per <xref target="RFC8126"/>, where the responsible IESG
-	area director should appoint the Expert Reviewer.  The initial
-	entries should be as follows:
-        <figure>
-          <artwork>
-	  Bit     Bit Name
-	  ----    -------------------
-	   0      IPv4 AFI 1, currently MUST be set
-	   1      IPv6 AFI 2, currently MUST be set
-	   2-7    Reserved, MUST be zero
-	   </artwork>
-	 </figure>
-       </t>
-
     </section>
 
   </middle>
@@ -2040,7 +2007,6 @@ Cache                         Router
       <?rfc include="reference.RFC.6810.xml"?>
       <?rfc include="reference.RFC.6811.xml"?>
       <?rfc include="reference.RFC.7525.xml"?>
-      <?rfc include="reference.RFC.8126.xml"?>
       <?rfc include="reference.RFC.8174.xml"?>
       <?rfc include="reference.RFC.8210.xml"?>
       <?rfc include="reference.RFC.8446.xml"?>