Revision: 15708
Author: [email protected]
Date: Fri Dec 10 09:42:26 2010
Log: Update Issue 2201

Fix + non regression test

Waiting for Testsuite and TCK before calling it fixed.
http://code.google.com/p/mobicents/source/detail?r=15708

Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/simple-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/SimpleSipServlet.java /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootmeSipServletTest.java

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java Tue Dec 7 01:23:43 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java Fri Dec 10 09:42:26 2010
@@ -461,6 +461,7 @@
                        } else {
Parameterable parametrable = createParameterable(first, first.getName());
                                try {
+                                       logger.debug("parametrable Value " + 
parametrable.getValue());
                                        if(this.isCommitted()) {
return new AddressImpl(SipFactories.addressFactory.createAddress(parametrable.getValue()), ((ParameterableHeaderImpl)parametrable).getInternalParameters(), false);
                                        } else {
@@ -1613,9 +1614,23 @@

                Map<String, String> paramMap = new HashMap<String, String>();
                String value = stringHeader;
-
+               String displayName = null;
+ // Issue 2201 : javax.servlet.sip.ServletParseException: Impossible to parse the following header Remote-Party-ID as an address.
+               // Need to handle the display name
+               if(stringHeader.trim().indexOf("\"") == 0) {
+                       String displayNameString = stringHeader.substring(1);
+                       int nextIndexOfDoubleQuote = 
displayNameString.indexOf("\"");
+                       displayName = stringHeader.substring(0, 
nextIndexOfDoubleQuote + 2);
+ stringHeader = stringHeader.substring(nextIndexOfDoubleQuote + 2).trim();
+               }
+
+               boolean hasLaRaQuotes = false;
                if(stringHeader.trim().indexOf("<") == 0) {
+
                        stringHeader = stringHeader.substring(1);
+                       if(stringHeader.indexOf(">") != -1) {
+                               hasLaRaQuotes = true;
+                       }
                        String[] split = stringHeader.split(">");
                        value = split[0];

@@ -1662,6 +1677,16 @@
                                }
                        }
                }
+
+               // quotes are parts of the value as well as the display Name
+               if(hasLaRaQuotes) {
+                       value = "<" + value + ">";
+               }
+
+               // if a display name is present then we need add the quote back
+               if(displayName != null) {
+                       value = displayName.concat(value);
+               }

boolean isNotModifiable = JainSipUtils.SYSTEM_HEADERS.contains(header.getName());
                ParameterableHeaderImpl parameterable = new 
ParameterableHeaderImpl(
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/simple-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/SimpleSipServlet.java Tue Dec 7 01:23:43 2010 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/simple-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/SimpleSipServlet.java Fri Dec 10 09:42:26 2010
@@ -231,6 +231,46 @@
                        }
                }

+               if(fromString.contains("RemotePartyId")) {
+                       Address remotePID = 
request.getAddressHeader("Remote-Party-ID");
+                       Address remotePID2 = 
request.getAddressHeader("Remote-Party-ID2");
+                       Address remotePID3 = 
request.getAddressHeader("Remote-Party-ID3");
+                       Address remotePID4 = 
request.getAddressHeader("Remote-Party-ID4");
+                       Address remotePID5 = 
request.getAddressHeader("Remote-Party-ID5");
+                       boolean sendErrorResponse = false;
+                       logger.info("Remote-Party-ID value is " + remotePID);
+                       logger.info("Remote-Party-ID2 value is " + remotePID2);
+                       logger.info("Remote-Party-ID3 value is " + remotePID3);
+                       logger.info("Remote-Party-ID4 value is " + remotePID4);
+                       logger.info("Remote-Party-ID5 value is " + remotePID5);
+
+ if(!remotePID.toString().trim().equals("\"KATE SMITH\" <sip:[email protected];user=phone>; screen=yes; party=calling; privacy=off")) {
+                               sendErrorResponse = true;
+                               logger.info("Remote-Party-ID Sending Error Response 
");
+                       }
+ if(!remotePID2.toString().trim().equals("sip:[email protected];user=phone; screen=yes; party=calling; privacy=off")) {
+                               sendErrorResponse = true;
+                               logger.info("Remote-Party-ID2 Sending Error Response 
");
+                       }
+ if(!remotePID3.toString().trim().equals("<sip:[email protected];user=phone>; screen=yes; party=calling; privacy=off")) {
+                               sendErrorResponse = true;
+                               logger.info("Remote-Party-ID3 Sending Error Response 
");
+                       }
+ if(!remotePID4.toString().trim().equals("\"KATE SMITH\" <sip:[email protected]>; screen=yes; party=calling; privacy=off")) {
+                               sendErrorResponse = true;
+                               logger.info("Remote-Party-ID4 Sending Error Response 
");
+                       }
+ if(!remotePID5.toString().trim().equals("<sip:[email protected]>; screen=yes; party=calling; privacy=off")) {
+                               sendErrorResponse = true;
+                               logger.info("Remote-Party-ID5 Sending Error Response 
");
+                       }
+                       if(sendErrorResponse) {
+ SipServletResponse sipServletResponse = request.createResponse(SipServletResponse.SC_SERVER_INTERNAL_ERROR);
+                               sipServletResponse.send();
+                               return;
+                       }
+               }
+
                request.getAddressHeader(TEST_NON_EXISTING_HEADER);
                request.getHeader(TEST_NON_EXISTING_HEADER);
                request.getHeaders(TEST_NON_EXISTING_HEADER);
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootmeSipServletTest.java Thu Nov 18 01:08:56 2010 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootmeSipServletTest.java Fri Dec 10 09:42:26 2010
@@ -297,6 +297,26 @@
                assertTrue(sender.isAckSent());
                assertTrue(sender.getOkToByeReceived());
        }
+
+       /**
+ * Non Regression Test for Issue http://code.google.com/p/mobicents/issues/detail?id=2201 + * javax.servlet.sip.ServletParseException: Impossible to parse the following header Remote-Party-ID as an address.
+        */
+ public void testShootmeRemotePartyID() throws InterruptedException, SipException, ParseException, InvalidArgumentException {
+               String fromName = "RemotePartyId";
+               String fromSipAddress = "sip-servlets.com";
+               SipURI fromAddress = 
senderProtocolObjects.addressFactory.createSipURI(
+                               fromName, fromSipAddress);
+
+               String toUser = "receiver";
+               String toSipAddress = "sip-servlets.com";
+               SipURI toAddress = 
senderProtocolObjects.addressFactory.createSipURI(
+                               toUser, toSipAddress);
+ sender.sendSipRequest("INVITE", fromAddress, toAddress, null, null, false, new String[] {"Remote-Party-ID", "Remote-Party-ID2", "Remote-Party-ID3", "Remote-Party-ID4", "Remote-Party-ID5"}, new String[] {"\"KATE SMITH\"<sip:[email protected];user=phone>; party=calling; privacy=off; screen=yes", "sip:[email protected];user=phone; party=calling; privacy=off; screen=yes", "<sip:[email protected];user=phone>; party=calling; privacy=off; screen=yes", "\"KATE SMITH\"<sip:[email protected]>; party=calling; privacy=off; screen=yes", "<sip:[email protected]>; party=calling; privacy=off; screen=yes"}, true);
+               Thread.sleep(TIMEOUT);
+               assertTrue(sender.isAckSent());
+               assertTrue(sender.getOkToByeReceived());
+       }

        public void testShootmeRegister() throws Exception {
                String fromName = "sender";

Reply via email to