net-snmp 3.13.0 → 3.13.1

package/README.md

@@ -1554,9 +1554,12 @@ in the `rinfo` field.  For example:
 Returns the receiver's `Authorizer` instance, used to control access
 to the receiver.  See the `Authorizer` section for further details.
 
-## receiver.close ()
+## receiver.close (callback)
 
-Closes the receiver's listening socket, ending the operation of the receiver.
+Closes the receiver's listening socket(s), ending the operation of the receiver.  The optionnal
+`callback` parameter is a callback function of the form `function (socket)`, which will be
+called once for each socket that the receiver is listening on, after the socket is closed.
+The `socket` argument will be given as an object triple of `address`, `family` and `port`.
 
 # Application: SNMP Agent
 
@@ -1657,9 +1660,12 @@ its existing `Mib` instance.
 Returns the agent's singleton `Forwarder` instance, which holds a list of registered
 proxies that specify context-based forwarding to remote hosts.
 
-## agent.close ()
+## agent.close (callback)
 
-Closes the agent's listening socket, ending the operation of the agent.
+Closes the agent's listening socket(s), ending the operation of the agent.  The optionnal
+`callback` parameter is a callback function of the form `function (socket)`, which will be
+called once for each socket that the agent is listening on, after the socket is closed.
+The `socket` argument will be given as an object triple of `address`, `family` and `port`.
 
 # Authorizer Module
 
@@ -3389,6 +3395,10 @@ Example programs are included under the module's `example` directory.
 
  * Add support for out-of-order MIB dependencies
 
+## Version 3.13.1 - 03/09/2024
+
+ * Add close callback for agent and receiver
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/index.js

@@ -2882,9 +2882,17 @@ Listener.processIncoming = function (buffer, authorizer, callback) {
 	return message;
 };
 
-Listener.prototype.close = function () {
+Listener.prototype.close = function (callback) {
 	for ( const socket of Object.values(this.sockets) ) {
-		socket.close ();
+		if ( callback ) {
+			const socketInfo = socket.address();
+			const socketCallback = () => {
+				callback(socketInfo);
+			};
+			socket.close (socketCallback);
+		} else {
+			socket.close();
+		}
 	}
 };
 
@@ -3168,8 +3176,8 @@ Receiver.prototype.formatCallbackData = function (message, rinfo) {
 	return formattedData;
 };
 
-Receiver.prototype.close  = function() {
-	this.listener.close ();
+Receiver.prototype.close  = function (callback) {
+	this.listener.close (callback);
 };
 
 Receiver.create = function (options, callback) {
@@ -3764,6 +3772,7 @@ MibNode.prototype.getNextInstanceNode = function () {
 				// end of MIB
 				return null;
 			} else {
+				// Move to next sibling
 				childrenAddresses = Object.keys (node.children).sort ( (a, b) => a - b);
 				var siblingPosition = childrenAddresses.indexOf(siblingIndex.toString());
 				if ( siblingPosition + 1 < childrenAddresses.length ) {
@@ -3773,11 +3782,11 @@ MibNode.prototype.getNextInstanceNode = function () {
 			}
 		}
 	}
-	// Descent
 	while ( node ) {
 		if ( node.value != null ) {
 			return node;
 		}
+		// Descend to first child if not at leaf
 		childrenAddresses = Object.keys (node.children).sort ( (a, b) => a - b);
 		node = node.children[childrenAddresses[0]];
 		if ( ! node ) {
@@ -5393,8 +5402,8 @@ Agent.prototype.getForwarder = function () {
 	return this.forwarder;
 };
 
-Agent.prototype.close  = function() {
-	this.listener.close ();
+Agent.prototype.close = function (callback) {
+	this.listener.close (callback);
 };
 
 Agent.create = function (options, callback, mib) {

package/package.json

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