--- a/realtimenetprots/rtp/shimrtp/bwins/rtpmu.def Tue Sep 14 22:01:18 2010 +0300
+++ b/realtimenetprots/rtp/shimrtp/bwins/rtpmu.def Wed Sep 15 12:36:02 2010 +0300
@@ -112,4 +112,5 @@
?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/src/sipalrmonitor.cpp Tue Sep 14 22:01:18 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/src/sipalrmonitor.cpp Wed Sep 15 12:36:02 2010 +0300
@@ -188,16 +188,20 @@
//
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 )
{
- delete iSnapMonitors[i];
- iSnapMonitors.Remove ( i );
+ monitor = iSnapMonitors[i];
+ iSnapMonitors.Remove(i);
+ delete monitor;
+ monitor = NULL;
PROFILE_DEBUG1( "CSipAlrMonitor::FreeResources monitor deleted" )
}
}
+ iSnapMonitors.Compress();
}
// -----------------------------------------------------------------------------
--- a/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/src/sipalrsnapmonitor.cpp Tue Sep 14 22:01:18 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/AlrMonitor/src/sipalrsnapmonitor.cpp Wed Sep 15 12:36:02 2010 +0300
@@ -300,6 +300,7 @@
iObservers.Remove( i );
}
}
+ iObservers.Compress();
return iObservers.Count() == 0;
}
@@ -485,7 +486,7 @@
DestroyMobilityAo();
Cancel();
- iConnection.Close();
+// iConnection.Close();
iMigrationAllowedByClient = EFalse;
iConnectionActive = EFalse;
iPreferredCarrierAvailableCalled = EFalse;
--- a/realtimenetprots/sipfw/ProfileAgent/ApnManager/src/sipapnmanager.cpp Tue Sep 14 22:01:18 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/ApnManager/src/sipapnmanager.cpp Wed Sep 15 12:36:02 2010 +0300
@@ -106,10 +106,8 @@
// 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/PluginMgr/Src/Sipplugindirector.cpp Tue Sep 14 22:01:18 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/PluginMgr/Src/Sipplugindirector.cpp Wed Sep 15 12:36:02 2010 +0300
@@ -305,6 +305,7 @@
}//if
}//for
+ iSIPProfileAgents.Compress();
}
// -----------------------------------------------------------------------------
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileCacheItem.cpp Tue Sep 14 22:01:18 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileCacheItem.cpp Wed Sep 15 12:36:02 2010 +0300
@@ -366,6 +366,7 @@
if (index != KErrNotFound)
{
iObservers.Remove(index);
+ iObservers.Compress();
}
RemoveFromPendingObservers(aObserver);
@@ -402,6 +403,7 @@
if (index != KErrNotFound)
{
iUsers.Remove(index);
+ iUsers.Compress();
CheckProfileEnabledState();
}
}
@@ -1256,6 +1258,7 @@
if (index != KErrNotFound)
{
iObserversWaitedForPermission.Remove(index);
+ iObserversWaitedForPermission.Compress();
}
}
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileServerCore.cpp Tue Sep 14 22:01:18 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileServerCore.cpp Wed Sep 15 12:36:02 2010 +0300
@@ -514,7 +514,27 @@
{
ConfirmSystemstateMonitor(CSipSystemStateMonitor::ESystemState);
}
- } //end if Offline
+ } //end if Offline
+
+ //If the System receives Online event
+ if(aValue == CSipSystemStateMonitor::ESystemOnline)
+ {
+ for (TInt i = 0; i < iProfileCache.Count(); i++)
+ {
+ CSIPProfileCacheItem* item = iProfileCache[i];
+ item->OfflineInitiated(EFalse);
+ CSIPConcreteProfile::TStatus status;
+ iPluginDirector->State(status, item->UsedProfile());
+ if (item->IsReferred() && status == CSIPConcreteProfile::EUnregistered)
+ {
+ TRAPD(err, item->StartRegisterL(*iWaitForIAP, *iRegInProg, ETrue));
+ if (err != KErrNone)
+ {
+ HandleAsyncError(*item,CSIPConcreteProfile::ERegistrationInProgress,err);
+ }
+ }
+ }
+ } //end if Online
} //end if SystemState
else if(aVariable == CSipSystemStateMonitor::ERfsState)
{
@@ -1553,6 +1573,7 @@
if (index != KErrNotFound)
{
iObservers.Remove(index);
+ iObservers.Compress();
}
for (TInt i = 0; i < iProfileCache.Count(); i ++)
@@ -1760,6 +1781,7 @@
{
// 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")
}
@@ -1933,6 +1955,7 @@
if (index >= 0)
{
iProfileCache.Remove(index);
+ iProfileCache.Compress();
}
}
@@ -1949,7 +1972,9 @@
{
CSipAlrMigrationController* unused = iMigrationControllers[i];
iMigrationControllers.Remove(i);
+ iMigrationControllers.Compress();
delete unused;
+ unused = NULL;
}
}
}
@@ -2199,7 +2224,8 @@
CSIPConcreteProfile::TStatus status;
self->iPluginDirector->State( status, self->iProfileCache[i]->UsedProfile() );
item->OfflineInitiated(EFalse);
- if (item->IsReferred() && (status == CSIPConcreteProfile::EUnregistered) )
+ if (item->IsReferred() && (!self->iApnManager->IsIapGPRSL(item->Profile().IapId()))
+ && status == CSIPConcreteProfile::EUnregistered)
{
TRAPD(err, item->StartRegisterL(*(self->iWaitForIAP), *(self->iRegInProg), ETrue));
if (err != KErrNone)
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrmigrationcontroller.cpp Tue Sep 14 22:01:18 2010 +0300
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrmigrationcontroller.cpp Wed Sep 15 12:36:02 2010 +0300
@@ -178,6 +178,7 @@
if (index != KErrNotFound)
{
iObservers.Remove(index);
+ iObservers.Compress();
}
if (iObservers.Count() == 0)
--- a/sipproviderplugins/sipprovider/sipconnectionplugins/inc/SIP_subconevents.h Tue Sep 14 22:01:18 2010 +0300
+++ b/sipproviderplugins/sipprovider/sipconnectionplugins/inc/SIP_subconevents.h Wed Sep 15 12:36:02 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 Tue Sep 14 22:01:18 2010 +0300
+++ b/sipproviderplugins/sipprovider/sipconnectionplugins/inc/SIP_subconparams.h Wed Sep 15 12:36:02 2010 +0300
@@ -272,6 +272,6 @@
static CSubConExtensionParameterSet* NewL(TAny* aConstructionParameters);
};
-#include "SIP_subconparams.inl"
+#include "sip_subconparams.inl"
#endif // SIP_SUBCONPARAMS_H