瀏覽代碼

Added support for TLV 54 SNMPv3AccessViewConfiguration

AdrianSimionov 10 年之前
父節點
當前提交
1824e33faf

+ 1 - 1
src/docsis_common.h

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

+ 6 - 2
src/docsis_symtable.h

@@ -544,7 +544,11 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 538,    "SNMPv1v2cTransportAddressMask",     2,      536,    (encode_ip_ip6_port),    (decode_ip_ip6_port),    0,           0             }, /* TLV 53.2.2 MULPIv3.0-I24 Annex C.1.2.13.2.2 */
 { 539,    "SNMPv1v2cAccessViewType",           3,      534,    (encode_uchar),          (decode_uchar),          1,           2             }, /* TLV 53.3 MULPIv3.0-I24 Annex C.1.2.13.3 */
 { 540,    "SNMPv1v2cAccessViewName",           4,      534,    (encode_string),         (decode_string),         0,           0             }, /* TLV 53.4 MULPIv3.0-I24 Annex C.1.2.13.4 */
-
+{ 541,    "SNMPv3AccessViewConfiguration",     54,     0,      (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 54 MULPIv3.0-I24 Annex C.1.2.14 */
+{ 542,    "SNMPv3AccessViewName",              1,      541,    (encode_string),         (decode_string),         0,           0             }, /* TLV 54.1 MULPIv3.0-I24 Annex C.1.2.14.1 */
+{ 543,    "SNMPv3AccessViewSubtree",           2,      541,    (encode_oid),            (decode_oid),            0,           0             }, /* TLV 54.2 MULPIv3.0-I24 Annex C.1.2.14.2 */
+{ 544,    "SNMPv3AccessViewMask",              3,      541,    (encode_hexstr),         (decode_hexstr),         1,           2             }, /* TLV 54.3 MULPIv3.0-I24 Annex C.1.2.14.3 */
+{ 545,    "SNMPv3AccessViewType",              4,      541,    (encode_uchar),          (decode_uchar),          1,           2             }, /* TLV 54.4 MULPIv3.0-I24 Annex C.1.2.14.4 */
 { 531,    "SNMPCPEAccessControl",              55,     0,      (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 55 MULPIv3.0-I24 Annex C.1.2.15 */
 { 185,    "ChannelAssignmentConfig",           56,     0,      (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 56 MULPIv3.0-I24 Annex C.1.1.25 */
 { 186,    "CaTransmit",                        1,      185,    (encode_uchar),          (decode_uchar),          0,           255           }, /* TLV 56.1 MULPIv3.0-I24 Annex C.1.1.25.1 */
@@ -641,7 +645,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 541 */
+/* A little more organized -> Start with 546 */
 
 /* 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_54_SNMPv3AccessViewConfiguration.cm


+ 7 - 0
tests/TLV_54_SNMPv3AccessViewConfiguration.conf

@@ -0,0 +1,7 @@
+Main 
+{
+	GenericTLV TlvCode 77 TlvLength 97 TlvValue 0x696e200a7b0a534e4d50763341636365737356696577436f6e66696775726174696f6e0a7b0a534e4d507633416363657373566965774e616d6520227075626c6963223b0a534e4d5076334163636573735669657753756274726565202e312e33;
+	GenericTLV TlvCode 46 TlvLength 54 TlvValue 0x3b0a534e4d507633416363657373566965774d61736b20307830303b0a534e4d507633416363657373566965775479706520313b0a7d;
+	SnmpWriteControl  114 ;
+	GenericTLV TlvCode 118 TlvLength 105 TlvValue 0x6365466c6f770a7b0a447353657276696365466c6f7752656620323b0a516f73506172616d5365745479706520373b0a7d0a7d0adba402000000004100000000000000e847a93c837f0000e847a93c837f00000000000000000000210000000000000020d6a4020000;
+}

+ 21 - 0
tests/TLV_54_SNMPv3AccessViewConfiguration.txt

@@ -0,0 +1,21 @@
+Main 
+{
+SNMPv3AccessViewConfiguration
+{
+SNMPv3AccessViewName "public";
+SNMPv3AccessViewSubtree .1.3.6;
+SNMPv3AccessViewMask 0x00;
+SNMPv3AccessViewType 1;
+}
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+}