Added TLV 22.43.6 ExtendedCMTSMICConfiguration and one more TLV.

src/docsis_common.h

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

src/docsis_symtable.h

@@ -302,6 +302,12 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 441,    "FrameLossMeasurementEnable",        1,      440,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 22.43.5.24.4.2.1 L2VPN-I13 Annex B.3.24.4.2.1 */
 { 442,    "FrameLossMeasurementTransmissionPeriodicity", 2, 440, (encode_ushort),       (decode_ushort),         0,           0             }, /* TLV 22.43.5.24.4.2.2 L2VPN-I13 Annex B.3.24.4.2.2 */
 { 443,    "L2VPNDSID",                         26,     202,    (encode_uint24),         (decode_uint24),         1,           1048575       }, /* TLV 22.43.5.24.4.2.2 L2VPN-I13 Annex B.3.24.4.2.2 */
+{ 448,    "VendorSpecific",                    43,     202,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 22.43.5.43 L2VPN-I13 Annex B.3.11 */
+{ 449,    "VendorIdentifier",                  8,      448,    (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 22.43.5.43.8 L2VPN-I13 Annex B.3.11 */
+{ 444,    "ExtendedCMTSMICConfigurationSetting", 6,    200,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 22.43.6 MULPIv3.0-I24 Annex C.1.1.18.1.6 */
+{ 445,    "ExtendedCMTSMICHMACtype",           1,      444,    (encode_uchar),          (decode_uchar),          0,           0             }, /* TLV 22.43.6.1 MULPIv3.0-I24 Annex C.1.1.18.1.6.1 */
+{ 446,    "ExtendedCMTSMICBitmap",             2,      444,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 22.43.6.2 MULPIv3.0-I24 Annex C.1.1.18.1.6.2 */
+{ 447,    "ExplicitExtendedCMTSMICDigest",     3,      444,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 22.43.6.3 MULPIv3.0-I24 Annex C.1.1.18.1.6.3 */
 { 201,    "VendorIdentifier",                  8,      200,    (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 22.43.8 */
 
 /* TODO: Vendor Specific support in the IEEE802Classifier */
@@ -545,7 +551,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 444 */
+/* A little more organized -> Start with 450 */
 
 /* 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_43_8_VendorSpecific.conf

@@ -0,0 +1,33 @@
+Main 
+{
+	UsPacketClass
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				VendorSpecific
+				{
+					VendorIdentifier 0x010203;
+				}
+			}
+		}
+		ClassifierRef 1;
+		ServiceFlowRef 1;
+	}
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	/* CmMic 4d26858c10ae06ab14645efb952849b0; */
+	/* CmtsMic a240c182823942cb2d5aa2f3616450d6; */
+	/*EndOfDataMkr*/
+}

tests/TLV_22_43_5_43_8_VendorSpecific.txt

@@ -0,0 +1,30 @@
+Main 
+{
+UsPacketClass
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+VendorSpecific
+{
+VendorIdentifier 0x010203;
+}
+}
+}
+ClassifierRef 1;
+ServiceFlowRef 1;
+}
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+}

tests/TLV_22_43_6_ExtendedCMTSMICConfiguration.conf

@@ -0,0 +1,33 @@
+Main 
+{
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	UsPacketClass
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			ExtendedCMTSMICConfigurationSetting
+			{
+				ExtendedCMTSMICHMACtype 1;
+				ExtendedCMTSMICBitmap 0x00;
+				ExplicitExtendedCMTSMICDigest 0x00;
+			}
+		}
+		ClassifierRef 1;
+		ServiceFlowRef 1;
+	}
+	/* CmMic 4fe03507090db92f1a5123a61c2592da; */
+	/* CmtsMic c04be250059d1db0aa229560aa2e1e14; */
+	/*EndOfDataMkr*/
+	/* Pad */
+}

tests/TLV_22_43_6_ExtendedCMTSMICConfiguration.txt

@@ -0,0 +1,29 @@
+Main 
+{
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+UsPacketClass
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+ExtendedCMTSMICConfigurationSetting
+{
+ExtendedCMTSMICHMACtype 1;
+ExtendedCMTSMICBitmap 0x00;
+ExplicitExtendedCMTSMICDigest 0x00;
+}
+}
+ClassifierRef 1;
+ServiceFlowRef 1;
+}
+}