From c6e264395edc3a5b7c340b137f63ea976782f1ed Mon Sep 17 00:00:00 2001 From: emcho Date: Sun, 31 Jan 2010 13:03:07 +0000 Subject: [PATCH] Merged StunStack and StunProvider as there is no good reason for them to live apart. --- .../ice4j/MessageEventDispatchingTest.java | 33 ++++++------------ test/org/ice4j/TransactionSupportTests.java | 34 +++++++++---------- test/org/ice4j/stack/ShallowStackTest.java | 32 ++++++++--------- .../stunclient/ResponseSequenceServer.java | 7 ++-- 4 files changed, 44 insertions(+), 62 deletions(-) diff --git a/test/org/ice4j/MessageEventDispatchingTest.java b/test/org/ice4j/MessageEventDispatchingTest.java index 5b62074..38644b6 100644 --- a/test/org/ice4j/MessageEventDispatchingTest.java +++ b/test/org/ice4j/MessageEventDispatchingTest.java @@ -139,10 +139,8 @@ public class MessageEventDispatchingTest extends TestCase String oldRetransValue = System.getProperty( "org.ice4j.MAX_RETRANSMISSIONS"); System.setProperty("org.ice4j.MAX_RETRANSMISSIONS", "1"); - stunStack.getProvider().sendRequest(bindingRequest, - serverAddress, - clientAddress, - responseCollector); + stunStack.sendRequest(bindingRequest, serverAddress, clientAddress, + responseCollector); responseCollector.waitForTimeout(); assertEquals( @@ -170,11 +168,9 @@ public class MessageEventDispatchingTest extends TestCase public void testEventDispatchingUponIncomingRequests() throws Exception { //prepare to listen - stunStack.getProvider().addRequestListener(requestCollector); + stunStack.addRequestListener(requestCollector); //send - stunStack.getProvider().sendRequest(bindingRequest, - serverAddress, - clientAddress, + stunStack.sendRequest(bindingRequest, serverAddress, clientAddress, responseCollector); //wait for retransmissions requestCollector.waitForRequest(); @@ -194,17 +190,13 @@ public class MessageEventDispatchingTest extends TestCase throws Exception { //prepare to listen - stunStack.getProvider().addRequestListener(serverAddress, - requestCollector); + stunStack.addRequestListener(serverAddress, requestCollector); PlainRequestCollector requestCollector2 = new PlainRequestCollector(); - stunStack.getProvider().addRequestListener(serverAddress2, - requestCollector2); + stunStack.addRequestListener(serverAddress2, requestCollector2); //send - stunStack.getProvider().sendRequest(bindingRequest, - serverAddress2, - clientAddress, + stunStack.sendRequest(bindingRequest, serverAddress2, clientAddress, responseCollector); //wait for retransmissions requestCollector.waitForRequest(); @@ -227,12 +219,9 @@ public class MessageEventDispatchingTest extends TestCase public void testServerResponseRetransmissions() throws Exception { //prepare to listen - stunStack.getProvider().addRequestListener(serverAddress, - requestCollector); + stunStack.addRequestListener(serverAddress, requestCollector); //send - stunStack.getProvider().sendRequest(bindingRequest, - serverAddress, - clientAddress, + stunStack.sendRequest(bindingRequest, serverAddress, clientAddress, responseCollector); //wait for the message to arrive @@ -240,9 +229,7 @@ public class MessageEventDispatchingTest extends TestCase StunMessageEvent evt = requestCollector.receivedRequests.get(0); byte[] tid = evt.getMessage().getTransactionID(); - stunStack.getProvider().sendResponse(tid, - bindingResponse, - serverAddress, + stunStack.sendResponse(tid, bindingResponse, serverAddress, clientAddress); //wait for retransmissions diff --git a/test/org/ice4j/TransactionSupportTests.java b/test/org/ice4j/TransactionSupportTests.java index 30ff0cc..5f52858 100644 --- a/test/org/ice4j/TransactionSupportTests.java +++ b/test/org/ice4j/TransactionSupportTests.java @@ -122,10 +122,10 @@ public class TransactionSupportTests extends TestCase System.setProperty("org.ice4j.PROPAGATE_RECEIVED_RETRANSMISSIONS", "true"); - StunStack.getInstance().getProvider() + StunStack.getInstance() .addRequestListener(serverAddress, requestCollector); //send - StunStack.getInstance().getProvider().sendRequest(bindingRequest, + StunStack.getInstance().sendRequest(bindingRequest, serverAddress, clientAddress, responseCollector); //wait for retransmissions Thread.sleep(12000); @@ -149,10 +149,10 @@ public class TransactionSupportTests extends TestCase public void testServerRetransmissionHiding() throws Exception { //prepare to listen - StunStack.getInstance().getProvider().addRequestListener( + StunStack.getInstance().addRequestListener( serverAddress, requestCollector); //send - StunStack.getInstance().getProvider().sendRequest(bindingRequest, + StunStack.getInstance().sendRequest(bindingRequest, serverAddress, clientAddress, responseCollector); //wait for retransmissions @@ -180,10 +180,10 @@ public class TransactionSupportTests extends TestCase //prepare to listen System.setProperty("org.ice4j.KEEP_CLIENT_TRANS_AFTER_A_RESPONSE", "true"); - StunStack.getInstance().getProvider().addRequestListener( + StunStack.getInstance().addRequestListener( serverAddress, requestCollector); //send - StunStack.getInstance().getProvider().sendRequest( + StunStack.getInstance().sendRequest( bindingRequest, serverAddress, clientAddress, responseCollector); @@ -196,7 +196,7 @@ public class TransactionSupportTests extends TestCase StunMessageEvent evt = ((StunMessageEvent)reqs.get(0)); byte[] tid = evt.getMessage().getTransactionID(); - StunStack.getInstance().getProvider().sendResponse( + StunStack.getInstance().sendResponse( tid, bindingResponse, serverAddress, clientAddress); //wait for retransmissions @@ -214,10 +214,10 @@ public class TransactionSupportTests extends TestCase */ public void testUniqueIDs() throws Exception { - StunStack.getInstance().getProvider().addRequestListener( + StunStack.getInstance().addRequestListener( serverAddress, requestCollector); //send req 1 - StunStack.getInstance().getProvider().sendRequest(bindingRequest, + StunStack.getInstance().sendRequest(bindingRequest, serverAddress, clientAddress, responseCollector); //wait for retransmissions @@ -230,11 +230,11 @@ public class TransactionSupportTests extends TestCase //send a response to make the other guy shut up byte[] tid = evt1.getMessage().getTransactionID(); - StunStack.getInstance().getProvider().sendResponse(tid, + StunStack.getInstance().sendResponse(tid, bindingResponse, serverAddress, clientAddress); //send req 2 - StunStack.getInstance().getProvider().sendRequest(bindingRequest, + StunStack.getInstance().sendRequest(bindingRequest, serverAddress, clientAddress, responseCollector); //wait for retransmissions @@ -261,10 +261,10 @@ public class TransactionSupportTests extends TestCase //make sure we see retransmissions so that we may count them System.setProperty("org.ice4j.PROPAGATE_RECEIVED_RETRANSMISSIONS", "true"); - StunStack.getInstance().getProvider().addRequestListener( + StunStack.getInstance().addRequestListener( serverAddress, requestCollector); //send - StunStack.getInstance().getProvider().sendRequest( + StunStack.getInstance().sendRequest( bindingRequest, serverAddress, clientAddress, responseCollector); //wait for retransmissions Thread.sleep(1600); @@ -292,10 +292,10 @@ public class TransactionSupportTests extends TestCase //make sure we see retransmissions so that we may count them System.setProperty("org.ice4j.PROPAGATE_RECEIVED_RETRANSMISSIONS", "true"); - StunStack.getInstance().getProvider().addRequestListener( + StunStack.getInstance().addRequestListener( serverAddress, requestCollector); //send - StunStack.getInstance().getProvider().sendRequest(bindingRequest, + StunStack.getInstance().sendRequest(bindingRequest, serverAddress, clientAddress, responseCollector); //wait a while @@ -330,10 +330,10 @@ public class TransactionSupportTests extends TestCase "true"); System.setProperty("org.ice4j.MAX_RETRANSMISSIONS", "11"); - StunStack.getInstance().getProvider() + StunStack.getInstance() .addRequestListener(serverAddress, requestCollector); //send - StunStack.getInstance().getProvider().sendRequest(bindingRequest, + StunStack.getInstance().sendRequest(bindingRequest, serverAddress, clientAddress, responseCollector); //wait a while diff --git a/test/org/ice4j/stack/ShallowStackTest.java b/test/org/ice4j/stack/ShallowStackTest.java index 3f0b807..1ddc1de 100644 --- a/test/org/ice4j/stack/ShallowStackTest.java +++ b/test/org/ice4j/stack/ShallowStackTest.java @@ -25,7 +25,6 @@ public class ShallowStackTest extends TestCase { private static final Logger logger = Logger.getLogger(ShallowStackTest.class.getName()); - private StunProvider stunProvider = null; private StunStack stunStack = null; private MsgFixture msgFixture = null; @@ -59,7 +58,6 @@ public class ShallowStackTest extends TestCase { //init the stack stunStack = StunStack.getInstance(); - stunProvider = stunStack.getProvider(); //access point localSock = new DatagramSocket(localAddress); @@ -99,10 +97,10 @@ public class ShallowStackTest extends TestCase { dgramCollector.startListening(dummyServerSocket); - stunProvider.sendRequest(bindingRequest, - dummyServerAddress, - localAddress, - new SimpleResponseCollector()); + stunStack.sendRequest(bindingRequest, + dummyServerAddress, + localAddress, + new SimpleResponseCollector()); //wait for its arrival dgramCollector.waitForPacket(); @@ -151,7 +149,7 @@ public class ShallowStackTest extends TestCase { throws Exception { SimpleRequestCollector requestCollector = new SimpleRequestCollector(); - stunProvider.addRequestListener(requestCollector); + stunStack.addRequestListener(requestCollector); dummyServerSocket.send(new DatagramPacket( msgFixture.bindingRequest2, @@ -184,7 +182,7 @@ public class ShallowStackTest extends TestCase { { //---------- send & receive the request -------------------------------- SimpleRequestCollector requestCollector = new SimpleRequestCollector(); - stunProvider.addRequestListener(requestCollector); + stunStack.addRequestListener(requestCollector); dummyServerSocket.send(new DatagramPacket( msgFixture.bindingRequest, @@ -213,10 +211,10 @@ public class ShallowStackTest extends TestCase { //---------- send & receive the response ------------------------------- dgramCollector.startListening(dummyServerSocket); - stunProvider.sendResponse(collectedRequest.getTransactionID(), - bindingResponse, - localAddress, - dummyServerAddress); + stunStack.sendResponse(collectedRequest.getTransactionID(), + bindingResponse, + localAddress, + dummyServerAddress); //wait for its arrival dgramCollector.waitForPacket(); @@ -243,10 +241,10 @@ public class ShallowStackTest extends TestCase { //--------------- send the original request ---------------------------- Request bindingRequest = MessageFactory.createBindingRequest(); - stunProvider.sendRequest(bindingRequest, - dummyServerAddress, - localAddress, - collector); + stunStack.sendRequest(bindingRequest, + dummyServerAddress, + localAddress, + collector); //wait for its arrival collector.waitForResponse(); @@ -330,7 +328,7 @@ public class ShallowStackTest extends TestCase { public void requestReceived(StunMessageEvent evt) { collectedRequest = (Request)evt.getMessage(); - stunProvider.removeRequestListener(this); + stunStack.removeRequestListener(this); logger.finest("Received request."); synchronized(this) diff --git a/test/org/ice4j/stunclient/ResponseSequenceServer.java b/test/org/ice4j/stunclient/ResponseSequenceServer.java index aabee51..fbd34bf 100644 --- a/test/org/ice4j/stunclient/ResponseSequenceServer.java +++ b/test/org/ice4j/stunclient/ResponseSequenceServer.java @@ -37,7 +37,6 @@ public class ResponseSequenceServer private Vector messageSequence = new Vector(); private StunStack stunStack = null; - private StunProvider stunProvider = null; private TransportAddress serverAddress = null; private DatagramSocket localSocket = null; @@ -56,12 +55,11 @@ public class ResponseSequenceServer throws IOException, StunException { stunStack = StunStack.getInstance(); - stunProvider = stunStack.getProvider(); localSocket = new DatagramSocket(serverAddress); stunStack.addSocket(localSocket); - stunProvider.addRequestListener(serverAddress, this); + stunStack.addRequestListener(serverAddress, this); } @@ -74,7 +72,6 @@ public class ResponseSequenceServer localSocket.close(); stunStack = null; - stunProvider = null; } /** @@ -112,7 +109,7 @@ public class ResponseSequenceServer try { - stunProvider.sendResponse(evt.getMessage().getTransactionID(), + stunStack.sendResponse(evt.getMessage().getTransactionID(), res, serverAddress, evt.getRemoteAddress()); } catch (Exception ex)