# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1278416394 -10800
# Node ID a858c2cf6a45d56ccfab11fa26a8252348868705
# Parent  3c8db403127f0bb4969eb4cd3b9f2a6f3c4b8f6c
Revision: 201025
Kit: 2010127

diff -r 3c8db403127f -r a858c2cf6a45 realtimenetprots/rtp/cfrtp/src/rtpflowfactory.cpp
--- a/realtimenetprots/rtp/cfrtp/src/rtpflowfactory.cpp	Wed Jun 23 18:36:31 2010 +0300
+++ b/realtimenetprots/rtp/cfrtp/src/rtpflowfactory.cpp	Tue Jul 06 14:39:54 2010 +0300
@@ -96,7 +96,7 @@
              protocolDescription->iServiceInfo     = KSIConnectionLess | KSIDatagram |
                                      KSIGracefulClose | KSIPeekData |
                                      KSIRequiresOwnerInfo;
-             protocolDescription->iNamingServices      = KNSNameResolution | KNSRequiresConnectionStartup;
+             protocolDescription->iNamingServices      = 0;
              protocolDescription->iSecurity    = KSocketNoSecurity;
              protocolDescription->iMessageSize     = 65536-128; /*KSocketMessageSizeUndefined;*/
              protocolDescription->iServiceTypeInfo  = ESocketSupport | ETransport |
@@ -116,7 +116,7 @@
              protocolDescription->iServiceInfo     = KSIConnectionLess | KSIDatagram |
                                      KSIGracefulClose | KSIPeekData |
                                      KSIRequiresOwnerInfo;
-             protocolDescription->iNamingServices      = KNSNameResolution | KNSRequiresConnectionStartup;
+             protocolDescription->iNamingServices      = 0;
              protocolDescription->iSecurity    = KSocketNoSecurity;
              protocolDescription->iMessageSize     = 65536-128; /*KSocketMessageSizeUndefined;*/
              protocolDescription->iServiceTypeInfo  = ESocketSupport | ETransport |
diff -r 3c8db403127f -r a858c2cf6a45 realtimenetprots/sipfw/SIP/ConnectionMgr/src/CReceiverTcp.cpp
--- a/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CReceiverTcp.cpp	Wed Jun 23 18:36:31 2010 +0300
+++ b/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CReceiverTcp.cpp	Tue Jul 06 14:39:54 2010 +0300
@@ -149,8 +149,8 @@
 		iContext.SocketContainer().CancelRecv();
 		}
 	else
-		{
-		iContext.SocketContainer().Socket().CancelAll();
+		{        
+		iContext.SocketContainer().CancelAll();        
 		}
 	RemoveReceived();
 	}
diff -r 3c8db403127f -r a858c2cf6a45 realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSecureSocketContainer.cpp
--- a/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSecureSocketContainer.cpp	Wed Jun 23 18:36:31 2010 +0300
+++ b/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSecureSocketContainer.cpp	Tue Jul 06 14:39:54 2010 +0300
@@ -237,5 +237,21 @@
     CSocketContainer( aSocket )
     {
     }
-    
+
+// -----------------------------------------------------------------------------
+// CSecureSocketContainer::CancelAll
+// -----------------------------------------------------------------------------
+// 
+void CSecureSocketContainer::CancelAll()
+    {
+    if ( HasSecureSocket() )
+        {        
+        iSecureSocket->CancelAll();
+        }
+    else
+        {
+        CSocketContainer::CancelAll();
+        }
+    }
+
 // End of file
diff -r 3c8db403127f -r a858c2cf6a45 realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSecureSocketContainer.h
--- a/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSecureSocketContainer.h	Wed Jun 23 18:36:31 2010 +0300
+++ b/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSecureSocketContainer.h	Tue Jul 06 14:39:54 2010 +0300
@@ -66,6 +66,8 @@
         
         void CancelConnect();
         
+        void CancelAll();
+        
         void RemoteName( TSockAddr& aAddr );
         
         TInt SetOpt( TUint aOptionName, TUint aOptionLevel, const TDesC8& aOption );
diff -r 3c8db403127f -r a858c2cf6a45 realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSocketContainer.cpp
--- a/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSocketContainer.cpp	Wed Jun 23 18:36:31 2010 +0300
+++ b/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSocketContainer.cpp	Tue Jul 06 14:39:54 2010 +0300
@@ -192,5 +192,14 @@
 CSocketContainer::CSocketContainer( RSocket& aSocket ) : iSocket( aSocket )
     {
     }
-    
+
+// -----------------------------------------------------------------------------
+// CSocketContainer::CancelAll
+// -----------------------------------------------------------------------------
+//                             
+void CSocketContainer::CancelAll()
+    {
+    iSocket.CancelAll();
+    }
+
 // End of file
diff -r 3c8db403127f -r a858c2cf6a45 realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSocketContainer.h
--- a/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSocketContainer.h	Wed Jun 23 18:36:31 2010 +0300
+++ b/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSocketContainer.h	Tue Jul 06 14:39:54 2010 +0300
@@ -72,6 +72,8 @@
         
         virtual void CancelConnect();
         
+        virtual void CancelAll();
+        
         virtual void RemoteName( TSockAddr& aAddr );
         
         virtual TInt SetOpt( TUint aOptionName, 
diff -r 3c8db403127f -r a858c2cf6a45 realtimenetprots/sipfw/SIP/ConnectionMgr/src/CTransport.cpp
--- a/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CTransport.cpp	Wed Jun 23 18:36:31 2010 +0300
+++ b/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CTransport.cpp	Tue Jul 06 14:39:54 2010 +0300
@@ -1455,39 +1455,44 @@
                 RStringF transportParam =
                     uri.SIPURI()->ParamValue(
                         SIPStrings::StringF( SipStrConsts::ETransport ) );
-
-                if ( Protocol() == KProtocolTls )
+                
+                RStringF tls = SIPStrings::StringF( SipStrConsts::ETLS ); 
+                //If the Contact header has parameter transport=tls, remove it
+                //as it is deprecated in RFC 3261
+                if(transportParam == tls)
+                    {
+                    uri.SIPURI()->DeleteParam(SIPStrings::StringF( SipStrConsts::ETransport ));
+                    }
+                
+                //If the message is CSIPRequest, make sure its scheme is as per From Header.
+                //So if the FROM header is SIPS, Contact header is SIPS, if FROM header is SIP,
+                //Contact header scheme is sip
+                if(aMessage->IsRequest())
                     {
-                    RStringF tls = SIPStrings::StringF( SipStrConsts::ETLS );
-                    // SIP Scheme in Contact header should be same as From Header
-                    CURIContainer& FromUri = (((aMessage->From())->SIPAddress()).URI());
-                    if(FromUri.IsSIPURI())
-                        {
-                        CSIPURI* FromSIPUri =FromUri.SIPURI();
-                        if(FromSIPUri->IsSIPSURI())
+                    if ( Protocol() == KProtocolTls )
+                        {                       
+                        CURIContainer& FromUri = (((aMessage->From())->SIPAddress()).URI());
+                        if(FromUri.IsSIPURI())
                             {
-                            uri.SIPURI()->SetSIPS( ETrue );
-                            }
-                        else
-                            {
-                            uri.SIPURI()->SetSIPS( EFalse );
+                            CSIPURI* FromSIPUri =FromUri.SIPURI();
+                            if(FromSIPUri->IsSIPSURI())
+                                {                                
+                                uri.SIPURI()->SetSIPS( ETrue );
+                                }
+                            else
+                                {
+                                uri.SIPURI()->SetSIPS( EFalse );
+                                }
                             }
-                        }                    
-                    if(transportParam == tls)
+                        }
+                    else
                         {
-                        //uri.SIPURI()->SetSIPS(EFalse);
-                        //Delete the param transport=tls from the URI as it is deprecated in RFC 3261
-                        uri.SIPURI()->DeleteParam(SIPStrings::StringF( SipStrConsts::ETransport ));
+                        uri.SIPURI()->SetSIPS( EFalse );
                         }
-                    }
-                else
-                    {
-                    uri.SIPURI()->SetSIPS( EFalse );
-                    }
-			    }
-			}
-		}    
-        
+                    } //end if (aMessage->IsRequest)                
+			    } //end if (uri.IsSIPURI())
+			} //end if(sipaddr)
+		} //end while    
     }
 
 // -----------------------------------------------------------------------------