master moved from 86962ad1ff47 to 27350073d9e4

3 new revisions:

Revision: 25e5d7f78e16
Author:   Jean Deruelle <[email protected]>
Date:     Fri May  2 20:08:14 2014 UTC
Log:      Fixes Issue 269...
http://code.google.com/p/sipservlets/source/detail?r=25e5d7f78e16

Revision: dad7fb89dfe8
Author:   Jean Deruelle <[email protected]>
Date:     Fri May  2 20:23:20 2014 UTC
Log:      Fixes Issue 246
http://code.google.com/p/sipservlets/source/detail?r=dad7fb89dfe8

Revision: 27350073d9e4
Author:   Jean Deruelle <[email protected]>
Date:     Fri May  2 21:00:34 2014 UTC
Log:      Update Issue 245...
http://code.google.com/p/sipservlets/source/detail?r=27350073d9e4

==============================================================================
Revision: 25e5d7f78e16
Author:   Jean Deruelle <[email protected]>
Date:     Fri May  2 20:08:14 2014 UTC
Log:      Fixes Issue 269

(cherry picked from commit a52ee90242334c59ac911d62a7ae820201e93b4e)

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

Modified:
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java

=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java Thu Apr 17 20:06:02 2014 UTC +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java Fri May 2 20:08:14 2014 UTC
@@ -45,6 +45,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.UUID;

 import javax.sip.InvalidArgumentException;
 import javax.sip.ListeningPoint;
@@ -538,7 +539,8 @@
         * @return
         */
        public static String createBranch(String appSessionId, String appname) {
- return createBranch(appSessionId, appname, Long.toString(System.nanoTime()));
+           // https://code.google.com/p/sipservlets/issues/detail?id=269
+               return createBranch(appSessionId, appname, 
UUID.randomUUID().toString());
     }

public static String createBranch(String appSessionId, String appname, String random) {

==============================================================================
Revision: dad7fb89dfe8
Author:   Jean Deruelle <[email protected]>
Date:     Fri May  2 20:23:20 2014 UTC
Log:      Fixes Issue 246

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

Modified:
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java /containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java

=======================================
--- /containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Wed Apr 23 16:53:22 2014 UTC +++ /containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Fri May 2 20:23:20 2014 UTC
@@ -1302,6 +1302,9 @@
                                                                                
        // reload the outbound interfaces if they have changed
this.getServletContext().setAttribute(javax.servlet.sip.SipServlet.OUTBOUND_INTERFACES,
                                                                                
                        sipApplicationDispatcher.getOutboundInterfaces());
+                                                                               
        // https://code.google.com/p/sipservlets/issues/detail?id=246
+ this.getServletContext().setAttribute("org.mobicents.servlet.sip.SIP_CONNECTORS", + sipApplicationDispatcher.getSipService().findSipConnectors());

List<SipConnectorListener> sipConnectorListeners = sipListeners.getSipConnectorListeners();
                                                                                
        if(logger.isDebugEnabled()) {
@@ -1316,6 +1319,9 @@
                                                                                
        // reload the outbound interfaces if they have changed
this.getServletContext().setAttribute(javax.servlet.sip.SipServlet.OUTBOUND_INTERFACES,
                                                                                
                        sipApplicationDispatcher.getOutboundInterfaces());
+                                                                               
        // https://code.google.com/p/sipservlets/issues/detail?id=246
+ this.getServletContext().setAttribute("org.mobicents.servlet.sip.SIP_CONNECTORS", + sipApplicationDispatcher.getSipService().findSipConnectors());

List<SipConnectorListener> sipConnectorListeners = sipListeners.getSipConnectorListeners();
                                                                                
        if(logger.isDebugEnabled()) {
=======================================
--- /containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Wed Apr 23 16:53:22 2014 UTC +++ /containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Fri May 2 20:23:20 2014 UTC
@@ -1158,7 +1158,10 @@
                                                                        case 
SIP_CONNECTOR_ADDED : {
                                                                                
// reload the outbound interfaces if they have changed
this.getServletContext().setAttribute(javax.servlet.sip.SipServlet.OUTBOUND_INTERFACES,
-                                                                               
                sipApplicationDispatcher.getOutboundInterfaces());
+                                                                               
                sipApplicationDispatcher.getOutboundInterfaces());
+                                                                               
// https://code.google.com/p/sipservlets/issues/detail?id=246
+ this.getServletContext().setAttribute("org.mobicents.servlet.sip.SIP_CONNECTORS", + sipApplicationDispatcher.getSipService().findSipConnectors());

List<SipConnectorListener> sipConnectorListeners = sipListeners.getSipConnectorListeners();
                                                                                
if(logger.isDebugEnabled()) {
@@ -1172,7 +1175,10 @@
                                                                        case 
SIP_CONNECTOR_REMOVED : {
                                                                                
// reload the outbound interfaces if they have changed
this.getServletContext().setAttribute(javax.servlet.sip.SipServlet.OUTBOUND_INTERFACES,
-                                                                               
                sipApplicationDispatcher.getOutboundInterfaces());
+                                                                               
                sipApplicationDispatcher.getOutboundInterfaces());
+                                                                               
// https://code.google.com/p/sipservlets/issues/detail?id=246
+ this.getServletContext().setAttribute("org.mobicents.servlet.sip.SIP_CONNECTORS", + sipApplicationDispatcher.getSipService().findSipConnectors());

List<SipConnectorListener> sipConnectorListeners = sipListeners.getSipConnectorListeners();
                                                                                
if(logger.isDebugEnabled()) {

==============================================================================
Revision: 27350073d9e4
Author:   Jean Deruelle <[email protected]>
Date:     Fri May  2 21:00:34 2014 UTC
Log:      Update Issue 245

Fix + non regression test

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

Modified:
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java /sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java

=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java Tue Apr 29 16:48:24 2014 UTC +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java Fri May 2 21:00:34 2014 UTC
@@ -808,8 +808,13 @@
        public Address getFrom() {
                FromHeader from = (FromHeader) this.message
                                
.getHeader(getCorrectHeaderName(FromHeader.NAME));
- AddressImpl address = new AddressImpl(from.getAddress(), AddressImpl.getParameters((Parameters)from), ModifiableRule.From);
-               return address;
+// AddressImpl address = new AddressImpl(from.getAddress(), AddressImpl.getParameters((Parameters)from), ModifiableRule.From);
+               // https://code.google.com/p/sipservlets/issues/detail?id=245
+        try {
+            return new AddressImpl(from, ModifiableRule.From);
+        } catch (ParseException e) {
+ throw new IllegalArgumentException("Couldn't parse From Header " + from, e);
+        }
        }

        /*
@@ -1136,7 +1141,13 @@
        public Address getTo() {
                ToHeader to = (ToHeader) this.message
                        .getHeader(getCorrectHeaderName(ToHeader.NAME));
- return new AddressImpl(to.getAddress(), AddressImpl.getParameters((Parameters)to), ModifiableRule.To); + // return new AddressImpl(to.getAddress(), AddressImpl.getParameters((Parameters)to), ModifiableRule.To);
+               // https://code.google.com/p/sipservlets/issues/detail?id=245
+               try {
+            return new AddressImpl(to, ModifiableRule.From);
+        } catch (ParseException e) {
+ throw new IllegalArgumentException("Couldn't parse From Header " + to, e);
+        }
        }

        /*
=======================================
--- /sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java Fri May 2 16:09:44 2014 UTC +++ /sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java Fri May 2 21:00:34 2014 UTC
@@ -550,6 +550,24 @@
throw new IllegalStateException("couldn't set the content", e);
                 }
                        }
+ if(ce.getServletContext().getInitParameter("testAddressParam") != null) {
+                           // 
https://code.google.com/p/sipservlets/issues/detail?id=245
+                try {
+ sipServletRequest.getFrom().setDisplayName("Test name"); + sipServletRequest.getFrom().setParameter("epid", "00112233"); + sipServletRequest.getTo().setParameter("epid", "33221100");
+
+ Address address = sipFactory.createAddress(sipFactory.createURI("sip:[email protected]"));
+                           address.setParameter("epid", "bzz");
+ sipServletRequest.addAddressHeader("TestAddress", address, true);
+
+                           logger.info("testAddressParam Test Address" + 
address);
+                           logger.info("request " + sipServletRequest);
+                } catch (ServletParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                       }
                        try {
                                sipServletRequest.send();
                        } catch (IOException e) {
=======================================
--- /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java Fri May 2 16:09:44 2014 UTC +++ /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java Fri May 2 21:00:34 2014 UTC
@@ -19,6 +19,8 @@

 package org.mobicents.servlet.sip.testsuite.simple;

+import gov.nist.javax.sip.message.MessageExt;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -1023,6 +1025,26 @@
         }
         assertEquals(2, i);
     }
+
+    /*
+     * https://code.google.com/p/sipservlets/issues/detail?id=245
+     */
+    public void testShootistAddressParam() throws Exception {
+//      receiver.sendInvite();
+        receiverProtocolObjects =new ProtocolObjects(
+ "sender", "gov.nist", TRANSPORT, AUTODIALOG, null, null, null);
+
+ receiver = new TestSipListener(5080, 5070, receiverProtocolObjects, false);
+        SipProvider receiverProvider = receiver.createProvider();
+        receiverProvider.addSipListener(receiver);
+        receiverProtocolObjects.start();
+        tomcat.startTomcat();
+        deployApplication("testAddressParam", "true");
+        Thread.sleep(TIMEOUT);
+        assertTrue(receiver.getByeReceived());
+ assertEquals("00112233", ((MessageExt)receiver.getInviteRequest()).getFromHeader().getParameter("epid")); + assertEquals("33221100", ((MessageExt)receiver.getInviteRequest()).getToHeader().getParameter("epid"));
+    }

        @Override
        @After

--

--- You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to