Added a timeout on finding an available port.

Signed-off-by: AntonJansen <gradius@fmf.nl>
openhab · Oct 14, 2024 · c3d7819 · c3d7819
1 parent 9194d0e
commit c3d7819
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/....binding.broadlink/src/main/java/org/openhab/binding/broadlink/internal/NetworkUtils.java b/....binding.broadlink/src/main/java/org/openhab/binding/broadlink/internal/NetworkUtils.java
@@ -19,12 +19,11 @@
 import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeoutException;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.broadlink.internal.handler.BroadlinkHostNotReachableException;
 import org.openhab.core.net.NetUtil;
-import org.slf4j.Logger;
 
 /**
  * Utilities for working with the local network.
@@ -84,14 +83,22 @@ public static InetAddress getLocalHostLANAddress() throws UnknownHostException {
      * @param from port number of the start of the range
      * @param to port number of the end of the range
      * @return number of the available port
+     * @throws TimeoutException when no available port can be found in 30 seconds
      */
-    public static int nextFreePort(InetAddress host, int from, int to) {
+    public static int nextFreePort(InetAddress host, int from, int to) throws TimeoutException {
+        if (to < from) {
+            throw new IllegalArgumentException("To value is smaller than from value.");
+        }
         int port = randInt(from, to);
+        long startTime = System.currentTimeMillis();
         do {
             if (isLocalPortFree(host, port)) {
                 return port;
             }
             port = ThreadLocalRandom.current().nextInt(from, to);
+            if (System.currentTimeMillis() - startTime > 30000) {
+                throw new TimeoutException("Cannot find an available port in the specified range");
+            }
         } while (true);
     }
 

diff --git a/...ink/src/main/java/org/openhab/binding/broadlink/internal/discovery/DiscoveryProtocol.java b/...ink/src/main/java/org/openhab/binding/broadlink/internal/discovery/DiscoveryProtocol.java
@@ -14,6 +14,7 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.concurrent.TimeoutException;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.broadlink.internal.BroadlinkProtocol;
@@ -67,6 +68,10 @@ public static void discoverDevices(Logger logger) {
             BroadlinkSocket.sendMessage(message, "255.255.255.255", 80, logger);
         } catch (UnknownHostException e) {
             logger.warn("Failed to initiate discovery: {}", e.getMessage());
+        } catch (IllegalArgumentException e) {
+            logger.warn("Failed to find free port: {}", e.getMessage());
+        } catch (TimeoutException e) {
+            logger.warn("Cannot find a port to discovber new devices");
         }
     }