snmp/bridge_mib: fix length of dot1dStaticTable as an index

In the generated code MacAddress is mapped into ASN_OCTET_STR, which uses a length as a first byte, then the content of MAC/string. With this behaviour of ASN_OCTET_STR, the index was 1 byte longer than suppose to be. Anyway, it is not needed to carry the length of MacAddress since it is defined as fixed in the MIB. Signed-off-by: Michal Wasiak <michal.wasiak@gmail.com>

snmp/bridge_mib: fix length of dot1dStaticTable as an index
In the generated code MacAddress is mapped into ASN_OCTET_STR, which uses a length as a first byte, then the content of MAC/string. With this behaviour of ASN_OCTET_STR, the index was 1 byte longer than suppose to be. Anyway, it is not needed to carry the length of MacAddress since it is defined as fixed in the MIB. Signed-off-by: Michal Wasiak <michal.wasiak@gmail.com>
31b0a0df · Michal Wasiak · Adam Wujek · 6907596b · 31b0a0df · 31b0a0df
Commit 31b0a0df authored Oct 14, 2020 by Michal Wasiak Committed by Adam Wujek Oct 29, 2020
Showing with 27 additions and 6 deletions

dot1dStaticTable.h ...pace/snmpd/bridge_mib/dot1dStaticTable/dot1dStaticTable.h +1 -1

dot1dStaticTable_interface.c .../bridge_mib/dot1dStaticTable/dot1dStaticTable_interface.c +26 -5

No files found.
--- a/userspace/snmpd/bridge_mib/dot1dStaticTable/dot1dStaticTable.h
+++ b/userspace/snmpd/bridge_mib/dot1dStaticTable/dot1dStaticTable.h
@@ -120,7 +120,7 @@ typedef struct dot1dStaticTable_mib_index_s {
     * POSSIBLE LENGHT FOR EVERY VARIABLE LENGTH INDEX!
     * Guessing 128 - col/entry(2)  - oid len(9)
 */
-#define MAX_dot1dStaticTable_IDX_LEN     8
+#define MAX_dot1dStaticTable_IDX_LEN     7


 /* *********************************************************************

--- a/userspace/snmpd/bridge_mib/dot1dStaticTable/dot1dStaticTable_interface.c
+++ b/userspace/snmpd/bridge_mib/dot1dStaticTable/dot1dStaticTable_interface.c
@@ -138,10 +138,31 @@ _dot1dStaticTable_initialize_interface(dot1dStaticTable_registration * reg_ptr,
    /*
     * Setting up the table's definition
     */
-    netsnmp_table_helper_add_indexes(tbl_info,
-                                  ASN_OCTET_STR, /** index: dot1dStaticAddress */
-                                  ASN_INTEGER, /** index: dot1dStaticReceivePort */
-                             0);
+    /* Don't use netsnmp_table_helper_add_indexes as in the generated code because MacAddress is
+     * mapped into ASN_OCTET_STR, which has a length as a first byte, then the content of MAC/string.
+     * With this behaviour of ASN_OCTET_STR, the index was 1 byte longer. It is not needed to carry
+     * the length of MacAddress since it is defined with a fixed length in the MIB.
+     */
+    /* netsnmp_table_helper_add_indexes(tbl_info,
+     *                            ASN_OCTET_STR,   // index: dot1dStaticAddress
+     *                            ASN_INTEGER,     // index: dot1dStaticReceivePort
+     *                           0);
+     */
+
+    snmp_varlist_add_variable(&tbl_info->indexes,
+                                  NULL,
+                                  0,
+                                  ASN_PRIV_IMPLIED_OCTET_STR,
+                                  "XXXXXX",
+                                  6);
+
+    snmp_varlist_add_variable(&tbl_info->indexes,
+                                  NULL,
+                                  0,
+                                  ASN_INTEGER,
+                                  NULL,
+                                  0);
+

    /*  Define the minimum and maximum accessible columns.  This
        optimizes retrieval. */
@@ -322,7 +343,7 @@ dot1dStaticTable_index_to_oid(netsnmp_index *oid_idx,
     * set up varbinds
     */
    memset( &var_dot1dStaticAddress, 0x00, sizeof(var_dot1dStaticAddress) );
-    var_dot1dStaticAddress.type = ASN_OCTET_STR;
+    var_dot1dStaticAddress.type = ASN_PRIV_IMPLIED_OCTET_STR;
    memset( &var_dot1dStaticReceivePort, 0x00, sizeof(var_dot1dStaticReceivePort) );
    var_dot1dStaticReceivePort.type = ASN_INTEGER;