Revision: 16090
Author: vladimir.ralev
Date: Tue Dec 28 18:56:39 2010
Log: Update Issue 2244
Fix + tests
http://code.google.com/p/mobicents/source/detail?r=16090

Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/ExtendedListeningPoint.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.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-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java Mon Dec 20 08:59:45 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java Tue Dec 28 18:56:39 2010
@@ -524,7 +524,7 @@
         * @param transport
         * @return
         */
- public static ContactHeader createContactHeader(SipNetworkInterfaceManager sipNetworkInterfaceManager, Request request, String displayName, String outboundInterface) { + public static ContactHeader createContactHeader(SipNetworkInterfaceManager sipNetworkInterfaceManager, Request request, String displayName, String userName, String outboundInterface) {
                ExtendedListeningPoint listeningPoint = null;
                if(outboundInterface == null) {
                        String transport = findTransport(request);
@@ -540,7 +540,7 @@
                }
                boolean usePublicAddress = findUsePublicAddress(
                                sipNetworkInterfaceManager, request, 
listeningPoint);
-               return listeningPoint.createContactHeader(displayName, 
usePublicAddress);
+ return listeningPoint.createContactHeader(displayName, userName, usePublicAddress);
        }

        /**
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/ExtendedListeningPoint.java Mon Dec 20 13:04:36 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/ExtendedListeningPoint.java Tue Dec 28 18:56:39 2010
@@ -121,11 +121,11 @@
         * @param displayName the display name to use
         * @return the Contact header
         */
- public ContactHeader createContactHeader(String displayName, boolean usePublicAddress) { + public ContactHeader createContactHeader(String displayName, String userName, boolean usePublicAddress) {
                try {
                        // FIXME : the SIP URI can be cached to improve 
performance
                        String host = getIpAddress(usePublicAddress);
- javax.sip.address.SipURI sipURI = SipFactories.addressFactory.createSipURI(null, host); + javax.sip.address.SipURI sipURI = SipFactories.addressFactory.createSipURI(userName, host);
                        sipURI.setHost(host);
                        sipURI.setPort(port);
// Issue 1150 : we assume that if the transport match the default protocol of the transport protocol used it is not added
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java Thu Dec 2 13:36:06 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java Tue Dec 28 18:56:39 2010
@@ -215,6 +215,7 @@
                                //Creating container contact header
                                ContactHeader contactHeader = null;
                                String fromName = null;
+                               String diaplayName = 
newFromHeader.getAddress().getDisplayName();
if(newFromHeader.getAddress().getURI() instanceof javax.sip.address.SipURI) { fromName = ((javax.sip.address.SipURI) newFromHeader.getAddress().getURI()).getUser();
                                }
@@ -227,12 +228,12 @@
                                        
sipURI.setPort(loadBalancerToUse.getSipPort());
                                        
sipURI.setTransportParam(ListeningPoint.UDP);
javax.sip.address.Address contactAddress = SipFactories.addressFactory.createAddress(sipURI);
-                                       if(fromName != null && fromName.length() 
> 0) {
-                                               
contactAddress.setDisplayName(fromName);
+                                       if(diaplayName != null && 
diaplayName.length() > 0) {
+                                               
contactAddress.setDisplayName(diaplayName);
                                        }
contactHeader = SipFactories.headerFactory.createContactHeader(contactAddress);
                                } else {
- contactHeader = JainSipUtils.createContactHeader(sipFactoryImpl.getSipNetworkInterfaceManager(), newRequest, fromName, session.getOutboundInterface()); + contactHeader = JainSipUtils.createContactHeader(sipFactoryImpl.getSipNetworkInterfaceManager(), newRequest, diaplayName, fromName, session.getOutboundInterface());
                                }
                                if(contactHeaderSet.size() > 0) {
// if the set is not empty then we adjust the values of the set to match the host and port + forbidden params of the container
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java Mon Oct 4 08:45:22 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java Tue Dec 28 18:56:39 2010
@@ -519,6 +519,7 @@
                        //Adding default contact header for specific methods 
only
                        
if(JainSipUtils.CONTACT_HEADER_METHODS.contains(method)) {
                                String fromName = null;
+                               String displayName = 
fromHeader.getAddress().getDisplayName();
if(fromHeader.getAddress().getURI() instanceof javax.sip.address.SipURI) { fromName = ((javax.sip.address.SipURI)fromHeader.getAddress().getURI()).getUser();
                                }
@@ -532,12 +533,12 @@
                                        
sipURI.setPort(loadBalancerToUse.getSipPort());
                                        sipURI.setTransportParam(transport);
javax.sip.address.Address contactAddress = SipFactories.addressFactory.createAddress(sipURI);
-                                       if(fromName != null && fromName.length() 
> 0) {
-                                               
contactAddress.setDisplayName(fromName);
+                                       if(displayName != null && 
displayName.length() > 0) {
+                                               
contactAddress.setDisplayName(displayName);
                                        }
contactHeader = SipFactories.headerFactory.createContactHeader(contactAddress);
                                } else {
- contactHeader = JainSipUtils.createContactHeader(getSipNetworkInterfaceManager(), requestToWrap, fromName, null); + contactHeader = JainSipUtils.createContactHeader(getSipNetworkInterfaceManager(), requestToWrap, displayName, fromName, null);
                                }
                        }
                        // Add all headers
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java Mon Dec 20 16:46:43 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java Tue Dec 28 18:56:39 2010
@@ -338,7 +338,7 @@
                                        }
                                    // Add the contact header for the dialog.
                                    ContactHeader contactHeader = 
JainSipUtils.createContactHeader(
- super.sipFactoryImpl.getSipNetworkInterfaceManager(), request, null, outboundInterface); + super.sipFactoryImpl.getSipNetworkInterfaceManager(), request, null, null, outboundInterface);
                                    String transport = "udp";
if(session != null && session.getTransport() != null) transport = session.getTransport(); SipConnector sipConnector = StaticServiceHolder.sipStandardService.findSipConnector(transport);
@@ -1155,12 +1155,13 @@
final FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME); final javax.sip.address.URI fromUri = fromHeader.getAddress().getURI();
                                        String fromName = null;
+                                       String displayName = 
fromHeader.getAddress().getDisplayName();
                                        if(fromUri instanceof 
javax.sip.address.SipURI) {
                                                fromName = 
((javax.sip.address.SipURI)fromUri).getUser();
                                        }
                                        // Create the contact name address.
                                        contactHeader =
- JainSipUtils.createContactHeader(sipNetworkInterfaceManager, request, fromName, session.getOutboundInterface()); + JainSipUtils.createContactHeader(sipNetworkInterfaceManager, request, displayName, fromName, session.getOutboundInterface());
                                        request.addHeader(contactHeader);
                                }

=======================================
--- /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 08:59:45 2010 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java Tue Dec 28 18:56:39 2010
@@ -241,7 +241,7 @@
                                return;
                        }
                } else {
- sipServletRequest = sipFactory.createRequest(sipApplicationSession, method, fromURI, toURI); + sipServletRequest = sipFactory.createRequest(sipApplicationSession, method, sipFactory.createAddress(fromURI, "from display"), sipFactory.createAddress(toURI,"to display"));
                }

String authHeader = ce.getServletContext().getInitParameter("auth-header");
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java Mon Dec 20 10:21:42 2010 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java Tue Dec 28 18:56:39 2010
@@ -429,6 +429,9 @@
                assertTrue(receiver.getByeReceived());
ContactHeader contactHeader = (ContactHeader) receiver.getInviteRequest().getHeader(ContactHeader.NAME); assertFalse(((SipURI)contactHeader.getAddress().getURI()).toString().contains("transport=udp"));
+               String contact = contactHeader.getAddress().toString();
+               assertTrue(contact.contains("BigGuy@"));
+               assertTrue(contact.contains("from display"));
        }

        public void testShootistContactTlsTransport() throws Exception {

Reply via email to