2 new revisions:

Revision: da31f80a2db4
Author:   Jean Deruelle <[email protected]>
Date:     Fri Jul 27 10:39:54 2012
Log:      Update Issue 42...
http://code.google.com/p/sipservlets/source/detail?r=da31f80a2db4

Revision: 01f39d03188d
Author:   Jean Deruelle <[email protected]>
Date:     Fri Jul 27 10:41:17 2012
Log:      Update Issue 42...
http://code.google.com/p/sipservlets/source/detail?r=01f39d03188d

==============================================================================
Revision: da31f80a2db4
Author:   Jean Deruelle <[email protected]>
Date:     Fri Jul 27 10:39:54 2012
Log:      Update Issue 42

Backport to TelScale branch

Fix + non regression HA test
(cherry picked from commit c34f3a3fa11ea365439704927c399e73da5450b2)

http://code.google.com/p/sipservlets/source/detail?r=da31f80a2db4

Added:
/sip-servlets-test-suite/sipp-scenarios/clustering/uac/register-receiver.xml
Modified:
/containers/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/sip/ClusteredSipSession.java /sip-servlets-test-suite/sipp-scenarios/clustering/clustering-failover-test.sh

=======================================
--- /dev/null
+++ /sip-servlets-test-suite/sipp-scenarios/clustering/uac/register-receiver.xml Fri Jul 27 10:39:54 2012
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- Jean Deruelle -->
+
+<scenario name="Distributable UAC for SIP-Servlets Tests">
+
+<label id="rcv_register" />
+
+  <recv request="REGISTER" timeout="20000" />
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      [last_Record-Route:]
+      Contact: sip:receiver-failover@[local_ip]:[local_port]
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=callee 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 0
+      a=rtpmap:0 PCMU/8000
+
+    ]]>
+  </send>
+
+   <recv request="REGISTER" timeout="40000" />
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=020[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      [last_Record-Route:]
+      Contact: sip:receiver-failover@[local_ip]:[local_port]
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=callee 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 0
+      a=rtpmap:0 PCMU/8000
+
+    ]]>
+  </send>
+
+<!--nop>
+   <action>
+      <assign assign_to="register_counter" value="0" />
+  </action>
+ </nop>
+
+<nop>
+  <action>
+    <add assign_to="register_counter" value="1" />
+ <test assign_to="continue_rcv_register" variable="register_counter" compare="less_than" value="5" /> + <test assign_to="done" variable="register_counter" compare="greater_than" value="5" />
+  </action>
+</nop>
+
+ <nop test="done" next="script_done" />
+ <nop test="continue_rcv_register" next="rcv_register"/>
+
+<label id="script_done" /-->
+
+</scenario>
+
=======================================
--- /containers/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/sip/ClusteredSipSession.java Thu Jul 5 07:13:19 2012 +++ /containers/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/sip/ClusteredSipSession.java Fri Jul 27 10:39:54 2012
@@ -80,6 +80,7 @@
 import org.mobicents.servlet.sip.catalina.CatalinaSipManager;
 import org.mobicents.servlet.sip.core.SipManager;
 import org.mobicents.servlet.sip.core.SipService;
+import org.mobicents.servlet.sip.core.message.MobicentsSipServletMessage;
import org.mobicents.servlet.sip.core.session.MobicentsSipApplicationSession;
 import org.mobicents.servlet.sip.core.session.MobicentsSipSessionKey;
 import org.mobicents.servlet.sip.core.session.SessionManagerUtil;
@@ -1662,7 +1663,7 @@
        private void sessionMetadataDirty() {
 //             if (!sessionMetadataDirty && !isNew && log.isTraceEnabled())
                if(log.isDebugEnabled()) {
-                       log.debug("Marking session metadata dirty " + key);
+                       log.debug("Marking sip session metadata dirty " + key);
                }
                sessionMetadataDirty = true;
ConvergedSessionReplicationContext.bindSipSession(this, manager.getSnapshotSipManager());
@@ -1748,6 +1749,16 @@
                sessionMetadataDirty();
                metadata.getMetaData().put(IS_VALID, isValid);
        }
+
+       // http://code.google.com/p/sipservlets/issues/detail?id=42
+       @Override
+       public void setSessionCreatingTransactionRequest(
+                       MobicentsSipServletMessage message) {
+               super.setSessionCreatingTransactionRequest(message);
+ if(State.INITIAL.equals(state) && sessionCreatingDialog == null && sessionCreatingTransactionRequest != null && sessionCreatingTransactionRequest.getMethod().equalsIgnoreCase(Request.REGISTER)) {
+                       sessionMetadataDirty();
+               }
+       }

        @Override
        public void setSessionCreatingDialog(Dialog dialog) {
=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/clustering-failover-test.sh Wed Apr 18 20:34:37 2012 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/clustering-failover-test.sh Fri Jul 27 10:39:54 2012
@@ -121,7 +121,7 @@
            uac-register)
                                rm ./uac/*.log
                    echo "Distributed example used is uac register";
- ./sipp $MSS_IP:5080 -sf uac/register-receiver.xml -i $SIPP_IP -p 5090 -trace_msg -timeout $ACTIVE_TIMEOUT -timeout_error -nd + sipp $MSS_IP:5080 -sf uac/register-receiver.xml -i $SIPP_IP -p 5090 -trace_msg -timeout $ACTIVE_TIMEOUT -timeout_error -nd
                    ;;
                c2c)
                                rm ./converged-click2call/*.log

==============================================================================
Revision: 01f39d03188d
Author:   Jean Deruelle <[email protected]>
Date:     Fri Jul 27 10:41:17 2012
Log:      Update Issue 42

Backport to TelScale branch

update non regression test
(cherry picked from commit 0762509ec457ac6ea798643379ba1eaa0a3ebf11)

http://code.google.com/p/sipservlets/source/detail?r=01f39d03188d

Modified:
/sip-servlets-test-suite/sipp-scenarios/clustering/uac/register-receiver.xml

=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/uac/register-receiver.xml Fri Jul 27 10:39:54 2012 +++ /sip-servlets-test-suite/sipp-scenarios/clustering/uac/register-receiver.xml Fri Jul 27 10:41:17 2012
@@ -36,6 +36,33 @@

    <recv request="REGISTER" timeout="40000" />

+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=020[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      [last_Record-Route:]
+      Contact: sip:receiver-failover@[local_ip]:[local_port]
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=callee 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 0
+      a=rtpmap:0 PCMU/8000
+
+    ]]>
+  </send>
+
+<recv request="REGISTER" timeout="40000" />
+
   <send>
     <![CDATA[

Reply via email to