Fix deadlock in CC2531 between sending and input parsing threads (#987)

Signed-off-by: Witold Sowa <[email protected]>

Author: wsowa

com.zsmartsystems.zigbee.dongle.cc2531/src/main/java/com/zsmartsystems/zigbee/dongle/cc2531/ZigBeeDongleTiCc2531.java

@@ -13,14 +13,12 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledExecutorService;
 
+import com.zsmartsystems.zigbee.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.zsmartsystems.zigbee.ExtendedPanId;
-import com.zsmartsystems.zigbee.IeeeAddress;
-import com.zsmartsystems.zigbee.ZigBeeChannel;
-import com.zsmartsystems.zigbee.ZigBeeStatus;
 import com.zsmartsystems.zigbee.aps.ZigBeeApsFrame;
 import com.zsmartsystems.zigbee.dongle.cc2531.frame.ZdoActiveEndpoint;
 import com.zsmartsystems.zigbee.dongle.cc2531.frame.ZdoCallbackIncoming;
@@ -107,6 +105,8 @@ public class ZigBeeDongleTiCc2531
      */
     private String versionString = "Unknown";
 
+    private ScheduledExecutorService executorService = ZigBeeExecutors.newScheduledThreadPool(1, "CC2531Commands");
+
     /**
      * Constructor to configure the port interface.
      *
@@ -304,23 +304,26 @@ public void sendCommand(final int msgTag, final ZigBeeApsFrame apsFrame) {
             } else {
                 sender = (short) getSendingEndpoint(apsFrame.getProfile());
             }
-            ZigBeeTransportProgressState state;
-
-            // TODO: How to differentiate group and device addressing?????
-            boolean groupCommand = false;
-            if (!groupCommand) {
-                messageIdMap.put(apsFrame.getApsCounter(), msgTag);
-                ZToolPacket response = networkManager.sendCommand(new AF_DATA_REQUEST(apsFrame.getDestinationAddress(),
-                        (short) apsFrame.getDestinationEndpoint(), sender, apsFrame.getCluster(),
-                        apsFrame.getApsCounter(), (byte) (0x20 | (apsFrame.getAckRequest() ? 0x10 : 0)), (byte) apsFrame.getRadius(), apsFrame.getPayload()));
-                state = (response == null || ((AF_DATA_SRSP)response).Status != 0) ? ZigBeeTransportProgressState.TX_NAK : ZigBeeTransportProgressState.TX_ACK;
-            } else {
-                ZToolPacket response = networkManager.sendCommand(new AF_DATA_REQUEST_EXT(apsFrame.getDestinationAddress(), sender,
-                        apsFrame.getCluster(), apsFrame.getApsCounter(), (byte) (0), (byte) 0, apsFrame.getPayload()));
-                state = (response == null || ((AF_DATA_SRSP_EXT)response).getStatus() != 0) ? ZigBeeTransportProgressState.TX_NAK : ZigBeeTransportProgressState.TX_ACK;
-            }
 
-            zigbeeNetworkReceive.receiveCommandState(msgTag, state);
+            executorService.execute(() -> {
+                ZigBeeTransportProgressState state;
+
+                // TODO: How to differentiate group and device addressing?????
+                boolean groupCommand = false;
+                if (!groupCommand) {
+                    messageIdMap.put(apsFrame.getApsCounter(), msgTag);
+                    ZToolPacket response = networkManager.sendCommand(new AF_DATA_REQUEST(apsFrame.getDestinationAddress(),
+                            (short) apsFrame.getDestinationEndpoint(), sender, apsFrame.getCluster(),
+                            apsFrame.getApsCounter(), (byte) (0x20 | (apsFrame.getAckRequest() ? 0x10 : 0)), (byte) apsFrame.getRadius(), apsFrame.getPayload()));
+                    state = (response == null || ((AF_DATA_SRSP)response).Status != 0) ? ZigBeeTransportProgressState.TX_NAK : ZigBeeTransportProgressState.TX_ACK;
+                } else {
+                    ZToolPacket response = networkManager.sendCommand(new AF_DATA_REQUEST_EXT(apsFrame.getDestinationAddress(), sender,
+                            apsFrame.getCluster(), apsFrame.getApsCounter(), (byte) (0), (byte) 0, apsFrame.getPayload()));
+                    state = (response == null || ((AF_DATA_SRSP_EXT)response).getStatus() != 0) ? ZigBeeTransportProgressState.TX_NAK : ZigBeeTransportProgressState.TX_ACK;
+                }
+
+                zigbeeNetworkReceive.receiveCommandState(msgTag, state);
+            });
         }
     }