dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-08-27 21:20:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix acceptDevIncoming. #538

Browse Source
This commit is contained in:
Koen Kanters
2019-04-01 20:30:27 +02:00
parent cee35c66e6
commit 32db1fd07a
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zigbee.js
+5 -16
View File
@@ -103,23 +103,12 @@ class Zigbee {
`Accept device incoming with ieeeAddr '${devInfo.ieeeAddr}' permit join is '${this.getPermitJoin()}'`
);
if (this.getPermitJoin()) {
if (settings.get().ban.includes(devInfo.ieeeAddr)) {
logger.info(`Banned device tried to connect (${devInfo.ieeeAddr})`);
callback(null, false);
} else {
logger.debug(`Allowing device '${devInfo.ieeeAddr}' to join`);
callback(null, true);
}
if (settings.get().ban.includes(devInfo.ieeeAddr)) {
logger.info(`Banned device tried to connect (${devInfo.ieeeAddr})`);
callback(null, false);
} else {
if (this.getAllClients().find((d) => d.ieeeAddr === devInfo.ieeeAddr)) {
// Allow already connected devices to rejoin.
logger.debug(`Allowing device '${devInfo.ieeeAddr}' to join (already connected device)`);
callback(null, true);
} else {
logger.debug(`Not allowing '${devInfo.ieeeAddr}' to join`);
callback(null, false);
}
logger.debug(`Allowing device '${devInfo.ieeeAddr}' to join`);
callback(null, true);
}
}