Revision: 17318
Author: [email protected]
Date: Mon Mar 14 13:16:49 2011
Log: Update Issue 2264
Georges I found some issues with the testcases so I updated some things and
added an updateTimer on ProxyBranchImpl on 200 OK to PRACK and UPDATE since
there is activity on the branch, timer C has to be reset.
Otherwise, looks good, so committing.
Horaci can you verify it ?
Thanks
Jean
http://code.google.com/p/mobicents/source/detail?r=17318
Added:
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/ProxyRecordRouteUpdateTest.java
Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/SubsequentRequestDispatcher.java
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java
/trunk/servers/sip-servlets/sip-servlets-test-suite/applications/proxy-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ProxySipServlet.java
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/AllTests.java
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
=======================================
--- /dev/null
+++
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/ProxyRecordRouteUpdateTest.java
Mon Mar 14 13:16:49 2011
@@ -0,0 +1,197 @@
+package org.mobicents.servlet.sip.testsuite.proxy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.sip.ListeningPoint;
+import javax.sip.SipProvider;
+import javax.sip.address.SipURI;
+import javax.sip.message.Response;
+
+import org.apache.log4j.Logger;
+import org.mobicents.servlet.sip.SipServletTestCase;
+import org.mobicents.servlet.sip.testsuite.ProtocolObjects;
+import org.mobicents.servlet.sip.testsuite.TestSipListener;
+
+public class ProxyRecordRouteUpdateTest extends SipServletTestCase {
+ private static transient Logger logger =
Logger.getLogger(ProxyRecordRouteUpdateTest.class);
+ private static final boolean AUTODIALOG = true;
+ TestSipListener sender;
+ TestSipListener receiver;
+ ProtocolObjects senderProtocolObjects;
+ ProtocolObjects receiverProtocolObjects;
+
+ private static final int TIMEOUT = 20000;
+
+ public ProxyRecordRouteUpdateTest(String name) {
+ super(name);
+ }
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
+ //https://code.google.com/p/mobicents/issues/detail?id=2264
+ //Call flow replicated the RFC3311 example but within the context of a
record-route proxy
+ //No PRACK involved, UPDATE is used to refresh the session-timer
+ public void testProxySendUpdateBeforeFinalResponse() throws Exception {
+ setupPhones(ListeningPoint.UDP);
+ String fromName = "unique-location-update";
+ String fromSipAddress = "sip-servlets.com";
+ SipURI fromAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ fromName, fromSipAddress);
+
+ String toSipAddress = "sip-servlets.com";
+ String toUser = "proxy-receiver-update";
+ SipURI toAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ toUser, toSipAddress);
+
+ List<Integer> provisionalResponsesToSend = new
ArrayList<Integer>();
+ provisionalResponsesToSend.add(Response.RINGING);
+
receiver.setProvisionalResponsesToSend(provisionalResponsesToSend);
+ receiver.setWaitBeforeFinalResponse(15000);
+
+ sender.setSendUpdateOn180(true);
+ receiver.setSendUpdateAfterUpdate(true);
+
+ sender.sendSipRequest("INVITE", fromAddress, toAddress, null, null,
false);
+ Thread.sleep(TIMEOUT*2);
+ assertTrue(sender.isSendUpdate());
+ assertTrue(receiver.isUpdateReceived());
+ assertFalse(receiver.isSendUpdateAfterUpdate());
+ Thread.sleep(TIMEOUT);
+ assertTrue(sender.isUpdateReceived());
+ assertTrue(receiver.isSendUpdate());
+ Thread.sleep(TIMEOUT);
+ assertTrue(sender.isAckSent());
+ assertTrue(receiver.isAckReceived());
+ sender.sendBye();
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.getByeReceived());
+ assertTrue(sender.getOkToByeReceived());
+ }
+
+ //https://code.google.com/p/mobicents/issues/detail?id=2264
+ //Only the receiver sends UPDATE
+ public void testProxyReceiverSendUpdateBeforeFinalResponse() throws
Exception {
+ setupPhones(ListeningPoint.UDP);
+ String fromName = "unique-location-update";
+ String fromSipAddress = "sip-servlets.com";
+ SipURI fromAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ fromName, fromSipAddress);
+
+ String toSipAddress = "sip-servlets.com";
+ String toUser = "proxy-receiver-update";
+ SipURI toAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ toUser, toSipAddress);
+
+ List<Integer> provisionalResponsesToSend = new
ArrayList<Integer>();
+ provisionalResponsesToSend.add(Response.RINGING);
+
receiver.setProvisionalResponsesToSend(provisionalResponsesToSend);
+ receiver.setWaitBeforeFinalResponse(15000);
+
+ receiver.setSendUpdateAfterProvisionalResponses(true);
+
+ sender.sendSipRequest("INVITE", fromAddress, toAddress, null, null,
false);
+ Thread.sleep(TIMEOUT*2);
+ assertTrue(receiver.isSendUpdate());
+ assertTrue(sender.isUpdateReceived());
+ assertFalse(receiver.isSendUpdateAfterUpdate());
+ Thread.sleep(TIMEOUT);
+ assertTrue(sender.isAckSent());
+ assertTrue(receiver.isAckReceived());
+ sender.sendBye();
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.getByeReceived());
+ assertTrue(sender.getOkToByeReceived());
+ }
+
+ //https://code.google.com/p/mobicents/issues/detail?id=2264
+ //Call flow replicated the RFC3311 example but within the context of a
record-route proxy
+ //PRACK involved
+ public void testProxySendUpdateBeforeFinalResponseWithPRACK() throws
Exception {
+ setupPhones(ListeningPoint.UDP);
+ String fromName = "unique-location-udpate";
+ String fromSipAddress = "sip-servlets.com";
+ SipURI fromAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ fromName, fromSipAddress);
+
+ String toSipAddress = "sip-servlets.com";
+ String toUser = "proxy-receiver-update";
+ SipURI toAddress =
senderProtocolObjects.addressFactory.createSipURI(
+ toUser, toSipAddress);
+
+ List<Integer> provisionalResponsesToSend = new
ArrayList<Integer>();
+ provisionalResponsesToSend.add(Response.RINGING);
+
receiver.setProvisionalResponsesToSend(provisionalResponsesToSend);
+ receiver.setWaitForCancel(true);
+
+ sender.setSendUpdateAfterPrack(true);
+ receiver.setSendUpdateAfterUpdate(true);
+
+ String[] headerNames = new String[]{"require"};
+ String[] headerValues = new String[]{"100rel"};
+
+ sender.sendSipRequest("INVITE", fromAddress, toAddress, null, null,
false, headerNames, headerValues, true);
+ Thread.sleep(TIMEOUT*2);
+ assertTrue(sender.isSendUpdate());
+ assertTrue(receiver.isUpdateReceived());
+// assertFalse(receiver.isSendUpdateAfterUpdate());
+ Thread.sleep(TIMEOUT);
+ assertTrue(sender.isUpdateReceived());
+ assertTrue(receiver.isSendUpdate());
+ Thread.sleep(TIMEOUT);
+ assertTrue(sender.isAckSent());
+ assertTrue(receiver.isAckReceived());
+ sender.sendBye();
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.getByeReceived());
+ assertTrue(sender.getOkToByeReceived());
+ }
+
+ public void setupPhones(String transport) throws Exception {
+ senderProtocolObjects = new ProtocolObjects("proxy-sender",
+ "gov.nist", transport, AUTODIALOG, null, null,
null);
+ receiverProtocolObjects = new ProtocolObjects("proxy-receiver",
+ "gov.nist", transport, AUTODIALOG, null, "3",
"true");
+ sender = new TestSipListener(5080, 5070, senderProtocolObjects,
false);
+ sender.setRecordRoutingProxyTesting(true);
+ SipProvider senderProvider = sender.createProvider();
+
+ receiver = new TestSipListener(5057, 5070, receiverProtocolObjects,
false);
+ receiver.setRecordRoutingProxyTesting(true);
+ SipProvider receiverProvider = receiver.createProvider();
+
+ receiverProvider.addSipListener(receiver);
+ senderProvider.addSipListener(sender);
+
+ senderProtocolObjects.start();
+ receiverProtocolObjects.start();
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ senderProtocolObjects.destroy();
+ receiverProtocolObjects.destroy();
+ logger.info("Test completed");
+ super.tearDown();
+ }
+
+ @Override
+ public void deployApplication() {
+ assertTrue(tomcat
+ .deployContext(
+ projectHome
+
+ "/sip-servlets-test-suite/applications/proxy-sip-servlet/src/main/sipapp",
+ "sip-test-context",
"sip-test"));
+ }
+
+ @Override
+ protected String getDarConfigurationFile() {
+ return "file:///"
+ + projectHome
+ +
"/sip-servlets-test-suite/testsuite/src/test/resources/"
+
+ "org/mobicents/servlet/sip/testsuite/proxy/simple-sip-servlet-dar.properties";
+ }
+}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/SubsequentRequestDispatcher.java
Mon Dec 20 06:05:51 2010
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/SubsequentRequestDispatcher.java
Mon Mar 14 13:16:49 2011
@@ -19,6 +19,7 @@
import gov.nist.javax.sip.header.extensions.JoinHeader;
import gov.nist.javax.sip.header.extensions.ReplacesHeader;
import gov.nist.javax.sip.message.MessageExt;
+import gov.nist.javax.sip.message.RequestExt;
import gov.nist.javax.sip.stack.SIPServerTransaction;
import gov.nist.javax.sip.stack.SIPTransaction;
@@ -54,6 +55,7 @@
import org.mobicents.servlet.sip.message.SipFactoryImpl;
import org.mobicents.servlet.sip.message.SipServletMessageImpl;
import org.mobicents.servlet.sip.message.SipServletRequestImpl;
+import org.mobicents.servlet.sip.message.SipServletResponseImpl;
import org.mobicents.servlet.sip.message.TransactionApplicationData;
import org.mobicents.servlet.sip.proxy.ProxyBranchImpl;
import org.mobicents.servlet.sip.proxy.ProxyImpl;
@@ -349,8 +351,10 @@
// See if the subsequent request should
go directly to the proxy
final ProxyImpl proxy =
sipSession.getProxy();
if(proxy != null) {
- final ProxyBranchImpl finalBranch =
proxy.getFinalBranchForSubsequentRequests();
+ ProxyBranchImpl finalBranch =
proxy.getFinalBranchForSubsequentRequests();
+
boolean isPrack =
requestMethod.equalsIgnoreCase(Request.PRACK);
+ boolean isUpdate =
requestMethod.equalsIgnoreCase(Request.UPDATE);
// JSR 289 Section 6.2.1 :
// any state transition caused
by the reception of a SIP message,
// the state change must be accomplished by the container before
calling
@@ -363,14 +367,37 @@
callServlet(sipServletRequest);
finalBranch.proxySubsequentRequest(sipServletRequest);
- } else if(isPrack) {
+ } else if(isPrack || isUpdate) {
callServlet(sipServletRequest);
final List<ProxyBranch>
branches = proxy.getProxyBranches();
for(ProxyBranch pb :
branches) {
final
ProxyBranchImpl proxyBranch = (ProxyBranchImpl) pb;
-
if(proxyBranch.isWaitingForPrack()) {
+
if(proxyBranch.isWaitingForPrack() && isPrack) {
proxyBranch.proxyDialogStateless(sipServletRequest);
proxyBranch.setWaitingForPrack(false);
+ } else {
+
//Issue: https://code.google.com/p/mobicents/issues/detail?id=2264
+
if(logger.isDebugEnabled()){
+ logger.debug("Checking request's To header tag against
proxyBranch's From tag and To tag" +
+
"in order to identify the proxyBranch for this request ");
+ }
+ String requestToTag =
((RequestExt)request).getToHeader().getTag();
+
+ SipServletResponseImpl proxyResponse =
(SipServletResponseImpl)(proxyBranch.getResponse());
+ String proxyToTag =
((MessageExt)proxyResponse.getMessage()).getToHeader().getTag();
+ String proxyFromTag =
((MessageExt)proxyResponse.getMessage()).getFromHeader().getTag();
+
+ if (proxyToTag.equals(requestToTag) ||
proxyFromTag.equals(requestToTag) ) {
+
finalBranch = proxyBranch;
+
finalBranch.proxySubsequentRequest(sipServletRequest);
+ }
+ }
+ }
+ if (finalBranch == null
&& isUpdate){
+ logger.warn("Final branch is null, enable debug for more
information.");
+
if(logger.isDebugEnabled()) {
+ logger.debug("Final branch is null, this will probably result in
a lost call or request. Here is the request:\n" + request, new
+
RuntimeException("Final branch is null"));
}
}
} else {
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java
Mon Jan 24 05:10:42 2011
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java
Mon Mar 14 13:16:49 2011
@@ -454,7 +454,8 @@
}
// Send informational responses back immediately
- if((status > 100 && status < 200) || (status == 200 &&
Request.PRACK.equals(response.getMethod())))
+ if((status > 100 && status < 200) || (status == 200 &&
+ (Request.PRACK.equals(response.getMethod()) ||
Request.UPDATE.equals(response.getMethod()))))
{
// Deterimine if the response is reliable. We just look
at RSeq, because
// every such response is required to have it.
@@ -489,6 +490,10 @@
} catch (Exception e) {
logger.error("A problem occured while proxying a
response", e);
}
+ if(status == 200 &&
+ (Request.PRACK.equals(response.getMethod()) ||
Request.UPDATE.equals(response.getMethod()))) {
+ updateTimer(true);
+ }
if(logger.isDebugEnabled())
logger.debug("About to return from
onResponse");
@@ -528,7 +533,7 @@
throw new IllegalArgumentException("Can not
parse contact header", e);
}
}
- }
+ }
if(status >= 200 && !recursed)
{
@@ -770,6 +775,7 @@
}
// Just do a timeout response
proxy.onBranchTimeOut(this);
+ logger.warn("Proxy branch has timed out");
} else {
logger.debug("ACKed proxybranch has timeout");
}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-test-suite/applications/proxy-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ProxySipServlet.java
Thu Sep 16 03:12:06 2010
+++
/trunk/servers/sip-servlets/sip-servlets-test-suite/applications/proxy-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ProxySipServlet.java
Mon Mar 14 13:16:49 2011
@@ -206,7 +206,11 @@
logger.info("doInvite: uri = " + uri);
proxy.setParallel(false);
}
- proxy.setProxyTimeout(4);
+ if (from.contains("update")){
+ proxy.setProxyTimeout(40);
+ } else {
+ proxy.setProxyTimeout(4);
+ }
proxy.proxyTo(uris);
}
}
@@ -404,4 +408,9 @@
sendMessage("sipSessionReadyToInvalidate", (Integer)
se.getSession().getAttribute("contactPort"), (String)
se.getSession().getAttribute("transport"));
}
}
-}
+
+ @Override
+ protected void doUpdate(SipServletRequest req) throws ServletException,
IOException {
+ logger.info("Got request:\n "+req);
+ }
+}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/AllTests.java
Thu Dec 30 18:14:21 2010
+++
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/AllTests.java
Mon Mar 14 13:16:49 2011
@@ -59,6 +59,7 @@
import org.mobicents.servlet.sip.testsuite.proxy.ProxyNonRecordRouteTest;
import org.mobicents.servlet.sip.testsuite.proxy.ProxyPrackTest;
import
org.mobicents.servlet.sip.testsuite.proxy.ProxyRecordRouteReInviteTest;
+import
org.mobicents.servlet.sip.testsuite.proxy.ProxyRecordRouteUpdateTest;
import org.mobicents.servlet.sip.testsuite.proxy.SpeedDialJunitTest;
import org.mobicents.servlet.sip.testsuite.publish.PublishSipServletTest;
import org.mobicents.servlet.sip.testsuite.refer.ReferSipServletTest;
@@ -126,6 +127,7 @@
suite.addTestSuite(LocationServiceReInviteSipServletTest.class);
suite.addTestSuite(SameSipSessionB2BUACompositionJunitTest.class);
suite.addTestSuite(ProxyRecordRouteReInviteTest.class);
+ suite.addTestSuite(ProxyRecordRouteUpdateTest.class);
suite.addTestSuite(ParallelProxyWithRecordRouteTest.class);
suite.addTestSuite(ParallelProxyTelURLWithRecordRouteTest.class);
suite.addTestSuite(ParallelProxyWithRecordRouteUseHostNameTest.class);
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
Wed Jan 26 06:46:26 2011
+++
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
Mon Mar 14 13:16:49 2011
@@ -46,6 +46,7 @@
import javax.sip.SipException;
import javax.sip.SipListener;
import javax.sip.SipProvider;
+import javax.sip.TransactionAlreadyExistsException;
import javax.sip.TransactionDoesNotExistException;
import javax.sip.TransactionTerminatedEvent;
import javax.sip.TransactionUnavailableException;
@@ -303,8 +304,20 @@
private boolean testNextNonce =false;
private String nextNonce = null;
-
+
private boolean dropRequest = false;
+
+ private long waitBeforeFinalResponse = 0;
+
+ private boolean sendUpdate;
+
+ private boolean updateReceived;
+
+ private boolean sendUpdateAfterUpdate = false;
+
+ private boolean sendUpdateAfterPrack = false;
+
+ private boolean sendUpdateAfterProvisionalResponses;
class MyEventSource implements Runnable {
private TestSipListener notifier;
@@ -421,15 +434,27 @@
prackRequestReceived = request;
ServerTransaction st = serverTransactionId;
if (st == null) {
- st =
sipProvider.getNewServerTransaction(request);
+ try {
+ st =
sipProvider.getNewServerTransaction(request);
+ } catch ( TransactionAlreadyExistsException
taex ) {
+ // This is a retransmission so just
return.
+ return;
+ }
}
Response response =
protocolObjects.messageFactory.createResponse(
200, request);
+ Address address = protocolObjects.addressFactory
+ .createAddress("Shootme <sip:127.0.0.1:" + myPort
+ +";transport="+protocolObjects.transport
+ + ">");
+ contactHeader =
protocolObjects.headerFactory.createContactHeader(address);
+ response.addHeader(contactHeader);
st.sendResponse(response);
Thread.sleep(200);
- inviteServerTid.sendResponse(getFinalResponse());
+ if(!sendUpdateAfterUpdate)
+
inviteServerTid.sendResponse(getFinalResponse());
} catch(Exception e) {
logger.error("Unexpected exception while trying to send the 200 to
PRACK " + request, e);
}
@@ -569,6 +594,28 @@
this.transactionCount++;
logger.info("shootist: Sending OK.");
logger.info("Dialog State = " + dialog.getState());
+ updateReceived = true;
+ if (sendUpdateAfterUpdate) {
+ Request updateRequest =
dialog.createRequest(Request.UPDATE);
+
+ if (recordRoutingProxyTesting){
+ ContactHeader contHdr = (ContactHeader)
request.getHeader(ContactHeader.NAME);
+ SipURI sipUri =
(SipURI)contHdr.getAddress().getURI();
+ updateRequest.setRequestURI(sipUri);
+ }
+
+ long seqNo = (((CSeqHeader)
request.getHeader(CSeqHeader.NAME)).getSeqNumber());
+ CSeqHeader cseqNew =
protocolObjects.headerFactory.createCSeqHeader(++seqNo, "UPDATE");
+ updateRequest.setHeader(cseqNew);
+
+ ClientTransaction ct = sipProvider
+ .getNewClientTransaction(updateRequest);
+ ct.sendRequest();
+ sendUpdate = true;
+ if(!prackReceived) {
+ sendUpdateAfterUpdate = false;
+ }
+ }
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -1119,12 +1166,42 @@
response.addHeader(requireHeader);
Header rseqHeader =
protocolObjects.headerFactory.createRSeqHeader(rseqNumber.getAndIncrement());
response.addHeader(rseqHeader);
+ Address address =
protocolObjects.addressFactory
+ .createAddress("Shootme
<sip:127.0.0.1:" + myPort
+
+";transport="+protocolObjects.transport
+ + ">");
+ contactHeader =
protocolObjects.headerFactory.createContactHeader(address);
+
response.addHeader(contactHeader);
dialog.sendReliableProvisionalResponse(response);
} else {
+ Address address =
protocolObjects.addressFactory
+ .createAddress("Shootme
<sip:127.0.0.1:" + myPort
+
+";transport="+protocolObjects.transport
+ + ">");
+ contactHeader =
protocolObjects.headerFactory.createContactHeader(address);
+
response.addHeader(contactHeader);
st.sendResponse(response);
}
}
- }
+ }
+
+ if (sendUpdateAfterProvisionalResponses) {
+ Request updateRequest =
dialog.createRequest(Request.UPDATE);
+
+ if (recordRoutingProxyTesting){
+ ContactHeader contHdr = (ContactHeader)
request.getHeader(ContactHeader.NAME);
+ SipURI sipUri =
(SipURI)contHdr.getAddress().getURI();
+ updateRequest.setRequestURI(sipUri);
+ }
+
+ long seqNo = (((CSeqHeader)
request.getHeader(CSeqHeader.NAME)).getSeqNumber());
+ CSeqHeader cseqNew =
protocolObjects.headerFactory.createCSeqHeader(++seqNo, "UPDATE");
+ updateRequest.setHeader(cseqNew);
+
+ sipProvider.sendRequest(updateRequest);
+ sendUpdate = true;
+ }
+
if(respondWithError != null && !sendReliably) {
Response response =
protocolObjects.messageFactory.createResponse(
respondWithError, request);
@@ -1153,8 +1230,9 @@
contactHeader =
protocolObjects.headerFactory.createContactHeader(address);
setFinalResponse(protocolObjects.messageFactory
.createResponse(finalResponseToSend, request));
+ Response response = getFinalResponse();
if(testAckViaParam) {
- ViaHeader viaHeader =
(ViaHeader)getFinalResponse().getHeader(ViaHeader.NAME);
+ ViaHeader viaHeader =
(ViaHeader)response.getHeader(ViaHeader.NAME);
viaHeader.setParameter("testAckViaParam",
"true");
}
if(testNextNonce) {
@@ -1162,15 +1240,22 @@
nextNonce = dsam.generateNonce();
authenticationInfoHeader.setNextNonce(nextNonce);
authenticationInfoHeader.removeParameter(ParameterNames.RESPONSE_AUTH);
-
getFinalResponse().addHeader(authenticationInfoHeader);
- }
- ToHeader toHeader = (ToHeader)
getFinalResponse().getHeader(ToHeader.NAME);
+
response.addHeader(authenticationInfoHeader);
+ }
+ ToHeader toHeader = (ToHeader)
response.getHeader(ToHeader.NAME);
if(toHeader.getTag() == null) {
toHeader.setTag(TO_TAG); // Application
is supposed to set.
}
getFinalResponse().addHeader(contactHeader);
- if(!sendReliably) {
- st.sendResponse(getFinalResponse());
+ if(!sendReliably) {
+ Thread.sleep(waitBeforeFinalResponse);
+ logger.debug("sending back response " +
response);
+ st.sendResponse(response);
+ }
+
+ if(sendUpdateAfterPrack){
+ Thread.sleep(waitBeforeFinalResponse);
+// st.sendResponse(getFinalResponse());
}
} else {
logger.info("Waiting for CANCEL, stopping the INVITE
processing ");
@@ -1254,6 +1339,7 @@
logger.info("shootist: got a " + request);
logger.info("shootist: got an ACK. ServerTxId = " +
serverTransactionId);
ackReceived = true;
+
//we don't count retransmissions
if(serverTransactionId != null) {
ackCount ++;
@@ -1323,6 +1409,7 @@
sendBye(replacesDialog);
}
if(sendReinvite && !reinviteSent) {
+ prackSent = false;
List<Header> headers = new ArrayList<Header>();
Header reinviteHeader =
protocolObjects.headerFactory.createHeader("ReInvite", "true");
headers.add(reinviteHeader);
@@ -1374,13 +1461,13 @@
logger.info("Response received : Status Code = "
+ response.getStatusCode() + " " + cseq);
// not dropping in PRACK case on REINVITE the ClientTx can be null it
seems
- if (tid == null && !prackSent) {
+ if (tid == null && responseDialog == null && !prackSent) {
if(countRetrans) {
nbRetrans++;
}
logger.info("Stray response -- dropping ");
return;
- }
+ }
logger.info("Dialog = " + responseDialog);
if(responseDialog != null) {
logger.info("Dialog State is " +
responseDialog.getState());
@@ -1429,7 +1516,8 @@
headers.add(reinviteHeader);
if(prackSent) {
headers.add(protocolObjects.headerFactory.createHeader(RequireHeader.NAME, "100rel"));
- }
+ }
+ prackSent = false;
sendInDialogSipRequest("INVITE", null, null, null, headers, null);
reinviteSent = true;
@@ -1460,6 +1548,33 @@
sipETag = sipTagHeader.getETag();
} else if
(cseq.getMethod().equals(Request.PRACK)) {
okToPrackReceived = true;
+ if (sendUpdateAfterPrack){
+ Request updateRequest =
dialog.createRequest(Request.UPDATE);
+
+ if (recordRoutingProxyTesting){
+ ContactHeader contHdr = (ContactHeader)
response.getHeader(ContactHeader.NAME);
+ SipURI sipUri =
(SipURI)contHdr.getAddress().getURI();
+
updateRequest.setRequestURI(sipUri);
+ }
+ ClientTransaction ct =
sipProvider
+
.getNewClientTransaction(updateRequest);
+ dialog.sendRequest(ct);
+ sendUpdate = true;
+ }
+ } else if(cseq.getMethod().equals(Request.UPDATE) &&
sendUpdateAfterUpdate && prackReceived) {
+ Address address =
protocolObjects.addressFactory
+ .createAddress("Shootme
<sip:127.0.0.1:" + myPort
+
+";transport="+protocolObjects.transport
+ + ">");
+ contactHeader =
protocolObjects.headerFactory.createContactHeader(address);
+
setFinalResponse(protocolObjects.messageFactory
+
.createResponse(finalResponseToSend, inviteRequest));
+ ToHeader toHeader = (ToHeader)
getFinalResponse().getHeader(ToHeader.NAME);
+ if(toHeader.getTag() == null) {
+ toHeader.setTag(TO_TAG); //
Application is supposed to set.
+ }
+
getFinalResponse().addHeader(contactHeader);
+
inviteServerTid.sendResponse(getFinalResponse());
}
} else if (response.getStatusCode() ==
Response.MOVED_TEMPORARILY) {
// Dialog dies as soon as you get an error
response.
@@ -1547,9 +1662,18 @@
} else if(response.getStatusCode() == Response.RINGING &&
sendUpdateOn180) {
Request updateRequest =
dialog.createRequest(Request.UPDATE);
+ if (recordRoutingProxyTesting){
+ ContactHeader contHdr = (ContactHeader)
response.getHeader(ContactHeader.NAME);
+ SipURI sipUri =
(SipURI)contHdr.getAddress().getURI();
+ updateRequest.setRequestURI(sipUri);
+ }
+
+
ClientTransaction ct = sipProvider
.getNewClientTransaction(updateRequest);
dialog.sendRequest(ct);
+ sendUpdate = true;
+
} else if (response.getStatusCode() ==
Response.PROXY_AUTHENTICATION_REQUIRED
|| response.getStatusCode() ==
Response.UNAUTHORIZED) {
URI uriReq = tid.getRequest().getRequestURI();
@@ -1560,13 +1684,14 @@
System.out
.println("INVITE AUTHORIZATION
sent:\n" + authrequest);
} else if (response.getStatusCode() > Response.TRYING &&
response.getStatusCode() < Response.OK) {
- RequireHeader requireHeader = (RequireHeader)
response.getHeader(RequireHeader.NAME);
- if(requireHeader != null
&& "100rel".equalsIgnoreCase(requireHeader.getOptionTag().trim())) {
+ RequireHeader requireHeader = (RequireHeader)
response.getHeader(RequireHeader.NAME);
+ logger.debug("prackSent ? " + prackSent);
+ if(requireHeader != null
&& "100rel".equalsIgnoreCase(requireHeader.getOptionTag().trim())
&& !prackSent) {
+ prackSent = true;
Request prack =
dialog.createPrack(response);
ClientTransaction ct = sipProvider
.getNewClientTransaction(prack);
- dialog.sendRequest(ct);
- prackSent = true;
+ dialog.sendRequest(ct);
}
}
/**
@@ -2912,4 +3037,31 @@
return dropRequest;
}
-}
+ public void setWaitBeforeFinalResponse(long waitBeforeFinalResponse) {
+ this.waitBeforeFinalResponse = waitBeforeFinalResponse;
+ }
+
+ public boolean isSendUpdate() {
+ return sendUpdate;
+ }
+
+ public boolean isUpdateReceived() {
+ return updateReceived;
+ }
+
+ public void setSendUpdateAfterUpdate(boolean sendUpdateAfterUpdate) {
+ this.sendUpdateAfterUpdate = sendUpdateAfterUpdate;
+ }
+
+ public boolean isSendUpdateAfterUpdate() {
+ return sendUpdateAfterUpdate;
+ }
+
+ public void setSendUpdateAfterPrack(boolean sendUpdateAfterPrack) {
+ this.sendUpdateAfterPrack = sendUpdateAfterPrack;
+ }
+
+ public void setSendUpdateAfterProvisionalResponses(boolean
sendUpdateAfterProvisonalResponses) {
+ this.sendUpdateAfterProvisionalResponses =
sendUpdateAfterProvisonalResponses;
+ }
+}