From 597fef6d504088b4e1cd9f407da345e37c4b3f2b Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 3 Jul 2020 13:04:26 +0100
Subject: [PATCH] Check server socket is bound.

---
 .../java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java  | 2 +-
 .../java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java
index 2416f233f..800643c75 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java
@@ -349,7 +349,7 @@ class LanTcpPlugin extends TcpPlugin {
 				tryToClose(ss, LOG, WARNING);
 			}
 		}
-		if (ss == null) {
+		if (ss == null || !ss.isBound()) {
 			LOG.info("Could not bind server socket for key agreement");
 			return null;
 		}
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java
index e97ff2993..2130c69cc 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java
@@ -162,7 +162,7 @@ abstract class TcpPlugin implements DuplexPlugin, EventListener {
 				tryToClose(ss, LOG, WARNING);
 			}
 		}
-		if (ss == null) {
+		if (ss == null || !ss.isBound()) {
 			LOG.info("Could not bind server socket");
 			return;
 		}