Merged StunStack and StunProvider as there is no good reason for them to live apart.

This commit is contained in:
emcho 2010-01-31 13:03:07 +00:00
parent 312b9d15b2
commit c6e264395e
4 changed files with 44 additions and 62 deletions

View File

@ -139,10 +139,8 @@ public class MessageEventDispatchingTest extends TestCase
String oldRetransValue = System.getProperty( String oldRetransValue = System.getProperty(
"org.ice4j.MAX_RETRANSMISSIONS"); "org.ice4j.MAX_RETRANSMISSIONS");
System.setProperty("org.ice4j.MAX_RETRANSMISSIONS", "1"); System.setProperty("org.ice4j.MAX_RETRANSMISSIONS", "1");
stunStack.getProvider().sendRequest(bindingRequest, stunStack.sendRequest(bindingRequest, serverAddress, clientAddress,
serverAddress, responseCollector);
clientAddress,
responseCollector);
responseCollector.waitForTimeout(); responseCollector.waitForTimeout();
assertEquals( assertEquals(
@ -170,11 +168,9 @@ public class MessageEventDispatchingTest extends TestCase
public void testEventDispatchingUponIncomingRequests() throws Exception public void testEventDispatchingUponIncomingRequests() throws Exception
{ {
//prepare to listen //prepare to listen
stunStack.getProvider().addRequestListener(requestCollector); stunStack.addRequestListener(requestCollector);
//send //send
stunStack.getProvider().sendRequest(bindingRequest, stunStack.sendRequest(bindingRequest, serverAddress, clientAddress,
serverAddress,
clientAddress,
responseCollector); responseCollector);
//wait for retransmissions //wait for retransmissions
requestCollector.waitForRequest(); requestCollector.waitForRequest();
@ -194,17 +190,13 @@ public class MessageEventDispatchingTest extends TestCase
throws Exception throws Exception
{ {
//prepare to listen //prepare to listen
stunStack.getProvider().addRequestListener(serverAddress, stunStack.addRequestListener(serverAddress, requestCollector);
requestCollector);
PlainRequestCollector requestCollector2 = new PlainRequestCollector(); PlainRequestCollector requestCollector2 = new PlainRequestCollector();
stunStack.getProvider().addRequestListener(serverAddress2, stunStack.addRequestListener(serverAddress2, requestCollector2);
requestCollector2);
//send //send
stunStack.getProvider().sendRequest(bindingRequest, stunStack.sendRequest(bindingRequest, serverAddress2, clientAddress,
serverAddress2,
clientAddress,
responseCollector); responseCollector);
//wait for retransmissions //wait for retransmissions
requestCollector.waitForRequest(); requestCollector.waitForRequest();
@ -227,12 +219,9 @@ public class MessageEventDispatchingTest extends TestCase
public void testServerResponseRetransmissions() throws Exception public void testServerResponseRetransmissions() throws Exception
{ {
//prepare to listen //prepare to listen
stunStack.getProvider().addRequestListener(serverAddress, stunStack.addRequestListener(serverAddress, requestCollector);
requestCollector);
//send //send
stunStack.getProvider().sendRequest(bindingRequest, stunStack.sendRequest(bindingRequest, serverAddress, clientAddress,
serverAddress,
clientAddress,
responseCollector); responseCollector);
//wait for the message to arrive //wait for the message to arrive
@ -240,9 +229,7 @@ public class MessageEventDispatchingTest extends TestCase
StunMessageEvent evt = requestCollector.receivedRequests.get(0); StunMessageEvent evt = requestCollector.receivedRequests.get(0);
byte[] tid = evt.getMessage().getTransactionID(); byte[] tid = evt.getMessage().getTransactionID();
stunStack.getProvider().sendResponse(tid, stunStack.sendResponse(tid, bindingResponse, serverAddress,
bindingResponse,
serverAddress,
clientAddress); clientAddress);
//wait for retransmissions //wait for retransmissions

View File

@ -122,10 +122,10 @@ public class TransactionSupportTests extends TestCase
System.setProperty("org.ice4j.PROPAGATE_RECEIVED_RETRANSMISSIONS", System.setProperty("org.ice4j.PROPAGATE_RECEIVED_RETRANSMISSIONS",
"true"); "true");
StunStack.getInstance().getProvider() StunStack.getInstance()
.addRequestListener(serverAddress, requestCollector); .addRequestListener(serverAddress, requestCollector);
//send //send
StunStack.getInstance().getProvider().sendRequest(bindingRequest, StunStack.getInstance().sendRequest(bindingRequest,
serverAddress, clientAddress, responseCollector); serverAddress, clientAddress, responseCollector);
//wait for retransmissions //wait for retransmissions
Thread.sleep(12000); Thread.sleep(12000);
@ -149,10 +149,10 @@ public class TransactionSupportTests extends TestCase
public void testServerRetransmissionHiding() throws Exception public void testServerRetransmissionHiding() throws Exception
{ {
//prepare to listen //prepare to listen
StunStack.getInstance().getProvider().addRequestListener( StunStack.getInstance().addRequestListener(
serverAddress, requestCollector); serverAddress, requestCollector);
//send //send
StunStack.getInstance().getProvider().sendRequest(bindingRequest, StunStack.getInstance().sendRequest(bindingRequest,
serverAddress, clientAddress, responseCollector); serverAddress, clientAddress, responseCollector);
//wait for retransmissions //wait for retransmissions
@ -180,10 +180,10 @@ public class TransactionSupportTests extends TestCase
//prepare to listen //prepare to listen
System.setProperty("org.ice4j.KEEP_CLIENT_TRANS_AFTER_A_RESPONSE", System.setProperty("org.ice4j.KEEP_CLIENT_TRANS_AFTER_A_RESPONSE",
"true"); "true");
StunStack.getInstance().getProvider().addRequestListener( StunStack.getInstance().addRequestListener(
serverAddress, requestCollector); serverAddress, requestCollector);
//send //send
StunStack.getInstance().getProvider().sendRequest( StunStack.getInstance().sendRequest(
bindingRequest, serverAddress, bindingRequest, serverAddress,
clientAddress, responseCollector); clientAddress, responseCollector);
@ -196,7 +196,7 @@ public class TransactionSupportTests extends TestCase
StunMessageEvent evt = ((StunMessageEvent)reqs.get(0)); StunMessageEvent evt = ((StunMessageEvent)reqs.get(0));
byte[] tid = evt.getMessage().getTransactionID(); byte[] tid = evt.getMessage().getTransactionID();
StunStack.getInstance().getProvider().sendResponse( StunStack.getInstance().sendResponse(
tid, bindingResponse, serverAddress, clientAddress); tid, bindingResponse, serverAddress, clientAddress);
//wait for retransmissions //wait for retransmissions
@ -214,10 +214,10 @@ public class TransactionSupportTests extends TestCase
*/ */
public void testUniqueIDs() throws Exception public void testUniqueIDs() throws Exception
{ {
StunStack.getInstance().getProvider().addRequestListener( StunStack.getInstance().addRequestListener(
serverAddress, requestCollector); serverAddress, requestCollector);
//send req 1 //send req 1
StunStack.getInstance().getProvider().sendRequest(bindingRequest, StunStack.getInstance().sendRequest(bindingRequest,
serverAddress, clientAddress, responseCollector); serverAddress, clientAddress, responseCollector);
//wait for retransmissions //wait for retransmissions
@ -230,11 +230,11 @@ public class TransactionSupportTests extends TestCase
//send a response to make the other guy shut up //send a response to make the other guy shut up
byte[] tid = evt1.getMessage().getTransactionID(); byte[] tid = evt1.getMessage().getTransactionID();
StunStack.getInstance().getProvider().sendResponse(tid, StunStack.getInstance().sendResponse(tid,
bindingResponse, serverAddress, clientAddress); bindingResponse, serverAddress, clientAddress);
//send req 2 //send req 2
StunStack.getInstance().getProvider().sendRequest(bindingRequest, StunStack.getInstance().sendRequest(bindingRequest,
serverAddress, clientAddress, responseCollector); serverAddress, clientAddress, responseCollector);
//wait for retransmissions //wait for retransmissions
@ -261,10 +261,10 @@ public class TransactionSupportTests extends TestCase
//make sure we see retransmissions so that we may count them //make sure we see retransmissions so that we may count them
System.setProperty("org.ice4j.PROPAGATE_RECEIVED_RETRANSMISSIONS", System.setProperty("org.ice4j.PROPAGATE_RECEIVED_RETRANSMISSIONS",
"true"); "true");
StunStack.getInstance().getProvider().addRequestListener( StunStack.getInstance().addRequestListener(
serverAddress, requestCollector); serverAddress, requestCollector);
//send //send
StunStack.getInstance().getProvider().sendRequest( StunStack.getInstance().sendRequest(
bindingRequest, serverAddress, clientAddress, responseCollector); bindingRequest, serverAddress, clientAddress, responseCollector);
//wait for retransmissions //wait for retransmissions
Thread.sleep(1600); Thread.sleep(1600);
@ -292,10 +292,10 @@ public class TransactionSupportTests extends TestCase
//make sure we see retransmissions so that we may count them //make sure we see retransmissions so that we may count them
System.setProperty("org.ice4j.PROPAGATE_RECEIVED_RETRANSMISSIONS", System.setProperty("org.ice4j.PROPAGATE_RECEIVED_RETRANSMISSIONS",
"true"); "true");
StunStack.getInstance().getProvider().addRequestListener( StunStack.getInstance().addRequestListener(
serverAddress, requestCollector); serverAddress, requestCollector);
//send //send
StunStack.getInstance().getProvider().sendRequest(bindingRequest, StunStack.getInstance().sendRequest(bindingRequest,
serverAddress, clientAddress, responseCollector); serverAddress, clientAddress, responseCollector);
//wait a while //wait a while
@ -330,10 +330,10 @@ public class TransactionSupportTests extends TestCase
"true"); "true");
System.setProperty("org.ice4j.MAX_RETRANSMISSIONS", System.setProperty("org.ice4j.MAX_RETRANSMISSIONS",
"11"); "11");
StunStack.getInstance().getProvider() StunStack.getInstance()
.addRequestListener(serverAddress, requestCollector); .addRequestListener(serverAddress, requestCollector);
//send //send
StunStack.getInstance().getProvider().sendRequest(bindingRequest, StunStack.getInstance().sendRequest(bindingRequest,
serverAddress, clientAddress, responseCollector); serverAddress, clientAddress, responseCollector);
//wait a while //wait a while

View File

@ -25,7 +25,6 @@ public class ShallowStackTest extends TestCase {
private static final Logger logger = private static final Logger logger =
Logger.getLogger(ShallowStackTest.class.getName()); Logger.getLogger(ShallowStackTest.class.getName());
private StunProvider stunProvider = null;
private StunStack stunStack = null; private StunStack stunStack = null;
private MsgFixture msgFixture = null; private MsgFixture msgFixture = null;
@ -59,7 +58,6 @@ public class ShallowStackTest extends TestCase {
//init the stack //init the stack
stunStack = StunStack.getInstance(); stunStack = StunStack.getInstance();
stunProvider = stunStack.getProvider();
//access point //access point
localSock = new DatagramSocket(localAddress); localSock = new DatagramSocket(localAddress);
@ -99,10 +97,10 @@ public class ShallowStackTest extends TestCase {
dgramCollector.startListening(dummyServerSocket); dgramCollector.startListening(dummyServerSocket);
stunProvider.sendRequest(bindingRequest, stunStack.sendRequest(bindingRequest,
dummyServerAddress, dummyServerAddress,
localAddress, localAddress,
new SimpleResponseCollector()); new SimpleResponseCollector());
//wait for its arrival //wait for its arrival
dgramCollector.waitForPacket(); dgramCollector.waitForPacket();
@ -151,7 +149,7 @@ public class ShallowStackTest extends TestCase {
throws Exception throws Exception
{ {
SimpleRequestCollector requestCollector = new SimpleRequestCollector(); SimpleRequestCollector requestCollector = new SimpleRequestCollector();
stunProvider.addRequestListener(requestCollector); stunStack.addRequestListener(requestCollector);
dummyServerSocket.send(new DatagramPacket( dummyServerSocket.send(new DatagramPacket(
msgFixture.bindingRequest2, msgFixture.bindingRequest2,
@ -184,7 +182,7 @@ public class ShallowStackTest extends TestCase {
{ {
//---------- send & receive the request -------------------------------- //---------- send & receive the request --------------------------------
SimpleRequestCollector requestCollector = new SimpleRequestCollector(); SimpleRequestCollector requestCollector = new SimpleRequestCollector();
stunProvider.addRequestListener(requestCollector); stunStack.addRequestListener(requestCollector);
dummyServerSocket.send(new DatagramPacket( dummyServerSocket.send(new DatagramPacket(
msgFixture.bindingRequest, msgFixture.bindingRequest,
@ -213,10 +211,10 @@ public class ShallowStackTest extends TestCase {
//---------- send & receive the response ------------------------------- //---------- send & receive the response -------------------------------
dgramCollector.startListening(dummyServerSocket); dgramCollector.startListening(dummyServerSocket);
stunProvider.sendResponse(collectedRequest.getTransactionID(), stunStack.sendResponse(collectedRequest.getTransactionID(),
bindingResponse, bindingResponse,
localAddress, localAddress,
dummyServerAddress); dummyServerAddress);
//wait for its arrival //wait for its arrival
dgramCollector.waitForPacket(); dgramCollector.waitForPacket();
@ -243,10 +241,10 @@ public class ShallowStackTest extends TestCase {
//--------------- send the original request ---------------------------- //--------------- send the original request ----------------------------
Request bindingRequest = MessageFactory.createBindingRequest(); Request bindingRequest = MessageFactory.createBindingRequest();
stunProvider.sendRequest(bindingRequest, stunStack.sendRequest(bindingRequest,
dummyServerAddress, dummyServerAddress,
localAddress, localAddress,
collector); collector);
//wait for its arrival //wait for its arrival
collector.waitForResponse(); collector.waitForResponse();
@ -330,7 +328,7 @@ public class ShallowStackTest extends TestCase {
public void requestReceived(StunMessageEvent evt) public void requestReceived(StunMessageEvent evt)
{ {
collectedRequest = (Request)evt.getMessage(); collectedRequest = (Request)evt.getMessage();
stunProvider.removeRequestListener(this); stunStack.removeRequestListener(this);
logger.finest("Received request."); logger.finest("Received request.");
synchronized(this) synchronized(this)

View File

@ -37,7 +37,6 @@ public class ResponseSequenceServer
private Vector<Object> messageSequence = new Vector<Object>(); private Vector<Object> messageSequence = new Vector<Object>();
private StunStack stunStack = null; private StunStack stunStack = null;
private StunProvider stunProvider = null;
private TransportAddress serverAddress = null; private TransportAddress serverAddress = null;
private DatagramSocket localSocket = null; private DatagramSocket localSocket = null;
@ -56,12 +55,11 @@ public class ResponseSequenceServer
throws IOException, StunException throws IOException, StunException
{ {
stunStack = StunStack.getInstance(); stunStack = StunStack.getInstance();
stunProvider = stunStack.getProvider();
localSocket = new DatagramSocket(serverAddress); localSocket = new DatagramSocket(serverAddress);
stunStack.addSocket(localSocket); stunStack.addSocket(localSocket);
stunProvider.addRequestListener(serverAddress, this); stunStack.addRequestListener(serverAddress, this);
} }
@ -74,7 +72,6 @@ public class ResponseSequenceServer
localSocket.close(); localSocket.close();
stunStack = null; stunStack = null;
stunProvider = null;
} }
/** /**
@ -112,7 +109,7 @@ public class ResponseSequenceServer
try try
{ {
stunProvider.sendResponse(evt.getMessage().getTransactionID(), stunStack.sendResponse(evt.getMessage().getTransactionID(),
res, serverAddress, evt.getRemoteAddress()); res, serverAddress, evt.getRemoteAddress());
} }
catch (Exception ex) catch (Exception ex)