From 105a49749e32c0ff337f0c0263caa65e303974c1 Mon Sep 17 00:00:00 2001 From: Han Xu Date: Wed, 17 Apr 2019 16:51:16 -0700 Subject: [PATCH] Fix Retransmitter creation to take effect of originalWaitInterval config --- .gitignore | 4 ++ .../ice4j/stack/StunClientTransaction.java | 4 +- .../org/ice4j/stack/DatagramCollector.java | 3 +- .../org/ice4j/stack/ShallowStackTest.java | 57 +++++++++++++++++++ 4 files changed, 66 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4d0c9e4..72c75c0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,7 @@ .project .settings/ bin/ + +# Ignore IntelliJ IDEA files +.idea +*.iml diff --git a/src/main/java/org/ice4j/stack/StunClientTransaction.java b/src/main/java/org/ice4j/stack/StunClientTransaction.java index 553947f..77828f8 100644 --- a/src/main/java/org/ice4j/stack/StunClientTransaction.java +++ b/src/main/java/org/ice4j/stack/StunClientTransaction.java @@ -150,7 +150,7 @@ public class StunClientTransaction /** * A transaction request retransmitter */ - private final Retransmitter retransmitter = new Retransmitter(); + private final Retransmitter retransmitter; /** * Creates a client transaction. @@ -206,6 +206,8 @@ public class StunClientTransaction initTransactionConfiguration(); + retransmitter = new Retransmitter(); // create it here to support 'originalWaitInterval' configuration + this.transactionID = transactionID; try diff --git a/src/test/java/org/ice4j/stack/DatagramCollector.java b/src/test/java/org/ice4j/stack/DatagramCollector.java index 18b4e55..33ef1b5 100644 --- a/src/test/java/org/ice4j/stack/DatagramCollector.java +++ b/src/test/java/org/ice4j/stack/DatagramCollector.java @@ -36,7 +36,8 @@ public class DatagramCollector { try { - + // The 'receive' method synchronized the packet, hence the 'getData()' (also synchronized) will block + // on this anyway even after 'waitForPacket' and 'collectPacket' calls. sock.receive(receivedPacket); synchronized (this) diff --git a/src/test/java/org/ice4j/stack/ShallowStackTest.java b/src/test/java/org/ice4j/stack/ShallowStackTest.java index fab49e3..ad1038d 100644 --- a/src/test/java/org/ice4j/stack/ShallowStackTest.java +++ b/src/test/java/org/ice4j/stack/ShallowStackTest.java @@ -316,6 +316,63 @@ public class ShallowStackTest extends TestCase Arrays.equals(expectedReturn, actualReturn)); } + /** + * Verify StackProperties.FIRST_CTRAN_RETRANS_AFTER can indeed update StunClientTransaction.Retransmitter + */ + public void testRetransmissionOriginalWait() + throws Exception + { + long originalWait = 200; // milliseconds + System.setProperty(StackProperties.FIRST_CTRAN_RETRANS_AFTER, String.valueOf(originalWait)); + + Request bindingRequest = MessageFactory.createBindingRequest(); + + dgramCollector.startListening(dummyServerSocket); + + long firstTime = System.currentTimeMillis(); + + stunStack.sendRequest(bindingRequest, + dummyServerAddress, + localAddress, + new SimpleResponseCollector()); + + //wait for its arrival + dgramCollector.waitForPacket(); + DatagramPacket receivedPacket = dgramCollector.collectPacket(); + + assertTrue("The stack did not properly send a Binding Request", + (receivedPacket.getLength() > 0)); + + Request receivedRequest = + (Request)Request.decode(receivedPacket.getData(), + (char)0, + (char)receivedPacket.getLength()); + assertEquals("The received request did not match the " + +"one that was sent.", + bindingRequest, //expected + receivedRequest); // actual + + // wait for the 1st retransmission with originalWait + dgramCollector.startListening(dummyServerSocket); + dgramCollector.waitForPacket(); + receivedPacket = dgramCollector.collectPacket(); + + assertTrue("The stack did not retransmit a Binding Request", + (receivedPacket.getLength() > 0)); + + receivedRequest = (Request)Request.decode( + receivedPacket.getData(), + (char)0, + (char)receivedPacket.getLength()); + assertEquals("The retransmitted request did not match the original.", + bindingRequest, //expected + receivedRequest); // actual + + // verify the retransmission is longer than the originalWait + long secondTime = System.currentTimeMillis(); + assertTrue((secondTime - firstTime) >= originalWait); + } + //--------------------------------------- listener implementations --------- /** * A simple utility that allows us to asynchronously collect messages.