diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2018-11-07 12:22:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2018-11-07 12:22:44 +0000 |
commit | 1e6c93250172946eeb38e94a92a1fd12c9d3011e (patch) | |
tree | 8ca5e16dfc7ad6b3bf2738ca0a48408a950f8f7e /collectors/node.d.plugin/node_modules | |
parent | Update watch file (diff) | |
download | netdata-1e6c93250172946eeb38e94a92a1fd12c9d3011e.tar.xz netdata-1e6c93250172946eeb38e94a92a1fd12c9d3011e.zip |
Merging upstream version 1.11.0+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | collectors/node.d.plugin/node_modules/asn1-ber.js (renamed from node.d/node_modules/asn1-ber.js) | 1 | ||||
-rw-r--r-- | collectors/node.d.plugin/node_modules/extend.js (renamed from node.d/node_modules/extend.js) | 1 | ||||
-rw-r--r-- | collectors/node.d.plugin/node_modules/lib/ber/errors.js (renamed from node.d/node_modules/lib/ber/errors.js) | 1 | ||||
-rw-r--r-- | collectors/node.d.plugin/node_modules/lib/ber/index.js (renamed from node.d/node_modules/lib/ber/index.js) | 1 | ||||
-rw-r--r-- | collectors/node.d.plugin/node_modules/lib/ber/reader.js (renamed from node.d/node_modules/lib/ber/reader.js) | 1 | ||||
-rw-r--r-- | collectors/node.d.plugin/node_modules/lib/ber/types.js (renamed from node.d/node_modules/lib/ber/types.js) | 1 | ||||
-rw-r--r-- | collectors/node.d.plugin/node_modules/lib/ber/writer.js (renamed from node.d/node_modules/lib/ber/writer.js) | 1 | ||||
-rw-r--r-- | collectors/node.d.plugin/node_modules/net-snmp.js (renamed from node.d/node_modules/net-snmp.js) | 16 | ||||
-rw-r--r-- | collectors/node.d.plugin/node_modules/netdata.js (renamed from node.d/node_modules/netdata.js) | 2 | ||||
-rw-r--r-- | collectors/node.d.plugin/node_modules/pixl-xml.js (renamed from node.d/node_modules/pixl-xml.js) | 1 |
10 files changed, 21 insertions, 5 deletions
diff --git a/node.d/node_modules/asn1-ber.js b/collectors/node.d.plugin/node_modules/asn1-ber.js index 57809f486..55c8f688e 100644 --- a/node.d/node_modules/asn1-ber.js +++ b/collectors/node.d.plugin/node_modules/asn1-ber.js @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT var Ber = require('./lib/ber/index') diff --git a/node.d/node_modules/extend.js b/collectors/node.d.plugin/node_modules/extend.js index 0fdd8be22..3cd2e9155 100644 --- a/node.d/node_modules/extend.js +++ b/collectors/node.d.plugin/node_modules/extend.js @@ -1,4 +1,5 @@ // https://github.com/justmoon/node-extend +// SPDX-License-Identifier: MIT 'use strict'; diff --git a/node.d/node_modules/lib/ber/errors.js b/collectors/node.d.plugin/node_modules/lib/ber/errors.js index 0106747e6..1c0df7b13 100644 --- a/node.d/node_modules/lib/ber/errors.js +++ b/collectors/node.d.plugin/node_modules/lib/ber/errors.js @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT module.exports = { InvalidAsn1Error: function(msg) { diff --git a/node.d/node_modules/lib/ber/index.js b/collectors/node.d.plugin/node_modules/lib/ber/index.js index 65985c1e1..eb69ec526 100644 --- a/node.d/node_modules/lib/ber/index.js +++ b/collectors/node.d.plugin/node_modules/lib/ber/index.js @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT var errors = require('./errors') var types = require('./types') diff --git a/node.d/node_modules/lib/ber/reader.js b/collectors/node.d.plugin/node_modules/lib/ber/reader.js index f93d829aa..06decf4b9 100644 --- a/node.d/node_modules/lib/ber/reader.js +++ b/collectors/node.d.plugin/node_modules/lib/ber/reader.js @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT var assert = require('assert'); diff --git a/node.d/node_modules/lib/ber/types.js b/collectors/node.d.plugin/node_modules/lib/ber/types.js index 345824bb1..7519ddcf5 100644 --- a/node.d/node_modules/lib/ber/types.js +++ b/collectors/node.d.plugin/node_modules/lib/ber/types.js @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT module.exports = { EOC: 0, diff --git a/node.d/node_modules/lib/ber/writer.js b/collectors/node.d.plugin/node_modules/lib/ber/writer.js index bf9805886..d3a718f14 100644 --- a/node.d/node_modules/lib/ber/writer.js +++ b/collectors/node.d.plugin/node_modules/lib/ber/writer.js @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT var assert = require('assert'); var ASN1 = require('./types'); diff --git a/node.d/node_modules/net-snmp.js b/collectors/node.d.plugin/node_modules/net-snmp.js index ac9a8d350..484597dcb 100644 --- a/node.d/node_modules/net-snmp.js +++ b/collectors/node.d.plugin/node_modules/net-snmp.js @@ -1,5 +1,6 @@ // Copyright 2013 Stephen Vickers <stephen.vickers.sv@gmail.com> +// SPDX-License-Identifier: MIT var ber = require ("asn1-ber").Ber; var dgram = require ("dgram"); @@ -577,6 +578,10 @@ var Session = function (target, community, options) { ? parseInt(options.sourcePort) : undefined; + this.idBitsSize = (options && options.idBitsSize) + ? parseInt(options.idBitsSize) + : 32; + this.reqs = {}; this.reqCount = 0; @@ -608,8 +613,11 @@ Session.prototype.cancelRequests = function (error) { } }; -function _generateId () { - return Math.floor (Math.random () + Math.random () * 10000000) +function _generateId (bitSize) { + if (bitSize === 16) { + return Math.floor(Math.random() * 10000) % 65535; + } + return Math.floor(Math.random() * 100000000) % 4294967295; } Session.prototype.get = function (oids, responseCb) { @@ -1043,7 +1051,7 @@ Session.prototype.simpleGet = function (pduClass, feedCb, varbinds, var req = {}; try { - var id = _generateId (); + var id = _generateId (this.idBitsSize); var pdu = new pduClass (id, varbinds, options); var message = new RequestMessage (this.version, this.community, pdu); @@ -1289,7 +1297,7 @@ Session.prototype.trap = function () { pduVarbinds.push (varbind); } - var id = _generateId (); + var id = _generateId (this.idBitsSize); if (this.version == Version2c) { if (typeof typeOrOid != "string") diff --git a/node.d/node_modules/netdata.js b/collectors/node.d.plugin/node_modules/netdata.js index 4ab8308c1..603922c6e 100644 --- a/node.d/node_modules/netdata.js +++ b/collectors/node.d.plugin/node_modules/netdata.js @@ -3,7 +3,7 @@ // netdata // real-time performance and health monitoring, done right! // (C) 2016 Costa Tsaousis <costa@tsaousis.gr> -// GPL v3+ +// SPDX-License-Identifier: GPL-3.0-or-later var url = require('url'); var http = require('http'); diff --git a/node.d/node_modules/pixl-xml.js b/collectors/node.d.plugin/node_modules/pixl-xml.js index 481acbaeb..48de89e77 100644 --- a/node.d/node_modules/pixl-xml.js +++ b/collectors/node.d.plugin/node_modules/pixl-xml.js @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT /* JavaScript XML Library Plus a bunch of object utility functions |