Revision: 15885
Author: [email protected]
Date: Mon Dec 20 06:05:51 2010
Log: Update Issue 2066

Refactoring to cope with Issue 2225

The flag is specified now at the session level to cope with container generated responses and B2BUA apps that could use createResponseToOriginalRequest method
http://code.google.com/p/mobicents/source/detail?r=15885

Modified:
/trunk/servers/sip-servlets/sip-servlets-client/src/main/java/org/mobicents/javax/servlet/sip/SipServletRequestExt.java /trunk/servers/sip-servlets/sip-servlets-client/src/main/java/org/mobicents/javax/servlet/sip/SipSessionExt.java /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/core/dispatchers/SubsequentRequestDispatcher.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/MobicentsSipSessionFacade.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-client/src/main/java/org/mobicents/javax/servlet/sip/SipServletRequestExt.java Fri Dec 10 08:22:25 2010 +++ /trunk/servers/sip-servlets/sip-servlets-client/src/main/java/org/mobicents/javax/servlet/sip/SipServletRequestExt.java Mon Dec 20 06:05:51 2010
@@ -22,7 +22,6 @@
 package org.mobicents.javax.servlet.sip;

 import javax.servlet.sip.SipServletRequest;
-import javax.servlet.sip.SipServletResponse;


 /**
@@ -31,8 +30,7 @@
  *
  * <ul>
  *             <li>
- * Allows for applications to copy the record route headers on the responses to subsequent INVITE requests - * where the dialog route set shouldn't normally be changed to cope with non compliant RFC 3261 servers.
+ *
  *             </li>
  * </ul>
  *
@@ -40,15 +38,5 @@
  * @since 1.5
  */
 public interface SipServletRequestExt extends SipServletRequest {
-       /**
- * Creates a response for this request with the specified status code and reason phrase.
-        * @param statusCode the status code for the response
-        * @param reasonPhrase reason phrase to appear in response line
- * @param copyRecordRouteHeaders whether or not to copy the record route headers on the response to a subsequent INVITE request - * @return response object with specified status code and reason phrase and eventually the record route from the request copied in the response
-        *
- * @throws IllegalArgumentException if the statuscode is not a valid SIP status code - * @throws IllegalStateException if this request has already been responded to with a final status code
-        */
- SipServletResponse createResponse(int statusCode, String reasonPhrase, boolean copyRecordRouteHeaders);
-}
+
+}
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-client/src/main/java/org/mobicents/javax/servlet/sip/SipSessionExt.java Wed Aug 18 09:41:22 2010 +++ /trunk/servers/sip-servlets/sip-servlets-client/src/main/java/org/mobicents/javax/servlet/sip/SipSessionExt.java Mon Dec 20 06:05:51 2010
@@ -34,6 +34,10 @@
  *             <li>
* Allows for applications to schedule work asynchronously against a SipSession in a thread-safe manner if used in conjunction with the Mobicents Concurrency Control Mechanism
  *             </li>
+ *             <li>
+ * Allows for applications to copy the record route headers on the responses to subsequent INVITE requests + * where the dialog route set shouldn't normally be changed to cope with non compliant RFC 3261 servers.
+ *             </li>
  * </ul>
  *
  * Here is some sample code to show how the asynchronous work can be used :
@@ -95,4 +99,18 @@
         * @param work the work to be performed on this SipSession.
         */
     void scheduleAsynchronousWork(SipSessionAsynchronousWork work);
-}
+    /**
+ * Allows for applications to copy the record route headers on the responses to subsequent INVITE requests + * where the dialog route set shouldn't normally be changed to cope with non compliant RFC 3261 servers.
+     *
+ * @param copyRecordRouteHeadersOnSubsequentResponses false by default, if true will exhibit the behavior described above
+     */
+ void setCopyRecordRouteHeadersOnSubsequentResponses(boolean copyRecordRouteHeadersOnSubsequentResponses);
+    /**
+ * Allows for applications to copy the record route headers on the responses to subsequent INVITE requests + * where the dialog route set shouldn't normally be changed to cope with non compliant RFC 3261 servers.
+     *
+ * @param copyRecordRouteHeadersOnSubsequentResponses true if the session currently exhibit the behavior described above
+     */
+    boolean getCopyRecordRouteHeadersOnSubsequentResponses();
+}
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Fri Dec 17 05:56:48 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Mon Dec 20 06:05:51 2010
@@ -1071,7 +1071,7 @@
                                                                                
}
SipServletRequestImpl sipServletRequestImpl = (SipServletRequestImpl) sipServletMessage;
                                                                                
sipServletMessage.setTransaction(transaction);
- SipServletResponseImpl response = (SipServletResponseImpl) sipServletRequestImpl.createResponse(408, null, false, false); + SipServletResponseImpl response = (SipServletResponseImpl) sipServletRequestImpl.createResponse(408, null, false);
                                                                                
// Fix for Issue 1734
                                                                                
sipServletRequestImpl.setResponse(response);

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/SubsequentRequestDispatcher.java Wed Dec 15 09:53:03 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/SubsequentRequestDispatcher.java Mon Dec 20 06:05:51 2010
@@ -264,7 +264,7 @@
                                        
sipServletRequest.createResponse(491).send();
                                        return;
                                } catch (IOException e) {
-                                       logger.error("Problem sending 491 
response");
+ logger.error("Problem sending 491 response to " + sipServletRequest, e);
                                }
                        }
                        
sipSession.setRequestsPending(sipSession.getRequestsPending() + 1);
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java Mon Dec 6 04:58:44 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java Mon Dec 20 06:05:51 2010
@@ -256,6 +256,9 @@
//original transaction that started this session is stored so that we know if the session should end when all subscriptions have terminated or when the BYE has come
        protected transient String originalMethod = null;
        protected transient boolean okToByeSentOrReceived = false;
+ // Issue 2066 Miss Record-Route in Response To Subsequent Requests for non RFC3261 compliant servers + protected transient boolean copyRecordRouteHeadersOnSubsequentResponses = false;
+
        protected transient Semaphore semaphore;

        protected transient MobicentsSipSessionFacade facade = null;
@@ -2084,4 +2087,20 @@
                if(requests < 0) requests = 0;
                requestsPending = requests;
        }
-}
+
+       /*
+        * (non-Javadoc)
+ * @see org.mobicents.javax.servlet.sip.SipSessionExt#setCopyRecordRouteHeadersOnSubsequentResponses(boolean)
+        */
+       public void setCopyRecordRouteHeadersOnSubsequentResponses(
+                       boolean copyRecordRouteHeadersOnSubsequentResponses) {
+ this.copyRecordRouteHeadersOnSubsequentResponses = copyRecordRouteHeadersOnSubsequentResponses;
+       }
+       /*
+        * (non-Javadoc)
+ * @see org.mobicents.javax.servlet.sip.SipSessionExt#getCopyRecordRouteHeadersOnSubsequentResponses()
+        */
+       public boolean getCopyRecordRouteHeadersOnSubsequentResponses() {
+               return copyRecordRouteHeadersOnSubsequentResponses;
+       }
+}
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/MobicentsSipSessionFacade.java Fri Nov 26 06:48:23 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/MobicentsSipSessionFacade.java Mon Dec 20 06:05:51 2010
@@ -460,5 +460,14 @@
        public void notifySipSessionListeners(SipSessionEventType creation) {
                sipSession.notifySipSessionListeners(creation);
        }
+
+       public void setCopyRecordRouteHeadersOnSubsequentResponses(
+                       boolean copyRecordRouteHeadersOnSubsequentResponses) {
+ sipSession.setCopyRecordRouteHeadersOnSubsequentResponses(copyRecordRouteHeadersOnSubsequentResponses);
+       }
+
+       public boolean getCopyRecordRouteHeadersOnSubsequentResponses() {
+               return 
sipSession.getCopyRecordRouteHeadersOnSubsequentResponses();
+       }

 }
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java Fri Dec 17 05:56:48 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java Mon Dec 20 06:05:51 2010
@@ -256,7 +256,7 @@
         * @see javax.servlet.sip.SipServletRequest#createResponse(int)
         */
        public SipServletResponse createResponse(int statusCode) {
-               return createResponse(statusCode, null, false, true);
+               return createResponse(statusCode, null, true);
        }

        /*
@@ -264,18 +264,10 @@
* @see javax.servlet.sip.SipServletRequest#createResponse(int, java.lang.String)
         */
public SipServletResponse createResponse(final int statusCode, final String reasonPhrase) {
-               return createResponse(statusCode, reasonPhrase, false, true);
-       }
-
-       /*
-        * (non-Javadoc)
- * @see org.mobicents.javax.servlet.sip.SipServletRequestExt#createResponse(int, java.lang.String, boolean)
-        */
- public SipServletResponse createResponse(final int statusCode, final String reasonPhrase, boolean copyRecordRouteHeaders) { - return createResponse(statusCode, reasonPhrase, copyRecordRouteHeaders, true);
-       }
-
- public SipServletResponse createResponse(final int statusCode, final String reasonPhrase, boolean copyRecordRouteHeaders, boolean validate) {
+               return createResponse(statusCode, reasonPhrase, true);
+       }
+
+ public SipServletResponse createResponse(final int statusCode, final String reasonPhrase, boolean validate) {
                checkReadOnly();
                final Transaction transaction = getTransaction();
                if(RoutingState.CANCELLED.equals(routingState)) {
@@ -374,7 +366,7 @@
 //                             response.addHeader(routeHeader);
 //                     }

- if(copyRecordRouteHeaders && !isInitial() && requestMethod.equals(Request.INVITE)) { + if(session.getCopyRecordRouteHeadersOnSubsequentResponses() && !isInitial() && requestMethod.equals(Request.INVITE)) { // Miss Record-Route in Response for non compliant Server in reINVITE http://code.google.com/p/mobicents/issues/detail?id=2066 final ListIterator<RecordRouteHeader> recordRouteHeaders = request.getHeaders(RecordRouteHeader.NAME);
                                while (recordRouteHeaders.hasNext()) {
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java Fri Dec 10 08:22:25 2010 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java Mon Dec 20 06:05:51 2010
@@ -145,7 +145,8 @@
                        return;
                }
                
if(req.getTo().getURI().toString().contains("recordrouteeinvite"))  {
-                       ((SipServletRequestExt) req).createResponse(200, null, 
true).send();
+ ((SipSessionExt)req.getSession()).setCopyRecordRouteHeadersOnSubsequentResponses(true);
+                       req.createResponse(200).send();
                        return;
                }
if(!requestURIStringified.startsWith("sip:[email protected];org.mobicents.servlet.sip.ApplicationSessionKey=%28") && !requestURIStringified.endsWith("%3Aorg.mobicents.servlet.sip.testsuite.ShootistApplication%29")) {

Reply via email to