Revision: 9557
Author: pavel.slegr
Date: Wed Jan 20 02:21:11 2010
Log: Fixes Issue 1184
http://code.google.com/p/mobicents/source/detail?r=9557
Modified:
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/applications/b2bua-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/B2BUASipServlet.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/applications/call-forwarding-b2bua-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/CallForwardingB2BUASipServlet.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/b2bua/B2BUASipUnitTest.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/b2bua/B2BUATcpUdpTest.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/callcontroller/MultiHomeB2BUATest.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/click2call/Click2CallBasicTest.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/composition/ApplicationRouterDirectionOptionalParameterTest.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/management/SipConnectorTestManagement.java
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java
Fri Dec 4 01:50:12 2009
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java
Wed Jan 20 02:21:11 2010
@@ -123,6 +123,19 @@
// private static final transient Logger logger =
Logger.getLogger(JainSipUtils.class);
public static final String GLOBAL_IPADDRESS = "0.0.0.0";
+
+ // methods where a contact header is mandatory
+ public static final Set<String> CONTACT_HEADER_METHODS = new
TreeSet<String>(
+ new NamesComparator());
+
+ static {
+ CONTACT_HEADER_METHODS.add(Request.INVITE);
+ CONTACT_HEADER_METHODS.add(Request.REGISTER);
+ CONTACT_HEADER_METHODS.add(Request.SUBSCRIBE);
+ CONTACT_HEADER_METHODS.add(Request.NOTIFY);
+ CONTACT_HEADER_METHODS.add(Request.REFER);
+ CONTACT_HEADER_METHODS.add(Request.UPDATE);
+ }
public static final Set<String> DIALOG_CREATING_METHODS = new
TreeSet<String>(
new NamesComparator());
@@ -593,5 +606,5 @@
return true;
}
return false;
- }
-}
+ }
+}
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java
Wed Jan 20 01:34:02 2010
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java
Wed Jan 20 02:21:11 2010
@@ -16,6 +16,7 @@
*/
package org.mobicents.servlet.sip.message;
+import gov.nist.javax.sip.address.SipURIExt;
import gov.nist.javax.sip.header.ims.PathHeader;
import gov.nist.javax.sip.message.SIPMessage;
@@ -25,6 +26,7 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
@@ -41,8 +43,11 @@
import javax.servlet.sip.SipSession.State;
import javax.servlet.sip.ar.SipApplicationRoutingDirective;
import javax.sip.ClientTransaction;
+import javax.sip.ListeningPoint;
import javax.sip.ServerTransaction;
import javax.sip.Transaction;
+import javax.sip.address.SipURI;
+import javax.sip.address.URI;
import javax.sip.header.CSeqHeader;
import javax.sip.header.CallIdHeader;
import javax.sip.header.ContactHeader;
@@ -55,6 +60,7 @@
import javax.sip.message.Request;
import org.apache.log4j.Logger;
+import org.mobicents.ha.javax.sip.SipLoadBalancer;
import org.mobicents.servlet.sip.JainSipUtils;
import org.mobicents.servlet.sip.SipFactories;
import org.mobicents.servlet.sip.core.ApplicationRoutingHeaderComposer;
@@ -88,6 +94,15 @@
B2BUA_SYSTEM_HEADERS.add(RecordRouteHeader.NAME);
B2BUA_SYSTEM_HEADERS.add(PathHeader.NAME);
}
+
+ // contact parameters not allowed to be modified as per JSR 289 Section
4.1.3
+ protected static final Set<String> CONTACT_FORBIDDEN_PARAMETER = new
HashSet<String>();
+ static {
+ CONTACT_FORBIDDEN_PARAMETER.add("method");
+ CONTACT_FORBIDDEN_PARAMETER.add("ttl");
+ CONTACT_FORBIDDEN_PARAMETER.add("maddr");
+ CONTACT_FORBIDDEN_PARAMETER.add("lr");
+ }
//Map to handle linked sessions
private Map<SipSessionKey, SipSessionKey> sessionMap = null;
@@ -171,21 +186,45 @@
null,
null,
JainSipUtils.DIALOG_CREATING_METHODS.contains(newRequest.getMethod()));
- //JSR 289 Section 15.1.6
+ //JSR 289 Section 15.1.6
newSipServletRequest.setRoutingDirective(SipApplicationRoutingDirective.CONTINUE,
origRequest);
- //If Contact header is present in the headerMap
- //then relevant portions of Contact header is to be used in the request
created,
- //in accordance with section 4.1.3 of the specification.
- if(contactHeaderSet.size() > 0) {
- newRequest.removeHeader(ContactHeader.NAME);
+
+ final String method = origRequest.getMethod();
+ newRequest.removeHeader(ContactHeader.NAME);
+ // Following JSR 289 section 4.1.3, for REGISTER
requests
+ if(Request.REGISTER.equalsIgnoreCase(method) && contactHeaderSet.size()
0) {
for (String contactHeaderValue :
contactHeaderSet) {
newSipServletRequest.addHeaderInternal(ContactHeader.NAME,
contactHeaderValue, true);
}
} else {
- //For non-REGISTER requests, the Contact header
field is not copied
- //but is populated by the container as
usualB2buaHelperImpl
-
if(!Request.REGISTER.equalsIgnoreCase(origRequest.getMethod())) {
-
newRequest.removeHeader(ContactHeader.NAME);
+ //Creating container contact header
+ ContactHeader contactHeader = null;
+ String fromName = null;
+ if(newFromHeader.getAddress().getURI() instanceof
javax.sip.address.SipURI) {
+ fromName = ((javax.sip.address.SipURI)
newFromHeader.getAddress().getURI()).getUser();
+ }
+ // if a sip load balancer is present in front of the server, the
contact header is the one from the sip lb
+ // so that the subsequent requests can be
failed over
+ if(sipFactoryImpl.isUseLoadBalancer()) {
+ final SipLoadBalancer loadBalancerToUse =
sipFactoryImpl.getLoadBalancerToUse();
+ javax.sip.address.SipURI sipURI =
SipFactories.addressFactory.createSipURI(fromName,
loadBalancerToUse.getAddress().getHostAddress());
+
sipURI.setHost(loadBalancerToUse.getAddress().getHostAddress());
+
sipURI.setPort(loadBalancerToUse.getSipPort());
+
sipURI.setTransportParam(ListeningPoint.UDP);
+ javax.sip.address.Address contactAddress =
SipFactories.addressFactory.createAddress(sipURI);
+ if(fromName != null && fromName.length()
> 0) {
+
contactAddress.setDisplayName(fromName);
+ }
+ contactHeader =
SipFactories.headerFactory.createContactHeader(contactAddress);
+ } else {
+ contactHeader =
JainSipUtils.createContactHeader(sipFactoryImpl.getSipNetworkInterfaceManager(),
newRequest, fromName);
+ }
+ if(contactHeaderSet.size() > 0) {
+ // if the set is not empty then we adjust the values of the set to
match the host and port + forbidden params of the container
+ setContactHeaders(contactHeaderSet, newSipServletRequest,
contactHeader);
+ } else
if(JainSipUtils.CONTACT_HEADER_METHODS.contains(method)) {
+ // otherwise we set the container
contact header for allowed methods
+ newRequest.setHeader(contactHeader);
}
}
@@ -249,8 +288,10 @@
//If Contact header is present in the headerMap
//then relevant portions of Contact header is to be used in the request
created,
//in accordance with section 4.1.3 of the specification.
- for (String contactHeaderValue : contactHeaderSet) {
- newSubsequentServletRequest.addHeaderInternal(ContactHeader.NAME,
contactHeaderValue, true);
+ Request subsequentRequest =
(Request)newSubsequentServletRequest.getMessage();
+ ContactHeader contactHeader = (ContactHeader)
subsequentRequest.getHeader(ContactHeader.NAME);
+ if(contactHeader != null && contactHeaderSet.size() >
0) {
+ setContactHeaders(contactHeaderSet, newSubsequentServletRequest,
contactHeader);
}
//Fix for Issue 585 by alexandre sova
@@ -280,6 +321,67 @@
}
}
+ /**
+ * Issue 1151 :
+ * For Contact header if present only the user part and some parameters
are to be used as defined in 4.1.3 The Contact Header Field
+ *
+ * @param newRequest
+ * @param contactHeaderSet
+ * @param newSipServletRequest
+ * @param contactHeader
+ * @throws ParseException
+ */
+ private void setContactHeaders(
+ final List<String> contactHeaderSet,
+ final SipServletRequestImpl newSipServletRequest,
+ ContactHeader contactHeader) throws ParseException {
+ // we parse and add the contact headers defined in the map
+ Request newRequest = (Request)
newSipServletRequest.getMessage();
+ for (String contactHeaderValue : contactHeaderSet) {
+ newSipServletRequest.addHeaderInternal(ContactHeader.NAME,
contactHeaderValue, true);
+ }
+ // we set up a list of contact headers to be added to the
request
+ List<ContactHeader> newContactHeaders = new
ArrayList<ContactHeader>();
+
+ ListIterator<ContactHeader> contactHeaders =
newRequest.getHeaders(ContactHeader.NAME);
+ while (contactHeaders.hasNext()) {
+ // we clone the default Mobicents Sip Servlets Contact
Header
+ ContactHeader newContactHeader = (ContactHeader)
contactHeader.clone();
+
+ ContactHeader newRequestContactHeader =
contactHeaders.next();
+ final URI newURI =
newRequestContactHeader.getAddress().getURI();
+
newContactHeader.getAddress().setDisplayName(newRequestContactHeader.getAddress().getDisplayName());
+ // and reset its user part and params accoridng to 4.1.3 The Contact
Header Field
+ if(newURI instanceof SipURI) {
+ SipURI newSipURI = (SipURI) newURI;
+ SipURI newContactSipURI = (SipURI)
newContactHeader.getAddress().getURI();
+
((SipURI)newContactHeader.getAddress().getURI()).setUser(newSipURI.getUser());
+ Iterator<String> uriParameters =
newSipURI.getParameterNames();
+ while (uriParameters.hasNext()) {
+ String parameter = uriParameters.next();
+
if(!CONTACT_FORBIDDEN_PARAMETER.contains(parameter)) {
+ String value =
newSipURI.getParameter(parameter);
+ newContactSipURI.setParameter(parameter, "".equals(value) ? null :
value);
+ }
+ }
+ }
+ // reset the header params according to 4.1.3 The
Contact Header Field
+ Iterator<String> headerParameters =
newRequestContactHeader.getParameterNames();
+ while (headerParameters.hasNext()) {
+ String parameter = headerParameters.next();
+ String value =
newRequestContactHeader.getParameter(parameter);
+ newContactHeader.setParameter(parameter, "".equals(value) ? null :
value);
+ }
+ newContactHeaders.add(newContactHeader);
+ }
+ // we remove the previously added contact headers
+ newRequest.removeHeader(ContactHeader.NAME);
+ // and set the new correct ones
+ for (ContactHeader newContactHeader : newContactHeaders) {
+ newRequest.addHeader(newContactHeader);
+ }
+ }
+
/**
* @param headerMap
* @param newRequest
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java
Wed Jan 20 01:34:02 2010
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java
Wed Jan 20 02:21:11 2010
@@ -508,9 +508,8 @@
viaHeaders,
maxForwardsHeader);
- //Adding default contact header for register
- if(Request.REGISTER.equalsIgnoreCase(method)
- ||
Request.INVITE.equalsIgnoreCase(method)) {
+ //Adding default contact header for specific methods
only
+
if(JainSipUtils.CONTACT_HEADER_METHODS.contains(method)) {
String fromName = null;
if(fromHeader.getAddress().getURI() instanceof
javax.sip.address.SipURI) {
fromName =
((javax.sip.address.SipURI)fromHeader.getAddress().getURI()).getUser();
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java
Fri Dec 4 01:50:12 2009
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java
Wed Jan 20 02:21:11 2010
@@ -18,6 +18,7 @@
import gov.nist.javax.sip.DialogExt;
import gov.nist.javax.sip.header.ims.PathHeader;
+import gov.nist.javax.sip.message.MessageExt;
import gov.nist.javax.sip.stack.SIPTransaction;
import java.io.BufferedReader;
@@ -872,7 +873,6 @@
public void send() {
checkReadOnly();
final Request request = (Request) super.message;
- final String transport = JainSipUtils.findTransport(request);
final MobicentsSipSession session = getSipSession();
try {
ProxyImpl proxy = null;
@@ -880,6 +880,9 @@
proxy = session.getProxy();
}
final SipNetworkInterfaceManager sipNetworkInterfaceManager =
sipFactoryImpl.getSipNetworkInterfaceManager();
+
+ ((MessageExt)message).setApplicationData(null);
+
ViaHeader viaHeader = (ViaHeader)
message.getHeader(ViaHeader.NAME);
//Issue 112 fix by folsson
if(!getMethod().equalsIgnoreCase(Request.CANCEL) && viaHeader ==
null) {
@@ -903,7 +906,7 @@
message.addHeader(viaHeader);
}
}
-
+ final String transport =
JainSipUtils.findTransport(request);
if(logger.isDebugEnabled()) {
logger.debug("The found transport for sending request is '" +
transport + "'");
}
@@ -958,12 +961,9 @@
getSipSession().getSipApplicationSession().getSipContext().getSipManager().dumpSipSessions();
}
if (super.getTransaction() == null) {
-
- final SipProvider sipProvider =
sipNetworkInterfaceManager.findMatchingListeningPoint(
- transport,
false).getSipProvider();
ContactHeader contactHeader =
(ContactHeader)request.getHeader(ContactHeader.NAME);
- if(contactHeader == null
&& !Request.REGISTER.equalsIgnoreCase(requestMethod)) {
+ if(contactHeader == null
&& !Request.REGISTER.equalsIgnoreCase(requestMethod) &&
JainSipUtils.CONTACT_HEADER_METHODS.contains(requestMethod) && proxy ==
null) {
final FromHeader fromHeader = (FromHeader)
request.getHeader(FromHeader.NAME);
final javax.sip.address.URI fromUri =
fromHeader.getAddress().getURI();
String fromName = null;
@@ -979,6 +979,8 @@
if(logger.isDebugEnabled()) {
logger.debug("Getting new Client Tx for
request " + request);
}
+ final SipProvider sipProvider =
sipNetworkInterfaceManager.findMatchingListeningPoint(
+ transport,
false).getSipProvider();
final ClientTransaction ctx = sipProvider
.getNewClientTransaction(request);
ctx.setRetransmitTimer(sipFactoryImpl.getSipApplicationDispatcher().getBaseTimerInterval());
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/applications/b2bua-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/B2BUASipServlet.java
Fri Dec 4 01:56:28 2009
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/applications/b2bua-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/B2BUASipServlet.java
Wed Jan 20 02:21:11 2010
@@ -66,8 +66,13 @@
if (logger.isDebugEnabled()) {
logger.debug("forkedRequest = " + forkedRequest);
}
- forkedRequest.getSession().setAttribute("originalRequest",
request);
- forkedRequest.send();
+ // Issue 1151 : making sure the contact is present in the B2BUAHelper
newly created request
+ if(forkedRequest.getParameterableHeaders("Contact").hasNext()) {
+
forkedRequest.getSession().setAttribute("originalRequest", request);
+ forkedRequest.send();
+ } else {
+ request.createResponse(500, "Contact not present in newly created
request").send();
+ }
}
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/applications/call-forwarding-b2bua-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/CallForwardingB2BUASipServlet.java
Mon Jan 18 03:22:13 2010
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/applications/call-forwarding-b2bua-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/CallForwardingB2BUASipServlet.java
Wed Jan 20 02:21:11 2010
@@ -34,6 +34,7 @@
import javax.servlet.sip.SipServletResponse;
import javax.servlet.sip.SipSession;
import javax.servlet.sip.SipURI;
+import javax.sip.header.ContactHeader;
import org.apache.log4j.Logger;
@@ -58,6 +59,8 @@
new
String[]{"sip:[email protected]", "sip:[email protected]:5090;transport=tcp"});
forwardingUris.put("sip:[email protected]",
new
String[]{"sip:[email protected]", "sip:[email protected]:5080"});
+
forwardingUris.put("sip:[email protected]",
+ new
String[]{"sip:[email protected]", "sip:[email protected]:5080"});
forwardingUris.put("sip:[email protected]:5090",
new
String[]{"sip:[email protected]:5090", "sip:[email protected]:5090"});
forwardingUris.put("sip:[email protected]:5090",
@@ -140,9 +143,17 @@
userAgentHeaderList.add("CallForwardingB2BUASipServlet");
headers.put("User-Agent", userAgentHeaderList);
- List<String> contactHeaderList = new
ArrayList<String>();
- contactHeaderList.add("\"callforwardingB2BUA\"
<sip:127.0.0.1:5070>");
- headers.put("Contact", contactHeaderList);
+
if(((SipURI)request.getFrom().getURI()).getUser().contains("tcp-sender")) {
+
if(request.getHeader(ContactHeader.NAME).contains("transport=tcp")) {
+ List<String> contactHeaderList = new
ArrayList<String>();
+ contactHeaderList.add("\"callforwardingB2BUA\"
<sip:[email protected]:5070;q=0.1;lr;transport=udp;test>;test");
+ headers.put("Contact",
contactHeaderList);
+ } else {
+ List<String> contactHeaderList = new
ArrayList<String>();
+ contactHeaderList.add("\"callforwardingB2BUA\"
<sip:[email protected]:5070;q=0.1;lr;transport=tcp;test>;test");
+ headers.put("Contact",
contactHeaderList);
+ }
+ }
List<String> extensionsHeaderList = new
ArrayList<String>();
extensionsHeaderList.add("extension-header-value1");
@@ -231,7 +242,7 @@
//create and sends OK for the first call leg
SipServletRequest originalRequest = (SipServletRequest)
sipServletResponse.getSession().getAttribute("originalRequest");
SipServletResponse responseToOriginalRequest =
originalRequest.createResponse(sipServletResponse.getStatus());
- logger.info("Sending OK on 1st call leg" +
responseToOriginalRequest);
+ logger.info("Sending OK on 1st call leg" +
responseToOriginalRequest);
responseToOriginalRequest.setContentLength(sipServletResponse.getContentLength());
//responseToOriginalRequest.setContent(sipServletResponse.getContent(),
sipServletResponse.getContentType());
responseToOriginalRequest.send();
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
Mon Jan 18 03:22:13 2010
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
Wed Jan 20 02:21:11 2010
@@ -1122,7 +1122,8 @@
if(sendBye) {
Thread.sleep(timeToWaitBeforeBye );
if(serverTransactionId != null && serverTransactionId.getDialog() !=
null) {
- Request byeRequest =
serverTransactionId.getDialog().createRequest(Request.BYE);
+ Request byeRequest =
serverTransactionId.getDialog().createRequest(Request.BYE);
+ logger.info("BYE created : " +
byeRequest);
ClientTransaction ct =
sipProvider.getNewClientTransaction(byeRequest);
logger.info("Sending BYE : " +
byeRequest);
serverTransactionId.getDialog().sendRequest(ct);
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/b2bua/B2BUASipUnitTest.java
Fri Dec 4 02:00:26 2009
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/b2bua/B2BUASipUnitTest.java
Wed Jan 20 02:21:11 2010
@@ -76,7 +76,7 @@
properties1.setProperty("gov.nist.javax.sip.DEBUG_LOG",
"logs/b2buadebug1.txt");
properties1.setProperty("gov.nist.javax.sip.SERVER_LOG",
- "logs/b2bualog1.txt");
+ "logs/b2bualog1.xml");
properties1.setProperty("gov.nist.javax.sip.TRACE_LEVEL",
"32");
@@ -90,7 +90,7 @@
properties2.setProperty("gov.nist.javax.sip.DEBUG_LOG",
"logs/b2buadebug2.txt");
properties2.setProperty("gov.nist.javax.sip.SERVER_LOG",
- "logs/b2bualog2.txt");
+ "logs/b2bualog2.xml");
properties2.setProperty("gov.nist.javax.sip.TRACE_LEVEL",
"32");
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/b2bua/B2BUATcpUdpTest.java
Mon Jan 18 03:22:13 2010
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/b2bua/B2BUATcpUdpTest.java
Wed Jan 20 02:21:11 2010
@@ -131,8 +131,8 @@
i = 0;
while (contactHeaderIt.hasNext()) {
ContactHeader contactHeader = (ContactHeader)
contactHeaderIt
- .next();
- assertTrue(contactHeader.toString().trim().startsWith("Contact:
\"callforwardingB2BUA\""));
+ .next();
+ assertTrue(contactHeader.toString().trim().startsWith("Contact:
\"callforwardingB2BUA\"
<sip:[email protected]:5070;q=0.1;transport=tcp;test>;test"));
i++;
}
assertEquals(1, i);
@@ -157,10 +157,9 @@
while (contactHeaderIt.hasNext()) {
ContactHeader contactHeader = (ContactHeader)
contactHeaderIt
.next();
- assertTrue(contactHeader.toString().trim().startsWith("Contact:
\"callforwardingB2BUA\""));
i++;
}
- assertEquals(1, i);
+ assertEquals(0, i);
assertFalse(receiverCallIdHeader.getCallId().equals(senderCallIdHeader.getCallId()));
extensionHeaderIt =
receiver.getByeRequestReceived().getHeaders("extension-header");
i = 0;
@@ -176,7 +175,7 @@
SipProvider senderProvider = sender.createProvider();
receiver = new TestSipListener(5090, 5070, receiverProtocolObjects,
false);
- receiver.setTransport(false);
+// receiver.setTransport(false);
SipProvider receiverProvider = receiver.createProvider();
receiverProvider.addSipListener(receiver);
@@ -185,7 +184,7 @@
senderProtocolObjects.start();
receiverProtocolObjects.start();
- String fromName = "forward-udp-sender";
+ String fromName = "forward-udp-sender-tcp-sender";
String fromSipAddress = "sip-servlets.com";
SipURI fromAddress =
senderProtocolObjects.addressFactory.createSipURI(
fromName, fromSipAddress);
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/callcontroller/MultiHomeB2BUATest.java
Wed Jul 22 11:12:32 2009
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/callcontroller/MultiHomeB2BUATest.java
Wed Jan 20 02:21:11 2010
@@ -30,7 +30,7 @@
private static final String TRANSPORT = "udp";
private static final boolean AUTODIALOG = true;
- private static final int TIMEOUT = 5000;
+ private static final int TIMEOUT = 10000;
// private static final int TIMEOUT = 100000000;
TestSipListener sender;
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/click2call/Click2CallBasicTest.java
Fri Dec 4 02:00:26 2009
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/click2call/Click2CallBasicTest.java
Wed Jan 20 02:21:11 2010
@@ -42,7 +42,7 @@
private SipPhone[] sipPhoneReceivers;
- private static final int timeout = 5000;
+ private static final int timeout = 10000;
private static final int receiversCount = 2;
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/composition/ApplicationRouterDirectionOptionalParameterTest.java
Fri Dec 4 02:00:26 2009
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/composition/ApplicationRouterDirectionOptionalParameterTest.java
Wed Jan 20 02:21:11 2010
@@ -38,7 +38,7 @@
private SipPhone[] sipPhoneReceivers;
- private static final int timeout = 5000;
+ private static final int timeout = 10000;
private static final int receiversCount = 2;
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/management/SipConnectorTestManagement.java
Fri Dec 4 02:00:26 2009
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/management/SipConnectorTestManagement.java
Wed Jan 20 02:21:11 2010
@@ -143,7 +143,7 @@
String message = (String) allMessagesIterator.next();
logger.info(message);
}
- assertEquals(2, sender.getAllMessagesContent().size());
+ assertEquals(3, sender.getAllMessagesContent().size());
for (int i = 0; i < CONNECTORS_TO_TEST.length; i++) {
assertTrue(sender.getAllMessagesContent().contains(CONNECTORS_TO_TEST[i]));
}
=======================================
---
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java
Wed Jan 20 02:04:15 2010
+++
/branches/jbcp/1.2/sip-servlets-release/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java
Wed Jan 20 02:21:11 2010
@@ -38,7 +38,7 @@
private static transient Logger logger =
Logger.getLogger(ShootistSipServletTest.class);
private static final String TRANSPORT = "udp";
private static final boolean AUTODIALOG = true;
- private static final int TIMEOUT = 5000;
+ private static final int TIMEOUT = 10000;
// private static final int TIMEOUT = 100000000;
TestSipListener receiver;
