浏览代码

Added TLV 22.43.5.2.3 ServiceMultiplexingValueIEEE8021ad

AdrianSimionov 10 年之前
父节点
当前提交
0cd351c88a

+ 1 - 1
src/docsis_common.h

@@ -31,7 +31,7 @@
 
 
 
 
 #ifndef NUM_IDENTIFIERS
 #ifndef NUM_IDENTIFIERS
-#define NUM_IDENTIFIERS 363
+#define NUM_IDENTIFIERS 364
 #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

@@ -214,6 +214,7 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 350,    "NSIEncapsulationSubtype",           2,      202,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 22.43.5.2 L2VPN-I13 Annex B.3.2 */
 { 350,    "NSIEncapsulationSubtype",           2,      202,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 22.43.5.2 L2VPN-I13 Annex B.3.2 */
 { 351,    "ServiceMultiplexingValueOther",     1,      350,    (encode_lenzero),        (decode_lenzero),        0,           0             }, /* TLV 22.43.5.2.1 L2VPN-I13 Annex B.3.2 */
 { 351,    "ServiceMultiplexingValueOther",     1,      350,    (encode_lenzero),        (decode_lenzero),        0,           0             }, /* TLV 22.43.5.2.1 L2VPN-I13 Annex B.3.2 */
 { 356,    "ServiceMultiplexingValueIEEE8021Q", 2,      350,    (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 22.43.5.2.2 L2VPN-I13 Annex B.3.2 */
 { 356,    "ServiceMultiplexingValueIEEE8021Q", 2,      350,    (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 22.43.5.2.2 L2VPN-I13 Annex B.3.2 */
+{ 357,    "ServiceMultiplexingValueIEEE8021ad", 3,     350,    (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 22.43.5.2.3 L2VPN-I13 Annex B.3.2 */
 { 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 */
@@ -457,7 +458,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 357 */
+/* A little more organized -> Start with 358 */
 
 
 /* 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             },

二进制
tests/TLV_22_43_5_2_3_ServiceMultiplexingValueIEEE8021ad.cm


+ 33 - 0
tests/TLV_22_43_5_2_3_ServiceMultiplexingValueIEEE8021ad.conf

@@ -0,0 +1,33 @@
+Main 
+{
+	UsPacketClass
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				NSIEncapsulationSubtype
+				{
+					ServiceMultiplexingValueIEEE8021ad 0x01020304;
+				}
+			}
+		}
+		ClassifierRef 1;
+		ServiceFlowRef 1;
+	}
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	/* CmMic 07037e114dbc770c829862d4d7ac3cf0; */
+	/* CmtsMic 2c27ae495b0c2b9be9bb7ee69a55ac95; */
+	/*EndOfDataMkr*/
+}

+ 33 - 0
tests/TLV_22_43_5_2_3_ServiceMultiplexingValueIEEE8021ad.txt

@@ -0,0 +1,33 @@
+Main 
+{
+	UsPacketClass
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				NSIEncapsulationSubtype
+				{
+					ServiceMultiplexingValueIEEE8021ad 0x01020304;
+				}
+			}
+		}
+		ClassifierRef 1;
+		ServiceFlowRef 1;
+	}
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	/* CmMic 07037e114dbc770c829862d4d7ac3cf0; */
+	/* CmtsMic 0be334fb17848e86b6735fd580776ae3; */
+	/*EndOfDataMkr*/
+}