mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-20 16:59:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring....

Browse Source
This commit is contained in:
bwssystems
2016-12-28 18:42:08 -06:00
parent 66d7306cda
commit a3325aa048
5 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
View File

@@ -74,7 +74,7 @@ public class UDPHome implements Home {
sendData = theUrlBody.getBytes();
}
try {
theUDPDatagramSender.sendUDPResponse(new String(sendData), IPAddress,
theUDPDatagramSender.sendUDPResponse(sendData, IPAddress,
Integer.parseInt(port));
} catch (NumberFormatException e) {
// noop

6
src/main/java/com/bwssystems/HABridge/upnp/UpnpListener.java
View File

@@ -209,7 +209,7 @@ public class UpnpListener {
}
else
log.debug("sendUpnpResponse discovery responseTemplate1 is <<<" + discoveryResponse + ">>>");
theUDPDatagramSender.sendUDPResponse(discoveryResponse, requester, sourcePort);
theUDPDatagramSender.sendUDPResponse(discoveryResponse.getBytes(), requester, sourcePort);
discoveryResponse = String.format(responseTemplate2, Configuration.UPNP_MULTICAST_ADDRESS, Configuration.UPNP_DISCOVERY_PORT, responseAddress, httpServerPort, bridgeId, bridgeSNUUID, bridgeSNUUID);
if(traceupnp) {
@@ -217,7 +217,7 @@ public class UpnpListener {
}
else
log.debug("sendUpnpResponse discovery responseTemplate2 is <<<" + discoveryResponse + ">>>");
theUDPDatagramSender.sendUDPResponse(discoveryResponse, requester, sourcePort);
theUDPDatagramSender.sendUDPResponse(discoveryResponse.getBytes(), requester, sourcePort);
discoveryResponse = String.format(responseTemplate3, Configuration.UPNP_MULTICAST_ADDRESS, Configuration.UPNP_DISCOVERY_PORT, responseAddress, httpServerPort, bridgeId, bridgeSNUUID);
if(traceupnp) {
@@ -225,6 +225,6 @@ public class UpnpListener {
}
else
log.debug("sendUpnpResponse discovery responseTemplate3 is <<<" + discoveryResponse + ">>>");
theUDPDatagramSender.sendUDPResponse(discoveryResponse, requester, sourcePort);
theUDPDatagramSender.sendUDPResponse(discoveryResponse.getBytes(), requester, sourcePort);
}
}

6
src/main/java/com/bwssystems/HABridge/util/UDPDatagramSender.java
View File

@@ -62,11 +62,11 @@ public class UDPDatagramSender {
responseSocket.close();
}
public void sendUDPResponse(String udpResponse, InetAddress requester, int sourcePort) throws IOException {
log.debug("Sending response string: <<<" + udpResponse + ">>>");
public void sendUDPResponse(byte[] udpMessage, InetAddress requester, int sourcePort) throws IOException {
log.debug("Sending response string: <<<" + new String(udpMessage) + ">>>");
if(responseSocket == null)
throw new IOException("Socket not initialized");
DatagramPacket response = new DatagramPacket(udpResponse.getBytes(), udpResponse.length(), requester, sourcePort);
DatagramPacket response = new DatagramPacket(udpMessage, udpMessage.length, requester, sourcePort);
responseSocket.send(response);
}
}