Add callback support for amt-scanner scan function
jsastriawan committed
Oct 1, 2019 at 09:53 UTC
4c65a18805165b6cd603748ce41486e2530034d7
1 file changed
+7
-3
agents/modules_meshcore/amt-scanner.js
+7
-3
@@ -64,7 +64,7 @@ function AMTScanner() {
64
if (masknum <= 16 || masknum > 32) return null;
65
masknum = 32 - masknum;
66
for (var i = 0; i < masknum; i++) { mask = (mask << 1); mask++; }
67
- return { min: ip & (0xFFFFFFFF - mask), max: (ip & (0xFFFFFFFF - mask)) + mask };
67
+ return { min: (ip & (0xFFFFFFFF - mask))+1, max: (ip & (0xFFFFFFFF - mask)) + mask -1 };//remove network and broadcast address to avoid irrecoverable socket error
68
}
69
x = this.parseIpv4Addr(range);
70
if (x == null) return null;
@@ -83,7 +83,7 @@ function AMTScanner() {
83
return ((num >> 24) & 0xFF) + '.' + ((num >> 16) & 0xFF) + '.' + ((num >> 8) & 0xFF) + '.' + (num & 0xFF);
84
}
85
86
- this.scan = function (rangestr, timeout) {
86
+ this.scan = function (rangestr, timeout, callback) {
87
var iprange = this.parseIPv4Range(rangestr);
88
var rmcp = this.buildRmcpPing(0);
89
var server = this.dgram.createSocket({ type: 'udp4' });
@@ -91,11 +91,15 @@ function AMTScanner() {
91
server.scanResults = [];
92
server.on('error', function (err) { console.log('Error:' + err); });
93
server.on('message', function (msg, rinfo) { if (rinfo.size > 4) { this.parent.parseRmcpPacket(this, msg, rinfo, function (s, res) { s.scanResults.push(res); }) }; });
94
- server.on('listening', function () { for (var i = iprange.min; i <= iprange.max; i++) { server.send(rmcp, 623, server.parent.IPv4NumToStr(i)); } });
94
+ server.on('listening', function () { for (var i = iprange.min; i <= iprange.max; i++) {
95
+ server.send(rmcp, 623, server.parent.IPv4NumToStr(i)); } });
96
server.bind({ address: '0.0.0.0', port: 0, exclusive: true });
97
var tmout = setTimeout(function cb() {
98
//console.log("Server closed");
99
server.close();
100
+ if (callback) {
101
+ callback(server.scanResults);
102
+ }
103
server.parent.emit('found', server.scanResults);
104
delete server;
105
}, timeout);