Revision: 15577
Author: [email protected]
Date: Tue Nov 30 11:39:49 2010
Log: Update Issue 2086
Fixes to support mid tx failover for TCP and handling of retransmissions
http://code.google.com/p/mobicents/source/detail?r=15577
Modified:
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/CallIDAffinityBalancerAlgorithm.java
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/SIPBalancerForwarder.java
=======================================
---
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/CallIDAffinityBalancerAlgorithm.java
Mon Nov 15 14:36:51 2010
+++
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/CallIDAffinityBalancerAlgorithm.java
Tue Nov 30 11:39:49 2010
@@ -3,7 +3,6 @@
import gov.nist.javax.sip.header.SIPHeader;
import gov.nist.javax.sip.header.Via;
-import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -14,9 +13,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.sip.SipProvider;
-import javax.sip.address.SipURI;
-import javax.sip.header.RouteHeader;
+import javax.sip.ListeningPoint;
import javax.sip.message.Request;
import javax.sip.message.Response;
@@ -53,7 +50,9 @@
found = true;
}
}
-
+ }
+ if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("external response node found ? " +
found);
}
if(!found) {
String callId = ((SIPHeader)
response.getHeader(headerName))
@@ -61,14 +60,40 @@
SIPNode node = callIdMap.get(callId);
if(node == null ||
!balancerContext.nodes.contains(node)) {
node = selectNewNode(node, callId);
+ String transportProperty = transport + "Port";
+ port = (Integer)
node.getProperties().get(transportProperty);
+ if(port == null) throw new RuntimeException("No transport found for
node " + node + " " + transportProperty);
+ if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("changing via " + via + "setting new values " +
node.getIp() + ":" + port);
+ }
try {
via.setHost(node.getIp());
- String transportProperty = transport +
"Port";
- port = (Integer)
node.getProperties().get(transportProperty);
- if(port == null) throw new RuntimeException("No transport found for
node " + node + " " + transportProperty);
via.setPort(port);
} catch (Exception e) {
- throw new RuntimeException("Error", e);
+ throw new RuntimeException("Error setting new values " + node.getIp()
+ ":" + port + " on via " + via, e);
+ }
+ // need to reset the rport for reliable
transports
+
if(!ListeningPoint.UDP.equalsIgnoreCase(transport)) {
+ via.setRPort();
+ }
+
+ } else {
+ String transportProperty = transport + "Port";
+ port = (Integer)
node.getProperties().get(transportProperty);
+ if(via.getHost().equalsIgnoreCase(node.getIp()) || via.getPort() !=
port) {
+ if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("changing retransmission via " + via + "setting new
values " + node.getIp() + ":" + port);
+ }
+ try {
+ via.setHost(node.getIp());
+ via.setPort(port);
+ } catch (Exception e) {
+ throw new RuntimeException("Error setting new values " +
node.getIp() + ":" + port + " on via " + via, e);
+ }
+ // need to reset the rport for reliable
transports
+
if(!ListeningPoint.UDP.equalsIgnoreCase(transport)) {
+ via.setRPort();
+ }
}
}
}
@@ -123,7 +148,12 @@
groupedFailover(oldNode, node);
} else {
node = nextAvailableNode();
- if(node == null) return null;
+ if(node == null) {
+ if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("no nodes available return null");
+ }
+ return null;
+ }
callIdMap.put(callId, node);
}
=======================================
---
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/SIPBalancerForwarder.java
Wed Nov 24 02:58:07 2010
+++
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/SIPBalancerForwarder.java
Tue Nov 30 11:39:49 2010
@@ -355,8 +355,12 @@
if(logger.isLoggable(Level.INFO)) {
logger.info("Removing the following Listening Point " +
listeningPoint);
}
-
sipProvider.removeListeningPoint(listeningPoint);
-
BalancerContext.balancerContext.sipStack.deleteListeningPoint(listeningPoint);
+ try {
+
sipProvider.removeListeningPoint(listeningPoint);
+
BalancerContext.balancerContext.sipStack.deleteListeningPoint(listeningPoint);
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "Cant remove the listening points or sip
providers", e);
+ }
}
if(logger.isLoggable(Level.INFO)) {
logger.info("Removing the sip
provider");
@@ -999,6 +1003,9 @@
}*/
BalancerContext.balancerContext.balancerAlgorithm.processInternalResponse(response);
try {
+ if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("from server sending response
externally " + response);
+ }
BalancerContext.balancerContext.externalSipProvider.sendResponse(response);
} catch (Exception ex) {
logger.log(Level.SEVERE, "Unexpected exception while forwarding the
response \n" + response, ex);
@@ -1007,8 +1014,14 @@
BalancerContext.balancerContext.balancerAlgorithm.processExternalResponse(response);
try {
if(BalancerContext.balancerContext.isTwoEntrypoints()) {
+ if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("from external sending
response " + response);
+ }
BalancerContext.balancerContext.internalSipProvider.sendResponse(response);
} else {
+ if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("from external sending
response " + response);
+ }
BalancerContext.balancerContext.externalSipProvider.sendResponse(response);
}
} catch (Exception ex) {