2 new revisions:
Revision: 947e0e98e565
Author: Jean Deruelle <[email protected]>
Date: Mon Jul 30 05:49:48 2012
Log: Update Issue 42...
http://code.google.com/p/sipservlets/source/detail?r=947e0e98e565
Revision: 674d2b13bafe
Author: Jean Deruelle <[email protected]>
Date: Mon Jul 30 15:04:45 2012
Log: Update Issue 130...
http://code.google.com/p/sipservlets/source/detail?r=674d2b13bafe
==============================================================================
Revision: 947e0e98e565
Author: Jean Deruelle <[email protected]>
Date: Mon Jul 30 05:49:48 2012
Log: Update Issue 42
Fix for initial state not being replicated in case of out of dialog requests
http://code.google.com/p/sipservlets/source/detail?r=947e0e98e565
Modified:
/containers/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/ClusteredSipSession.java
=======================================
---
/containers/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/ClusteredSipSession.java
Fri Jul 27 10:39:54 2012
+++
/containers/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/ClusteredSipSession.java
Mon Jul 30 05:49:48 2012
@@ -867,6 +867,15 @@
super.setValid(valid);
}
state = (State)metaData.get(STATE);
+ if(logger.isDebugEnabled()) {
+ logger.debug("replicated sip session state = " + state);
+ }
+ // http://code.google.com/p/sipservlets/issues/detail?id=42
+ // in case of REGISTER (or out of dialog requests) , the state will have
stayed INITIAL
+ // and as such not changed so not replicated, thus if state is null we
default to INITIAL
+ if(state == null) {
+ state = State.INITIAL;
+ }
Long cSeq = (Long) metaData.get(CSEQ);
if(cSeq != null) {
cseq = cSeq;
==============================================================================
Revision: 674d2b13bafe
Author: Jean Deruelle <[email protected]>
Date: Mon Jul 30 15:04:45 2012
Log: Update Issue 130
Add LB Route Header for out of Dialog requests as well as PAth Header (for
REGISTER request)
http://code.google.com/p/sipservlets/source/detail?r=674d2b13bafe
Modified:
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java
/sip-servlets-test-suite/sipp-scenarios/clustering/start-lb.sh
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
Fri Jul 27 05:50:42 2012
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
Mon Jul 30 15:04:45 2012
@@ -24,6 +24,7 @@
import gov.nist.javax.sip.ServerTransactionExt;
import gov.nist.javax.sip.address.SipUri;
+import gov.nist.javax.sip.header.ims.PathHeader;
import gov.nist.javax.sip.message.MessageExt;
import java.io.IOException;
@@ -520,6 +521,11 @@
}
request.setRequestURI(sipUri);
}
+ //
http://code.google.com/p/sipservlets/issues/detail?id=130
+ // removes the Route and Path Headers added previously for requests
that the container originated
+ // when the Load Balancer is used to avoid adding them again with
each request going out.
+ request.removeHeader(RouteHeader.NAME);
+ request.removeHeader(PathHeader.NAME);
} else {
if(logger.isDebugEnabled()) {
logger.debug("orignal tx for creating susbequent request " + method
+ " on session " + key +" was a Server Tx");
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java
Tue May 1 20:34:52 2012
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java
Mon Jul 30 15:04:45 2012
@@ -22,7 +22,9 @@
package org.mobicents.servlet.sip.message;
+import gov.nist.javax.sip.header.HeaderFactoryExt;
import gov.nist.javax.sip.header.HeaderFactoryImpl;
+import gov.nist.javax.sip.header.ims.PathHeader;
import gov.nist.javax.sip.message.MessageExt;
import java.io.Externalizable;
@@ -889,8 +891,13 @@
javax.sip.address.Address routeAddress =
SipFactoryImpl.addressFactory.createAddress(sipUri);
RouteHeader routeHeader =
-
SipFactoryImpl.headerFactory.createRouteHeader(routeAddress);
- request.addFirst(routeHeader);
+
SipFactoryImpl.headerFactory.createRouteHeader(routeAddress);
+ request.addFirst(routeHeader);
+
if(Request.REGISTER.equalsIgnoreCase(request.getMethod())) {
+ PathHeader pathHeader =
+
((HeaderFactoryExt)SipFactoryImpl.headerFactory).createPathHeader(routeAddress);
+ request.addFirst(pathHeader);
+ }
} catch (ParseException e) {
//this should never happen
throw new IllegalArgumentException("Impossible to set the Load Balancer
Route Header !", e);
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java
Fri Jun 8 02:33:37 2012
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java
Mon Jul 30 15:04:45 2012
@@ -1118,27 +1118,31 @@
//to check if there is any other apps
interested in it
addInfoForRoutingBackToContainer(routerInfo,
session.getSipApplicationSession().getKey().getId(),
session.getKey().getApplicationName());
addDNSRoute = false;
- } else {
- if(logger.isDebugEnabled()) {
- logger.debug("routing outside the
container " +
- "since no more apps
are interested.");
- }
- //Adding Route Header for LB if we are
in a HA configuration
- if(isInitial) {
-
if(sipFactoryImpl.isUseLoadBalancer()) {
-
sipFactoryImpl.addLoadBalancerRouteHeader(request);
- addDNSRoute = false;
-
if(logger.isDebugEnabled()) {
- logger.debug("adding route to Load Balancer since we are in a HA
configuration " +
- " and no more apps
are interested.");
- }
- } else
if(StaticServiceHolder.sipStandardService.getOutboundProxy() != null) {
-
sipFactoryImpl.addLoadBalancerRouteHeader(request);
- addDNSRoute = false;
-
if(logger.isDebugEnabled()) {
- logger.debug("adding route to outbound proxy (no load balancer
set) since we have outboundProxy configured " +
- " and no more apps
are interested.");
- }
+ }
+ }
+
+ if(addDNSRoute) {
+ if(logger.isDebugEnabled()) {
+ logger.debug("routing outside the container
" +
+ "since no more apps are
interested.");
+ }
+ // Adding Route Header for LB if the request is
initial or
+ //
http://code.google.com/p/sipservlets/issues/detail?id=130
+ // if we are in a HA configuration and the request is an out of dialog
request
+ if(isInitial() || dialog == null) {
+ if(sipFactoryImpl.isUseLoadBalancer()) {
+
sipFactoryImpl.addLoadBalancerRouteHeader(request);
+ addDNSRoute = false;
+ if(logger.isDebugEnabled()) {
+ logger.debug("adding route to Load Balancer since we are in a HA
configuration " +
+ " and no more apps are
interested.");
+ }
+ } else
if(StaticServiceHolder.sipStandardService.getOutboundProxy() != null) {
+
sipFactoryImpl.addLoadBalancerRouteHeader(request);
+ addDNSRoute = false;
+ if(logger.isDebugEnabled()) {
+ logger.debug("adding route to outbound proxy (no load balancer set)
since we have outboundProxy configured " +
+ " and no more apps are
interested.");
}
}
}
=======================================
--- /sip-servlets-test-suite/sipp-scenarios/clustering/start-lb.sh Wed Aug
10 01:54:05 2011
+++ /sip-servlets-test-suite/sipp-scenarios/clustering/start-lb.sh Mon Jul
30 15:04:45 2012
@@ -1,3 +1,3 @@
rm ./logs/*
-java -Djava.util.logging.config.file=./lb-logging.properties -jar
${M2_REPO}/org/mobicents/tools/sip-balancer-jar/1.4-SNAPSHOT/sip-balancer-jar-1.4-SNAPSHOT-jar-with-dependencies.jar
-mobicents-balancer-config=lb-configuration.properties -Xms1024m -Xmx1024m
-XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseConcMarkSweepGC
-XX:+CMSIncrementalMode
+java -Djava.util.logging.config.file=./lb-logging.properties -jar
${M2_REPO}/org/mobicents/tools/sip-balancer-jar/6.1.1.GA-TelScale/sip-balancer-jar-6.1.1.GA-TelScale-jar-with-dependencies.jar
-mobicents-balancer-config=lb-configuration.properties -Xms1024m -Xmx1024m
-XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseConcMarkSweepGC
-XX:+CMSIncrementalMode
#java -Djava.util.logging.config.file=./lb-logging.properties -jar
${M2_REPO}/org/mobicents/tools/sip-balancer-jar/1.0.2/sip-balancer-jar-1.0.2-jar-with-dependencies.jar
-mobicents-balancer-config=lb-configuration.properties -Xms1024m -#Xmx1024m
-XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseConcMarkSweepGC
-XX:+CMSIncrementalMode