Revision: 15578
Author: [email protected]
Date: Tue Nov 30 11:48:22 2010
Log: Update Issue 1875

TCP support added for early dialog failover => working
http://code.google.com/p/mobicents/source/detail?r=15578

Modified:
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPserverTransaction.java /trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn1xxTCPTest.java /trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/SimpleB2BUAHandler.java

=======================================
--- /trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPserverTransaction.java Mon Nov 29 12:25:49 2010 +++ /trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPserverTransaction.java Tue Nov 30 11:48:22 2010
@@ -22,6 +22,7 @@
 package gov.nist.javax.sip.stack;

 import gov.nist.core.StackLogger;
+import gov.nist.javax.sip.message.ResponseExt;
 import gov.nist.javax.sip.message.SIPMessage;
 import gov.nist.javax.sip.message.SIPRequest;
 import gov.nist.javax.sip.message.SIPResponse;
@@ -52,6 +53,7 @@
        public static final String DIALOG_ID = "did";
        public static final String ORIGINAL_REQUEST = "req";
        String localDialogId;
+       int peerReliablePort = -1;

        public MobicentsHASIPserverTransaction(SIPTransactionStack sipStack,
                        MessageChannel newChannelToUse) {
@@ -90,13 +92,17 @@
if (sipStack.getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) { sipStack.getStackLogger().logDebug(transactionId + " : message channel ip " + getMessageChannel().getPeerInetAddress());
                }
- transactionMetaData.put(PEER_PORT, Integer.valueOf(getMessageChannel().getPeerPort()));
+               int peerPort = getMessageChannel().getPeerPort();
+               if(isReliable()) {
+                       peerPort = peerReliablePort;
+               }
+               transactionMetaData.put(PEER_PORT, Integer.valueOf(peerPort));
if (sipStack.getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) { - sipStack.getStackLogger().logDebug(transactionId + " : message channel ip " + getMessageChannel().getPeerPort()); + sipStack.getStackLogger().logDebug(transactionId + " : message channel peer port " + peerPort);
                }
transactionMetaData.put(MY_PORT, Integer.valueOf(getMessageChannel().getPort())); if (sipStack.getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) { - sipStack.getStackLogger().logDebug(transactionId + " : message channel ip " + getMessageChannel().getPort()); + sipStack.getStackLogger().logDebug(transactionId + " : message channel my port " + getMessageChannel().getPort());
                }

                return transactionMetaData;
@@ -109,6 +115,12 @@
                        this.localDialogId = response.getDialogId(true);
if (sipStack.getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) { sipStack.getStackLogger().logDebug(transactionId + " : local dialog Id " + localDialogId);
+                       }
+                       if(isReliable()) {
+ this.peerReliablePort = ((ResponseExt)response).getTopmostViaHeader().getPort(); + if (sipStack.getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) { + sipStack.getStackLogger().logDebug(transactionId + " : peer Reliable Port " + peerReliablePort);
+                               }
                        }
                        // store the tx when the response will be sent
                        try {
=======================================
--- /trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn1xxTCPTest.java Tue Nov 30 07:08:01 2010 +++ /trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn1xxTCPTest.java Tue Nov 30 11:48:22 2010
@@ -324,7 +324,7 @@

                 st.sendResponse(response);

-                Thread.sleep(3000);
+                Thread.sleep(4000);

this.okResponse = messageFactory.createResponse(Response.OK,
                         request);
@@ -1518,7 +1518,7 @@

         shootme.init();
         shootist.init("ReInvite");
-        Thread.sleep(60000);
+        Thread.sleep(80000);

         shootme.checkState(false);
         shootist.checkState(false);
@@ -1600,7 +1600,7 @@

         shootme.init();
         shootist.init("ReInvite");
-        Thread.sleep(60000);
+        Thread.sleep(80000);

         shootme.checkState(false);
         shootist.checkState(false);
=======================================
--- /trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/SimpleB2BUAHandler.java Tue Nov 30 07:08:01 2010 +++ /trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/SimpleB2BUAHandler.java Tue Nov 30 11:48:22 2010
@@ -367,6 +367,7 @@
                        if(ListeningPoint.TCP.equalsIgnoreCase(transport)) {
remotePort = ((MessageExt)requestEvent.getRequest()).getTopmostViaHeader().getPort();
                        }
+ ((ClusteredSipStack)sipStack).getStackLogger().logDebug("remotePort = " + remotePort); requestEvent.getServerTransaction().sendResponse(messageFactory.createResponse(200, requestEvent.getRequest()));
                        Dialog dialog = getOutgoingDialog();
                        if(remotePort == 5060 || remotePort == 5065) {
@@ -527,7 +528,12 @@
                // forwarding of this response and further UAC Ack
                // note that the app does not handles UAC ACKs
                String outgoingDialogId = 
responseEvent.getDialog().getDialogId();
-               if(((ResponseEventExt)responseEvent).getRemotePort() == 5065) {
+               int remotePort = 
((ResponseEventExt)responseEvent).getRemotePort() ;
+               if(ListeningPoint.TCP.equalsIgnoreCase(transport)) {
+ remotePort = ((MessageExt)responseEvent.getResponse()).getTopmostViaHeader().getPort();
+               }
+ ((ClusteredSipStack)sipStack).getStackLogger().logDebug("remotePort = " + remotePort);
+               if(remotePort == 5065 || remotePort == 5081) {
                        storeOutgoingDialogId(outgoingDialogId);
                }
                if(myPort == 5080 && getOutgoingDialogId() == null) {

Reply via email to