Revision: 15610
Author: [email protected]
Date: Thu Dec 2 13:34:30 2010
Log: Update Issue 1874
Adding non regression B2BUA test case forwarding ACK => not working yet
http://code.google.com/p/mobicents/source/detail?r=15610
Modified:
/trunk/servers/sip-servlets/sip-servlets-examples/call-forwarding-distributable/src/main/java/org/mobicents/servlet/sip/example/DistributableCallForwardingB2BUASipServlet.java
/trunk/servers/sip-servlets/sip-servlets-test-suite/sipp-scenarios/clustering/clustering-failover-test.sh
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-examples/call-forwarding-distributable/src/main/java/org/mobicents/servlet/sip/example/DistributableCallForwardingB2BUASipServlet.java
Wed Jun 9 12:19:02 2010
+++
/trunk/servers/sip-servlets/sip-servlets-examples/call-forwarding-distributable/src/main/java/org/mobicents/servlet/sip/example/DistributableCallForwardingB2BUASipServlet.java
Thu Dec 2 13:34:30 2010
@@ -27,10 +27,12 @@
import javax.servlet.sip.B2buaHelper;
import javax.servlet.sip.SipFactory;
import javax.servlet.sip.SipServlet;
+import javax.servlet.sip.SipServletMessage;
import javax.servlet.sip.SipServletRequest;
import javax.servlet.sip.SipServletResponse;
import javax.servlet.sip.SipSession;
import javax.servlet.sip.SipURI;
+import javax.servlet.sip.UAMode;
import org.apache.log4j.Logger;
@@ -63,6 +65,13 @@
new
String[]{"sip:[email protected]", "sip:[email protected]:5090"});
forwardingUris.put("sip:[email protected]:5080",
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]:5080",
+ new
String[]{"sip:[email protected]", "sip:[email protected]:5090"});
}
@Override
@@ -71,6 +80,21 @@
if(logger.isInfoEnabled()) {
logger.info("Got : " + request.toString());
}
+ if(request.getFrom().getURI().toString().contains("fwd-ack")) {
+ B2buaHelper helper = request.getB2buaHelper();
+ SipSession peerSession =
helper.getLinkedSession(request.getSession());
+ List<SipServletMessage> pendingMessages =
helper.getPendingMessages(peerSession, UAMode.UAC);
+ SipServletResponse invitePendingResponse = null;
+ logger.info("pending messages : ");
+ for(SipServletMessage pendingMessage : pendingMessages) {
+ logger.info("\t pending message : " + pendingMessage);
+ if(((SipServletResponse)pendingMessage).getStatus() ==
200) {
+ invitePendingResponse =
(SipServletResponse)pendingMessage;
+ break;
+ }
+ }
+ invitePendingResponse.createAck().send();
+ }
}
@Override
@@ -191,11 +215,13 @@
// helper.getLinkedSession(sipServletResponse.getSession());
//if this is a response to an INVITE we ack it and forward the
OK
if("INVITE".equalsIgnoreCase(sipServletResponse.getMethod())) {
- SipServletRequest ackRequest =
sipServletResponse.createAck();
- if(logger.isInfoEnabled()) {
- logger.info("Sending " + ackRequest);
- }
- ackRequest.send();
+
if(sipServletResponse.getFrom().getURI().toString().contains("fwd-ack")) {
+ SipServletRequest ackRequest =
sipServletResponse.createAck();
+ if(logger.isInfoEnabled()) {
+ logger.info("Sending " + ackRequest);
+ }
+ ackRequest.send();
+ }
//create and sends OK for the first call leg
SipServletRequest originalRequest = (SipServletRequest)
sipServletResponse.getSession().getAttribute("originalRequest");
SipServletResponse responseToOriginalRequest =
originalRequest.createResponse(sipServletResponse.getStatus());
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-test-suite/sipp-scenarios/clustering/clustering-failover-test.sh
Thu Dec 2 08:23:10 2010
+++
/trunk/servers/sip-servlets/sip-servlets-test-suite/sipp-scenarios/clustering/clustering-failover-test.sh
Thu Dec 2 13:34:30 2010
@@ -65,6 +65,12 @@
$NOHUP ./sipp $MSS_IP:5080 -sf
b2bua/call-forwarding-receiver-early.xml -i $SIPP_IP -p 5090 -nd
$BACKGROUNDMETHOD
./sipp $MSS_IP:5080 -s receiver -sf
b2bua/call-forwarding-sender-early.xml -trace_err -i $SIPP_IP -p 5050 -r
$RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -timeout $ACTIVE_TIMEOUT
$SIPP_OPTIONS -timeout_error
;;
+ b2bua-early-fwd-ack)
+ rm ./b2bua/*.log
+ echo "Distributed example used is b2bua early dialog
failover";
+ $NOHUP ./sipp $MSS_IP:5080 -sf
b2bua/call-forwarding-receiver-early.xml -i $SIPP_IP -p 5090 -nd
$BACKGROUNDMETHOD
+ ./sipp $MSS_IP:5080 -s receiver-fwd-ack -sf
b2bua/call-forwarding-sender-early.xml -trace_err -i $SIPP_IP -p 5050 -r
$RATE -m $CALLS -rsa $LB_IP:5060 -trace_msg -timeout $ACTIVE_TIMEOUT
$SIPP_OPTIONS -timeout_error
+ ;;
b2bua-remote-send-bye)
rm ./b2bua/*.log
echo "Distributed example used is b2bua-remote-send-bye";