net-snmp 3.10.1 → 3.10.3

package/README.md

@@ -3347,6 +3347,14 @@ Example programs are included under the module's `example` directory.
 
  * Fix table column type in provider definition with column type constraints
 
+## Version 3.10.2 - 05/02/2024
+
+ * Add MIB parsing support for OID values with intermediate entries in list
+
+## Version 3.10.3 - 05/02/2024
+
+ * Add MIB parsing support for final member of OID value list containing identifier/descriptor pair
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/example/test.js

@@ -1,25 +1,67 @@
-const snmp = require("../");
+/* eslint-disable no-unused-vars */
 
-const store = snmp.createModuleStore();
+var snmp = require ("../");
+var getopts = require ("getopts");
 
-store.loadFromFile("/var/tmp/mibs/IANAifType-MIB.mib");
-store.loadFromFile("/var/tmp/mibs/IF-MIB.mib");
+var options = getopts(process.argv.slice(2));
+var providers;
+var mibDir = '/var/tmp/mibs/';
 
-// const mod = store.getModule("IF-MIB");
+var counter64 = function (num) {
+    var buf = Buffer.alloc (4);
+    buf.writeUInt32BE (num);
+    return buf;
+};
 
-//Object.keys(mod)
-//  .forEach(key => console.log(key));
+var snmpOptions = {
+    disableAuthorization: options.n,
+    port: options.p,
+    engineID: options.e,
+    debug: options.d
+};
 
-//console.log(JSON.stringify(mod, null, 2));
-const provs = store.getProvidersForModule('IF-MIB');
-console.log(JSON.stringify(provs, null, 2));
+var callback = function (error, data) {
+    if ( error ) {
+        console.error (error);
+    } else {
+        console.log (data.pdu.varbinds[0].oid);
+    }
+};
 
+var store = snmp.createModuleStore ();
+var agent = snmp.createAgent (snmpOptions, callback);
+var mib = agent.getMib ();
 
-//const mod = store.getModule("CISCO-CONFIG-MAN-MIB");
-//console.log(mod);
-//console.log(JSON.stringify(mod.ccmHistoryEventTerminalUser, null, 2));
-//console.log(JSON.stringify(mod.ciscoConfigManCTIDNotifyGroup, null, 2));
-//console.log(JSON.stringify(mod.ciscoConfigManCTIDObjectGroup, null, 2));
-//console.log(JSON.stringify(mod.HistoryEventMedium, null, 2));
-//console.log(JSON.stringify(mod.ccmHistoryRunningLastChanged, null, 2));
-//console.log(JSON.stringify(mod.ccmHistoryRunningLastSaved, null, 2));
+var authorizer = agent.getAuthorizer ();
+authorizer.addCommunity ("public");
+
+// IF-MIB load and providers registration
+store.loadFromFile (mibDir + "IANAifType-MIB.mib");
+store.loadFromFile (mibDir + "IF-MIB.mib");
+store.loadFromFile (mibDir + "HOST-RESOURCES-MIB.MIB");
+store.loadFromFile (mibDir + "IANA-PRINTER-MIB.mib");
+store.loadFromFile (mibDir + "IANA-CHARSET-MIB.mib");
+store.loadFromFile (mibDir + "PRINTER-MIBv1.mib");
+store.loadFromFile (mibDir + "JOB-MONITORING-MIB-RFC.mib");
+
+// const mibModuleOid = store.translate('1.3.6.1.4.1', snmp.OidFormat.module);
+// console.log('mibModuleOid: ', mibModuleOid);
+// const mibOid = store.translate('Job-Monitoring-MIB::jmJobTable', snmp.OidFormat.oid);
+// console.log('mibOid: ', mibOid);
+console.log(store.translate('Job-Monitoring-MIB::jmJobTable', snmp.OidFormat.oid));
+console.log(store.translate('Job-Monitoring-MIB::jmJobTable', snmp.OidFormat.path));
+console.log(store.translate('1.3.6.1.4.1.2699.1.1.1.3.1', snmp.OidFormat.path));
+console.log(store.translate('1.3.6.1.4.1.2699.1.1.1.3.1', snmp.OidFormat.module));
+console.log(store.translate('iso.org.dod.internet.private.enterprises.pwg.mibs.jobmonMIB.jobmonMIBObjects.jmJob.jmJobTable', snmp.OidFormat.oid));
+console.log(store.translate('iso.org.dod.internet.private.enterprises.pwg.mibs.jobmonMIB.jobmonMIBObjects.jmJob.jmJobTable', snmp.OidFormat.module));
+
+// ifNumber
+// Scalar type - setScalarValue() and getScalarValue() are the entire API for these
+
+// console.log("All modules: ", JSON.stringify(modules, '', 2));
+// const jobModule = store.getModule('Job-Monitoring-MIB');
+// console.log('jobModule: ', JSON.stringify(jobModule, null, 2));
+
+// print IF-MIB
+const ifModule = store.getModule('IF-MIB');
+console.log('ifModule: ', JSON.stringify(ifModule, null, 2));

package/lib/mib.js

@@ -733,9 +733,13 @@ var MIB = function (dir) {
             callback(summary);
         },
         OID: function (OBJECT_IDENTIFIER, ID, ObjectName, OD, callback) {
-            let members = OBJECT_IDENTIFIER.split(" ");
+            let members = OBJECT_IDENTIFIER.split(/\s+/);
             let parent = members.shift();
             let oid = members.pop();
+            if ( oid.includes('(') ) {
+                let oidSplit = oid.match(/(.*)\((.+)\)$/);
+                oid = oidSplit[2];
+            }
             if (parent == 'iso') {
                 let midID = ['1'];
                 let midOD = ['iso'];
@@ -755,8 +759,29 @@ var MIB = function (dir) {
                 callback(midID.join('.'), midOD.join('.'));
                 return;
             }
-            ID = ID == '' ? oid : [oid, ID].join('.');
-            OD = OD == '' ? parent : [parent, OD].join('.');
+            if (members.length > 0) {
+                // We have middle entries e.g. { enterprises pwg(2699) mibs(1) 1 }
+                let midID = [];
+                let midOD = [parent];
+                for (let entry of members) {
+                    let match = entry.match(/(.*)\((.+)\)$/);
+                    midID.push(match[2]);
+                    midOD.push(match[1]);
+                }
+                midID.push(oid);
+                if ( ID != '' ) {
+                    midID.push(ID);
+                }
+                if ( OD != '' ) {
+                    midOD.push(OD);
+                }
+                ID = midID.join('.');
+                OD = midOD.join('.');
+            } else {
+                // We have no middle entries e.g. { enterprises 2021 }
+                ID = ID == '' ? oid : [oid, ID].join('.');
+                OD = OD == '' ? parent : [parent, OD].join('.');
+            }
             for (var ModuleName in this.Modules) {
                 if (this.Modules.hasOwnProperty(ModuleName)) {
                     if (this.Modules[ModuleName][parent]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "net-snmp",
-  "version": "3.10.1",
+  "version": "3.10.3",
   "description": "JavaScript implementation of the Simple Network Management Protocol (SNMP)",
   "main": "index.js",
   "directories": {