Makes TransportAddress a descendant of InetSocketAddress.

This commit is contained in:
emcho 2010-01-31 13:01:34 +00:00
parent 30ae0a9047
commit cb3228446f
11 changed files with 482 additions and 335 deletions

View File

@ -1,49 +1,102 @@
/*
* ice4j, the OpenSource Java Solution for NAT and Firewall Traversal.
* Maintained by the SIP Communicator community (http://sip-communicator.org).
*
* Distributable under LGPL license. See terms of license at gnu.org.
*/
package org.ice4j; package org.ice4j;
import java.net.*;
import java.util.*;
import junit.framework.*; import junit.framework.*;
import java.util.*;
import org.ice4j.*;
import org.ice4j.message.*; import org.ice4j.message.*;
import org.ice4j.stack.*; import org.ice4j.stack.*;
/** /**
* Test event dispatching for both client and server. * Test event dispatching for both client and server.
* <p>Company: Net Research Team, Louis Pasteur University</p> *`
* @author Emil Ivov * @author Emil Ivov
*/ */
public class MessageEventDispatchingTest extends TestCase public class MessageEventDispatchingTest extends TestCase
{ {
/**
* The stack that we are using for the tests.
*/
StunStack stunStack = null; StunStack stunStack = null;
TransportAddress clientAddress = new TransportAddress("127.0.0.1", 5216); /**
TransportAddress serverAddress = new TransportAddress("127.0.0.2", 5255); * The address of the client.
TransportAddress serverAddress2 = new TransportAddress("127.0.0.2", 5259); */
TransportAddress clientAddress
= new TransportAddress("127.0.0.1", 5216, Transport.UDP);
NetAccessPointDescriptor clientAccessPoint = null; /**
NetAccessPointDescriptor serverAccessPoint = null; * The Address of the server.
NetAccessPointDescriptor serverAccessPoint2 = null; */
TransportAddress serverAddress
= new TransportAddress("127.0.0.2", 5255, Transport.UDP);
/**
* The address of the second server.
*/
TransportAddress serverAddress2
= new TransportAddress("127.0.0.2", 5259, Transport.UDP);
/**
* The socket that the client is using.
*/
DatagramSocket clientSock = null;
/**
* The socket that the server is using
*/
DatagramSocket serverSock = null;
/**
* The second server socket.
*/
DatagramSocket serverSock2 = null;
/**
* The request that we will be sending in this test.
*/
Request bindingRequest = null; Request bindingRequest = null;
/**
* The response that we will be sending in response to the above request.
*/
Response bindingResponse = null; Response bindingResponse = null;
/**
* The request collector that we use to wait for requests.
*/
PlainRequestCollector requestCollector = null; PlainRequestCollector requestCollector = null;
/**
* The responses collector that we use to wait for responses.
*/
PlainResponseCollector responseCollector = null; PlainResponseCollector responseCollector = null;
/**
* junit setup method.
*
* @throws Exception if anything goes wrong.
*/
protected void setUp() throws Exception protected void setUp() throws Exception
{ {
super.setUp(); super.setUp();
stunStack = StunStack.getInstance(); stunStack = StunStack.getInstance();
clientAccessPoint = new NetAccessPointDescriptor(clientAddress); clientSock = new DatagramSocket(clientAddress);
serverAccessPoint = new NetAccessPointDescriptor(serverAddress); serverSock = new DatagramSocket(clientAddress);
serverAccessPoint2 = new NetAccessPointDescriptor(serverAddress2); serverSock = new DatagramSocket(serverAddress2);
stunStack.installNetAccessPoint(clientAccessPoint); stunStack.installNetAccessPoint(clientSock);
stunStack.installNetAccessPoint(serverAccessPoint); stunStack.installNetAccessPoint(serverSock);
stunStack.installNetAccessPoint(serverAccessPoint2); stunStack.installNetAccessPoint(serverSock2);
bindingRequest = MessageFactory.createBindingRequest(); bindingRequest = MessageFactory.createBindingRequest();
bindingResponse = MessageFactory.createBindingResponse( bindingResponse = MessageFactory.createBindingResponse(
@ -54,10 +107,17 @@ public class MessageEventDispatchingTest extends TestCase
} }
/**
* junit tear down method.
*
* @throws Exception if anything goes wrong.
*/
protected void tearDown() throws Exception protected void tearDown() throws Exception
{ {
clientAccessPoint = null; clientSock.close();
serverAccessPoint = null; serverSock.close();
serverSock.close();
requestCollector = null; requestCollector = null;
responseCollector = null; responseCollector = null;
@ -74,9 +134,9 @@ public class MessageEventDispatchingTest extends TestCase
stunStack.getProvider().sendRequest(bindingRequest, stunStack.getProvider().sendRequest(bindingRequest,
serverAddress, serverAddress,
clientAccessPoint, clientAddress,
responseCollector); responseCollector);
Thread.currentThread().sleep(12000); Thread.sleep(12000);
assertEquals( assertEquals(
"No timeout was produced upon expiration of a client transaction", "No timeout was produced upon expiration of a client transaction",
@ -99,10 +159,10 @@ public class MessageEventDispatchingTest extends TestCase
//send //send
stunStack.getProvider().sendRequest(bindingRequest, stunStack.getProvider().sendRequest(bindingRequest,
serverAddress, serverAddress,
clientAccessPoint, clientAddress,
responseCollector); responseCollector);
//wait for retransmissions //wait for retransmissions
Thread.currentThread().sleep(500); Thread.sleep(50);
//verify //verify
assertTrue("No MessageEvents have been dispatched", assertTrue("No MessageEvents have been dispatched",
@ -119,20 +179,20 @@ public class MessageEventDispatchingTest extends TestCase
throws Exception throws Exception
{ {
//prepare to listen //prepare to listen
stunStack.getProvider().addRequestListener(serverAccessPoint, stunStack.getProvider().addRequestListener(serverAddress,
requestCollector); requestCollector);
PlainRequestCollector requestCollector2 = new PlainRequestCollector(); PlainRequestCollector requestCollector2 = new PlainRequestCollector();
stunStack.getProvider().addRequestListener(serverAccessPoint2, stunStack.getProvider().addRequestListener(serverAddress2,
requestCollector2); requestCollector2);
//send //send
stunStack.getProvider().sendRequest(bindingRequest, stunStack.getProvider().sendRequest(bindingRequest,
serverAddress2, serverAddress2,
clientAccessPoint, clientAddress,
responseCollector); responseCollector);
//wait for retransmissions //wait for retransmissions
Thread.currentThread().sleep(500); Thread.sleep(50);
//verify //verify
assertTrue( assertTrue(
@ -151,26 +211,26 @@ public class MessageEventDispatchingTest extends TestCase
public void testServerResponseRetransmissions() throws Exception public void testServerResponseRetransmissions() throws Exception
{ {
//prepare to listen //prepare to listen
stunStack.getProvider().addRequestListener(serverAccessPoint, stunStack.getProvider().addRequestListener(serverAddress,
requestCollector); requestCollector);
//send //send
stunStack.getProvider().sendRequest(bindingRequest, stunStack.getProvider().sendRequest(bindingRequest,
serverAddress, serverAddress,
clientAccessPoint, clientAddress,
responseCollector); responseCollector);
//wait for the message to arrive //wait for the message to arrive
Thread.currentThread().sleep(500); Thread.sleep(50);
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.getProvider().sendResponse(tid,
bindingResponse, bindingResponse,
serverAccessPoint, serverAddress,
clientAddress); clientAddress);
//wait for retransmissions //wait for retransmissions
Thread.currentThread().sleep(500); Thread.sleep(50);
//verify that we got the response. //verify that we got the response.
assertTrue( assertTrue(
@ -178,23 +238,49 @@ public class MessageEventDispatchingTest extends TestCase
responseCollector.receivedResponses.size() == 1 ); responseCollector.receivedResponses.size() == 1 );
} }
private class PlainRequestCollector implements RequestListener{ /**
public Vector<StunMessageEvent> receivedRequests = new Vector<StunMessageEvent>(); * A utility class we use to collect incoming requests.
*/
private class PlainRequestCollector implements RequestListener
{
/** all requests we've received so far. */
public Vector<StunMessageEvent> receivedRequests
= new Vector<StunMessageEvent>();
public void requestReceived(StunMessageEvent evt){ /**
* Stores incoming requests.
*
* @param evt the event containing the incoming request.
*/
public void requestReceived(StunMessageEvent evt)
{
receivedRequests.add(evt); receivedRequests.add(evt);
} }
} }
private class PlainResponseCollector implements ResponseCollector{ /**
* A utility class we use to collect incoming responses.
*/
private class PlainResponseCollector implements ResponseCollector
{
/**
*
*/
public Vector<Object> receivedResponses = new Vector<Object>(); public Vector<Object> receivedResponses = new Vector<Object>();
/**
* Stores incoming requests.
*
* @param responseEvt the event containing the incoming request.
*/
public void processResponse(StunMessageEvent responseEvt) public void processResponse(StunMessageEvent responseEvt)
{ {
receivedResponses.add(responseEvt); receivedResponses.add(responseEvt);
} }
/**
* Indicates that no response has been received.
*/
public void processTimeout() public void processTimeout()
{ {
receivedResponses.add(new String("timeout")); receivedResponses.add(new String("timeout"));

View File

@ -1,10 +1,16 @@
/*
* ice4j, the OpenSource Java Solution for NAT and Firewall Traversal.
* Maintained by the SIP Communicator community (http://sip-communicator.org).
*
* Distributable under LGPL license. See terms of license at gnu.org.
*/
package org.ice4j; package org.ice4j;
import java.net.*;
import java.util.*;
import junit.framework.*; import junit.framework.*;
import java.util.*;
import org.ice4j.*;
import org.ice4j.message.*; import org.ice4j.message.*;
import org.ice4j.stack.*; import org.ice4j.stack.*;
@ -12,20 +18,41 @@ import org.ice4j.stack.*;
* Test how client and server behave, how they recognize/adopt messages and * Test how client and server behave, how they recognize/adopt messages and
* how they both handle retransmissions (i.e. client transactions should make * how they both handle retransmissions (i.e. client transactions should make
* them and server transactions should hide them) * them and server transactions should hide them)
* <p>Company: Net Research Team, Louis Pasteur University</p> *
* @author Emil Ivov * @author Emil Ivov
*/ */
public class TransactionSupportTests extends TestCase public class TransactionSupportTests extends TestCase
{ {
StunStack stunStack = null; /**
* The client address we use for this test.
*/
TransportAddress clientAddress
= new TransportAddress("127.0.0.1", 5216, Transport.UDP);
TransportAddress clientAddress = new TransportAddress("127.0.0.1", 5216); /**
TransportAddress serverAddress = new TransportAddress("127.0.0.2", 5255); * The client address we use for this test.
*/
TransportAddress serverAddress
= new TransportAddress("127.0.0.2", 5255, Transport.UDP);
NetAccessPointDescriptor clientAccessPoint = null; /**
NetAccessPointDescriptor serverAccessPoint = null; * The socket the client uses in this test.
*/
DatagramSocket clientSock = null;
/**
* The socket the server uses in this test.
*/
DatagramSocket serverSock = null;
/**
* The request we send in this test.
*/
Request bindingRequest = null; Request bindingRequest = null;
/**
* The response we send in this test.
*/
Response bindingResponse = null; Response bindingResponse = null;
PlainRequestCollector requestCollector = null; PlainRequestCollector requestCollector = null;
@ -35,13 +62,11 @@ public class TransactionSupportTests extends TestCase
{ {
super.setUp(); super.setUp();
stunStack = StunStack.getInstance(); clientSock = new DatagramSocket(clientAddress);
serverSock = new DatagramSocket(serverAddress);
clientAccessPoint = new NetAccessPointDescriptor(clientAddress); StunStack.getInstance().installNetAccessPoint(clientSock);
serverAccessPoint = new NetAccessPointDescriptor(serverAddress); StunStack.getInstance().installNetAccessPoint(serverSock);
stunStack.installNetAccessPoint(clientAccessPoint);
stunStack.installNetAccessPoint(serverAccessPoint);
bindingRequest = MessageFactory.createBindingRequest(); bindingRequest = MessageFactory.createBindingRequest();
bindingResponse = MessageFactory.createBindingResponse( bindingResponse = MessageFactory.createBindingResponse(
@ -66,8 +91,9 @@ public class TransactionSupportTests extends TestCase
protected void tearDown() throws Exception protected void tearDown() throws Exception
{ {
clientAccessPoint = null; clientSock.close();
serverAccessPoint = null; serverSock.close();
requestCollector = null; requestCollector = null;
responseCollector = null; responseCollector = null;
@ -95,18 +121,19 @@ public class TransactionSupportTests extends TestCase
//prepare to listen //prepare to listen
System.setProperty("org.ice4j.PROPAGATE_RECEIVED_RETRANSMISSIONS", System.setProperty("org.ice4j.PROPAGATE_RECEIVED_RETRANSMISSIONS",
"true"); "true");
stunStack.getProvider().addRequestListener(serverAccessPoint,
requestCollector); StunStack.getInstance().getProvider()
.addRequestListener(serverAddress, requestCollector);
//send //send
stunStack.getProvider().sendRequest(bindingRequest, StunStack.getInstance().getProvider().sendRequest(bindingRequest,
serverAddress, serverAddress, clientAddress, responseCollector);
clientAccessPoint,
responseCollector);
//wait for retransmissions //wait for retransmissions
Thread.currentThread().sleep(12000); Thread.sleep(12000);
//verify //verify
Vector<StunMessageEvent> reqs = requestCollector.getRequestsForTransaction(bindingRequest.getTransactionID()); Vector<StunMessageEvent> reqs
= requestCollector.getRequestsForTransaction(
bindingRequest.getTransactionID());
assertTrue("No retransmissions of the request have been received", assertTrue("No retransmissions of the request have been received",
reqs.size() > 1); reqs.size() > 1);
assertTrue("The binding request has not been retransmitted enough!", assertTrue("The binding request has not been retransmitted enough!",
@ -122,28 +149,30 @@ public class TransactionSupportTests extends TestCase
public void testServerRetransmissionHiding() throws Exception public void testServerRetransmissionHiding() throws Exception
{ {
//prepare to listen //prepare to listen
stunStack.getProvider().addRequestListener(serverAccessPoint, StunStack.getInstance().getProvider().addRequestListener(
requestCollector); serverAddress, requestCollector);
//send //send
stunStack.getProvider().sendRequest(bindingRequest, StunStack.getInstance().getProvider().sendRequest(bindingRequest,
serverAddress, serverAddress, clientAddress, responseCollector);
clientAccessPoint,
responseCollector);
//wait for retransmissions //wait for retransmissions
Thread.currentThread().sleep(12000); Thread.sleep(12000);
//verify //verify
Vector reqs = requestCollector.getRequestsForTransaction( Vector<StunMessageEvent> reqs
bindingRequest.getTransactionID()); = requestCollector.getRequestsForTransaction(
bindingRequest.getTransactionID());
assertTrue( assertTrue(
"Retransmissions of a binding request were propagated to the server", "Retransmissions of a binding request were propagated "
reqs.size() <= 1 ); + "to the server", reqs.size() <= 1 );
} }
/** /**
* Makes sure that once a request has been answered by the server, * Makes sure that once a request has been answered by the server,
* retransmissions of this request are not propagated to the UA and are * retransmissions of this request are not propagated to the UA and are
* automatically handled with a retransmission of the last seen response * automatically handled with a retransmission of the last seen response
*
* @throws Exception if we screw up. * @throws Exception if we screw up.
*/ */
public void testServerResponseRetransmissions() throws Exception public void testServerResponseRetransmissions() throws Exception
@ -151,26 +180,24 @@ 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.getProvider().addRequestListener(serverAccessPoint, StunStack.getInstance().getProvider().addRequestListener(
requestCollector); serverAddress, requestCollector);
//send //send
stunStack.getProvider().sendRequest(bindingRequest, StunStack.getInstance().getProvider().sendRequest(
serverAddress, bindingRequest, serverAddress,
clientAccessPoint, clientAddress, responseCollector);
responseCollector);
//wait for the message to arrive //wait for the message to arrive
Thread.currentThread().sleep(500); Thread.sleep(500);
Vector<StunMessageEvent> reqs = requestCollector
.getRequestsForTransaction( bindingRequest.getTransactionID());
StunMessageEvent evt = ((StunMessageEvent)reqs.get(0));
Vector reqs = requestCollector.getRequestsForTransaction(
bindingRequest.getTransactionID());
StunMessageEvent evt =
((StunMessageEvent)reqs.get(0));
byte[] tid = evt.getMessage().getTransactionID(); byte[] tid = evt.getMessage().getTransactionID();
stunStack.getProvider().sendResponse(tid, StunStack.getInstance().getProvider().sendResponse(
bindingResponse, tid, bindingResponse, serverAddress, clientAddress);
serverAccessPoint,
clientAddress);
//wait for retransmissions //wait for retransmissions
Thread.currentThread().sleep(12000); Thread.currentThread().sleep(12000);
@ -187,38 +214,35 @@ public class TransactionSupportTests extends TestCase
*/ */
public void testUniqueIDs() throws Exception public void testUniqueIDs() throws Exception
{ {
stunStack.getProvider().addRequestListener(serverAccessPoint, StunStack.getInstance().getProvider().addRequestListener(
requestCollector); serverAddress, requestCollector);
//send req 1 //send req 1
stunStack.getProvider().sendRequest(bindingRequest, StunStack.getInstance().getProvider().sendRequest(bindingRequest,
serverAddress, serverAddress, clientAddress, responseCollector);
clientAccessPoint,
responseCollector);
//wait for retransmissions
Thread.currentThread().sleep(500);
Vector reqs1 = requestCollector.getRequestsForTransaction( //wait for retransmissions
bindingRequest.getTransactionID()); Thread.sleep(500);
StunMessageEvent evt1 =
((StunMessageEvent)reqs1.get(0)); Vector<StunMessageEvent> reqs1 = requestCollector
.getRequestsForTransaction( bindingRequest.getTransactionID());
StunMessageEvent evt1 = ((StunMessageEvent)reqs1.get(0));
//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.getProvider().sendResponse(tid, StunStack.getInstance().getProvider().sendResponse(tid,
bindingResponse, bindingResponse, serverAddress, clientAddress);
serverAccessPoint,
clientAddress);
//send req 2 //send req 2
stunStack.getProvider().sendRequest(bindingRequest, StunStack.getInstance().getProvider().sendRequest(bindingRequest,
serverAddress, serverAddress, clientAddress, responseCollector);
clientAccessPoint,
responseCollector);
//wait for retransmissions
Thread.currentThread().sleep(12000);
Vector reqs2 = requestCollector.getRequestsForTransaction( //wait for retransmissions
bindingRequest.getTransactionID()); Thread.sleep(12000);
Vector<StunMessageEvent> reqs2
= requestCollector.getRequestsForTransaction(
bindingRequest.getTransactionID());
StunMessageEvent evt2 = ((StunMessageEvent)reqs2.get(0)); StunMessageEvent evt2 = ((StunMessageEvent)reqs2.get(0));
@ -237,19 +261,19 @@ 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.getProvider().addRequestListener(serverAccessPoint, StunStack.getInstance().getProvider().addRequestListener(
requestCollector); serverAddress, requestCollector);
//send //send
stunStack.getProvider().sendRequest(bindingRequest, StunStack.getInstance().getProvider().sendRequest(
serverAddress, bindingRequest, serverAddress, clientAddress, responseCollector);
clientAccessPoint,
responseCollector);
//wait for retransmissions //wait for retransmissions
Thread.currentThread().sleep(1600); Thread.sleep(1600);
//verify //verify
Vector reqs = requestCollector.getRequestsForTransaction( Vector<StunMessageEvent> reqs
bindingRequest.getTransactionID()); = requestCollector.getRequestsForTransaction(
bindingRequest.getTransactionID());
assertTrue("No retransmissions of the request have been received", assertTrue("No retransmissions of the request have been received",
reqs.size() > 1); reqs.size() > 1);
assertEquals( assertEquals(
@ -268,13 +292,11 @@ 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.getProvider().addRequestListener(serverAccessPoint, StunStack.getInstance().getProvider().addRequestListener(
requestCollector); serverAddress, requestCollector);
//send //send
stunStack.getProvider().sendRequest(bindingRequest, StunStack.getInstance().getProvider().sendRequest(bindingRequest,
serverAddress, serverAddress, clientAddress, responseCollector);
clientAccessPoint,
responseCollector);
//wait a while //wait a while
Thread.currentThread().sleep(500); Thread.currentThread().sleep(500);
@ -308,15 +330,14 @@ public class TransactionSupportTests extends TestCase
"true"); "true");
System.setProperty("org.ice4j.MAX_RETRANSMISSIONS", System.setProperty("org.ice4j.MAX_RETRANSMISSIONS",
"11"); "11");
stunStack.getProvider().addRequestListener(serverAccessPoint, StunStack.getInstance().getProvider()
requestCollector); .addRequestListener(serverAddress, requestCollector);
//send //send
stunStack.getProvider().sendRequest(bindingRequest, StunStack.getInstance().getProvider().sendRequest(bindingRequest,
serverAddress, serverAddress, clientAddress, responseCollector);
clientAccessPoint,
responseCollector); //wait a while
// //wait a while Thread.sleep(1095);
Thread.currentThread().sleep(1095);
//verify //verify
Vector reqs = requestCollector.getRequestsForTransaction( Vector reqs = requestCollector.getRequestsForTransaction(

View File

@ -1,17 +1,16 @@
/* /*
* Stun4j, the OpenSource Java Solution for NAT and Firewall Traversal. * ice4j, the OpenSource Java Solution for NAT and Firewall Traversal.
* Maintained by the SIP Communicator community (http://sip-communicator.org).
* *
* Distributable under LGPL license. * Distributable under LGPL license. See terms of license at gnu.org.
* See terms of license at gnu.org.
*/ */
package org.ice4j.attribute; package org.ice4j.attribute;
import java.util.*;
import junit.framework.*; import junit.framework.*;
import java.util.Arrays;
import org.ice4j.*; import org.ice4j.*;
import org.ice4j.attribute.*;
/** /**
* *
@ -211,13 +210,13 @@ public class AddressAttributeTest extends TestCase {
{ {
XorMappedAddressAttribute addressAttribute = new XorMappedAddressAttribute(); XorMappedAddressAttribute addressAttribute = new XorMappedAddressAttribute();
TransportAddress testAddress = TransportAddress testAddress =
new TransportAddress("130.79.95.53", 12120); new TransportAddress("130.79.95.53", 12120, Transport.UDP);
addressAttribute.setAddress(testAddress); addressAttribute.setAddress(testAddress);
//do a xor with an id equal to the v4 address itself so that we get 0000.., //do a xor with an id equal to the v4 address itself so that we get 0000..,
TransportAddress xorredAddr = TransportAddress xorredAddr = addressAttribute.applyXor(
addressAttribute.applyXor(new byte[]{(byte)130,79,95,53,0,0,0,0,0,0,0,0,0,0,0,0,0}); new byte[]{(byte)130,79,95,53,0,0,0,0,0,0,0,0,0,0,0,0,0});
assertTrue("Xorring the address with itself didn't return 00000...", assertTrue("Xorring the address with itself didn't return 00000...",
Arrays.equals(xorredAddr.getAddressBytes(), new byte[]{0,0,0,0})); Arrays.equals(xorredAddr.getAddressBytes(), new byte[]{0,0,0,0}));
@ -227,28 +226,28 @@ public class AddressAttributeTest extends TestCase {
//Test xor-ing the original with the xored - should get the xor code //Test xor-ing the original with the xored - should get the xor code
addressAttribute.setAddress(testAddress); addressAttribute.setAddress(testAddress);
xorredAddr = xorredAddr = addressAttribute.applyXor(
addressAttribute.applyXor(new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36}); new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36});
xorredAddr = xorredAddr =
addressAttribute.applyXor(xorredAddr.getAddressBytes()); addressAttribute.applyXor(xorredAddr.getAddressBytes());
assertTrue("Xorring the original with the xor-ed didn't return the code..", assertTrue("Xorring the original with the xor-ed didn't "
Arrays.equals( +"return the code..",
xorredAddr.getAddressBytes(), Arrays.equals( xorredAddr.getAddressBytes(),
new byte[]{21,22,23,24})); new byte[]{21,22,23,24}));
assertTrue("Port was not xorred", assertTrue("Port was not xorred",
testAddress.getPort() != 0xFFFF); testAddress.getPort() != 0xFFFF);
//Test double xor-ing - should get the original //Test double xor-ing - should get the original
addressAttribute.setAddress(testAddress); addressAttribute.setAddress(testAddress);
xorredAddr = xorredAddr = addressAttribute.applyXor(
addressAttribute.applyXor(new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36}); new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36});
addressAttribute.setAddress(xorredAddr); addressAttribute.setAddress(xorredAddr);
xorredAddr = xorredAddr = addressAttribute.applyXor(
addressAttribute.applyXor(new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36}); new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36});
assertEquals("Double xorring didn't give the original ...", assertEquals("Double xorring didn't give the original ...",
testAddress, xorredAddr); testAddress, xorredAddr);
@ -259,9 +258,10 @@ public class AddressAttributeTest extends TestCase {
*/ */
public void testXorMappedAddressXoring_v6() public void testXorMappedAddressXoring_v6()
{ {
XorMappedAddressAttribute addressAttribute = new XorMappedAddressAttribute(); XorMappedAddressAttribute addressAttribute
TransportAddress testAddress = = new XorMappedAddressAttribute();
new TransportAddress("2001:660:4701:1001:202:8aff:febe:130b", 12120); TransportAddress testAddress = new TransportAddress(
"2001:660:4701:1001:202:8aff:febe:130b", 12120, Transport.UDP);
addressAttribute.setAddress(testAddress); addressAttribute.setAddress(testAddress);
@ -285,36 +285,36 @@ public class AddressAttributeTest extends TestCase {
//Test xor-ing the original with the xored - should get the xor code //Test xor-ing the original with the xored - should get the xor code
addressAttribute.setAddress(testAddress); addressAttribute.setAddress(testAddress);
xorredAddr = xorredAddr = addressAttribute.applyXor(
addressAttribute.applyXor(new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36}); new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36});
xorredAddr = xorredAddr = addressAttribute.applyXor(xorredAddr.getAddressBytes());
addressAttribute.applyXor(xorredAddr.getAddressBytes());
assertTrue("Xorring the original with the xor-ed didn't return the code..", assertTrue("Xorring the original with the xor-ed didn't return the code..",
Arrays.equals( Arrays.equals(
xorredAddr.getAddressBytes(), xorredAddr.getAddressBytes(),
new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36})); new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36}));
assertTrue("Port was not xorred", assertTrue("Port was not xorred",
testAddress.getPort() != 0xFFFF); testAddress.getPort() != 0xFFFF);
//Test double xor-ing - should get the original //Test double xor-ing - should get the original
addressAttribute.setAddress(testAddress); addressAttribute.setAddress(testAddress);
xorredAddr = xorredAddr = addressAttribute.applyXor(
addressAttribute.applyXor(new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36}); new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36});
addressAttribute.setAddress(xorredAddr); addressAttribute.setAddress(xorredAddr);
xorredAddr = xorredAddr = addressAttribute.applyXor(
addressAttribute.applyXor(new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36}); new byte[]{21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36});
assertEquals("Double xorring didn't give the original ...", assertEquals("Double xorring didn't give the original ...",
testAddress, xorredAddr); testAddress, xorredAddr);
} }
/** /**
* Test whetner sample binary arrays are correctly decoded. * Test whether sample binary arrays are correctly decoded.
* @throws StunException *
* @throws StunException if something goes wrong
*/ */
public void testDecodeAttributeBody() throws StunException { public void testDecodeAttributeBody() throws StunException {
byte[] attributeValue = msgFixture.mappedAddress; byte[] attributeValue = msgFixture.mappedAddress;
@ -324,19 +324,20 @@ public class AddressAttributeTest extends TestCase {
addressAttribute.decodeAttributeBody(attributeValue, offset, length); addressAttribute.decodeAttributeBody(attributeValue, offset, length);
assertEquals("AddressAttribute.decode() did not properly decode the port field.", assertEquals(
msgFixture.ADDRESS_ATTRIBUTE_PORT, "AddressAttribute.decode() did not properly decode the port field.",
addressAttribute.getPort()); msgFixture.ADDRESS_ATTRIBUTE_PORT, addressAttribute.getPort());
assertTrue("AddressAttribute.decode() did not properly decode the address field.", assertTrue(
Arrays.equals( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS, "AddressAttribute.decode() did not properly decode the address field.",
addressAttribute.getAddressBytes())); Arrays.equals( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS,
addressAttribute.getAddressBytes()));
} }
/** /**
* Test whetner sample binary arrays are correctly decoded. * Test whetner sample binary arrays are correctly decoded.
* @throws StunException * @throws StunException if something goes wrong
*/ */
public void testDecodeAttributeBodyv6() throws StunException { public void testDecodeAttributeBodyv6() throws StunException {
byte[] attributeValue = msgFixture.mappedAddressv6; byte[] attributeValue = msgFixture.mappedAddressv6;
@ -362,16 +363,18 @@ public class AddressAttributeTest extends TestCase {
* @throws StunException java.lang.Exception if we fail * @throws StunException java.lang.Exception if we fail
*/ */
public void testEncode() public void testEncode()
throws StunException throws Exception
{ {
byte[] expectedReturn = msgFixture.mappedAddress; byte[] expectedReturn = msgFixture.mappedAddress;
addressAttribute.setAddress( addressAttribute.setAddress(
new TransportAddress(msgFixture.ADDRESS_ATTRIBUTE_ADDRESS, new TransportAddress(msgFixture.ADDRESS_ATTRIBUTE_ADDRESS,
msgFixture.ADDRESS_ATTRIBUTE_PORT)); msgFixture.ADDRESS_ATTRIBUTE_PORT,
Transport.UDP));
byte[] actualReturn = addressAttribute.encode(); byte[] actualReturn = addressAttribute.encode();
assertTrue("AddressAttribute.encode() did not properly encode a sample attribute", assertTrue("AddressAttribute.encode() did not "
+"properly encode a sample attribute",
Arrays.equals( expectedReturn, actualReturn)); Arrays.equals( expectedReturn, actualReturn));
} }
@ -381,13 +384,13 @@ public class AddressAttributeTest extends TestCase {
* @throws StunException java.lang.Exception if we fail * @throws StunException java.lang.Exception if we fail
*/ */
public void testEncodev6() public void testEncodev6()
throws StunException throws Exception
{ {
byte[] expectedReturn = msgFixture.mappedAddressv6; byte[] expectedReturn = msgFixture.mappedAddressv6;
addressAttribute.setAddress( addressAttribute.setAddress(
new TransportAddress(msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_V6, new TransportAddress(msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_V6,
msgFixture.ADDRESS_ATTRIBUTE_PORT)); msgFixture.ADDRESS_ATTRIBUTE_PORT, Transport.UDP));
byte[] actualReturn = addressAttribute.encode(); byte[] actualReturn = addressAttribute.encode();
assertTrue("An AddressAttribute did not properly encode an IPv6 addr.", assertTrue("An AddressAttribute did not properly encode an IPv6 addr.",
@ -402,7 +405,7 @@ public class AddressAttributeTest extends TestCase {
* @throws StunException java.lang.Exception if we fail * @throws StunException java.lang.Exception if we fail
*/ */
public void testEquals() public void testEquals()
throws StunException throws Exception
{ {
//null test //null test
AddressAttribute target = null; AddressAttribute target = null;
@ -416,34 +419,41 @@ public class AddressAttributeTest extends TestCase {
target = new MappedAddressAttribute(); target = new MappedAddressAttribute();
char port = (char)(msgFixture.ADDRESS_ATTRIBUTE_PORT + 1 ); char port = (char)(msgFixture.ADDRESS_ATTRIBUTE_PORT + 1 );
target.setAddress( new TransportAddress(msgFixture.ADDRESS_ATTRIBUTE_ADDRESS, target.setAddress( new TransportAddress(
port)); msgFixture.ADDRESS_ATTRIBUTE_ADDRESS, port, Transport.UDP));
addressAttribute.setAddress( addressAttribute.setAddress( new TransportAddress(
new TransportAddress(msgFixture.ADDRESS_ATTRIBUTE_ADDRESS, msgFixture.ADDRESS_ATTRIBUTE_ADDRESS,
msgFixture.ADDRESS_ATTRIBUTE_PORT )); msgFixture.ADDRESS_ATTRIBUTE_PORT,
Transport.UDP));
expectedReturn = false; expectedReturn = false;
actualReturn = addressAttribute.equals(target); actualReturn = addressAttribute.equals(target);
assertEquals("AddressAttribute.equals() failed against a different target.", assertEquals(
expectedReturn, actualReturn); "AddressAttribute.equals() failed against a different target.",
expectedReturn, actualReturn);
//equality test //equality test
target.setAddress( new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS, target.setAddress( new TransportAddress(
msgFixture.ADDRESS_ATTRIBUTE_PORT )); msgFixture.ADDRESS_ATTRIBUTE_ADDRESS,
msgFixture.ADDRESS_ATTRIBUTE_PORT, Transport.UDP ));
expectedReturn = true; expectedReturn = true;
actualReturn = addressAttribute.equals(target); actualReturn = addressAttribute.equals(target);
assertEquals("AddressAttribute.equals() failed against an equal target.", assertEquals(
expectedReturn, actualReturn); "AddressAttribute.equals() failed against an equal target.",
expectedReturn, actualReturn);
//ipv6 equality test //ipv6 equality test
target.setAddress( new TransportAddress(msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_V6, target.setAddress( new TransportAddress(
msgFixture.ADDRESS_ATTRIBUTE_PORT)); msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_V6,
msgFixture.ADDRESS_ATTRIBUTE_PORT, Transport.UDP));
addressAttribute.setAddress(new TransportAddress(
msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_V6,
msgFixture.ADDRESS_ATTRIBUTE_PORT,
Transport.UDP));
addressAttribute.setAddress(
new TransportAddress(msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_V6,
msgFixture.ADDRESS_ATTRIBUTE_PORT ));
expectedReturn = true; expectedReturn = true;
actualReturn = addressAttribute.equals(target); actualReturn = addressAttribute.equals(target);
assertEquals("AddressAttribute.equals() failed for IPv6 addresses.", assertEquals("AddressAttribute.equals() failed for IPv6 addresses.",
@ -456,13 +466,14 @@ public class AddressAttributeTest extends TestCase {
* @throws StunException java.lang.Exception if we fail * @throws StunException java.lang.Exception if we fail
*/ */
public void testGetDataLength() public void testGetDataLength()
throws StunException throws Exception
{ {
char expectedReturn = 8;//1-padding + 1-family + 2-port + 4-address char expectedReturn = 8;//1-padding + 1-family + 2-port + 4-address
addressAttribute.setAddress( addressAttribute.setAddress( new TransportAddress(
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS, msgFixture.ADDRESS_ATTRIBUTE_ADDRESS,
msgFixture.ADDRESS_ATTRIBUTE_PORT)); msgFixture.ADDRESS_ATTRIBUTE_PORT,
Transport.UDP));
char actualReturn = addressAttribute.getDataLength(); char actualReturn = addressAttribute.getDataLength();
@ -470,9 +481,9 @@ public class AddressAttributeTest extends TestCase {
expectedReturn, actualReturn); expectedReturn, actualReturn);
expectedReturn = 20;//1-padding + 1-family + 2-port + 16-address expectedReturn = 20;//1-padding + 1-family + 2-port + 16-address
addressAttribute.setAddress( addressAttribute.setAddress( new TransportAddress(
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_V6, msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_V6,
msgFixture.ADDRESS_ATTRIBUTE_PORT)); msgFixture.ADDRESS_ATTRIBUTE_PORT, Transport.UDP));
actualReturn = addressAttribute.getDataLength(); actualReturn = addressAttribute.getDataLength();
@ -483,20 +494,22 @@ public class AddressAttributeTest extends TestCase {
/** /**
* Tests that the address family is always 1. * Tests that the address family is always 1.
*/ */
public void testGetFamily() { public void testGetFamily()
throws Exception
{
byte expectedReturn = 1; byte expectedReturn = 1;
addressAttribute.setAddress( addressAttribute.setAddress(new TransportAddress(
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS, msgFixture.ADDRESS_ATTRIBUTE_ADDRESS,
msgFixture.ADDRESS_ATTRIBUTE_PORT)); msgFixture.ADDRESS_ATTRIBUTE_PORT, Transport.UDP));
byte actualReturn = addressAttribute.getFamily(); byte actualReturn = addressAttribute.getFamily();
assertEquals("Address family was not 1 for an IPv4", assertEquals("Address family was not 1 for an IPv4",
expectedReturn, actualReturn); expectedReturn, actualReturn);
//ipv6 //ipv6
expectedReturn = 2; expectedReturn = 2;
addressAttribute.setAddress( addressAttribute.setAddress(new TransportAddress(
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_V6, msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_V6,
msgFixture.ADDRESS_ATTRIBUTE_PORT)); msgFixture.ADDRESS_ATTRIBUTE_PORT, Transport.UDP));
actualReturn = addressAttribute.getFamily(); actualReturn = addressAttribute.getFamily();
assertEquals("Address family was not 2 for an IPv6 address", assertEquals("Address family was not 2 for an IPv6 address",
expectedReturn, actualReturn); expectedReturn, actualReturn);

View File

@ -51,7 +51,7 @@ public class AttributeDecoderTest extends TestCase {
} }
public void testDecodeMappedAddress() public void testDecodeMappedAddress()
throws StunException throws Exception
{ {
// //
byte[] bytes = msgFixture.mappedAddress; byte[] bytes = msgFixture.mappedAddress;
@ -61,17 +61,19 @@ public class AttributeDecoderTest extends TestCase {
//create the message //create the message
MappedAddressAttribute expectedReturn = new MappedAddressAttribute(); MappedAddressAttribute expectedReturn = new MappedAddressAttribute();
expectedReturn.setAddress( expectedReturn.setAddress(new TransportAddress(
new TransportAddress(msgFixture.ADDRESS_ATTRIBUTE_ADDRESS, msgFixture.ADDRESS_ATTRIBUTE_ADDRESS,
msgFixture.ADDRESS_ATTRIBUTE_PORT)); msgFixture.ADDRESS_ATTRIBUTE_PORT,
Transport.UDP));
Attribute actualReturn = attributeDecoder.decode(bytes, offset, length); Attribute actualReturn = attributeDecoder.decode(bytes, offset, length);
assertEquals("AttributeDecoder.decode() failed for a MAPPED-ADDRESS attribute", assertEquals(
expectedReturn, actualReturn); "AttributeDecoder.decode() failed for a MAPPED-ADDRESS attribute",
expectedReturn, actualReturn);
} }
public void testDecodeMappedAddress_v6() public void testDecodeMappedAddress_v6()
throws StunException throws Exception
{ {
// //
byte[] bytes = msgFixture.mappedAddressv6; byte[] bytes = msgFixture.mappedAddressv6;
@ -81,13 +83,15 @@ public class AttributeDecoderTest extends TestCase {
//create the message //create the message
MappedAddressAttribute expectedReturn = new MappedAddressAttribute(); MappedAddressAttribute expectedReturn = new MappedAddressAttribute();
expectedReturn.setAddress( expectedReturn.setAddress( new TransportAddress(
new TransportAddress(msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_V6, msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_V6,
msgFixture.ADDRESS_ATTRIBUTE_PORT)); msgFixture.ADDRESS_ATTRIBUTE_PORT,
Transport.UDP));
Attribute actualReturn = attributeDecoder.decode(bytes, offset, length); Attribute actualReturn = attributeDecoder.decode(bytes, offset, length);
assertEquals("AttributeDecoder.decode() failed for a MAPPED-ADDRESS attribute", assertEquals(
expectedReturn, actualReturn); "AttributeDecoder.decode() failed for a MAPPED-ADDRESS attribute",
expectedReturn, actualReturn);
} }
public void testDecodeChangeRequest() public void testDecodeChangeRequest()

View File

@ -1,16 +1,15 @@
/* /*
* Stun4j, the OpenSource Java Solution for NAT and Firewall Traversal. * ice4j, the OpenSource Java Solution for NAT and Firewall Traversal.
* Maintained by the SIP Communicator community (http://sip-communicator.org).
* *
* Distributable under LGPL license. * Distributable under LGPL license. See terms of license at gnu.org.
* See terms of license at gnu.org.
*/ */
package org.ice4j.message; package org.ice4j.message;
import junit.framework.*;
import org.ice4j.*; import org.ice4j.*;
import org.ice4j.attribute.*; import org.ice4j.attribute.*;
import org.ice4j.message.*;
import junit.framework.*;
public class MessageFactoryTest extends TestCase { public class MessageFactoryTest extends TestCase {
private MessageFactory messageFactory = null; private MessageFactory messageFactory = null;
@ -42,10 +41,12 @@ public class MessageFactoryTest extends TestCase {
Response expectedReturn = new Response(); Response expectedReturn = new Response();
expectedReturn.setMessageType(Message.BINDING_ERROR_RESPONSE); expectedReturn.setMessageType(Message.BINDING_ERROR_RESPONSE);
Attribute errorCodeAtt = AttributeFactory.createErrorCodeAttribute(errorCode); Attribute errorCodeAtt
= AttributeFactory.createErrorCodeAttribute(errorCode);
expectedReturn.addAttribute(errorCodeAtt); expectedReturn.addAttribute(errorCodeAtt);
Message actualReturn = messageFactory.createBindingErrorResponse(errorCode); Message actualReturn
= messageFactory.createBindingErrorResponse(errorCode);
assertEquals("return value", expectedReturn, actualReturn); assertEquals("return value", expectedReturn, actualReturn);
} }
@ -57,11 +58,14 @@ public class MessageFactoryTest extends TestCase {
Response expectedReturn = new Response(); Response expectedReturn = new Response();
expectedReturn.setMessageType(Message.BINDING_ERROR_RESPONSE); expectedReturn.setMessageType(Message.BINDING_ERROR_RESPONSE);
Attribute errorCodeAtt = AttributeFactory.createErrorCodeAttribute(errorCode, reasonPhrase); Attribute errorCodeAtt = AttributeFactory
.createErrorCodeAttribute(errorCode, reasonPhrase);
expectedReturn.addAttribute(errorCodeAtt); expectedReturn.addAttribute(errorCodeAtt);
Message actualReturn = messageFactory.createBindingErrorResponse(errorCode, reasonPhrase); Message actualReturn = messageFactory
assertEquals("Failed to create an error code attribute.", expectedReturn, actualReturn); .createBindingErrorResponse(errorCode, reasonPhrase);
assertEquals("Failed to create an error code attribute.",
expectedReturn, actualReturn);
} }
@ -75,8 +79,10 @@ public class MessageFactoryTest extends TestCase {
Response expectedReturn = new Response(); Response expectedReturn = new Response();
expectedReturn.setMessageType(Message.BINDING_ERROR_RESPONSE); expectedReturn.setMessageType(Message.BINDING_ERROR_RESPONSE);
Attribute errorCodeAtt = AttributeFactory.createErrorCodeAttribute(errorCode); Attribute errorCodeAtt = AttributeFactory
((ErrorCodeAttribute)errorCodeAtt).setReasonPhrase(ErrorCodeAttribute.getDefaultReasonPhrase(errorCode)); .createErrorCodeAttribute(errorCode);
((ErrorCodeAttribute)errorCodeAtt).setReasonPhrase(
ErrorCodeAttribute.getDefaultReasonPhrase(errorCode));
expectedReturn.addAttribute(errorCodeAtt); expectedReturn.addAttribute(errorCodeAtt);
UnknownAttributesAttribute unknownAtts = UnknownAttributesAttribute unknownAtts =
@ -88,7 +94,8 @@ public class MessageFactoryTest extends TestCase {
expectedReturn.addAttribute(unknownAtts); expectedReturn.addAttribute(unknownAtts);
//create the same message using the factory //create the same message using the factory
Message actualReturn = messageFactory.createBindingErrorResponseUnknownAttributes(unknownAttributes); Message actualReturn = messageFactory
.createBindingErrorResponseUnknownAttributes(unknownAttributes);
//compare //compare
assertEquals("return value", expectedReturn, actualReturn); assertEquals("return value", expectedReturn, actualReturn);
@ -117,12 +124,14 @@ public class MessageFactoryTest extends TestCase {
} }
expectedReturn.addAttribute(unknownAtts); expectedReturn.addAttribute(unknownAtts);
Message actualReturn = messageFactory.createBindingErrorResponseUnknownAttributes( Message actualReturn = messageFactory
reasonPhrase, unknownAttributes); .createBindingErrorResponseUnknownAttributes(
reasonPhrase, unknownAttributes);
assertEquals("return value", expectedReturn, actualReturn); assertEquals("return value", expectedReturn, actualReturn);
} }
public void testCreateBindingRequest() throws StunException { public void testCreateBindingRequest() throws StunException
{
Request bindingRequest = new Request(); Request bindingRequest = new Request();
Request expectedReturn = bindingRequest; Request expectedReturn = bindingRequest;
bindingRequest.setMessageType(Message.BINDING_REQUEST); bindingRequest.setMessageType(Message.BINDING_REQUEST);
@ -136,32 +145,44 @@ public class MessageFactoryTest extends TestCase {
} }
public void testCreateBindingResponse() public void testCreateBindingResponse()
throws StunException throws Exception
{ {
Response bindingResponse = new Response(); Response bindingResponse = new Response();
bindingResponse.setMessageType(Message.BINDING_RESPONSE); bindingResponse.setMessageType(Message.BINDING_RESPONSE);
Attribute mappedAddress = AttributeFactory.createMappedAddressAttribute( Attribute mappedAddress = AttributeFactory.createMappedAddressAttribute(
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS,msgFixture.ADDRESS_ATTRIBUTE_PORT)); new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS,
msgFixture.ADDRESS_ATTRIBUTE_PORT,
Transport.UDP));
bindingResponse.addAttribute(mappedAddress); bindingResponse.addAttribute(mappedAddress);
Attribute sourceAddress = AttributeFactory.createSourceAddressAttribute( Attribute sourceAddress = AttributeFactory.createSourceAddressAttribute(
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_2, msgFixture.ADDRESS_ATTRIBUTE_PORT_2)); new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_2,
msgFixture.ADDRESS_ATTRIBUTE_PORT_2,
Transport.UDP));
bindingResponse.addAttribute(sourceAddress); bindingResponse.addAttribute(sourceAddress);
Attribute changedAddress = AttributeFactory. Attribute changedAddress = AttributeFactory.
createChangedAddressAttribute( createChangedAddressAttribute(
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_3, msgFixture.ADDRESS_ATTRIBUTE_PORT_3)); new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_3,
msgFixture.ADDRESS_ATTRIBUTE_PORT_3,
Transport.UDP));
bindingResponse.addAttribute(changedAddress); bindingResponse.addAttribute(changedAddress);
Message expectedReturn = bindingResponse; Message expectedReturn = bindingResponse;
Message actualReturn = messageFactory.createBindingResponse( Message actualReturn = messageFactory.createBindingResponse(
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS, msgFixture.ADDRESS_ATTRIBUTE_PORT), new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS,
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_2,msgFixture.ADDRESS_ATTRIBUTE_PORT_2), msgFixture.ADDRESS_ATTRIBUTE_PORT,
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_3,msgFixture.ADDRESS_ATTRIBUTE_PORT_3)); Transport.UDP),
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_2,
msgFixture.ADDRESS_ATTRIBUTE_PORT_2,
Transport.UDP),
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_3,
msgFixture.ADDRESS_ATTRIBUTE_PORT_3,
Transport.UDP));
assertEquals("return value", expectedReturn, actualReturn); assertEquals("return value", expectedReturn, actualReturn);
} }
} }

View File

@ -1,18 +1,17 @@
/* /*
* Stun4j, the OpenSource Java Solution for NAT and Firewall Traversal. * ice4j, the OpenSource Java Solution for NAT and Firewall Traversal.
* Maintained by the SIP Communicator community (http://sip-communicator.org).
* *
* Distributable under LGPL license. * Distributable under LGPL license. See terms of license at gnu.org.
* See terms of license at gnu.org.
*/ */
package org.ice4j.message; package org.ice4j.message;
import junit.framework.*;
import java.util.*; import java.util.*;
import junit.framework.*;
import org.ice4j.*; import org.ice4j.*;
import org.ice4j.attribute.*; import org.ice4j.attribute.*;
import org.ice4j.message.*;
public class MessageTest extends TestCase { public class MessageTest extends TestCase {
private Message bindingRequest = null; private Message bindingRequest = null;
@ -52,17 +51,24 @@ public class MessageTest extends TestCase {
bindingResponse.setMessageType(Message.BINDING_RESPONSE); bindingResponse.setMessageType(Message.BINDING_RESPONSE);
mappedAddress = AttributeFactory.createMappedAddressAttribute( mappedAddress = AttributeFactory.createMappedAddressAttribute(
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS, msgFixture.ADDRESS_ATTRIBUTE_PORT)); new TransportAddress(
msgFixture.ADDRESS_ATTRIBUTE_ADDRESS,
msgFixture.ADDRESS_ATTRIBUTE_PORT,
Transport.UDP));
bindingResponse.addAttribute(mappedAddress); bindingResponse.addAttribute(mappedAddress);
sourceAddress = AttributeFactory.createSourceAddressAttribute( sourceAddress = AttributeFactory.createSourceAddressAttribute(
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_2, msgFixture.ADDRESS_ATTRIBUTE_PORT_2)); new TransportAddress(
msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_2,
msgFixture.ADDRESS_ATTRIBUTE_PORT_2,
Transport.UDP));
bindingResponse.addAttribute(sourceAddress); bindingResponse.addAttribute(sourceAddress);
changedAddress = AttributeFactory.createChangedAddressAttribute( changedAddress = AttributeFactory.createChangedAddressAttribute(
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_3,msgFixture.ADDRESS_ATTRIBUTE_PORT_3)); new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_3,
msgFixture.ADDRESS_ATTRIBUTE_PORT_3, Transport.UDP));
bindingResponse.addAttribute(changedAddress); bindingResponse.addAttribute(changedAddress);
bindingResponse.setTransactionID(msgFixture.TRANSACTION_ID); bindingResponse.setTransactionID(msgFixture.TRANSACTION_ID);

View File

@ -1,23 +1,19 @@
/* /*
* Stun4j, the OpenSource Java Solution for NAT and Firewall Traversal. * ice4j, the OpenSource Java Solution for NAT and Firewall Traversal.
* Maintained by the SIP Communicator community (http://sip-communicator.org).
* *
* Distributable under LGPL license. * Distributable under LGPL license. See terms of license at gnu.org.
* See terms of license at gnu.org.
*/ */
package org.ice4j.stack; package org.ice4j.stack;
import junit.framework.*; import java.net.*;
import java.net.DatagramSocket; import java.util.*;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.DatagramPacket;
import java.io.*;
import java.util.Arrays;
import java.util.logging.*; import java.util.logging.*;
import junit.framework.*;
import org.ice4j.*; import org.ice4j.*;
import org.ice4j.message.*; import org.ice4j.message.*;
import org.ice4j.stack.*;
/** /**
* All unit stack tests should be provided later. I just don't have the time now. * All unit stack tests should be provided later. I just don't have the time now.
@ -41,7 +37,8 @@ public class ShallowStackTest extends TestCase {
private DatagramCollector dgramCollector = new DatagramCollector(); private DatagramCollector dgramCollector = new DatagramCollector();
private NetAccessPointDescriptor apDescriptor = null; private TransportAddress localAddress = null;
private DatagramSocket localSock = null;
private DatagramSocket dummyImplSocket = null; private DatagramSocket dummyImplSocket = null;
private DatagramPacket bindingRequestPacket private DatagramPacket bindingRequestPacket
@ -58,21 +55,20 @@ public class ShallowStackTest extends TestCase {
msgFixture = new MsgFixture(); msgFixture = new MsgFixture();
msgFixture.setUp(); msgFixture.setUp();
//Addresses //Addresses
stun4jAddressOfDummyImpl = stun4jAddressOfDummyImpl = new TransportAddress(
new TransportAddress(InetAddress.getByName("127.0.0.1"), 6000); "127.0.0.1", 6000, Transport.UDP);
socketAddressOfStun4jStack = socketAddressOfStun4jStack = new TransportAddress(
new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 5000); "127.0.0.1", 5000, Transport.UDP);
//init the stack //init the stack
stunStack = StunStack.getInstance(); stunStack = StunStack.getInstance();
stunProvider = stunStack.getProvider(); stunProvider = stunStack.getProvider();
//access point //access point
apDescriptor = new NetAccessPointDescriptor( localAddress = new TransportAddress("127.0.0.1", 5000, Transport.UDP);
new TransportAddress(InetAddress.getByName("127.0.0.1"), 5000)); localSock = new DatagramSocket(localAddress);
stunStack.installNetAccessPoint(apDescriptor); stunStack.installNetAccessPoint(localSock);
//init the phoney stack //init the phoney stack
dummyImplSocket = new DatagramSocket( 6000 ); dummyImplSocket = new DatagramSocket( 6000 );
@ -106,7 +102,7 @@ public class ShallowStackTest extends TestCase {
stunProvider.sendRequest(bindingRequest, stunProvider.sendRequest(bindingRequest,
stun4jAddressOfDummyImpl, stun4jAddressOfDummyImpl,
apDescriptor, localAddress,
new SimpleResponseCollector()); new SimpleResponseCollector());
//wait for its arrival //wait for its arrival
@ -217,18 +213,18 @@ public class ShallowStackTest extends TestCase {
//---------- create the response --------------------------------------- //---------- create the response ---------------------------------------
Response bindingResponse = MessageFactory.createBindingResponse( Response bindingResponse = MessageFactory.createBindingResponse(
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS, new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS,
msgFixture.ADDRESS_ATTRIBUTE_PORT ), msgFixture.ADDRESS_ATTRIBUTE_PORT, Transport.UDP ),
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_2, new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_2,
msgFixture.ADDRESS_ATTRIBUTE_PORT_2), msgFixture.ADDRESS_ATTRIBUTE_PORT_2, Transport.UDP),
new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_3, new TransportAddress( msgFixture.ADDRESS_ATTRIBUTE_ADDRESS_3,
msgFixture.ADDRESS_ATTRIBUTE_PORT_3)); msgFixture.ADDRESS_ATTRIBUTE_PORT_3, Transport.UDP));
//---------- send & receive the response ------------------------------- //---------- send & receive the response -------------------------------
dgramCollector.startListening(dummyImplSocket); dgramCollector.startListening(dummyImplSocket);
stunProvider.sendResponse(collectedRequest.getTransactionID(), stunProvider.sendResponse(collectedRequest.getTransactionID(),
bindingResponse, bindingResponse,
apDescriptor, localAddress,
stun4jAddressOfDummyImpl); stun4jAddressOfDummyImpl);
//wait for its arrival //wait for its arrival
@ -258,7 +254,7 @@ public class ShallowStackTest extends TestCase {
stunProvider.sendRequest(bindingRequest, stunProvider.sendRequest(bindingRequest,
stun4jAddressOfDummyImpl, stun4jAddressOfDummyImpl,
apDescriptor, localAddress,
collector); collector);
//wait for its arrival //wait for its arrival

View File

@ -1,14 +1,15 @@
/* /*
* Stun4j, the OpenSource Java Solution for NAT and Firewall Traversal. * ice4j, the OpenSource Java Solution for NAT and Firewall Traversal.
* Maintained by the SIP Communicator community (http://sip-communicator.org).
* *
* Distributable under LGPL license. * Distributable under LGPL license. See terms of license at gnu.org.
* See terms of license at gnu.org.
*/ */
package org.ice4j.stunclient; package org.ice4j.stunclient;
import java.util.Vector;
import java.util.logging.*;
import java.io.*; import java.io.*;
import java.net.*;
import java.util.*;
import java.util.logging.*;
import org.ice4j.*; import org.ice4j.*;
import org.ice4j.message.*; import org.ice4j.message.*;
@ -38,8 +39,8 @@ public class ResponseSequenceServer
private StunStack stunStack = null; private StunStack stunStack = null;
private StunProvider stunProvider = null; private StunProvider stunProvider = null;
private TransportAddress serverAddress = null; private TransportAddress serverAddress = null;
private NetAccessPointDescriptor apDescriptor = null; private DatagramSocket localSocket = null;
public ResponseSequenceServer(TransportAddress bindAddress) public ResponseSequenceServer(TransportAddress bindAddress)
{ {
@ -57,10 +58,10 @@ public class ResponseSequenceServer
stunStack = StunStack.getInstance(); stunStack = StunStack.getInstance();
stunProvider = stunStack.getProvider(); stunProvider = stunStack.getProvider();
apDescriptor = new NetAccessPointDescriptor(serverAddress); localSocket = new DatagramSocket(serverAddress);
stunStack.installNetAccessPoint(apDescriptor); stunStack.installNetAccessPoint(localSocket);
stunProvider.addRequestListener(apDescriptor, this); stunProvider.addRequestListener(serverAddress, this);
} }
@ -70,6 +71,7 @@ public class ResponseSequenceServer
public void shutDown() public void shutDown()
{ {
messageSequence.removeAllElements(); messageSequence.removeAllElements();
localSocket.close();
stunStack = null; stunStack = null;
stunProvider = null; stunProvider = null;
@ -111,9 +113,7 @@ public class ResponseSequenceServer
try try
{ {
stunProvider.sendResponse(evt.getMessage().getTransactionID(), stunProvider.sendResponse(evt.getMessage().getTransactionID(),
res, res, serverAddress, evt.getRemoteAddress());
apDescriptor,
evt.getRemoteAddress());
} }
catch (Exception ex) catch (Exception ex)
{ {

View File

@ -1,17 +1,15 @@
/* /*
* Stun4j, the OpenSource Java Solution for NAT and Firewall Traversal. * ice4j, the OpenSource Java Solution for NAT and Firewall Traversal.
* Maintained by the SIP Communicator community (http://sip-communicator.org).
* *
* Distributable under LGPL license. * Distributable under LGPL license. See terms of license at gnu.org.
* See terms of license at gnu.org.
*/ */
package org.ice4j.stunclient; package org.ice4j.stunclient;
import junit.framework.*; import junit.framework.*;
import java.io.*;
import org.ice4j.*; import org.ice4j.*;
import org.ice4j.message.*; import org.ice4j.message.*;
import org.ice4j.stunclient.*;
/** /**
* The StunAddressDiscovererTest_XXX set of tests were created to verify stun * The StunAddressDiscovererTest_XXX set of tests were created to verify stun
@ -27,17 +25,18 @@ public class StunAddressDiscovererTest
extends TestCase extends TestCase
{ {
private NetworkConfigurationDiscoveryProcess stunAddressDiscoverer = null; private NetworkConfigurationDiscoveryProcess stunAddressDiscoverer = null;
private TransportAddress discovererAddress = new TransportAddress("127.0.0.1", 15555); private TransportAddress discovererAddress
= new TransportAddress("127.0.0.1", 15555, Transport.UDP);
private ResponseSequenceServer responseServer = null; private ResponseSequenceServer responseServer = null;
private TransportAddress responseServerAddress private TransportAddress responseServerAddress
= new TransportAddress("127.0.0.1", 19999); = new TransportAddress("127.0.0.1", 19999, Transport.UDP);
private TransportAddress mappedClientAddress private TransportAddress mappedClientAddress
= new TransportAddress("212.56.4.10", 15612); = new TransportAddress("212.56.4.10", 15612, Transport.UDP);
private TransportAddress mappedClientAddressPort2 private TransportAddress mappedClientAddressPort2
= new TransportAddress("212.56.4.10", 15611); = new TransportAddress("212.56.4.10", 15611, Transport.UDP);
public StunAddressDiscovererTest(String name) public StunAddressDiscovererTest(String name)
throws StunException throws StunException

View File

@ -1,16 +1,15 @@
/* /*
* Stun4j, the OpenSource Java Solution for NAT and Firewall Traversal. * ice4j, the OpenSource Java Solution for NAT and Firewall Traversal.
* Maintained by the SIP Communicator community (http://sip-communicator.org).
* *
* Distributable under LGPL license. * Distributable under LGPL license. See terms of license at gnu.org.
* See terms of license at gnu.org.
*/ */
package org.ice4j.stunclient; package org.ice4j.stunclient;
import junit.framework.*;
import org.ice4j.*; import org.ice4j.*;
import org.ice4j.message.*; import org.ice4j.message.*;
import org.ice4j.stunclient.*;
import junit.framework.*;
/** /**
* Makes basic stun tests for cases where local network addresses and the public * Makes basic stun tests for cases where local network addresses and the public
@ -34,27 +33,28 @@ public class StunAddressDiscovererTest_v4v6 extends TestCase {
= null; = null;
private TransportAddress discovererAddress_v4 private TransportAddress discovererAddress_v4
= new TransportAddress("127.0.0.1", 17555); = new TransportAddress("127.0.0.1", 17555, Transport.UDP);
private TransportAddress discovererAddress_v6 private TransportAddress discovererAddress_v6
= new TransportAddress("::1", 17555); = new TransportAddress("::1", 17555, Transport.UDP);
private ResponseSequenceServer responseServer_v6 = null; private ResponseSequenceServer responseServer_v6 = null;
private ResponseSequenceServer responseServer_v4 = null; private ResponseSequenceServer responseServer_v4 = null;
private TransportAddress responseServerAddress_v6 private TransportAddress responseServerAddress_v6
= new TransportAddress("::1", 21999); = new TransportAddress("::1", 21999, Transport.UDP);
private TransportAddress responseServerAddress_v4 private TransportAddress responseServerAddress_v4
= new TransportAddress("127.0.0.1", 21999); = new TransportAddress("127.0.0.1", 21999, Transport.UDP);
private TransportAddress mappedClientAddress_v6 private TransportAddress mappedClientAddress_v6 = new TransportAddress(
= new TransportAddress("2001:660:4701:1001:ff::1", 17612); "2001:660:4701:1001:ff::1", 17612, Transport.UDP);
private TransportAddress mappedClientAddress_v6_Port2 private TransportAddress mappedClientAddress_v6_Port2
= new TransportAddress("2001:660:4701:1001:ff::1", 17611); = new TransportAddress(
"2001:660:4701:1001:ff::1", 17611, Transport.UDP);
private TransportAddress mappedClientAddress_v4 private TransportAddress mappedClientAddress_v4
= new TransportAddress("130.79.99.55", 17612); = new TransportAddress("130.79.99.55", 17612, Transport.UDP);
private TransportAddress mappedClientAddress_v4_Port2 private TransportAddress mappedClientAddress_v4_Port2
= new TransportAddress("130.79.99.55", 17611); = new TransportAddress("130.79.99.55", 17611, Transport.UDP);
public StunAddressDiscovererTest_v4v6(String name) public StunAddressDiscovererTest_v4v6(String name)
throws StunException throws StunException

View File

@ -1,16 +1,15 @@
/* /*
* Stun4j, the OpenSource Java Solution for NAT and Firewall Traversal. * ice4j, the OpenSource Java Solution for NAT and Firewall Traversal.
* Maintained by the SIP Communicator community (http://sip-communicator.org).
* *
* Distributable under LGPL license. * Distributable under LGPL license. See terms of license at gnu.org.
* See terms of license at gnu.org.
*/ */
package org.ice4j.stunclient; package org.ice4j.stunclient;
import junit.framework.*;
import org.ice4j.*; import org.ice4j.*;
import org.ice4j.message.*; import org.ice4j.message.*;
import org.ice4j.stunclient.*;
import junit.framework.*;
/** /**
* The StunAddressDiscovererTest_XXX set of tests were created to verify stun * The StunAddressDiscovererTest_XXX set of tests were created to verify stun
@ -24,15 +23,17 @@ import junit.framework.*;
*/ */
public class StunAddressDiscovererTest_v6 extends TestCase { public class StunAddressDiscovererTest_v6 extends TestCase {
private NetworkConfigurationDiscoveryProcess stunAddressDiscoverer = null; private NetworkConfigurationDiscoveryProcess stunAddressDiscoverer = null;
private TransportAddress discovererAddress = new TransportAddress("::1", 16555); private TransportAddress discovererAddress
= new TransportAddress("::1", 16555, Transport.UDP);
private ResponseSequenceServer responseServer = null; private ResponseSequenceServer responseServer = null;
private TransportAddress responseServerAddress = new TransportAddress("::1", 20999); private TransportAddress responseServerAddress
= new TransportAddress("::1", 20999, Transport.UDP);
private TransportAddress mappedClientAddress private TransportAddress mappedClientAddress = new TransportAddress(
= new TransportAddress("2001:660:4701:1001:ff::1", 16612); "2001:660:4701:1001:ff::1", 16612, Transport.UDP);
private TransportAddress mappedClientAddressPort2 private TransportAddress mappedClientAddressPort2 = new TransportAddress(
= new TransportAddress("2001:660:4701:1001:ff::1", 16611); "2001:660:4701:1001:ff::1", 16611, Transport.UDP);
public StunAddressDiscovererTest_v6(String name) public StunAddressDiscovererTest_v6(String name)
throws StunException throws StunException