Revision: 15845
Author: vladimir.ralev
Date: Fri Dec 17 05:56:48 2010
Log: Update Issue 2210
Fixing regressions caused by this issue + a couple of other fixes for proxy and IP load balacning
http://code.google.com/p/mobicents/source/detail?r=15845

Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyUtils.java

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Tue Dec 14 06:04:48 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Fri Dec 17 05:56:48 2010
@@ -111,6 +111,7 @@
 import org.mobicents.servlet.sip.message.SipServletRequestImpl;
 import org.mobicents.servlet.sip.message.SipServletResponseImpl;
 import org.mobicents.servlet.sip.message.TransactionApplicationData;
+import org.mobicents.servlet.sip.proxy.ProxyBranchImpl;
 import org.mobicents.servlet.sip.proxy.ProxyImpl;
 import org.mobicents.servlet.sip.router.ManageableApplicationRouter;
 import org.mobicents.servlet.sip.startup.SipContext;
@@ -1058,6 +1059,16 @@
// naoki : Fix for Issue 1618 http://code.google.com/p/mobicents/issues/detail?id=1618 on Timeout don't do the 408 processing for Server Transactions if(sipServletMessage instanceof SipServletRequestImpl && !timeoutEvent.isServerTransaction()) {
                                                                        try {
+                                                                               
boolean finalizedProxy = false;
+                                                                               
ProxyBranchImpl proxyBranchImpl = tad.getProxyBranch();
+                                                                               
if(proxyBranchImpl != null) {
+                                                                               
        ProxyImpl proxy = (ProxyImpl) proxyBranchImpl.getProxy();
+                                                                               
        if(proxy.getFinalBranchForSubsequentRequests() != null) {
+                                                                               
                tad.cleanUp();
+                                                                               
                transaction.setApplicationData(null);
+                                                                               
                return;
+                                                                               
        }
+                                                                               
}
SipServletRequestImpl sipServletRequestImpl = (SipServletRequestImpl) sipServletMessage;
                                                                                
sipServletMessage.setTransaction(transaction);
SipServletResponseImpl response = (SipServletResponseImpl) sipServletRequestImpl.createResponse(408, null, false, false);
@@ -1076,9 +1087,9 @@
                                                                }
                                                                
checkForAckNotReceived(sipServletMessage);
appNotifiedOfPrackNotReceived = checkForPrackNotReceived(sipServletMessage);
+                                                       } finally {
                                                                
sipSession.removeOngoingTransaction(transaction);
                                                                
sipSession.setRequestsPending(0);
-                                                       } finally {
sipContext.exitSipApp(sipSession.getSipApplicationSession(), sipSession);
                                                        }
// don't invalidate here because if the application sends a final response on the noPrack received
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java Tue Dec 14 15:59:42 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java Fri Dec 17 05:56:48 2010
@@ -941,7 +941,40 @@
                        }
                }
        }
-
+
+ public static void optimizeRequestUriHeaderAddressForInternalRoutingrequest(SipConnector sipConnector, Request request, MobicentsSipSession session, SipFactoryImpl sipFactoryImpl, String transport) { + SipNetworkInterfaceManager sipNetworkInterfaceManager = sipFactoryImpl.getSipNetworkInterfaceManager();
+
+               javax.sip.address.URI uri =request.getRequestURI();
+               if(uri.isSipURI()) {
+                       try {
+                               javax.sip.address.SipURI sipUri = 
(javax.sip.address.SipURI) uri;
+ boolean isExternal = sipFactoryImpl.getSipApplicationDispatcher().isExternal(sipUri.getHost(), sipUri.getPort(), transport);
+                               if(!isExternal) {
+                                       if(logger.isDebugEnabled()) {
+                                               logger.debug("The request is going 
internally due to RURI = " + uri);
+                                       }
+                                       ExtendedListeningPoint lp = null;
+                                       if(session.getOutboundInterface() != 
null) {
+
+ javax.sip.address.SipURI outboundInterfaceURI = (javax.sip.address.SipURI) SipFactories.addressFactory.createURI(session.getOutboundInterface()); + lp = sipNetworkInterfaceManager.findMatchingListeningPoint(outboundInterfaceURI, false);
+                                       } else {
+ lp = sipNetworkInterfaceManager.findMatchingListeningPoint(transport, false);
+                                       }
+
+                                       sipUri.setHost(lp.getHost(false));
+                                       sipUri.setPort(lp.getPort());
+                                       
sipUri.setTransportParam(lp.getTransport());
+                               }
+                       } catch (ParseException e) {
+                               logger.error("AR optimization error", e);
+                       }
+
+               }
+
+       }
+
        /*
         * (non-Javadoc)
         *
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java Mon Dec 6 10:12:43 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java Fri Dec 17 05:56:48 2010
@@ -699,7 +699,7 @@
RouteHeader routeHeader = (RouteHeader) clonedRequest.getHeader(RouteHeader.NAME);
                if(routeHeader != null) {
                        
if(!sipApplicationDispatcher.isRouteExternal(routeHeader)) {
-                               clonedRequest.removeFirst(RouteHeader.NAME);
+                               //clonedRequest.removeFirst(RouteHeader.NAME);
                        }
                }

@@ -715,8 +715,29 @@
                if(sipAppSession != null) {
                        sipAppSession.access();
                }
+
+ SipConnector sipConnector = StaticServiceHolder.sipStandardService.findSipConnector(transport);
+
                ClientTransaction ctx = null;
-               try {
+               try {
+                       if(sipConnector != null && 
sipConnector.isUseStaticAddress()) {
+                               javax.sip.address.URI uri = 
clonedRequest.getRequestURI();
+ RouteHeader route = (RouteHeader) clonedRequest.getHeader(RouteHeader.NAME);
+                               if(route != null) {
+                                       uri = route.getAddress().getURI();
+                               }
+                               if(uri.isSipURI()) {
+                                       javax.sip.address.SipURI sipUri = 
(javax.sip.address.SipURI) uri;
+                                       String host = sipUri.getHost();
+                                       int port = sipUri.getPort();
+ if(sipFactoryImpl.getSipApplicationDispatcher().isExternal(host, port, transport)) {
+                                               
viaHeader.setHost(sipConnector.getStaticServerAddress());
+                                               
viaHeader.setPort(sipConnector.getStaticServerPort());
+                                       }
+                               }
+ SipServletRequestImpl.optimizeRouteHeaderAddressForInternalRoutingrequest(sipConnector,
+                                               clonedRequest, sipSession, 
sipFactoryImpl, transport);
+                       }
                        ctx = 
sipProvider.getNewClientTransaction(clonedRequest);
                        
ctx.setRetransmitTimer(sipApplicationDispatcher.getBaseTimerInterval());
((TransactionExt)ctx).setTimerT2(sipApplicationDispatcher.getT2Interval());
@@ -728,7 +749,7 @@
                        ctx.setApplicationData(appData);

                        ctx.sendRequest();
-               } catch (SipException e) {
+               } catch (Exception e) {
logger.error("A problem occured while proxying a request " + request + " in a dialog-stateless transaction", e);
                        JainSipUtils.terminateTransaction(ctx);
                }
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyUtils.java Wed Dec 15 03:04:35 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyUtils.java Fri Dec 17 05:56:48 2010
@@ -138,7 +138,9 @@
// This is needed because otherwise we have the IP LB address here. If there is no route header // this means the request will go to the IP LB. For outbound requests we must bypass the IP LB.
                                        // 
http://code.google.com/p/mobicents/issues/detail?id=2210
- clonedRequest.setRequestURI(((URIImpl)(proxyBranch).getTargetURI()).getURI()); + //clonedRequest.setRequestURI(((URIImpl)(proxyBranch).getTargetURI()).getURI()); + SipServletRequestImpl.optimizeRequestUriHeaderAddressForInternalRoutingrequest(sipConnector, + clonedRequest, originalRequest.getSipSession(), sipFactoryImpl, outboundTransport);
                                        if(logger.isDebugEnabled()){
logger.debug("setting request uri as cloned request has no Route headers and is using static address: " + destination);
                                        }
@@ -163,7 +165,7 @@
final String appName = sipFactoryImpl.getSipApplicationDispatcher().getHashFromApplicationName(sipAppKey.getApplicationName()); final SipServletRequestImpl proxyBranchRequest = (SipServletRequestImpl) proxyBranch.getRequest();
                        //Add via header
-                       ViaHeader viaHeader = proxyBranch.viaHeader;
+                       ViaHeader viaHeader = null;//proxyBranch.viaHeader;
                        if(viaHeader == null) {
                                if(proxy.getOutboundInterface() == null) {
                                        String branchId = null;

Reply via email to