Преглед изворни кода

Added support for TLV 65 L2VPNMACAgingEncoding

AdrianSimionov пре 10 година
родитељ
комит
759be15d95

+ 1 - 1
src/docsis_common.h

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

+ 4 - 3
src/docsis_symtable.h

@@ -543,13 +543,14 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 
 
 /* IPv6 */
 /* IPv6 */
 { 173,    "SwUpgradeServer6",                  58,     0,      (encode_ip6),            (decode_ip6),            0,           0             }, /* TLV 58 MULPIv3.0-I24 Annex C.1.2.8 */
 { 173,    "SwUpgradeServer6",                  58,     0,      (encode_ip6),            (decode_ip6),            0,           0             }, /* TLV 58 MULPIv3.0-I24 Annex C.1.2.8 */
-{ 174,    "SubMgmtControl6",                   63,     0,      (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 63 MULPIv3.0-I24 Annex C.1.1.19.5 */
 
 
+{ 174,    "SubMgmtControl6",                   63,     0,      (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 63 MULPIv3.0-I24 Annex C.1.1.19.5 */
 { 341,    "CMTSStaticMulticastSessionEncodings",  64,  0,      (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 64 MULPIv3.0-I24 Annex C.1.1.27 */
 { 341,    "CMTSStaticMulticastSessionEncodings",  64,  0,      (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 64 MULPIv3.0-I24 Annex C.1.1.27 */
 { 342,    "CMTSStaticMulticastSessionGroup",   1,      341,    (encode_ip_ip6),         (decode_ip_ip6),         0,           0             }, /* TLV 64.1 MULPIv3.0-I24 Annex C.1.1.27.1 */
 { 342,    "CMTSStaticMulticastSessionGroup",   1,      341,    (encode_ip_ip6),         (decode_ip_ip6),         0,           0             }, /* TLV 64.1 MULPIv3.0-I24 Annex C.1.1.27.1 */
 { 343,    "CMTSStaticMulticastSessionSource",  2,      341,    (encode_ip_ip6),         (decode_ip_ip6),         0,           0             }, /* TLV 64.2 MULPIv3.0-I24 Annex C.1.1.27.2 */
 { 343,    "CMTSStaticMulticastSessionSource",  2,      341,    (encode_ip_ip6),         (decode_ip_ip6),         0,           0             }, /* TLV 64.2 MULPIv3.0-I24 Annex C.1.1.27.2 */
 { 344,    "CMTSStaticMulticastSessionCMIM",    3,      341,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 64.3 MULPIv3.0-I24 Annex C.1.1.27.3 */
 { 344,    "CMTSStaticMulticastSessionCMIM",    3,      341,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 64.3 MULPIv3.0-I24 Annex C.1.1.27.3 */
-
+{ 526,    "L2VPNMACAgingEncoding",             65,     0,      (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 65 L2VPN-I13 Annex B.7 */
+{ 527,    "L2VPNMACAgingMode",                 1,      526,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 65.1 L2VPN-I13 Annex B.7.1 */
 { 525,    "ManagementEventControl",            66,     0,      (encode_uint),           (decode_uint),           0,           0             }, /* TLV 66 MULPIv3.0-I24 Annex C.1.2.16 */
 { 525,    "ManagementEventControl",            66,     0,      (encode_uint),           (decode_uint),           0,           0             }, /* TLV 66 MULPIv3.0-I24 Annex C.1.2.16 */
 { 478,    "SubscriberManagementCPEIPv6Table",  67,     0,      (encode_ip6_list),       (decode_ip6_list),       0,           0             }, /* TLV 67 MULPIv3.0-I24 Annex C.1.1.19.6 */
 { 478,    "SubscriberManagementCPEIPv6Table",  67,     0,      (encode_ip6_list),       (decode_ip6_list),       0,           0             }, /* TLV 67 MULPIv3.0-I24 Annex C.1.1.19.6 */
 { 513,    "DefaultUpstreamTargetBuffer",       68,     0,      (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 68 MULPIv3.0-I24 Annex C.1.2.17 */
 { 513,    "DefaultUpstreamTargetBuffer",       68,     0,      (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 68 MULPIv3.0-I24 Annex C.1.2.17 */
@@ -629,7 +630,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 526 */
+/* A little more organized -> Start with 528 */
 
 
 /* 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_65_L2VPNMACAgingEncoding.cm


+ 21 - 0
tests/TLV_65_L2VPNMACAgingEncoding.conf

@@ -0,0 +1,21 @@
+Main 
+{
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	L2VPNMACAgingEncoding
+	{
+		L2VPNMACAgingMode 1;
+	}
+	/* CmMic 069952adbba1bfe61021257a1b0e4c4f; */
+	/* CmtsMic 8c7db773b649e9ee3042ec568fda9bde; */
+	/*EndOfDataMkr*/
+}

+ 18 - 0
tests/TLV_65_L2VPNMACAgingEncoding.txt

@@ -0,0 +1,18 @@
+Main 
+{
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+L2VPNMACAgingEncoding
+{
+L2VPNMACAgingMode 1;
+}
+}