Prevent duplicate connections

core/src/main/groovy/com/muwire/core/connection/Connection.groovy

@@ -84,12 +84,11 @@ abstract class Connection implements Closeable {
 		} catch (SocketTimeoutException e) {
 			close()
         } catch (Exception e) {
-			if (running.get()) {
             log.log(Level.WARNING,"unhandled exception in reader",e)
+        } finally {
             close()
         }
 	}
-	}
 	
 	protected abstract void read()
 	
@@ -100,12 +99,11 @@ abstract class Connection implements Closeable {
 				write(message)
 			}
 		} catch (Exception e) {
-			if (running.get()) {
             log.log(Level.WARNING, "unhandled exception in writer",e)
+        } finally {
             close()
         }
 	}
-	}
 	
 	protected abstract void write(def message);
 	

core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy

@@ -140,7 +140,7 @@ class ConnectionAcceptor {
     }
 
 	private void handleIncoming(Endpoint e, boolean leaf) {
-		boolean accept = leaf ? manager.hasLeafSlots() : manager.hasPeerSlots()
+		boolean accept = !manager.isConnected(e.destination) && (leaf ? manager.hasLeafSlots() : manager.hasPeerSlots())
 		if (accept) {
 			log.info("accepting connection, leaf:$leaf")
 			e.outputStream.write("OK".bytes)

core/src/test/groovy/com/muwire/core/connection/ConnectionAcceptorTest.groovy

@@ -108,6 +108,10 @@ class ConnectionAcceptorTest {
 			new Endpoint(destinations.dest1, is, os, null)
 		}
 		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        connectionManagerMock.demand.isConnected { dest ->
+            assert dest == destinations.dest1
+            false
+        }
         connectionManagerMock.demand.hasLeafSlots() { true }
 		trustServiceMock.demand.getLevel { dest ->
 			assert dest == destinations.dest1
@@ -146,6 +150,10 @@ class ConnectionAcceptorTest {
 			new Endpoint(destinations.dest1, is, os, null)
 		}
 		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        connectionManagerMock.demand.isConnected { dest ->
+            assert dest == destinations.dest1
+            false
+        }
         connectionManagerMock.demand.hasPeerSlots() { true }
 		trustServiceMock.demand.getLevel { dest ->
 			assert dest == destinations.dest1
@@ -242,7 +250,7 @@ class ConnectionAcceptorTest {
 	}
 	
 	@Test
-	void testPeerRejectsPeer() {
+	void testPeerRejectsPeerSlots() {
 		settings = new MuWireSettings() {
 			boolean isLeaf() {
 				false
@@ -256,6 +264,10 @@ class ConnectionAcceptorTest {
 			new Endpoint(destinations.dest1, is, os, null)
 		}
 		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        connectionManagerMock.demand.isConnected { dest ->
+            assert dest == destinations.dest1
+            false
+        }
         connectionManagerMock.demand.hasPeerSlots() { false }
 		trustServiceMock.demand.getLevel { dest ->
 			assert dest == destinations.dest1
@@ -284,7 +296,7 @@ class ConnectionAcceptorTest {
 	}
 	
 	@Test
-	void testPeerRejectsLeaf() {
+	void testPeerRejectsLeafSlots() {
 		settings = new MuWireSettings() {
 			boolean isLeaf() {
 				false
@@ -298,6 +310,10 @@ class ConnectionAcceptorTest {
 			new Endpoint(destinations.dest1, is, os, null)
 		}
 		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        connectionManagerMock.demand.isConnected { dest ->
+            assert dest == destinations.dest1
+            false
+        }
         connectionManagerMock.demand.hasLeafSlots() { false }
 		trustServiceMock.demand.getLevel { dest ->
 			assert dest == destinations.dest1
@@ -340,6 +356,10 @@ class ConnectionAcceptorTest {
 			new Endpoint(destinations.dest1, is, os, null)
 		}
 		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        connectionManagerMock.demand.isConnected { dest ->
+            assert dest == destinations.dest1
+            false
+        }
         connectionManagerMock.demand.hasPeerSlots() { false }
 		trustServiceMock.demand.getLevel { dest ->
 			assert dest == destinations.dest1