--- a/realtimenetprots/rtp/shimrtp/bwins/rtpmu.def Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/rtp/shimrtp/bwins/rtpmu.def Wed Oct 13 14:57:13 2010 +0300
@@ -112,5 +112,4 @@
?SetPrePostProcessingRegisterCallback@RRtpSession_Internal@@QAEXPAVMPrePostProcessingCallback@@@Z @ 111 NONAME ; void RRtpSession_Internal::SetPrePostProcessingRegisterCallback(class MPrePostProcessingCallback *)
?RtcpStatistics@RRtpSession_Internal@@QAEHKAAVTRtcpStatistics@@@Z @ 112 NONAME ; int RRtpSession_Internal::RtcpStatistics(unsigned long, class TRtcpStatistics &)
?Close@RRtpSendPacket@@QAEXXZ @ 113 NONAME ; void RRtpSendPacket::Close(void)
- ?SenderSSRC@RRtcpRRItem@@QBEIXZ @ 114 NONAME ; unsigned int RRtcpRRItem::SenderSSRC(void) const
--- a/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/inc/sipalrmonitor.h Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/inc/sipalrmonitor.h Wed Oct 13 14:57:13 2010 +0300
@@ -64,48 +64,48 @@
* Starts to monitor IAP availability for the SNAP.
* The observer will be informed asynchronouysly
* when any IAP is available for the monitored SNAP.
- * @param aConfigData SNAP Data to identify the correct SNAP Monitor.
+ * @param aSnapId SNAP id
* @param aObserver observer to be informed when an IAP becomes available
*/
- void MonitorSnapL( TSipSNAPConfigurationData & aConfigData,
- MSipAlrObserver& aObserver);
+ void MonitorSnapL( TUint32 aSnapId,
+ MSipAlrObserver& aObserver );
/**
* Refreshes the IAP availability for the SNAP.
* Scans the available IAPs for the SNAP and informs all the observers
* if a better IAP than the current one is available.
- * @param aConfigData SNAP Data to identify the correct SNAP Monitor.
+ * @param aSnapId SNAP id
*/
- void RefreshIapAvailabilityL( TSipSNAPConfigurationData & aConfigData );
+ void RefreshIapAvailabilityL( TUint32 aSnapId );
/**
* Allows migration to a new IAP for the SNAP.
- * @param aConfigData SNAP Data to identify the correct SNAP Monitor.
+ * @param aSnapId SNAP id
* @return KErrNone on success, otherwise a system wide error code.
*/
- TInt AllowMigration( TSipSNAPConfigurationData & aConfigData );
+ TInt AllowMigration( TUint32 aSnapId );
/**
* Disallows migration to a new IAP for the SNAP.
- * @param aConfigData SNAP Data to identify the correct SNAP Monitor.
+ * @param aSnapId SNAP id
* @return KErrNone on success, otherwise a system wide error code.
*/
- TInt DisallowMigration( TSipSNAPConfigurationData & aConfigData );
+ TInt DisallowMigration( TUint32 aSnapId );
/**
* The migration has succeeded and the new IAP has been taken into use.
- * @param aConfigData SNAP Data to identify the correct SNAP Monitor.
+ * @param aSnapId SNAP id
* @return KErrNone on success, otherwise a system wide error code.
*/
- TInt NewIapAccepted( TSipSNAPConfigurationData & aConfigData );
+ TInt NewIapAccepted( TUint32 aSnapId );
/**
* The migration has failed and the new IAP was not taken into use.
- * @param aConfigData SNAP Data to identify the correct SNAP Monitor.
+ * @param aSnapId SNAP id
* @return KErrNone on success, otherwise a system wide error code.
*/
- TInt NewIapRejected( TSipSNAPConfigurationData & aConfigData );
+ TInt NewIapRejected( TUint32 aSnapId );
/**
* Frees all the resources reserved for the observer.
@@ -122,9 +122,8 @@
private: // New functions
- CSipAlrSnapMonitor* FindSnapMonitor( TSipSNAPConfigurationData & aConfigData);
-
-
+ CSipAlrSnapMonitor* FindSnapMonitor( TUint32 aSnapId );
+
private: // Data
// Used for monitoring SNAP availability
--- a/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/inc/sipalrobserver.h Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/inc/sipalrobserver.h Wed Oct 13 14:57:13 2010 +0300
@@ -82,22 +82,4 @@
};
-// CLASS DECLARATION
-/**
-* This is the class that encapsulates all snap specific data.
-*/
-
-class TSipSNAPConfigurationData
- {
-public:
-
- TSipSNAPConfigurationData(TUint32 aSnapId , TUint32 aBearerId)
- {
- iSnapId = aSnapId;
- iBearerId = aBearerId;
- };
-
- TUint32 iSnapId;
- TBool iBearerId;
- };
#endif // MSIPALROBSERVER_H
--- a/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/inc/sipalrsnapmonitor.h Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/inc/sipalrsnapmonitor.h Wed Oct 13 14:57:13 2010 +0300
@@ -34,7 +34,6 @@
#include <e32base.h>
#include <in_sock.h>
#include <connpref.h>
-#include <extendedconnpref.h>
#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
#include <comms-infras/es_mobility_apiext.h>
@@ -57,10 +56,10 @@
public: // Constructors and destructor
static CSipAlrSnapMonitor* NewLC(
- TSipSNAPConfigurationData aSnapData,
+ TUint32 aSnapId,
MSipAlrObserver& aObserver,
RSocketServ& aSocketServer,
- CSipSystemStateMonitor& aSystemStateMonitor);
+ CSipSystemStateMonitor& aSystemStateMonitor );
~CSipAlrSnapMonitor();
@@ -109,9 +108,7 @@
void NewIapAccepted();
- void NewIapRejected();
-
- TBool BearerId();
+ void NewIapRejected();
private: // New functions
@@ -137,9 +134,9 @@
private: // Constructors
CSipAlrSnapMonitor(
- TSipSNAPConfigurationData aSnapData,
+ TUint32 aSnapId,
RSocketServ& aSocketServer,
- CSipSystemStateMonitor& aSystemStateMonitor);
+ CSipSystemStateMonitor& aSystemStateMonitor );
void ConstructL(
MSipAlrObserver& aObserver );
@@ -155,7 +152,7 @@
private: // Data
- TSipSNAPConfigurationData iSnapData;
+ TUint32 iSnapId;
RSocketServ& iSocketServer;
CSipSystemStateMonitor& iSystemStateMonitor;
RConnection iConnection;
@@ -167,8 +164,6 @@
TBool iFirstStartHasSucceeded;
TBool iConnectionActive;
TBool iDying;
- TConnPrefList iPrefList;
- TExtendedConnPref iExtPrefs;
private: // For testing purposes
@@ -178,4 +173,4 @@
#endif
};
-#endif //CSIPALRSNAPMONITOR_H
+#endif //CSIPALRSNAPMONITOR_H
\ No newline at end of file
--- a/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/src/sipalrmonitor.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/src/sipalrmonitor.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -71,12 +71,12 @@
// CSipAlrMonitor::RefreshIapAvailabilityL
// -----------------------------------------------------------------------------
//
-void CSipAlrMonitor::RefreshIapAvailabilityL ( TSipSNAPConfigurationData & aConfigData )
+void CSipAlrMonitor::RefreshIapAvailabilityL ( TUint32 aSnapId )
{
PROFILE_DEBUG3( "CSipAlrMonitorImplementation::RefreshIapAvailabilityL",
- aConfigData.iSnapId )
+ aSnapId )
- CSipAlrSnapMonitor* monitor = FindSnapMonitor( aConfigData );
+ CSipAlrSnapMonitor* monitor = FindSnapMonitor( aSnapId );
if ( monitor )
{
monitor->RefreshL();
@@ -87,11 +87,11 @@
// CSipAlrMonitor::AllowMigration
// -----------------------------------------------------------------------------
//
-TInt CSipAlrMonitor::AllowMigration( TSipSNAPConfigurationData & aConfigData )
+TInt CSipAlrMonitor::AllowMigration( TUint32 aSnapId )
{
- PROFILE_DEBUG3("CSipAlrMonitor::AllowMigration, SnapId",aConfigData.iSnapId)
- PROFILE_DEBUG3("CSipAlrMonitor::AllowMigration, BearerFiltering",aConfigData.iBearerId)
- CSipAlrSnapMonitor* monitor = FindSnapMonitor( aConfigData );
+ PROFILE_DEBUG3("CSipAlrMonitor::AllowMigration, SnapId",aSnapId)
+
+ CSipAlrSnapMonitor* monitor = FindSnapMonitor( aSnapId );
if ( monitor )
{
monitor->AllowMigration();
@@ -103,11 +103,11 @@
// CSipAlrMonitor::DisallowMigration
// -----------------------------------------------------------------------------
//
-TInt CSipAlrMonitor::DisallowMigration( TSipSNAPConfigurationData& aConfigData )
+TInt CSipAlrMonitor::DisallowMigration( TUint32 aSnapId )
{
- PROFILE_DEBUG3("CSipAlrMonitor::DisallowMigration, SnapId",aConfigData.iSnapId)
- PROFILE_DEBUG3("CSipAlrMonitor::DisallowMigration, BearerFiltering",aConfigData.iBearerId)
- CSipAlrSnapMonitor* monitor = FindSnapMonitor( aConfigData );
+ PROFILE_DEBUG3("CSipAlrMonitor::DisallowMigration, SnapId",aSnapId)
+
+ CSipAlrSnapMonitor* monitor = FindSnapMonitor( aSnapId );
if ( monitor )
{
monitor->DisallowMigration();
@@ -120,11 +120,11 @@
// CSipAlrMonitor::NewIapAccepted
// -----------------------------------------------------------------------------
//
-TInt CSipAlrMonitor::NewIapAccepted( TSipSNAPConfigurationData & aConfigData)
+TInt CSipAlrMonitor::NewIapAccepted( TUint32 aSnapId )
{
- PROFILE_DEBUG3("CSipAlrMonitor::NewIapAccepted, SnapId",aConfigData.iSnapId)
+ PROFILE_DEBUG3("CSipAlrMonitor::NewIapAccepted, SnapId",aSnapId)
- CSipAlrSnapMonitor* monitor = FindSnapMonitor( aConfigData );
+ CSipAlrSnapMonitor* monitor = FindSnapMonitor( aSnapId );
if ( monitor )
{
monitor->NewIapAccepted();
@@ -137,11 +137,11 @@
// CSipAlrMonitor::NewIapRejected
// -----------------------------------------------------------------------------
//
-TInt CSipAlrMonitor::NewIapRejected( TSipSNAPConfigurationData & aConfigData )
+TInt CSipAlrMonitor::NewIapRejected( TUint32 aSnapId )
{
- PROFILE_DEBUG3( "CSipAlrMonitor::NewIapRejected, SnapId",aConfigData.iSnapId )
+ PROFILE_DEBUG3( "CSipAlrMonitor::NewIapRejected, SnapId",aSnapId )
- CSipAlrSnapMonitor* monitor = FindSnapMonitor( aConfigData );
+ CSipAlrSnapMonitor* monitor = FindSnapMonitor( aSnapId );
if ( monitor )
{
monitor->NewIapRejected();
@@ -155,14 +155,13 @@
// -----------------------------------------------------------------------------
//
void CSipAlrMonitor::MonitorSnapL(
- TSipSNAPConfigurationData& aConfigData,
- MSipAlrObserver& aObserver)
+ TUint32 aSnapId,
+ MSipAlrObserver& aObserver )
{
PROFILE_DEBUG4( "CSipAlrMonitor::MonitorSnapL",
- aConfigData.iSnapId, reinterpret_cast< TUint >( &aObserver ) )
-
-
- CSipAlrSnapMonitor* monitor = FindSnapMonitor( aConfigData);
+ aSnapId, reinterpret_cast< TUint >( &aObserver ) )
+
+ CSipAlrSnapMonitor* monitor = FindSnapMonitor( aSnapId );
if ( monitor )
{
// Monitor exists, add observer and get current IAP availability
@@ -174,7 +173,7 @@
else
{
monitor = CSipAlrSnapMonitor::NewLC(
- aConfigData, aObserver, iSocketServer, iSystemStateMonitor);
+ aSnapId, aObserver, iSocketServer, iSystemStateMonitor );
iSnapMonitors.AppendL( monitor );
CleanupStack::Pop( monitor );
@@ -188,38 +187,31 @@
//
void CSipAlrMonitor::FreeResources ( MSipAlrObserver& aObserver )
{
- CSipAlrSnapMonitor* monitor= 0;
for ( TInt i = iSnapMonitors.Count()-1; i >= 0; i-- )
{
TBool last = iSnapMonitors[i]->DetachObserver ( aObserver );
if ( last )
{
- monitor = iSnapMonitors[i];
- iSnapMonitors.Remove(i);
- delete monitor;
- monitor = NULL;
+ delete iSnapMonitors[i];
+ iSnapMonitors.Remove ( i );
PROFILE_DEBUG1( "CSipAlrMonitor::FreeResources monitor deleted" )
}
}
- iSnapMonitors.Compress();
}
// -----------------------------------------------------------------------------
// CSipAlrMonitor::FindSnapMonitor
// -----------------------------------------------------------------------------
//
-CSipAlrSnapMonitor* CSipAlrMonitor::FindSnapMonitor( TSipSNAPConfigurationData & aConfigData)
+CSipAlrSnapMonitor* CSipAlrMonitor::FindSnapMonitor( TUint32 aSnapId )
{
CSipAlrSnapMonitor* monitor = NULL;
for ( TInt i = 0; i < iSnapMonitors.Count() && !monitor; i++ )
{
- if ( iSnapMonitors[i]->SnapId() == aConfigData.iSnapId && iSnapMonitors[i]->BearerId() == aConfigData.iBearerId ) //mtr found
- {
- monitor = iSnapMonitors[i];
+ if ( iSnapMonitors[i]->SnapId() == aSnapId )
+ {
+ monitor = iSnapMonitors[i];
}
}
return monitor;
}
-
-
-
--- a/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/src/sipalrsnapmonitor.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/src/sipalrsnapmonitor.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -28,14 +28,14 @@
// -----------------------------------------------------------------------------
//
CSipAlrSnapMonitor* CSipAlrSnapMonitor::NewLC(
- TSipSNAPConfigurationData aSnapData,
+ TUint32 aSnapId,
MSipAlrObserver& aObserver,
RSocketServ& aSocketServer,
- CSipSystemStateMonitor& aSystemStateMonitor)
+ CSipSystemStateMonitor& aSystemStateMonitor )
{
CSipAlrSnapMonitor* self =
new ( ELeave ) CSipAlrSnapMonitor(
- aSnapData, aSocketServer, aSystemStateMonitor);
+ aSnapId, aSocketServer, aSystemStateMonitor );
CleanupStack::PushL( self );
self->ConstructL( aObserver );
return self;
@@ -46,15 +46,15 @@
// -----------------------------------------------------------------------------
//
CSipAlrSnapMonitor::CSipAlrSnapMonitor(
- TSipSNAPConfigurationData aSnapData,
+ TUint32 aSnapId,
RSocketServ& aSocketServer,
- CSipSystemStateMonitor& aSystemStateMonitor) :
+ CSipSystemStateMonitor& aSystemStateMonitor ) :
CActive ( CActive::EPriorityStandard ),
- iSnapData( aSnapData ),
+ iSnapId( aSnapId ),
iSocketServer( aSocketServer ),
- iSystemStateMonitor( aSystemStateMonitor )
+ iSystemStateMonitor( aSystemStateMonitor )
{
- iPrefs.SetSnap( aSnapData.iSnapId );
+ iPrefs.SetSnap( iSnapId );
CActiveScheduler::Add( this );
}
@@ -67,16 +67,9 @@
PROFILE_DEBUG1( "CSipAlrSnapMonitor::ConstructL entered" )
iSystemStateMonitor.StartMonitoringL(
- CSipSystemStateMonitor::ESnapAvailability, SnapId(), *this );
+ CSipSystemStateMonitor::ESnapAvailability, iSnapId, *this );
AddObserverL( aObserver );
-
- if(IsSnapAvailable())
- {
- // SNAP is already Available to be started.
- // No Need to wait for Notification from System State Monitor.
- StartSnap();
- }
PROFILE_DEBUG1( "CSipAlrSnapMonitor::ConstructL returns" )
}
@@ -98,7 +91,7 @@
iObservers.Close();
iSystemStateMonitor.StopMonitoring(
- CSipSystemStateMonitor::ESnapAvailability, SnapId(), *this );
+ CSipSystemStateMonitor::ESnapAvailability, iSnapId, *this );
PROFILE_DEBUG1( "CSipAlrSnapMonitor::~CSipAlrSnapMonitor returns" )
}
@@ -136,7 +129,7 @@
for ( TInt i = iObservers.Count() - 1; i >= 0; --i )
{
iObservers[i].iObserver->AlrEvent(
- MSipAlrObserver::EOfferedIapRejected, SnapId(), KNoIap );
+ MSipAlrObserver::EOfferedIapRejected, iSnapId, KNoIap );
}
}
else
@@ -195,7 +188,7 @@
TAccessPointInfo aNewAP,
TBool /*aIsSeamless*/ )
{
- PROFILE_DEBUG3( "CSipSnapAlrMonitor::NewCarrierActive", SnapId() )
+ PROFILE_DEBUG3( "CSipSnapAlrMonitor::NewCarrierActive", iSnapId )
NotifyInitializedObservers( aNewAP.AccessPoint(),
MSipAlrObserver::EIapActive );
@@ -213,7 +206,7 @@
PROFILE_DEBUG1( "CSipSnapAlrMonitor::Error iCommsMobilityAO==NULL")
return;
}
- if ( aError == KErrNotFound && !BearerId())
+ if ( aError == KErrNotFound)
{
NotifyInitializedObservers( KNoIap,
MSipAlrObserver::ENoNewIapAvailable );
@@ -224,12 +217,8 @@
if ( !iDying )
{
ResetState();
- if(!BearerId())
- {
- PROFILE_DEBUG3( "CSipSnapAlrMonitor::Error, Start Snap as Bearer Id is ", BearerId() )
StartSnap();
}
- }
}
// -----------------------------------------------------------------------------
@@ -246,7 +235,7 @@
if ( !IsActive() &&
aVariable == CSipSystemStateMonitor::ESnapAvailability &&
- aObjectId == SnapId() )
+ aObjectId == iSnapId )
{
if ( aValue == CSipSystemStateMonitor::ESnapAvailable )
{
@@ -268,7 +257,7 @@
//
TUint32 CSipAlrSnapMonitor::SnapId() const
{
- return iSnapData.iSnapId;
+ return iSnapId;
}
// -----------------------------------------------------------------------------
@@ -300,7 +289,6 @@
iObservers.Remove( i );
}
}
- iObservers.Compress();
return iObservers.Count() == 0;
}
@@ -336,7 +324,7 @@
for ( TInt i = iObservers.Count() - 1; i >= 0; --i )
{
iObservers[i].iObserver->AlrEvent(
- MSipAlrObserver::ERefreshError, SnapId(), KNoIap );
+ MSipAlrObserver::ERefreshError, iSnapId, KNoIap );
}
}
}
@@ -414,6 +402,7 @@
TInt CSipAlrSnapMonitor::StartSnap()
{
PROFILE_DEBUG1( "CSipAlrSnapMonitor::StartSnap entered" )
+
TInt err = KErrNone;
if ( !IsActive() && IsSnapAvailable() )
{
@@ -424,40 +413,14 @@
if ( err == KErrNone )
{
- if(BearerId())
- {
- if(BearerId()== 1)
- {
- iExtPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerWLAN);
- }
- else if(BearerId() == 2)
- {
- iExtPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerCellular);
- }
- PROFILE_DEBUG1( "CSipAlrSnapMonitor::Starting Bearer Filtered connection" )
- iExtPrefs.SetSnapId( SnapId());
-
- TRAPD(error, iPrefList.AppendL(&iExtPrefs));
- if(error)
- {
- return error;
- }
- // Start connecting
- iConnection.Start( iPrefList, iStatus );
- SetActive();
- }
- else
- {
- PROFILE_DEBUG1( "CSipAlrSnapMonitor::Starting Normal Connection" )
- iConnection.Start( iPrefs, iStatus );
- SetActive();
- }
+ iConnection.Start( iPrefs, iStatus );
+ SetActive();
}
}
PROFILE_DEBUG3( "CSipAlrSnapMonitor::StartSnap returns", err )
return err;
- }
+ }
// -----------------------------------------------------------------------------
// CSipAlrSnapMonitor::CreateMobilityAoL
@@ -486,7 +449,7 @@
DestroyMobilityAo();
Cancel();
-// iConnection.Close();
+ iConnection.Close();
iMigrationAllowedByClient = EFalse;
iConnectionActive = EFalse;
iPreferredCarrierAvailableCalled = EFalse;
@@ -513,7 +476,7 @@
void CSipAlrSnapMonitor::NotifyObservers( TUint aIapId )
{
PROFILE_DEBUG4( "CSipSnapAlrMonitor::NotifyObservers SNAP, IAP",
- SnapId(), aIapId )
+ iSnapId, aIapId )
NotifyInitializedObservers( aIapId, MSipAlrObserver::EIapAvailable );
NotifyNewObservers( aIapId );
@@ -532,9 +495,9 @@
if ( iObservers[i].iInitialEventDone )
{
PROFILE_DEBUG3( "CSipAlrSnapMonitor::NotifyIntitializedObservers",
- SnapId() )
+ iSnapId )
- iObservers[i].iObserver->AlrEvent( aEvent, SnapId(), aIapId );
+ iObservers[i].iObserver->AlrEvent( aEvent, iSnapId, aIapId );
}
}
}
@@ -549,10 +512,10 @@
{
if ( !iObservers[i].iInitialEventDone )
{
- PROFILE_DEBUG3( "CSipAlrSnapMonitor::NotifyNewObservers", SnapId() )
+ PROFILE_DEBUG3( "CSipAlrSnapMonitor::NotifyNewObservers", iSnapId )
iObservers[i].iObserver->AlrEvent(
- MSipAlrObserver::EIapAvailable, SnapId(), aIapId );
+ MSipAlrObserver::EIapAvailable, iSnapId, aIapId );
iObservers[i].iInitialEventDone = ETrue;
}
@@ -566,15 +529,6 @@
TBool CSipAlrSnapMonitor::IsSnapAvailable() const
{
return ( iSystemStateMonitor.CurrentValue(
- CSipSystemStateMonitor::ESnapAvailability, SnapId() ) ==
+ CSipSystemStateMonitor::ESnapAvailability, iSnapId ) ==
CSipSystemStateMonitor::ESnapAvailable );
}
-
-// -----------------------------------------------------------------------------
-// CSipAlrSnapMonitor::BearerId
-// -----------------------------------------------------------------------------
-//
-TBool CSipAlrSnapMonitor::BearerId()
- {
- return iSnapData.iBearerId;
- }
--- a/realtimenetprots/sipfw/ProfileAgent/ApnManager/src/sipapnmanager.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/ApnManager/src/sipapnmanager.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -106,8 +106,10 @@
// CSIPApnManager::WriteApnL
// ----------------------------------------------------------------------------
//
-void CSIPApnManager::WriteApnL( TUint32 aIapId, TBool /*aIsPrimaryApn*/, const TDesC8* aApn )
+void CSIPApnManager::WriteApnL( TUint32 aIapId, TBool aIsPrimaryApn, const TDesC8* aApn )
{
+ PROFILE_DEBUG3( "CSIPApnManager::WriteApnL isPrimary", aIsPrimaryApn )
+
CSIPApnConfigurationHandler* handler = FindIapIdHandler( aIapId );
if (!handler)
{
--- a/realtimenetprots/sipfw/ProfileAgent/Client/Api/sipprofile.h Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Client/Api/sipprofile.h Wed Oct 13 14:57:13 2010 +0300
@@ -195,15 +195,6 @@
*/
const TUint32 KSecondaryAPN = 21;
-/**
-* BearerType is of type TUint32.
-* Possible Values and its purpose.
-* 0 --> Not Specified.
-* 1 --> WLAN Bearer Only.
-* 2 --> Cellular Data Bearer Only.
-**/
-const TUint32 KBearerType = 22;
-
// CLASS DECLARATION
/**
--- a/realtimenetprots/sipfw/ProfileAgent/Client/Src/sipmanagedprofile.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Client/Src/sipmanagedprofile.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -185,7 +185,6 @@
case KSIPDigestPassword:
case KSIPHeaders:
case KSIPSoIpTOS:
- case KBearerType:
User::Leave(KErrNotFound);
case KSIPContactHeaderUser:
User::Leave(KErrAccessDenied);
@@ -277,7 +276,6 @@
case KSIPSnapId:
case KPrimaryAPN:
case KSecondaryAPN:
- case KBearerType:
User::Leave(KErrNotFound);
default:
iSIPProfile->SetExtensionParameterL(aParam, aVal);
--- a/realtimenetprots/sipfw/ProfileAgent/Group/sipprofileserver.mmp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Group/sipprofileserver.mmp Wed Oct 13 14:57:13 2010 +0300
@@ -94,7 +94,6 @@
LIBRARY commsdat.lib
LIBRARY featmgr.lib
LIBRARY commdb.lib
-LIBRARY extendedconnpref.lib
VENDORID 0x70000001
--- a/realtimenetprots/sipfw/ProfileAgent/IETF_Agent/src/Sipietfprofilecontext.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/IETF_Agent/src/Sipietfprofilecontext.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -491,9 +491,7 @@
//
TBool CSIPIetfProfileContext::ShouldRetryRegistration( TInt aError )
{
- return (iProfile &&
- AgentObserver().ProceedRegistration(*iProfile, aError) &&
- (aError == K503ServiceUnavailable ||
+ return (aError == K503ServiceUnavailable ||
aError == K408TimeOut ||
aError == K500ServerInternalError ||
aError == KErrTimedOut ||
@@ -501,7 +499,7 @@
aError == KErrSIPTransportFailure ||
aError == KErrSIPICMPFailure ||
aError == KErrSIPOutboundProxyNotResponding ) &&
- iConnection.State() != CSIPConnection::ESuspended)));
+ iConnection.State() != CSIPConnection::ESuspended));
}
// -----------------------------------------------------------------------------
@@ -564,12 +562,10 @@
PROFILE_DEBUG3("SIPIetfProfileContext::IncomingResponse", ProfileId())
aHandled = ETrue;
const CSIPResponseElements* response = aTransaction.ResponseElements();
- TInt responseCode = KErrGeneral;
+ TUint responseCode = response->StatusCode();
TBool retry = EFalse;
if (response)
{
- responseCode = response->StatusCode();
-
retry = RetryRegister( &aTransaction, responseCode);
if( !retry )
{
--- a/realtimenetprots/sipfw/ProfileAgent/IMS_Agent/Src/Sipimsprofilecontext.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/IMS_Agent/Src/Sipimsprofilecontext.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -781,9 +781,7 @@
//
TBool CSIPIMSProfileContext::ShouldRetryRegistration( TInt aError )
{
- return (iProfile &&
- AgentObserver().ProceedRegistration(*iProfile, aError) &&
- (aError == K503ServiceUnavailable ||
+ return (aError == K503ServiceUnavailable ||
aError == K408TimeOut ||
aError == K480TemporarilyUnavailable ||
aError == K500ServerInternalError ||
@@ -793,7 +791,7 @@
aError == KErrSIPTransportFailure ||
aError == KErrSIPICMPFailure ||
aError == KErrSIPOutboundProxyNotResponding ) &&
- iConnection.State() != CSIPConnection::ESuspended)));
+ iConnection.State() != CSIPConnection::ESuspended));
}
// -----------------------------------------------------------------------------
--- a/realtimenetprots/sipfw/ProfileAgent/PluginMgr/Src/Sipplugindirector.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/PluginMgr/Src/Sipplugindirector.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -305,7 +305,6 @@
}//if
}//for
- iSIPProfileAgents.Compress();
}
// -----------------------------------------------------------------------------
--- a/realtimenetprots/sipfw/ProfileAgent/Profile/Src/sipconcreteprofile.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Profile/Src/sipconcreteprofile.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -14,7 +14,7 @@
// Name : sipconcreteprofile.cpp
// Part of : SIP / SIP Profile Agent / SIP Concrete Profile
// Implementation
-// Version : %version: 3.1.2.1.2 %
+// Version : %version: 3.1.2 %
//
@@ -2256,12 +2256,5 @@
PROFILE_DEBUG3("Exceptional SNAP Entry verifier :", KDefaultSNAPIdentifier)
SetExtensionParameterL(KSIPSnapId,KDefaultSNAPIdentifier);
}
-
-if ( ExtensionParameter(KBearerType,iVal) == KErrNotFound)
- {
-PROFILE_DEBUG3("CSIPConcreteProfile::ValidateProfileParamsL.. Setting bearer Id to 0", 0)
- TUint32 defaultId=0;
- SetExtensionParameterL(KBearerType,defaultId);
- }
return res;
}
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Inc/SipProfileCacheItem.h Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Inc/SipProfileCacheItem.h Wed Oct 13 14:57:13 2010 +0300
@@ -567,12 +567,7 @@
*/
void HandleProfileError(TInt aError,
CSIPConcreteProfile& aProfile);
-/**
- * Function returns the Bearer ID for the Profile.
- */
- TUint32 BearerID();
- TBool HasQueuedUpdate()const;
private:
/**
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Inc/SipProfileServerCore.h Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Inc/SipProfileServerCore.h Wed Oct 13 14:57:13 2010 +0300
@@ -36,7 +36,6 @@
#include "sipprofileerrorhandler.h"
#include <sipsystemstateobserver.h>
#include "sipapnmanager.h"
-#include "sipalrobserver.h"
#include <e32base.h>
// FORWARD DECLARATIONS
@@ -467,10 +466,10 @@
/**
* Gets the migration controller of the given SNAP id. If a controller
* does not exists, creates a new one.
- * @param aSnapData
+ * @param aSnapId SNAP id
* @return Migration controller, ownership is not transferred.
*/
- CSipAlrMigrationController& MigrationControllerL(TSipSNAPConfigurationData aSnapData);
+ CSipAlrMigrationController& MigrationControllerL(TUint32 aSnapId);
CSIPProfileState& UnregisteredState();
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileCacheItem.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileCacheItem.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -366,7 +366,6 @@
if (index != KErrNotFound)
{
iObservers.Remove(index);
- iObservers.Compress();
}
RemoveFromPendingObservers(aObserver);
@@ -403,7 +402,6 @@
if (index != KErrNotFound)
{
iUsers.Remove(index);
- iUsers.Compress();
CheckProfileEnabledState();
}
}
@@ -971,12 +969,9 @@
StopSnapMonitoring();
}
- if (!iMigrationController)
+ if (!iMigrationController)
{
- TUint32 bearerId = BearerID();
- TSipSNAPConfigurationData aSnapData(aSnapId,bearerId);
- iMigrationController = &iServerCore.MigrationControllerL(aSnapData);
- PROFILE_DEBUG3("ProfileCacheItem::BearerFilter value is", bearerId)
+ iMigrationController = &iServerCore.MigrationControllerL(aSnapId);
TUint32 iapId = iMigrationController->AttachProfileL(*this);
if (iapId)
{
@@ -1258,7 +1253,6 @@
if (index != KErrNotFound)
{
iObserversWaitedForPermission.Remove(index);
- iObserversWaitedForPermission.Compress();
}
}
@@ -1409,24 +1403,3 @@
return iIsOfflineInitiated;
}
-// -----------------------------------------------------------------------------
-// CSIPProfileCacheItem::BearerID
-// This function will return the Bearer ID of the Profile.
-// -----------------------------------------------------------------------------
-//
-TUint32 CSIPProfileCacheItem::BearerID()
-{ TUint32 bearerId(0);
- LatestProfile().ExtensionParameter(KBearerType , bearerId);
- return bearerId;
-}
-
-// -----------------------------------------------------------------------------
-// CSIPProfileCacheItem::HasQueuedUpdate
-// This function will return true if profile updated and not yet processed
-// false otherwise
-// -----------------------------------------------------------------------------
-//
-TBool CSIPProfileCacheItem::HasQueuedUpdate() const
- {
- return (iQueuedProfile != NULL);
- }
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileServerCore.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileServerCore.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -396,14 +396,7 @@
{
return EFalse;
}
-
- if((aError != KErrNone) && item->HasQueuedUpdate())
- {
- PROFILE_DEBUG4("ProfileServerCore::ProceedRegistration HasQueuedUpdate, err",
- item->HasQueuedUpdate(), aError)
- return EFalse;
- }
-
+
if ( ShouldChangeIap(item->UsedProfile(), aError) &&
!item->SnapRetryCountReached() )
{
@@ -1573,7 +1566,6 @@
if (index != KErrNotFound)
{
iObservers.Remove(index);
- iObservers.Compress();
}
for (TInt i = 0; i < iProfileCache.Count(); i ++)
@@ -1781,7 +1773,6 @@
{
// Backup ends. Do not read profiles, as they are already in cache.
iProfileStorage = CSIPProfileStorage::NewL(iFs);
- iProfileStorage->GetProfileStorageIndexObject()->SetProfileServerCoreObject(this);
}
PROFILE_DEBUG1("ProfileServerCore::ReserveStorageL, storage reserved")
}
@@ -1915,22 +1906,20 @@
// -----------------------------------------------------------------------------
//
CSipAlrMigrationController&
-CSIPProfileServerCore::MigrationControllerL(TSipSNAPConfigurationData aSnapData)
+CSIPProfileServerCore::MigrationControllerL(TUint32 aSnapId)
{
- RemoveUnusedMigrationControllers(aSnapData.iSnapId);
+ RemoveUnusedMigrationControllers(aSnapId);
for (TInt i = 0; i < iMigrationControllers.Count(); ++i)
{
- // Migration controller is unique based on the SNAP ID and Bearer ID.
- if (iMigrationControllers[i]->SnapId() == aSnapData.iSnapId
- && iMigrationControllers[i]->BearerId() == aSnapData.iBearerId)
+ if (iMigrationControllers[i]->SnapId() == aSnapId)
{
return *iMigrationControllers[i];
}
}
CSipAlrMigrationController* ctrl =
- CSipAlrMigrationController::NewLC(iAlrHandler->AlrMonitorL(),aSnapData);
+ CSipAlrMigrationController::NewLC(iAlrHandler->AlrMonitorL(), aSnapId);
iMigrationControllers.AppendL(ctrl);
CleanupStack::Pop(ctrl);
return *ctrl;
@@ -1955,7 +1944,6 @@
if (index >= 0)
{
iProfileCache.Remove(index);
- iProfileCache.Compress();
}
}
@@ -1972,9 +1960,7 @@
{
CSipAlrMigrationController* unused = iMigrationControllers[i];
iMigrationControllers.Remove(i);
- iMigrationControllers.Compress();
delete unused;
- unused = NULL;
}
}
}
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrhandler.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrhandler.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -134,8 +134,8 @@
TUint32 snapId(0);
__ASSERT_ALWAYS(aProfile.IsSNAPConfigured(snapId),
User::Leave(KErrArgument));
- TSipSNAPConfigurationData aSnapData(snapId ,aProfile.BearerID());
- AlrMonitorL().RefreshIapAvailabilityL(aSnapData);
+
+ AlrMonitorL().RefreshIapAvailabilityL(snapId);
}
// -----------------------------------------------------------------------------
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrmigrationcontroller.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrmigrationcontroller.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -30,10 +30,10 @@
// -----------------------------------------------------------------------------
//
CSipAlrMigrationController*
-CSipAlrMigrationController::NewLC(CSipAlrMonitor& aAlrMonitor, TSipSNAPConfigurationData aSnapData)
+CSipAlrMigrationController::NewLC(CSipAlrMonitor& aAlrMonitor, TUint32 aSnapId)
{
CSipAlrMigrationController* self =
- new (ELeave) CSipAlrMigrationController(aAlrMonitor, aSnapData);
+ new (ELeave) CSipAlrMigrationController(aAlrMonitor, aSnapId);
CleanupStack::PushL(self);
return self;
}
@@ -44,9 +44,9 @@
//
CSipAlrMigrationController::CSipAlrMigrationController(
CSipAlrMonitor& aAlrMonitor,
- TSipSNAPConfigurationData aSnapData) :
+ TUint32 aSnapId) :
iAlrMonitor(aAlrMonitor),
- iSnapData(aSnapData)
+ iSnapId(aSnapId)
#ifdef CPPUNIT_TEST
// Set the array granularity to 1, so it allocates memory in each append
, iObservers(1)
@@ -125,14 +125,9 @@
//
TUint32 CSipAlrMigrationController::SnapId() const
{
- return iSnapData.iSnapId;
+ return iSnapId;
}
-TUint32 CSipAlrMigrationController::BearerId() const
- {
- return iSnapData.iBearerId;
- }
-
// -----------------------------------------------------------------------------
// CSipAlrMigrationController::IsUsed
// -----------------------------------------------------------------------------
@@ -153,13 +148,12 @@
{
TSipAlrMigrationObserverInfo observerInfo(aObserver);
iObservers.AppendL(observerInfo);
-
+
const TInt KFirstObserverExists = 1;
if (iObservers.Count() == KFirstObserverExists)
{
- PROFILE_DEBUG3("CSipAlrMigrCtrl::AttachProfileL snapId", SnapId())
- PROFILE_DEBUG3("CSipAlrMigrCtrl::AttachProfileL BearerFiltered.. ", BearerId())
- iAlrMonitor.MonitorSnapL(iSnapData, *this);
+ PROFILE_DEBUG3("CSipAlrMigrCtrl::AttachProfileL snapId", iSnapId)
+ iAlrMonitor.MonitorSnapL(iSnapId, *this);
return KNoIap;
}
@@ -178,7 +172,6 @@
if (index != KErrNotFound)
{
iObservers.Remove(index);
- iObservers.Compress();
}
if (iObservers.Count() == 0)
@@ -258,11 +251,11 @@
TInt err(KErrNone);
if (iMigrationDisallowed)
{
- err = iAlrMonitor.DisallowMigration(iSnapData);
+ err = iAlrMonitor.DisallowMigration(iSnapId);
}
else
{
- err = iAlrMonitor.AllowMigration(iSnapData);
+ err = iAlrMonitor.AllowMigration(iSnapId);
}
if (err != KErrNone)
{
@@ -281,10 +274,9 @@
//
void CSipAlrMigrationController::RefreshIapAvailabilityL(TUint32 aSnapId)
{
- if (!iRefreshIssued && aSnapId == SnapId())
+ if (!iRefreshIssued && aSnapId == iSnapId)
{
-
- iAlrMonitor.RefreshIapAvailabilityL(iSnapData);
+ iAlrMonitor.RefreshIapAvailabilityL(aSnapId);
iRefreshIssued = ETrue;
}
}
@@ -301,7 +293,7 @@
PROFILE_DEBUG4("CSipAlrMigrCtrl::SetIapAcceptance, iap,works=",
iAllowedIapId,
aIapWorks)
-
+
TInt index = FindIndex(aObserver);
if (index != KErrNotFound && iObservers[index].iIsWaitingForAcceptance)
{
@@ -314,14 +306,14 @@
iObservers[i].iIsWaitingForAcceptance = EFalse;
}
PROFILE_DEBUG1("CSipAlrMigrCtrl::SetIapAcceptance accepted")
- return iAlrMonitor.NewIapAccepted(iSnapData);
+ return iAlrMonitor.NewIapAccepted(iSnapId);
}
if (!ObserversWaitingAcceptance())
{
// Nobody got IAP to work
PROFILE_DEBUG1("CSipAlrMigrCtrl::SetIapAcceptance rejected")
- return iAlrMonitor.NewIapRejected(iSnapData);
+ return iAlrMonitor.NewIapRejected(iSnapId);
}
}
return KErrNone;
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrmigrationcontroller.h Wed Sep 15 12:36:02 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrmigrationcontroller.h Wed Oct 13 14:57:13 2010 +0300
@@ -58,7 +58,7 @@
public:
static CSipAlrMigrationController* NewLC(CSipAlrMonitor& aAlrMonitor,
- TSipSNAPConfigurationData aSnapData);
+ TUint32 aSnapId);
~CSipAlrMigrationController();
@@ -71,8 +71,6 @@
public: // New functions
TUint32 SnapId() const;
-
- TUint32 BearerId() const;
/**
* Check if any profile is using this instance.
@@ -118,13 +116,11 @@
TBool aIapWorks);
void ResetFlags();
-
-
private: // Constructors
CSipAlrMigrationController(CSipAlrMonitor& aAlrMonitor,
- TSipSNAPConfigurationData aSnapData);
+ TUint32 aSnapId);
private: // New functions
@@ -147,6 +143,9 @@
RArray<TSipAlrMigrationObserverInfo> iObservers;
+ // SNAP id that is monitored. Does not change.
+ const TUint32 iSnapId;
+
// The IAP id, that was most recently offered to observers with
// MSipAlrMigrationObserver::IapAvailableL.
TUint32 iOfferedIapId;
@@ -164,9 +163,6 @@
// Will be set to EFalse, when ALR monitor notifies about IAP, using
// MSipAlrObserver::IapAvailable.
TBool iRefreshIssued;
-
- // This contains the SNAP ID and the Bearer ID configured for the SNAP.
- TSipSNAPConfigurationData iSnapData;
private: // For testing purposes
#ifdef CPPUNIT_TEST
--- a/rtp/rtpstack/group/rtpservice.mmp Wed Sep 15 12:36:02 2010 +0300
+++ b/rtp/rtpstack/group/rtpservice.mmp Wed Oct 13 14:57:13 2010 +0300
@@ -65,6 +65,8 @@
LIBRARY efsrv.lib
LIBRARY srtp.lib
LIBRARY charconv.lib
+LIBRARY extendedconnpref.lib
+LIBRARY netmeta.lib
CAPABILITY CAP_GENERAL_DLL
--- a/rtp/rtpstack/inc/rtpmanager.h Wed Sep 15 12:36:02 2010 +0300
+++ b/rtp/rtpstack/inc/rtpmanager.h Wed Oct 13 14:57:13 2010 +0300
@@ -25,6 +25,8 @@
#include <es_enum.h>
#include <rtpdef.h>
#include <rtpheader.h>
+#include <extendedconnpref.h>
+#include <connpref.h>
#include "rtpsession.h"
#include "rtpsdes.h"
#include "localaddrresolver.h"
@@ -233,7 +235,7 @@
* Opens the socket server and the connection
* @return KErrNone if successful, system error code otherwise
*/
- TInt PrepareConnection( TCommDbConnPref& aPrefs, TInt aIapId );
+ TInt PrepareConnection( TConnPrefList& aPrefs, TInt aIapId );
/*
* @return Internet Access Point ID of iConn
@@ -267,7 +269,9 @@
MRtpErrNotify& iErrNotify;
- TCommDbConnPref iPrefs;
+ TConnPrefList iPrefs;
+ TExtendedConnPref iPreferences;
+
private:
#ifdef EUNIT_TESTING
friend class UT_CRtpAPI;
--- a/rtp/rtpstack/src/rtpmanager.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/rtp/rtpstack/src/rtpmanager.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -228,20 +228,17 @@
// TInt CRtpManager::PrepareConnection()
// ---------------------------------------------------------------------------
//
-TInt CRtpManager::PrepareConnection( TCommDbConnPref& aPrefs, TInt aIapId )
+TInt CRtpManager::PrepareConnection( TConnPrefList& aPrefs, TInt aIapId )
{
RTP_DEBUG_DETAIL( "CRtpManager::PrepareConnection" );
TInt err( KErrCouldNotConnect );
if ( aIapId != KUseDefaultIap )
- {
- aPrefs.SetDialogPreference( ECommDbDialogPrefDoNotPrompt );
- aPrefs.SetIapId( aIapId );
- }
-
- aPrefs.SetDirection( ECommDbConnectionDirectionOutgoing );
-
+ {
+ iPreferences.SetIapId( aIapId );
+ aPrefs.AppendL( &iPreferences );
+ }
err = iSocketServPtr->Connect();
if ( err != KErrNone )
--- a/rtp/rtpstack/tsrc/ut_rtpstack/group/TestRTPService.mmp Wed Sep 15 12:36:02 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/group/TestRTPService.mmp Wed Oct 13 14:57:13 2010 +0300
@@ -106,5 +106,8 @@
LIBRARY hash.lib
LIBRARY rtpstppacket.lib
LIBRARY charconv.lib
+LIBRARY esock.lib
+LIBRARY extendedconnpref.lib
+LIBRARY netmeta.lib
// End of file
--- a/sipplugins/sippdevmgmtsipadapter/inc/smldmsipadapterconstants.h Wed Sep 15 12:36:02 2010 +0300
+++ b/sipplugins/sippdevmgmtsipadapter/inc/smldmsipadapterconstants.h Wed Oct 13 14:57:13 2010 +0300
@@ -77,8 +77,6 @@
"DestinationNetwork" );
_LIT8( KNSmlDMSIPSigQos,
"SignalingQoS" );
-_LIT8( KNSmlDMSIPBearerID,
- "BearerID" );
// Explanations of parameters
_LIT8( KNSmlDMSIPNodeNameExp,
@@ -129,8 +127,6 @@
"Reference to Destination Network" );
_LIT8( KNSmlDMSIPSigQosExp,
"Signaling QoS" );
-_LIT8( KNSmlDMSIPBearerIDExp,
- "Bearer ID" );
// For SIP URI.
// References: OMA DM MO for Nokia SIP and IETF RFC3261.
--- a/sipplugins/sippdevmgmtsipadapter/src/nsmldmsipadapter.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/sipplugins/sippdevmgmtsipadapter/src/nsmldmsipadapter.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -499,16 +499,6 @@
sigQos.SetDFFormatL( MSmlDmDDFObject::EInt );
sigQos.AddDFTypeMimeTypeL( KNSmlDMSIPTextPlain );
sigQos.SetDescriptionL( KNSmlDMSIPSigQosExp );
-
- //Bearer ID
- MSmlDmDDFObject& bearerid = idNode.AddChildObjectL( KNSmlDMSIPBearerID );
- bearerid.SetAccessTypesL( accessTypesGetReplaceAdd );
- bearerid.SetOccurenceL( MSmlDmDDFObject::EZeroOrOne );
- bearerid.SetScopeL( MSmlDmDDFObject::EDynamic );
- bearerid.SetDFFormatL( MSmlDmDDFObject::EInt );
- bearerid.AddDFTypeMimeTypeL( KNSmlDMSIPTextPlain );
- bearerid.SetDescriptionL( KNSmlDMSIPBearerIDExp );
-
DBG_PRINT("CNSmlDmSIPAdapter::DDFStructureL(): end");
}
@@ -866,22 +856,6 @@
}
}
- // SIP/x/BearerId
- if ( KNSmlDMSIPBearerID() == lastUriSeg )
- {
- TUint32 bearerid = DesToInt( aObject );
- if ( bearerid )
- {
- err = iProfiles->At( profileID )->SetParameter(
- KBearerType, bearerid );
- }
- else
- {
- status = CSmlDmAdapter::EInvalidObject;
- }
- }
-
-
// ==============================
// OutboundProxy settings node
// ==============================
@@ -1286,16 +1260,6 @@
sigQos >>= 2;
segmentResult.Num( sigQos );
}
-
- // SIP/x/BearerId
- if ( KNSmlDMSIPBearerID() == lastUriSeg )
- {
- TUint32 bearerid;
- err = iProfiles->At( profileID )->GetParameter(
- KBearerType, bearerid );
- segmentResult.Num( bearerid );
- }
-
// Set error if fetch failed.
if ( -1 > err )
@@ -1556,12 +1520,6 @@
segmentName );
currentURISegmentList->InsertL( currentURISegmentList->Size(),
KNSmlDMSIPSeparator8 );
-
- segmentName.Copy( KNSmlDMSIPBearerID );
- currentURISegmentList->InsertL( currentURISegmentList->Size(),
- segmentName );
- currentURISegmentList->InsertL( currentURISegmentList->Size(),
- KNSmlDMSIPSeparator8 );
}
// SIP/x/OutboundProxy
@@ -1863,11 +1821,7 @@
}
}
}
-
- if(i < 0)
- return aURI.Left(i+1);
- else
- return aURI.Left( i );
+ return aURI.Left( i );
}
// ---------------------------------------------------------------------------
--- a/sipplugins/sippsipadapter/inc/CWPSIPItem.h Wed Sep 15 12:36:02 2010 +0300
+++ b/sipplugins/sippsipadapter/inc/CWPSIPItem.h Wed Oct 13 14:57:13 2010 +0300
@@ -488,9 +488,6 @@
* @param aSigQos Signalling QoS value.
*/
void SetSigQos( TUint32 aSigQos );
-
- void SetBearerID(TUint32 aBearerId);
- TUint32 GetBearerID();
private:
@@ -689,8 +686,6 @@
* Signalling QoS value.
*/
TUint32 iSigQos;
-
- TUint32 iBearerId;
private:
//friend class UT_CWPSIPItem; // For testing purposes.
--- a/sipplugins/sippsipadapter/src/CWPSIPAdapter.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/sipplugins/sippsipadapter/src/CWPSIPAdapter.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -52,7 +52,6 @@
_LIT( KParmLOCK, "LOCK" );
_LIT( KParmAUTOREG, "AUTOREG" );
_LIT( KParmSIGQOS, "SIGQOS" );
-_LIT( KParmBearerID, "PBEARERID" );
// For other purposes.
const TUint32 KNotSet = 0xffffffff;
@@ -502,14 +501,6 @@
iCurrentSIPItem->SetSigQos( parmVal );
}
}
-
- else if(aParameter.Name() == KParmBearerID )
- {
- TInt bearerid;
- TLex8 lex( tmpValue->Des() );
- User::LeaveIfError( lex.Val( bearerid ) );
- iCurrentSIPItem->SetBearerID((TUint32) bearerid );
- }
break;
}
case EWPParameterAppRef:
--- a/sipplugins/sippsipadapter/src/CWPSIPItem.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/sipplugins/sippsipadapter/src/CWPSIPItem.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -146,7 +146,6 @@
iToAppRef = HBufC8::NewL( 0 );
iNetwork = HBufC::NewL( 0 );
iSnapId = KErrNotFound;
- iBearerId = 0;
SetSigQos( 40 );
DBG_PRINT( "CWPSIPItem::ConstructL - end" );
}
@@ -1008,9 +1007,7 @@
// Signalling QoS parameter.
cSIPManagedProfile->SetParameter( KSIPSoIpTOS, iSigQos );
-
- cSIPManagedProfile->SetParameter( KBearerType, iBearerId );
-
+
// Stores SIP profile to permanent storage
cSIPManagedProfileRegistry->SaveL( *cSIPManagedProfile );
@@ -1262,14 +1259,4 @@
iSigQos = tosBits;
}
-
-void CWPSIPItem::SetBearerID(TUint32 aBearerId)
-{
-iBearerId = aBearerId;
-}
-
-TUint32 CWPSIPItem:: GetBearerID()
-{
-return iBearerId;
-}
// End of file.
--- a/sipplugins/sippsipsettingsui/src/sipsettingsplugin.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/sipplugins/sippsipsettingsui/src/sipsettingsplugin.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -363,10 +363,6 @@
iContainer->ListItemDeletedL();
CheckMiddleSoftkeyLabelL();
}
- else
- {
- AppUi()->ActivateLocalViewL( KGSSIPSettingsPluginUID );
- }
break;
// Activate 'Connection' or 'Administrative Settings' view
--- a/sipproviderplugins/sipprovider/sipconnectionplugins/inc/SIP_subconevents.h Wed Sep 15 12:36:02 2010 +0300
+++ b/sipproviderplugins/sipprovider/sipconnectionplugins/inc/SIP_subconevents.h Wed Oct 13 14:57:13 2010 +0300
@@ -133,6 +133,6 @@
static CSubConNotificationEvent* NewL(TAny* aConstructionParameters);
};
-#include "sip_subconevents.inl"
+#include "SIP_subconevents.inl"
#endif // SIPSCPR_SUBCONEVENTS_H
--- a/sipproviderplugins/sipprovider/sipconnectionplugins/inc/SIP_subconparams.h Wed Sep 15 12:36:02 2010 +0300
+++ b/sipproviderplugins/sipprovider/sipconnectionplugins/inc/SIP_subconparams.h Wed Oct 13 14:57:13 2010 +0300
@@ -272,6 +272,6 @@
static CSubConExtensionParameterSet* NewL(TAny* aConstructionParameters);
};
-#include "sip_subconparams.inl"
+#include "SIP_subconparams.inl"
#endif // SIP_SUBCONPARAMS_H