Revision: 16414
Author: [email protected]
Date: Thu Jan 13 09:31:15 2011
Log: Update Issue 2230
Adding non regression tests and fixing the code. Should have done the non
regression tests before committing any code, it is working now for sure ;-)
http://code.google.com/p/mobicents/source/detail?r=16414
Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
/trunk/servers/sip-servlets/sip-servlets-test-suite/applications/call-forwarding-b2bua-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/b2bua/CallForwardingB2BUASipServlet.java
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/reinvite/CallForwardingB2BUAReInviteJunitTest.java
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
Thu Jan 13 03:11:24 2011
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
Thu Jan 13 09:31:15 2011
@@ -334,27 +334,29 @@
"Can not create ACK, PRACK or CANCEL
requests with this method");
}
if(!isValid()) {
- throw new IllegalStateException("cannot create a subsequent request
because the session " + key + " is invalid");
+ throw new IllegalStateException("cannot create a subsequent request " +
method + " because the session " + key + " is invalid");
}
if(State.TERMINATED.equals(state)) {
- throw new IllegalStateException("cannot create a subsequent request
because the session " + key + " is in TERMINATED state");
+ throw new IllegalStateException("cannot create a subsequent request " +
method + " because the session " + key + " is in TERMINATED state");
}
// if((State.INITIAL.equals(state) && hasOngoingTransaction())) {
// throw new IllegalStateException("cannot create a request because the
session is in INITIAL state with ongoing transactions");
// }
if(logger.isDebugEnabled()) {
- logger.debug("dialog associated with this session to create the new
request within that dialog "+
+ logger.debug("dialog associated with this session to create the new
request " + method + " within that dialog "+
sessionCreatingDialog);
}
SipServletRequestImpl sipServletRequest = null;
- if(sessionCreatingDialog != null
&& !DialogState.TERMINATED.equals(sessionCreatingDialog.getState())
&& !method.equalsIgnoreCase(Request.BYE)) {
+ if(sessionCreatingDialog != null &&
DialogState.TERMINATED.equals(sessionCreatingDialog.getState())
&& !method.equalsIgnoreCase(Request.BYE)) {
// Fix for Issue
http://code.google.com/p/mobicents/issues/detail?id=2230 BYE is routed to
unexpected IP
// MSS should throw an IllegalStateException when a subsequent request
is being created on a TERMINATED dialog
// don't do it on the BYE method as a 408 within a dialog could have
make the dialog TERMINATED and MSS should allow the app to create the
subsequent BYE from any thread
- throw new IllegalStateException("cannot create a subsequent request
because the dialog " + sessionCreatingDialog + " for session " + key + " is
in TERMINATED state");
+ throw new IllegalStateException("cannot create a subsequent request " +
method + " because the dialog " + sessionCreatingDialog + " for session " +
key + " is in TERMINATED state");
}
if(this.sessionCreatingDialog != null
&& !DialogState.TERMINATED.equals(sessionCreatingDialog.getState())) {
-
+ if(logger.isDebugEnabled()) {
+ logger.debug("dialog " + sessionCreatingDialog + " used to create the
new request " + method);
+ }
try {
final Request methodRequest =
this.sessionCreatingDialog.createRequest(method);
@@ -458,6 +460,7 @@
request,
this.sipFactory, this, null, sessionCreatingDialog,
true);
+ // Fix for Issue
http://code.google.com/p/mobicents/issues/detail?id=2230 BYE is routed to
unexpected IP
if(sessionCreatingDialog != null &&
sessionCreatingDialog.getRemoteTarget() != null) {
SipUri sipUri = (SipUri)
sessionCreatingDialog.getRemoteTarget().getURI().clone();
sipUri.clearUriParms();
@@ -494,7 +497,7 @@
final Iterator<String> fromParameterNames =
fromHeader.getParameterNames();
while
(fromParameterNames.hasNext()) {
String parameterName =
(String) fromParameterNames.next();
-
if(!SipFactoryImpl.FORBIDDEN_PARAMS.contains(parameterName)) {
+ if(sessionCreatingDialog != null |
| !SipFactoryImpl.FORBIDDEN_PARAMS.contains(parameterName)) {
fromParameters.put(parameterName,
fromHeader.getParameter(parameterName));
}
}
@@ -502,7 +505,7 @@
final Iterator<String> toParameterNames =
toHeader.getParameterNames();
while
(toParameterNames.hasNext()) {
String parameterName =
(String) toParameterNames.next();
-
if(!SipFactoryImpl.FORBIDDEN_PARAMS.contains(parameterName)) {
+ if(sessionCreatingDialog != null |
| !SipFactoryImpl.FORBIDDEN_PARAMS.contains(parameterName)) {
toParameters.put(parameterName,
toHeader.getParameter(parameterName));
}
}
@@ -523,6 +526,7 @@
}
newFrom.setParameter(toParameter.getKey(), value);
}
+ // Fix for Issue
http://code.google.com/p/mobicents/issues/detail?id=2230 BYE is routed to
unexpected IP
if(sessionCreatingDialog != null &&
sessionCreatingDialog.getRemoteTarget() != null) {
SipUri sipUri = (SipUri)
sessionCreatingDialog.getRemoteTarget().getURI().clone();
sipUri.clearUriParms();
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-test-suite/applications/call-forwarding-b2bua-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/b2bua/CallForwardingB2BUASipServlet.java
Thu Dec 30 18:14:21 2010
+++
/trunk/servers/sip-servlets/sip-servlets-test-suite/applications/call-forwarding-b2bua-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/b2bua/CallForwardingB2BUASipServlet.java
Thu Jan 13 09:31:15 2011
@@ -18,6 +18,7 @@
import java.io.File;
import java.io.IOException;
+import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -32,6 +33,7 @@
import javax.servlet.sip.AuthInfo;
import javax.servlet.sip.B2buaHelper;
import javax.servlet.sip.ServletParseException;
+import javax.servlet.sip.ServletTimer;
import javax.servlet.sip.SipApplicationSession;
import javax.servlet.sip.SipApplicationSessionEvent;
import javax.servlet.sip.SipApplicationSessionListener;
@@ -44,16 +46,19 @@
import javax.servlet.sip.SipServletResponse;
import javax.servlet.sip.SipSession;
import javax.servlet.sip.SipURI;
+import javax.servlet.sip.TimerListener;
+import javax.servlet.sip.TimerService;
import javax.servlet.sip.TooManyHopsException;
import javax.servlet.sip.UAMode;
import javax.servlet.sip.URI;
import javax.servlet.sip.SipSession.State;
import javax.sip.header.ContactHeader;
+import javax.sip.message.Request;
import org.apache.log4j.Logger;
-public class CallForwardingB2BUASipServlet extends SipServlet implements
SipErrorListener, SipApplicationSessionListener {
+public class CallForwardingB2BUASipServlet extends SipServlet implements
SipErrorListener, SipApplicationSessionListener, TimerListener {
private static final String CHECK_CONTACT = "checkContact";
private static final String TEST_SIP_APP_SESSION_READY_TO_BE_INVALIDATED
= "testSipAppSessionReadyToBeInvalidated";
private static final String TEST_USE_LINKED_REQUEST =
"useLinkedRequest";
@@ -67,6 +72,10 @@
forwardingUris = new HashMap<String, String[]>();
forwardingUris.put("sip:[email protected]",
new
String[]{"sip:[email protected]", "sip:[email protected]:5090"});
+ forwardingUris.put("sip:[email protected]",
+ new
String[]{"sip:[email protected]", "sip:[email protected]:5090"});
+
forwardingUris.put("sip:[email protected]",
+ new
String[]{"sip:[email protected]", "sip:[email protected]:5090"});
forwardingUris.put("sip:[email protected]",
new
String[]{"sip:[email protected]", "sip:[email protected]:5090"});
forwardingUris.put("sip:[email protected]",
@@ -235,7 +244,12 @@
contactHeaderList.add("\"callforwardingB2BUA\"
<sip:[email protected]:5070;q=0.1;lr;transport=udp;test>;test");
}
headers.put("Contact", contactHeaderList);
- b2buaHelper.createRequest(origSession, request,
headers).send();
+ SipServletRequest forkedRequest =
b2buaHelper.createRequest(origSession, request, headers);
+ String method = request.getHeader("Method");
+ if(method != null) {
+
forkedRequest.getSession().setAttribute("method", method);
+ }
+ forkedRequest.send();
}
}
@@ -306,6 +320,12 @@
IOException {
logger.info("Got BYE: " + request.toString());
+ if(request.getFrom().toString().contains("408")) {
+ SipServletResponse sipServletResponse =
request.createResponse(SipServletResponse.SC_OK);
+ sipServletResponse.send();
+ return;
+ }
+
if(request.getSession().getAttribute(ACT_AS_UAS) == null) {
//we forward the BYE
SipSession session = request.getSession();
@@ -510,12 +530,20 @@
challengeRequest.send();
}
} else {
+ if(sipServletResponse.getStatus() ==
SipServletResponse.SC_REQUEST_TIMEOUT) {
+
if(sipServletResponse.getFrom().toString().contains("new-thread")) {
+
((TimerService)getServletContext().getAttribute(TIMER_SERVICE)).createTimer(sipServletResponse.getApplicationSession(),
35000, false, (Serializable)sipServletResponse.getSession());
+ } else {
+
sendSubsequentRequestTo408(sipServletResponse.getSession(), "BYE");
+ }
+ return;
+ }
if(sipServletResponse.getStatus() !=
SipServletResponse.SC_REQUEST_TERMINATED) {
SipServletRequest originalRequest = (SipServletRequest)
sipServletResponse.getSession().getAttribute("originalRequest");
SipServletResponse responseToOriginalRequest =
originalRequest.createResponse(sipServletResponse.getStatus(),
sipServletResponse.getReasonPhrase());
logger.info("Sending on the first call leg " +
responseToOriginalRequest.toString());
responseToOriginalRequest.send();
- }
+ }
}
}
@@ -631,5 +659,27 @@
logger.error("Exception occured while sending the
request",e);
}
}
+
+ public void timeout(ServletTimer timer) {
+ SipSession sipSession = (SipSession)timer.getInfo();
+ sendSubsequentRequestTo408(sipSession,
(String)sipSession.getAttribute("method"));
+ }
+
+ public void sendSubsequentRequestTo408(SipSession sipSession, String
method) {
+ try {
+ sipSession.createRequest(method).send();
+ SipServletRequest originalRequest = (SipServletRequest)
sipSession.getAttribute("originalRequest");
+ originalRequest.createResponse(200).send();
+ } catch (IOException e) {
+ logger.error("Error while creating subsequent BYE", e);
+ } catch (IllegalStateException e) {
+ if(method.equals(Request.BYE)) {
+ logger.error("Error while creating subsequent
BYE", e);
+ } else {
+ SipFactory sipFactory = (SipFactory)
getServletContext().getAttribute(SIP_FACTORY);
+ sendMessage(sipFactory.createApplicationSession(),
sipFactory, "IllegalStateException");
+ }
+ }
+ }
}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/reinvite/CallForwardingB2BUAReInviteJunitTest.java
Thu Nov 11 20:00:04 2010
+++
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/reinvite/CallForwardingB2BUAReInviteJunitTest.java
Thu Jan 13 09:31:15 2011
@@ -16,9 +16,15 @@
*/
package org.mobicents.servlet.sip.testsuite.reinvite;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import javax.sip.SipProvider;
import javax.sip.address.SipURI;
+import javax.sip.header.Header;
import javax.sip.header.MaxForwardsHeader;
+import javax.sip.message.Response;
import org.apache.log4j.Logger;
import org.mobicents.servlet.sip.SipServletTestCase;
@@ -119,6 +125,171 @@
// B2buaHelper.createRequest does not decrement Max-forwards
assertEquals(69, maxForwardsHeader.getMaxForwards());
}
+
+ /**
+ * Non Regression test for
+ * http://code.google.com/p/mobicents/issues/detail?id=2230
+ * BYE is routed to unexpected IP
+ */
+ public void testCallForwardingCallerSendBye408onReinvite() throws
Exception {
+ sender = new TestSipListener(5080, 5070, senderProtocolObjects,
false);
+ SipProvider senderProvider = sender.createProvider();
+
+ receiver = new TestSipListener(5090, 5070, receiverProtocolObjects,
false);
+ SipProvider receiverProvider = receiver.createProvider();
+
+ receiverProvider.addSipListener(receiver);
+ senderProvider.addSipListener(sender);
+
+ senderProtocolObjects.start();
+ receiverProtocolObjects.start();
+
+ String fromName = "forward-sender-408";
+ String fromSipAddress = "sip-servlets.com";
+ SipURI fromAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ fromName, fromSipAddress);
+
+ String toSipAddress = "sip-servlets.com";
+ String toUser = "receiver";
+ SipURI toAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ toUser, toSipAddress);
+
+ sender.sendSipRequest("INVITE", fromAddress, toAddress, null, null,
false);
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.isInviteReceived());
+ assertTrue(receiver.isAckReceived());
+ MaxForwardsHeader maxForwardsHeader = (MaxForwardsHeader)
receiver.getInviteRequest().getHeader(MaxForwardsHeader.NAME);
+ assertNotNull(maxForwardsHeader);
+ receiver.setFinalResponseToSend(Response.REQUEST_TIMEOUT);
+ sender.sendInDialogSipRequest("INVITE", null, null, null, null,
null);
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.isInviteReceived());
+ assertTrue(receiver.isAckReceived());
+
+ // Non Regression test for
http://code.google.com/p/mobicents/issues/detail?id=1490
+ // B2buaHelper.createRequest does not decrement Max-forwards
+ assertEquals(69, maxForwardsHeader.getMaxForwards());
+ sender.sendInDialogSipRequest("BYE", null, null, null, null,
null);
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.getByeReceived());
+ assertTrue(sender.getOkToByeReceived());
+ }
+
+ /**
+ * Non Regression test for
+ * http://code.google.com/p/mobicents/issues/detail?id=2230
+ * BYE is routed to unexpected IP
+ */
+ public void testCallForwardingCallerSendBye408onReinviteBYENewThread()
throws Exception {
+ sender = new TestSipListener(5080, 5070, senderProtocolObjects,
false);
+ SipProvider senderProvider = sender.createProvider();
+
+ receiver = new TestSipListener(5090, 5070, receiverProtocolObjects,
false);
+ SipProvider receiverProvider = receiver.createProvider();
+
+ receiverProvider.addSipListener(receiver);
+ senderProvider.addSipListener(sender);
+
+ senderProtocolObjects.start();
+ receiverProtocolObjects.start();
+
+ String fromName = "forward-sender-408-new-thread";
+ String fromSipAddress = "sip-servlets.com";
+ SipURI fromAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ fromName, fromSipAddress);
+
+ String toSipAddress = "sip-servlets.com";
+ String toUser = "receiver";
+ SipURI toAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ toUser, toSipAddress);
+
+ sender.sendSipRequest("INVITE", fromAddress, toAddress, null, null,
false);
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.isInviteReceived());
+ assertTrue(receiver.isAckReceived());
+ MaxForwardsHeader maxForwardsHeader = (MaxForwardsHeader)
receiver.getInviteRequest().getHeader(MaxForwardsHeader.NAME);
+ assertNotNull(maxForwardsHeader);
+ receiver.setProvisionalResponsesToSend(new
ArrayList<Integer>());
+ receiver.setFinalResponseToSend(Response.REQUEST_TIMEOUT);
+ Header methodHeader =
receiverProtocolObjects.headerFactory.createHeader("Method", "BYE");
+ List<Header> headers = new ArrayList<Header>();
+ headers.add(methodHeader);
+ sender.sendInDialogSipRequest("INVITE", null, null, null,
headers, null);
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.isInviteReceived());
+ assertTrue(receiver.isAckReceived());
+
+ receiver.sendInDialogSipRequest("UPDATE", null, null, null,
null, null);
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.isInviteReceived());
+ assertTrue(receiver.isAckReceived());
+
+ sender.sendInDialogSipRequest("BYE", null, null, null, null,
null);
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.getByeReceived());
+ assertTrue(sender.getOkToByeReceived());
+ }
+
+ /**
+ * Non Regression test for
+ * http://code.google.com/p/mobicents/issues/detail?id=2230
+ * BYE is routed to unexpected IP
+ */
+ public void testCallForwardingCallerSendBye408onReinviteUPDATENewThread()
throws Exception {
+ sender = new TestSipListener(5080, 5070, senderProtocolObjects,
false);
+ SipProvider senderProvider = sender.createProvider();
+
+ receiver = new TestSipListener(5090, 5070, receiverProtocolObjects,
false);
+ SipProvider receiverProvider = receiver.createProvider();
+
+ receiverProvider.addSipListener(receiver);
+ senderProvider.addSipListener(sender);
+
+ senderProtocolObjects.start();
+ receiverProtocolObjects.start();
+
+ String fromName = "forward-sender-408-new-thread";
+ String fromSipAddress = "sip-servlets.com";
+ SipURI fromAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ fromName, fromSipAddress);
+
+ String toSipAddress = "sip-servlets.com";
+ String toUser = "receiver";
+ SipURI toAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ toUser, toSipAddress);
+
+ sender.sendSipRequest("INVITE", fromAddress, toAddress, null, null,
false);
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.isInviteReceived());
+ assertTrue(receiver.isAckReceived());
+ MaxForwardsHeader maxForwardsHeader = (MaxForwardsHeader)
receiver.getInviteRequest().getHeader(MaxForwardsHeader.NAME);
+ assertNotNull(maxForwardsHeader);
+ receiver.setProvisionalResponsesToSend(new
ArrayList<Integer>());
+ receiver.setFinalResponseToSend(Response.REQUEST_TIMEOUT);
+ Header methodHeader =
receiverProtocolObjects.headerFactory.createHeader("Method", "UPDATE");
+ List<Header> headers = new ArrayList<Header>();
+ headers.add(methodHeader);
+ sender.sendInDialogSipRequest("INVITE", null, null, null,
headers, null);
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.isInviteReceived());
+ assertTrue(receiver.isAckReceived());
+
+ receiver.sendInDialogSipRequest("UPDATE", null, null, null,
null, null);
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.isInviteReceived());
+ assertTrue(receiver.isAckReceived());
+
+ sender.sendInDialogSipRequest("BYE", null, null, null, null,
null);
+ Thread.sleep(TIMEOUT);
+ assertTrue(sender.getOkToByeReceived());
+
+ Iterator<String> allMessagesIterator =
sender.getAllMessagesContent().iterator();
+ while (allMessagesIterator.hasNext()) {
+ String message = (String) allMessagesIterator.next();
+ logger.info(message);
+ }
+
assertTrue(sender.getAllMessagesContent().contains("IllegalStateException"));
+ }
/**
* Non Regression test for