One more renumbering... previous one introduced another collision (with data packet)
git-svn-id: svn+ssh://dyadis.cs.arizona.edu/NDN-spec/spec-sphinx@201 c5937c81-b952-4fd9-96ba-3036b240b622
diff --git a/types.rst b/types.rst
index 141c1e7..1f85b50 100644
--- a/types.rst
+++ b/types.rst
@@ -7,69 +7,69 @@
| Type | Assigned value | Assigned value |
| | (decimal) | (hexadecimal) |
+=============================================+===================+================+
-| **Common fields** |
-+---------------------------------------------+-------------------+----------------+
-| Name | 1 | 0x01 |
-+---------------------------------------------+-------------------+----------------+
-| NameComponent | 2 | 0x02 |
-+---------------------------------------------+-------------------+----------------+
| **Packet types** |
+---------------------------------------------+-------------------+----------------+
-| Interest | 3 | 0x03 |
+| Interest | 5 | 0x05 |
+---------------------------------------------+-------------------+----------------+
-| Data | 4 | 0x04 |
+| Data | 6 | 0x06 |
++---------------------------------------------+-------------------+----------------+
+| **Common fields** |
++---------------------------------------------+-------------------+----------------+
+| Name | 7 | 0x07 |
++---------------------------------------------+-------------------+----------------+
+| NameComponent | 8 | 0x08 |
+---------------------------------------------+-------------------+----------------+
| **Interest packet** |
+---------------------------------------------+-------------------+----------------+
-| Selectors | 5 | 0x05 |
+| Selectors | 9 | 0x09 |
+---------------------------------------------+-------------------+----------------+
-| Nonce | 6 | 0x06 |
+| Nonce | 10 | 0x0a |
+---------------------------------------------+-------------------+----------------+
-| Scope | 7 | 0x07 |
+| Scope | 11 | 0x0b |
+---------------------------------------------+-------------------+----------------+
-| InterestLifetime | 8 | 0x08 |
+| InterestLifetime | 12 | 0x0c |
+---------------------------------------------+-------------------+----------------+
| **Interest/Selectors** |
+---------------------------------------------+-------------------+----------------+
-| MinSuffixComponents | 9 | 0x09 |
+| MinSuffixComponents | 13 | 0x0d |
+---------------------------------------------+-------------------+----------------+
-| MaxSuffixComponents | 10 | 0x0a |
+| MaxSuffixComponents | 14 | 0x0e |
+---------------------------------------------+-------------------+----------------+
-| PublisherPublicKeyLocator | 11 | 0x0b |
+| PublisherPublicKeyLocator | 15 | 0x0f |
+---------------------------------------------+-------------------+----------------+
-| Exclude | 12 | 0x0c |
+| Exclude | 16 | 0x10 |
+---------------------------------------------+-------------------+----------------+
-| ChildSelector | 13 | 0x0d |
+| ChildSelector | 17 | 0x11 |
+---------------------------------------------+-------------------+----------------+
-| MustBeFresh | 14 | 0x0e |
+| MustBeFresh | 18 | 0x12 |
+---------------------------------------------+-------------------+----------------+
-| Any | 15 | 0x0f |
+| Any | 19 | 0x13 |
+---------------------------------------------+-------------------+----------------+
| **Data packet** |
+---------------------------------------------+-------------------+----------------+
-| MetaInfo | 16 | 0x10 |
+| MetaInfo | 20 | 0x14 |
+---------------------------------------------+-------------------+----------------+
-| Content | 17 | 0x11 |
+| Content | 21 | 0x15 |
+---------------------------------------------+-------------------+----------------+
-| SignatureInfo | 18 | 0x12 |
+| SignatureInfo | 22 | 0x16 |
+---------------------------------------------+-------------------+----------------+
-| SignatureValue | 19 | 0x13 |
+| SignatureValue | 23 | 0x17 |
+---------------------------------------------+-------------------+----------------+
| **Data/MetaInfo** |
+---------------------------------------------+-------------------+----------------+
-| ContentType | 20 | 0x14 |
+| ContentType | 24 | 0x18 |
+---------------------------------------------+-------------------+----------------+
-| FreshnessPeriod | 21 | 0x15 |
+| FreshnessPeriod | 25 | 0x19 |
+---------------------------------------------+-------------------+----------------+
-| FinalBlockId | 25 | 0x19 |
+| FinalBlockId | 26 | 0x1a |
+---------------------------------------------+-------------------+----------------+
| **Data/Signature** |
+---------------------------------------------+-------------------+----------------+
-| SignatureType | 22 | 0x16 |
+| SignatureType | 27 | 0x1b |
+---------------------------------------------+-------------------+----------------+
-| KeyLocator | 23 | 0x17 |
+| KeyLocator | 28 | 0x1c |
+---------------------------------------------+-------------------+----------------+
-| KeyLocatorDigest | 24 | 0x18 |
+| KeyLocatorDigest | 29 | 0x1d |
+---------------------------------------------+-------------------+----------------+
.. _type reservations:
@@ -80,7 +80,7 @@
+----------------+-----------------------------------------------------------+
| Values | Designation |
+================+===========================================================+
-| 0, 26-100 | Reserved for future assignments (1-byte encoding) |
+| 0-4, 30-100 | Reserved for future assignments (1-byte encoding) |
+----------------+-----------------------------------------------------------+
| 101-127 | Reserved for assignments related to forwarding daemon |
+----------------+-----------------------------------------------------------+