Browse Source

Added support for TLV 22.43.5.2.8

AdrianSimionov 10 years ago
parent
commit
6662acefbb

+ 1 - 1
src/docsis_common.h

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

+ 2 - 1
src/docsis_symtable.h

@@ -236,6 +236,7 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 374,    "BPCPEncapsulation",                 10,     364,    (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 22.43.5.2.6.10 L2VPN-I13 Annex B.3.2.2.10 */
 { 374,    "BPCPEncapsulation",                 10,     364,    (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 22.43.5.2.6.10 L2VPN-I13 Annex B.3.2.2.10 */
 { 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 */
 { 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 */
 { 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 */
 { 201,    "VendorIdentifier",                  8,      200,    (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 22.43.8 */
 { 201,    "VendorIdentifier",                  8,      200,    (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 22.43.8 */
 
 
 /* TODO: Vendor Specific support in the IEEE802Classifier */
 /* TODO: Vendor Specific support in the IEEE802Classifier */
@@ -479,7 +480,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 */
 { 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 */
 { 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 377 */
+/* A little more organized -> Start with 378 */
 
 
 /* Generic TLV ... we only use the limits, code and length don't matter ...*/
 /* Generic TLV ... we only use the limits, code and length don't matter ...*/
 { 998,    "GenericTLV",                        0,      0,      (encode_nothing),        (decode_special),        0,           0             },
 { 998,    "GenericTLV",                        0,      0,      (encode_nothing),        (decode_special),        0,           0             },

BIN
tests/TLV_22_43_5_2_8_ServiceMultiplexingValueIEEE8021adSTPID.cm


+ 34 - 0
tests/TLV_22_43_5_2_8_ServiceMultiplexingValueIEEE8021adSTPID.conf

@@ -0,0 +1,34 @@
+Main 
+{
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	UsPacketClass
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				NSIEncapsulationSubtype
+				{
+					ServiceMultiplexingValueIEEE8021adSTPID 0x88a8;
+				}
+			}
+		}
+		ClassifierRef 1;
+		ServiceFlowRef 1;
+	}
+	/* CmMic 6aab6ae3af8d9d2d5acc1734b3b654bf; */
+	/* CmtsMic cd75f9bdce3792b5385cbcc25a85bcf3; */
+	/*EndOfDataMkr*/
+	/* Pad */
+}

+ 30 - 0
tests/TLV_22_43_5_2_8_ServiceMultiplexingValueIEEE8021adSTPID.txt

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