stagehacks/Cue-View
1
0
Fork 0
mirror of https://github.com/stagehacks/Cue-View.git synced 2026-07-26 09:18:39 +00:00
Code Issues Packages Projects Releases 9 Wiki Activity

UDP use proper broadcast IPs

Browse Source 
instead of generic 255.255.255.255 to search all interfaces, search all interfaces one by one using its appropriate broadcast IP
This commit is contained in:
sparks-alec
2023-01-04 21:25:59 -05:00
parent cd2fddea6e
commit da31f9b199
1 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/search.js
+41 -28
View File
@@ -10,23 +10,29 @@ const PLUGINS = require('./plugins.js');
let searching = false;
let allServers = false;
const validInterfaces = {};
function getServers() {
const interfaces = os.networkInterfaces();
const result = [];
console.log(interfaces);
Object.keys(interfaces).forEach((key) => {
const addresses = interfaces[key];
for (let i = addresses.length; i--; ) {
const address = addresses[i];
if (address.family === 'IPv4' && !address.internal && address.address.substring(0, 3) !== '169') {
const subnet = ip.subnet(address.address, address.netmask);
let current = ip.toLong(subnet.firstAddress);
const last = ip.toLong(subnet.lastAddress) - 1;
console.log(`range ${subnet.firstAddress} - ${subnet.lastAddress}`);
// console.log(`range ${subnet.firstAddress} - ${subnet.lastAddress}`);
address.broadcastAddress = subnet.broadcastAddress;
if (!validInterfaces[key]) {
validInterfaces[key] = [];
}
validInterfaces[key].push(address);
while (current++ < last) result.push(ip.fromLong(current));
}
}
@@ -123,6 +129,7 @@ function TCPtest(ipAddr, pluginType, pluginConfig) {
if (pluginConfig.searchOptions.validateResponse(data)) {
client.end(
'',
'utf8',
DEVICE.registerDevice({
type: pluginType,
defaultName: pluginConfig.defaultName,
@@ -138,32 +145,38 @@ function TCPtest(ipAddr, pluginType, pluginConfig) {
}
function searchUDP(pluginType, pluginConfig) {
const i = searchSockets.push(dgram.createSocket('udp4')) - 1;
for (let i = 0; i < Object.keys(validInterfaces).length; i++) {
const interfaceID = Object.keys(validInterfaces)[i];
const interfaceObj = validInterfaces[interfaceID];
searchSockets[i].bind(pluginConfig.searchOptions.listenPort, () => {
searchSockets[i].on('message', (msg, info) => {
if (pluginConfig.searchOptions.validateResponse(msg, info, DEVICE.all)) {
searchSockets[i].close();
DEVICE.registerDevice({
type: pluginType,
defaultName: pluginConfig.defaultName,
port: pluginConfig.defaultPort,
addresses: [info.address],
});
}
const j = searchSockets.push(dgram.createSocket('udp4')) - 1;
searchSockets[j].bind(pluginConfig.searchOptions.listenPort, () => {
searchSockets[j].on('message', (msg, info) => {
if (pluginConfig.searchOptions.validateResponse(msg, info, DEVICE.all)) {
searchSockets[j].close();
DEVICE.registerDevice({
type: pluginType,
defaultName: pluginConfig.defaultName,
port: pluginConfig.defaultPort,
addresses: [info.address],
});
}
});
});
});
searchSockets[i].on('listening', () => {
searchSockets[i].setBroadcast(true);
searchSockets[i].send(
pluginConfig.searchOptions.searchBuffer,
pluginConfig.searchOptions.devicePort,
'255.255.255.255',
(err) => {
// console.log(err)
}
);
});
searchSockets[j].on('listening', () => {
searchSockets[j].setBroadcast(true);
searchSockets[j].send(
pluginConfig.searchOptions.searchBuffer,
pluginConfig.searchOptions.devicePort,
interfaceObj[0].broadcastAddress,
(err) => {
// console.log(err);
}
);
});
}
}
function searchMulticast(pluginType, pluginConfig) {