Added several new TLVs:

22.43.5.3 eSAFEDHCPSnooping
22.43.5.4 CMInterfaceMaskCMIMSubtype
22.43.5.5 AttachmentGroupID
22.43.5.6 SourceAttachmentIndividualID
22.43.5.7 TargetAttachmentIndividualID
22.43.5.8 IngressUserPriority
22.43.5.9 UserPriorityRange

src/docsis_common.h

@@ -31,7 +31,7 @@
 
 
 #ifndef NUM_IDENTIFIERS
-#define NUM_IDENTIFIERS 382
+#define NUM_IDENTIFIERS 389
 #endif /*  NUM_IDENTIFIERS, needed in docsis_symtable.h  */
 
 #define MAXINT 2000000000

src/docsis_symtable.h

@@ -237,6 +237,13 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 375,    "BDEIEncapsulation",                 11,     364,    (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 22.43.5.2.6.11 L2VPN-I13 Annex B.3.2.2.11 */
 { 376,    "BVIDEncapsulation",                 12,     364,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 22.43.5.2.6.12 L2VPN-I13 Annex B.3.2.2.11 */
 { 377,    "ServiceMultiplexingValueIEEE8021adSTPID", 8, 350,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 22.43.5.2.8 L2VPN-I13 Annex B.3.2.1 */
+{ 378,    "eSAFEDHCPSnooping",                 3,      202,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 22.43.5.3 L2VPN-I13 Annex B.3.3 */
+{ 378,    "CMInterfaceMaskCMIMSubtype",        4,      202,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 22.43.5.4 L2VPN-I13 Annex B.3.4 */
+{ 379,    "AttachmentGroupID",                 5,      202,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 22.43.5.5 L2VPN-I13 Annex B.3.5 */
+{ 380,    "SourceAttachmentIndividualID",      6,      202,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 22.43.5.6 L2VPN-I13 Annex B.3.6 */
+{ 381,    "TargetAttachmentIndividualID",      7,      202,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 22.43.5.7 L2VPN-I13 Annex B.3.7 */
+{ 382,    "IngressUserPriority",               8,      202,    (encode_uchar),          (decode_uchar),          0,           7             }, /* TLV 22.43.5.8 L2VPN-I13 Annex B.3.8 */
+{ 383,    "UserPriorityRange",                 9,      202,    (encode_dual_int),       (decode_dual_int),       0,           0             }, /* TLV 22.43.5.9 L2VPN-I13 Annex B.3.9 */
 { 201,    "VendorIdentifier",                  8,      200,    (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 22.43.8 */
 
 /* TODO: Vendor Specific support in the IEEE802Classifier */
@@ -480,7 +487,7 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 236,    "SNMPv3AccessViewMask",              3,      233,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 202.54.3 eRouter-I12 Annex B.4.6.3 */
 { 237,    "SNMPv3AccessViewType",              4,      233,    (encode_uchar),          (decode_uchar),          1,           2             }, /* TLV 202.54.4 eRouter-I12 Annex B.4.6.4 */
 
-/* A little more organized -> Start with 378 */
+/* A little more organized -> Start with 384 */
 
 /* Generic TLV ... we only use the limits, code and length don't matter ...*/
 { 998,    "GenericTLV",                        0,      0,      (encode_nothing),        (decode_special),        0,           0             },

tests/TLV_22_43_5_3_to_9.conf

@@ -0,0 +1,37 @@
+Main 
+{
+	UsPacketClass
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				eSAFEDHCPSnooping 0x000000;
+				CMInterfaceMaskCMIMSubtype 0x000080;
+				AttachmentGroupID 0x0102;
+				SourceAttachmentIndividualID 0x0102;
+				TargetAttachmentIndividualID 0x0102;
+				IngressUserPriority 1;
+				UserPriorityRange 1,2;
+			}
+		}
+		ClassifierRef 1;
+		ServiceFlowRef 1;
+	}
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	/* CmMic 19ae4d2be718fe71c7932d9da214ca90; */
+	/* CmtsMic d5a8f3c56f3f16abe920dec26c13f1f3; */
+	/*EndOfDataMkr*/
+	/* Pad */
+}

tests/TLV_22_43_5_3_to_9.txt

@@ -0,0 +1,36 @@
+Main 
+{
+	UsPacketClass
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				eSAFEDHCPSnooping 0x000000;
+				CMInterfaceMaskCMIMSubtype 0x000080;
+				AttachmentGroupID 0x0102;
+				SourceAttachmentIndividualID 0x0102;
+				TargetAttachmentIndividualID 0x0102;
+				IngressUserPriority 1;
+				UserPriorityRange 1,2;
+			}
+		}
+		ClassifierRef 1;
+		ServiceFlowRef 1;
+	}
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	/* CmMic 19ae4d2be718fe71c7932d9da214ca90; */
+	/* CmtsMic 86fb411d1a930d87b27f8a5e06e3ab0f; */
+	/*EndOfDataMkr*/
+}