diff --git a/src/dorkbox/network/aeron/IpcMediaDriverConnection.kt b/src/dorkbox/network/aeron/IpcMediaDriverConnection.kt index 9dbae58d..c7070aae 100644 --- a/src/dorkbox/network/aeron/IpcMediaDriverConnection.kt +++ b/src/dorkbox/network/aeron/IpcMediaDriverConnection.kt @@ -30,7 +30,7 @@ internal open class IpcMediaDriverConnection(streamId: Int, val streamIdSubscription: Int, sessionId: Int, ) : - MediaDriverConnection(0, 0, streamId, sessionId, 1_000, true) { + MediaDriverConnection(0, 0, streamId, sessionId, 1, true) { var success: Boolean = false @@ -93,7 +93,7 @@ internal open class IpcMediaDriverConnection(streamId: Int, success = false // this will wait for the server to acknowledge the connection (all via aeron) - startTime = System.currentTimeMillis() + startTime = System.nanoTime() while (timoutInNanos == 0L || System.nanoTime() - startTime < timoutInNanos) { if (publication.isConnected) { success = true diff --git a/test/dorkboxTest/network/ConnectionFilterTest.kt b/test/dorkboxTest/network/ConnectionFilterTest.kt index 501ee83b..76ef30f5 100644 --- a/test/dorkboxTest/network/ConnectionFilterTest.kt +++ b/test/dorkboxTest/network/ConnectionFilterTest.kt @@ -245,6 +245,8 @@ class ConnectionFilterTest : BaseTest() { @Test fun rejectServerIpc() { + // we do not want to limit loopback addresses! Even with filtering, IPC is always allowed to connect + val serverConnectSuccess = atomic(false) val clientConnectSuccess = atomic(false) @@ -291,8 +293,8 @@ class ConnectionFilterTest : BaseTest() { waitForThreads() - Assert.assertFalse(serverConnectSuccess.value) - Assert.assertFalse(clientConnectSuccess.value) + Assert.assertTrue(serverConnectSuccess.value) + Assert.assertTrue(clientConnectSuccess.value) } @Test(expected = ClientException::class)