demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Align V2 response with V3 reponse

Browse Source 
Changed V2 response to align with V3 process after extra decoding.
Signed-off-by: Bob Eckhoff <katmandodo@yahoo.com>
This commit is contained in:
Bob Eckhoff 2024-11-24 20:10:59 -05:00
parent 18d67a08c5
commit 736551b613
1 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
bundles/org.openhab.binding.mideaac/src/main/java/org/openhab/binding/mideaac/internal/connection/ConnectionManager.java
View File

@ -377,43 +377,44 @@ public class ConnectionManager {
logger.debug("Bytes in BINARY, decoded and stripped without header: length: {}, data: {}",
data.length, Utils.bytesToBinary(data));
if (data.length > 0) {
if (data.length < 21) {
logger.warn("Response data is {} long, minimum is 21!", data.length);
if (data.length < 21) {
logger.warn("Response data is {} long, minimum is 21!", data.length);
return;
}
if (bodyType != -64) {
if (bodyType == 30) {
logger.warn("Error response 0x1E received {} from IP Address:{}", bodyType,
ipAddress);
return;
}
if (bodyType != -64) {
if (bodyType == 30) {
logger.warn("Error response 0x1E received {} from IP Address:{}", bodyType,
ipAddress);
return;
}
logger.warn("Unexpected response bodyType {}", bodyType);
return;
}
lastResponse = new Response(data, version, responseType, bodyType);
try {
logger.trace("Data length is {}, version is {}, IP address is {}", data.length,
version, ipAddress);
if (callback != null) {
callback.updateChannels(lastResponse);
}
} catch (Exception ex) {
logger.warn("Processing response exception: {}", ex.getMessage());
logger.warn("Unexpected response bodyType {}", bodyType);
return;
}
lastResponse = new Response(data, version, responseType, bodyType);
try {
logger.trace("Data length is {}, version is {}, IP address is {}", data.length, version,
ipAddress);
if (callback != null) {
callback.updateChannels(lastResponse);
}
} catch (Exception ex) {
logger.warn("Processing response exception: {}", ex.getMessage());
}
}
}
} else {
byte[] data = security.aesDecrypt(Arrays.copyOfRange(responseBytes, 40, responseBytes.length - 16));
// The response data from the appliance includes a packet header which we don't want
logger.trace("V2 Bytes decoded with header: length: {}, data: {}", data.length,
Utils.bytesToHex(data));
if (data.length > 0) {
if (responseBytes.length > 40 + 16) {
byte[] data = security
.aesDecrypt(Arrays.copyOfRange(responseBytes, 40, responseBytes.length - 16));
logger.trace("V2 Bytes decoded with header: length: {}, data: {}", data.length,
Utils.bytesToHex(data));
// The response data from the appliance includes a packet header which we don't want
data = Arrays.copyOfRange(data, 10, data.length);
byte bodyType = data[0x0];
logger.trace("V2 Bytes decoded and stripped without header: length: {}, data: {}", data.length,
Utils.bytesToHex(data));
if (data.length < 21) {
logger.warn("Response data is {} long, minimum is 21!", data.length);
return;
@ -436,10 +437,6 @@ public class ConnectionManager {
} catch (Exception ex) {
logger.warn("Processing response exception: {}", ex.getMessage());
}
} else {
droppedCommands = droppedCommands + 1;
logger.debug("Problem with reading V2 response, skipping {} skipped count since startup {}",
command, droppedCommands);
}
}
return;
@ -495,7 +492,7 @@ public class ConnectionManager {
/**
* Reads the inputStream byte array
*
* @return byte array
* @return byte array or null
*/
public synchronized byte @Nullable [] read() {
byte[] bytes = new byte[512];