# HG changeset patch
# User hgs
# Date 1284483314 -3600
# Node ID b982c3e940f3ba3dc74888a5b5ef39c1dc22a85b
# Parent ac20d6a0a19d9548ab5b43fd7bdb12ee571c354e
201035_04
diff -r ac20d6a0a19d -r b982c3e940f3 package_definition.xml
--- a/package_definition.xml Mon Aug 09 17:43:08 2010 +0100
+++ b/package_definition.xml Tue Sep 14 17:55:14 2010 +0100
@@ -36,9 +36,6 @@
-
-
-
diff -r ac20d6a0a19d -r b982c3e940f3 smsprotocols/smsstack/smsprot/Group/sms_test.pkg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/Group/sms_test.pkg Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,17 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSSTOR\te_smsstor.script"-"c:\testdata\scripts\te_smsstor.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\Te_SMSStackOutOfDiskSpace.script"-"c:\testdata\scripts\Te_SMSStackOutOfDiskSpace.script"
diff -r ac20d6a0a19d -r b982c3e940f3 smsprotocols/smsstack/smsprot/Group/smsport_test.pkg
--- a/smsprotocols/smsstack/smsprot/Group/smsport_test.pkg Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSEMSPRT\TE_SMSEMSPRT.script"-"c:\testdata\scripts\TE_SMSEMSPRT.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSEMSPRT\te_smsemsprt_commdb.cfg"-"c:\testdata\scripts\te_smsemsprt_commdb.cfg"
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSPRTSTRESS\te_smsprtstress.script"-"c:\testdata\scripts\te_smsprtstress.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSPRTSTRESS\te_smsprtstress_commdb.cfg"-"c:\testdata\scripts\te_smsprtstress_commdb.cfg"
-
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSSTOR\te_smsstor.script"-"c:\testdata\scripts\te_smsstor.script"
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_gsmu.script"-"c:\testdata\scripts\TE_smsprt_gsmu.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_prot.script"-"c:\testdata\scripts\TE_smsprt_prot.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_smsstack.script"-"c:\testdata\scripts\TE_smsprt_smsstack.script"
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\Te_SMSStackOutOfDiskSpace.script"-"c:\testdata\scripts\Te_SMSStackOutOfDiskSpace.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_SetupSMSStackOutOfDiskSpace.script"-"c:\testdata\scripts\TE_SetupSMSStackOutOfDiskSpace.script"
diff -r ac20d6a0a19d -r b982c3e940f3 smsprotocols/smsstack/smsprot/Group/smsprt_test.pkg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/Group/smsprt_test.pkg Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,26 @@
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSEMSPRT\TE_SMSEMSPRT.script"-"c:\testdata\scripts\TE_SMSEMSPRT.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSEMSPRT\te_smsemsprt_commdb.cfg"-"c:\testdata\scripts\te_smsemsprt_commdb.cfg"
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSPRTSTRESS\te_smsprtstress.script"-"c:\testdata\scripts\te_smsprtstress.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSPRTSTRESS\te_smsprtstress_commdb.cfg"-"c:\testdata\scripts\te_smsprtstress_commdb.cfg"
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_gsmu.script"-"c:\testdata\scripts\TE_smsprt_gsmu.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_prot.script"-"c:\testdata\scripts\TE_smsprt_prot.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_smsstack.script"-"c:\testdata\scripts\TE_smsprt_smsstack.script"
+
diff -r ac20d6a0a19d -r b982c3e940f3 smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp
--- a/smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -996,10 +996,12 @@
void CPreallocatedFile::OpenL()
{
User::LeaveIfError(iFile.Open(iFs, iFileName->Des(), EFileShareExclusive|EFileRead|EFileWrite));
+ CleanupClosePushL(iFile);
// Check the validity of the data.
CheckDataL();
// Internalize data
InternalizeEntryArrayL();
+ CleanupStack::Pop(&iFile);
}
/**
diff -r ac20d6a0a19d -r b982c3e940f3 smsprotocols/smsstack/wapprot/Group/wapport_test.pkg
--- a/smsprotocols/smsstack/wapprot/Group/wapport_test.pkg Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/Group/wapport_test.pkg Tue Sep 14 17:55:14 2010 +0100
@@ -15,11 +15,8 @@
"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\TE_WAPDGRM\TE_wapdgrm.script"-"c:\testdata\scripts\TE_wapdgrm.script"
-
"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\TE_WAPTHDR\TE_wapthdr.script"-"c:\testdata\scripts\TE_wapthdr.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\TE_WAPTHDR\TE_wapthdr_setup.script"-"c:\testdata\scripts\TE_wapthdr_setup.script"
-
"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\Te_wapprot\Te_WapProt.script"-"c:\testdata\scripts\Te_WapProt.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\Te_wapprot\Te_WapStackOutOfDiskSpace_ARM_UREL.script"-"c:\testdata\scripts\Te_WapStackOutOfDiskSpace_ARM_UREL.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\Te_wapprot\Te_WapStackOutOfDiskSpace.script"-"c:\testdata\scripts\Te_WapStackOutOfDiskSpace.script"
diff -r ac20d6a0a19d -r b982c3e940f3 smsprotocols/smsstack/wapprot/test/Te_wapprot/TE_WapProt.mmp
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/TE_WapProt.mmp Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/TE_WapProt.mmp Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -30,8 +30,7 @@
USERINCLUDE ../../../test
USERINCLUDE ../../../smsprot/Inc
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib
LIBRARY etel.lib
LIBRARY smsu.lib
@@ -41,7 +40,6 @@
LIBRARY testexecutelogclient.lib
LIBRARY c32root.lib
LIBRARY efsrv.lib
-LIBRARY sbeclient.lib
LIBRARY estor.lib
LIBRARY smsstacktestutilities.lib
diff -r ac20d6a0a19d -r b982c3e940f3 smsprotocols/smsstack/wapprot/test/Te_wapprot/Te_WapProt.script
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/Te_WapProt.script Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/Te_WapProt.script Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -207,18 +207,6 @@
END_TESTCASE SMS-SMSStack-NA-8015
-START_TESTCASE SMS-SMSStack-NA-8014
-//!@SYMTestCaseID SMS-SMSStack-NA-8014
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc IoctlStep_16
-//!@SYMTestPriority critical
-//!@SYMTestActions IoctlStep 16
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 100 TE_WapProt BackupRestoreStep z:\testdata\configs\WapProtSuite\WapProtSuite.ini TestStep16
-
-END_TESTCASE SMS-SMSStack-NA-8014
-
START_TESTCASE SMS-SMSStack-NA-8017
//! @SYMTestCaseID SMS-SMSStack-NA-8017
//! @SYMTestCaseDesc Sends a 7_Bit business card. Using IOCTL query SMS transport parameters
diff -r ac20d6a0a19d -r b982c3e940f3 smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.cpp
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -666,202 +666,6 @@
iSocket.Close();
return TestStepResult();
}
-
-TInt CBackupRestoreStep::SendWapL()
- {
- //modified from test 10
- INFO_PRINTF1(_L("SendWapL: send 7-Bit business card using IOCTL"));
-
- TInt ret = KErrNone;
-
- TPtrC16 TelNumber;
- TInt port=226;
-
- if(!GetStringFromConfig(ConfigSection(),KSCNumber,TelNumber) ||
- !GetIntFromConfig(ConfigSection(),KWapPort,port)
- )
- {
- // Leave if there's any error.
- User::Leave(KErrNotFound);
- }
-
- //
- // Setting the port number and service center number of the wap address
- // The service center number should be the same as the sim phone number used
- // for test (not required for SIM tsy)
- //
- TWapAddr wapAddr;
- wapAddr.SetWapPort(TWapPortNumber(port));
-
- TBuf8<100> scNumber;
- scNumber.Copy(TelNumber);
- TPtrC8 scAddr(scNumber);
- wapAddr.SetWapAddress(scAddr);
-
- //
- // Define and open the socket
- //
- RSocket sock;
- ret = sock.Open(iSocketServer,KWAPSMSAddrFamily,KSockDatagram,KWAPSMSDatagramProtocol);
- if (ret != KErrNone)
- {
- //
- // PREQ399 changes mean that -1 is sometimes now returned from Open() when
- // a Backup and Restore session is in progress (DEF114381).
- //
- INFO_PRINTF2(_L("Socket could not be opened (error %d)..."), ret);
-
- return ret;
- }
- CleanupClosePushL(sock);
-
- TRequestStatus status;
-
- //
- // Indicating to the protocol that it's a new client
- //
- INFO_PRINTF1(_L("Socket set option for indicating new client"));
- User::LeaveIfError(sock.SetOpt(KWapSmsOptionNewStyleClient,KWapSmsOptionLevel, 0));
- //
- // Bind
- //
- User::LeaveIfError(sock.Bind(wapAddr));
-
- TTimeIntervalMicroSeconds32 InitPause=9000000; //Pause to Allow SMSStack to Complete its Async Init
- User::After(InitPause); //call to the TSY and finish its StartUp.
-
- //
- // Send a calendar entry
- //
- TPtrC testData = GetStringFromConfigL(KTestData1);
- TBuf8<200> data;
- data.Copy(testData);
- sock.SendTo(data, wapAddr, 0, status);
- User::WaitForRequest(status);
- ret = status.Int();
-
- if(ret == KErrNone)
- {
- INFO_PRINTF1(_L("Message sent..."));
- }
- else
- {
- INFO_PRINTF2(_L("Message NOT sent (error %d)..."), ret);
- }
-
- CleanupStack::PopAndDestroy(&sock);
- return ret;
- }
-
-TBool CBackupRestoreStep::IsWapFileOpenL()
- {
- TBool ret = ETrue; //assume the file was open
- RFs fsSession;
- User::LeaveIfError(fsSession.Connect());
- CleanupClosePushL(fsSession);
-
- CFileMan* fileManager = CFileMan::NewL(fsSession);
- CleanupStack::PushL(fileManager);
-
- _LIT(KWapFile,"C:\\Private\\101F7989\\sms\\wapreast.dat");
- _LIT(KWapFileBackup,"C:\\Private\\101f7989\\sms\\wapreast.backup");
-
- TEntry entry;
- if (fsSession.Entry(KWapFile,entry)==KErrNone) // File found
- {
- TInt moveStatus = fileManager->Move(KWapFile,KWapFileBackup);
- TESTL(moveStatus == KErrNone || moveStatus == KErrInUse);
-
- // If the move was successful, the file is not opened
- // If the move failed with KErrInUse the file is opened
- if (moveStatus == KErrNone)
- {
- // move it back
- TEST(fileManager->Move(KWapFileBackup,KWapFile) == KErrNone);
- ret = EFalse;
- }
- else // moveStatus == KErrInUse
- {
- ret = ETrue;
- }
- }
- else
- {
- //file not found so it couldn't be open
- ret = EFalse;
- }
-
- CleanupStack::PopAndDestroy(fileManager);
- CleanupStack::PopAndDestroy(&fsSession);
-
- if(ret)
- INFO_PRINTF1(_L("Wapfile open..."));
- else
- INFO_PRINTF1(_L("Wapfile closed..."));
-
- return ret;
- }
-
-TVerdict CBackupRestoreStep::doTestStepL()
-/**
- * Test step 16:
- * simulating backup and restore
- * @return - TVerdict code
- */
- {
- INFO_PRINTF1(_L("IOCTL Test step 16: send 7-Bit business card using IOCTL to test backup and restore"));
- CSBEClient* secureBackupEngine = CSBEClient::NewL();
- CleanupStack::PushL(secureBackupEngine);
- secureBackupEngine->SetBURModeL(TDriveList(_L8("C")),
- EBURNormal, ENoBackup);
-
- INFO_PRINTF1(_L("Expecting SendWapL to succeed and the wap data file to be open"));
- TEST(SendWapL() == KErrNone);
- TEST(IsWapFileOpenL() != EFalse);
-
- // Notify the WAPPROT server that a backup is about to take place and
- // that the server should close the wapstor
- INFO_PRINTF1(_L("Simulating a backup notification"));
- secureBackupEngine->SetBURModeL(TDriveList(_L8("C")),
- EBURBackupFull, EBackupBase);
-
- INFO_PRINTF1(_L("Expecting SendWapL to fail and the wap data file to be closed"));
- TEST(SendWapL() != KErrNone);
- TEST(IsWapFileOpenL() == EFalse);
-
- // Notify the WAPPROT server that a backup has completed
- // that the server should open the wapstor
- INFO_PRINTF1(_L("Simulating a backup complete notification"));
- secureBackupEngine->SetBURModeL(TDriveList(_L8("C")),
- EBURNormal, ENoBackup);
-
- INFO_PRINTF1(_L("Expecting SendWapL to succeed and the wap data file to be open"));
- TEST(SendWapL() == KErrNone);
- TEST(IsWapFileOpenL() != EFalse);
-
- // Notify the WAPPROT server that a restore is about to take place and
- // that the server should close the wapstor
- INFO_PRINTF1(_L("Simulating a restore notification"));
- secureBackupEngine->SetBURModeL(TDriveList(_L8("C")),
- EBURRestorePartial, EBackupIncrement);
-
- INFO_PRINTF1(_L("Expecting SendWapL to fail and the wap data file to be closed"));
- TEST(SendWapL() != KErrNone);
- TEST(IsWapFileOpenL() == EFalse);
-
- // Notify the WAPPROT server that a restore has completed
- // that the server should open the wapstor
- INFO_PRINTF1(_L("Simulating a restore complete notification"));
- secureBackupEngine->SetBURModeL(TDriveList(_L8("C")),
- EBURNormal, ENoBackup);
-
- INFO_PRINTF1(_L("Expecting SendWapL to succeed and the wap data file to be open"));
- TEST(SendWapL() == KErrNone);
- TEST(IsWapFileOpenL() != EFalse);
-
- CleanupStack::PopAndDestroy(secureBackupEngine); // testNumberProperty, secureBackupEngine
- return TestStepResult();
- }
TVerdict CIoctlStep_17::doTestStepL()
/**
diff -r ac20d6a0a19d -r b982c3e940f3 smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.h
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.h Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.h Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
/**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -160,19 +160,6 @@
virtual TVerdict doTestStepL();
};
-class CBackupRestoreStep : public CWapProtSuiteStepBase
-/**
- * Simulating client crash conditions with 8bit message
- */
- {
-public:
- virtual TVerdict doTestStepL();
-
-private:
- TInt SendWapL();
- TBool IsWapFileOpenL();
- };
-
class CIoctlStep_17 : public CWapProtSuiteStepBase
/**
* Sends a 7_Bit business card. Using IOCTL query SMS transport parameters
diff -r ac20d6a0a19d -r b982c3e940f3 smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuite.ini
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuite.ini Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuite.ini Tue Sep 14 17:55:14 2010 +0100
@@ -83,12 +83,6 @@
Service_Center=+447765222315
Wap_Port=9204
-[TestStep16]
-testNumber=16
-Test_Data1=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n
-Service_Center=+447765222315
-Wap_Port=2948
-
[TestStep17_TestWapDatagramSegmentContainingNoData]
testNumber=36
Service_Center=+447765222315
diff -r ac20d6a0a19d -r b982c3e940f3 smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteServer.cpp
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteServer.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteServer.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -170,10 +170,6 @@
{
testStep = new CIoctlStep_15();
}
- else if (aStepName == _L("BackupRestoreStep"))
- {
- testStep = new CBackupRestoreStep();
- }
else if (aStepName == _L("IoctlStep_17"))
{
testStep = new CIoctlStep_17();
diff -r ac20d6a0a19d -r b982c3e940f3 smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteStepBase.h
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteStepBase.h Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteStepBase.h Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
/**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -25,7 +25,6 @@
#include "smsstackbaseteststeps.h"
-#include
#include
#include
@@ -38,8 +37,6 @@
#define LDD_NAME _L("ECOMM")
#endif
-using namespace conn;
-
class CWapProtSuiteStepBase : public CSmsBaseTestStep
{
public:
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/csdagt/group/CSD.MMP
--- a/telephonyprotocols/csdagt/group/CSD.MMP Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/csdagt/group/CSD.MMP Tue Sep 14 17:55:14 2010 +0100
@@ -59,12 +59,12 @@
LIBRARY commsdat.lib
-#if defined(WINS)
+#if defined(EABI)
+deffile /epoc32/include/def/eabi/agent.def
+#elif defined(WINS)
deffile /epoc32/release/wins/agent.def
-#elif defined(GCC32)
+#else
deffile /epoc32/release/marm/agent.def
-#else
-deffile /epoc32/include/def/eabi/agent.def
#endif
START WINS
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/csdagt/script/SCHAT.CPP
--- a/telephonyprotocols/csdagt/script/SCHAT.CPP Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/csdagt/script/SCHAT.CPP Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -114,7 +114,6 @@
: (cs->LastChar()==aChar && Match(cs)) )
{
iNotify->ChatStringMatch(index);
- cs=iter; // In case user removed cs;
}
index++;
}
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/group/pdp.mmp
--- a/telephonyprotocols/pdplayer/group/pdp.mmp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/group/pdp.mmp Tue Sep 14 17:55:14 2010 +0100
@@ -41,11 +41,9 @@
SOURCE PDPConfig.cpp
SOURCE ecom_impl.cpp
SOURCE psdavailabilitylistener.cpp
-SOURCE pdptiermanagerfactory.cpp
-SOURCE pdptiermanager.cpp
SOURCE pdpservices.cpp
SOURCE mbmsengine.cpp
-SOURCE pdptiermanagerselector.cpp
+
SOURCE PDPCPR.cpp
SOURCE PDPCPRFactory.cpp
#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
@@ -53,6 +51,15 @@
#endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
SOURCE AuthenticationDialog.cpp
+// tier manager
+SOURCE pdptiermanagerfactory.cpp
+SOURCE pdptiermanager.cpp
+SOURCE pdptiermanagerselector.cpp
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
+SOURCE pdp_contention.cpp
+#endif
+
+
SOURCEPATH ../umts/spudfsm/src
SOURCE PDPSCPRFSM.cpp
SOURCE cpdpfsm.cpp
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/inc/PDPFSM.h
--- a/telephonyprotocols/pdplayer/inc/PDPFSM.h Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/inc/PDPFSM.h Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
/**
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -151,6 +151,8 @@
return iUmtsRelease;
}
+ const TName& GetContextName(TContextId aPdpId);
+
protected:
private:
// DO NOT provide implementations to these methods: Copying this object should be disabled
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/inc/pdp_contention.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/inc/pdp_contention.h Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,159 @@
+/**
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Header file declaring the RawIP Provisioning structures.
+*
+*
+*/
+
+/**
+ @file
+ @internalTechnology
+*/
+
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
+
+#ifndef PDP_CONTENTION_H
+#define PDP_CONTENTION_H
+
+#include
+
+class CMBMSEngine;
+class CContextStatusMonitor;
+class CContextTypeChecker;
+
+
+class MContextEventsObserver
+ {
+public:
+ virtual void PrimaryContextAddedL(const TName* aContextName) = 0;
+ virtual void SecondaryContextAdded(const TName* aContextName) = 0;
+ virtual void PrimaryContextDeleted(const CContextStatusMonitor* aContextStatusMonitor) = 0;
+ virtual void ContextMonitoringError(const CContextStatusMonitor* aContextStatusMonitor, TInt aError) = 0;
+ virtual void ContextTypeCheckingError(const TName* aContextName, TInt aError) = 0;
+ };
+
+class CContextStatusMonitor : public CActive
+ {
+public:
+ CContextStatusMonitor(RPacketService& aPacketService, MContextEventsObserver& aCallback);
+ ~CContextStatusMonitor();
+
+public:
+ TBool StartL(const TName& aContextName);
+ inline TBool IsPassedThroughActiveState() const;
+
+private:
+ void RunL();
+ void DoCancel();
+ TInt RunError(TInt aError);
+
+private:
+ RPacketService& iPacketService;
+ RPacketContext iPacketContext;
+ RPacketContext::TContextStatus iContextStatus;
+ MContextEventsObserver& iCallback;
+ TName iContextName;
+ TBool iWasActive;
+ };
+
+
+class CPrimaryContextsMonitor : public CActive, MContextEventsObserver
+ {
+ enum TState {EEnumeratingContexts, EGettingInfo, EListening};
+public:
+ CPrimaryContextsMonitor(RPacketService& aPacketService, MContentionObserver& aCallback);
+ ~CPrimaryContextsMonitor();
+public:
+ void StartL();
+
+// from MContextEventsObserver
+ void PrimaryContextAddedL(const TName* aContextName);
+ void SecondaryContextAdded(const TName* aContextName);
+ void PrimaryContextDeleted(const CContextStatusMonitor* aContextStatusMonitor);
+ void ContextMonitoringError(const CContextStatusMonitor* aContextStatusMonitor, TInt aError);
+ void ContextTypeCheckingError(const TName* aContextName, TInt aError);
+
+private:
+ void RunL();
+ void DoCancel();
+ TInt RunError(TInt aError);
+ void DeleteContextStatusMonitor(const CContextStatusMonitor* aContextStatusMonitor);
+ void SwitchStateL();
+ void StartContextStatusMonitoringL(const TName& aContextName);
+ void RemoveContextNameAndCheckNext(const TName* aContextName);
+ void ProcessError(TInt aError);
+
+private:
+ RPointerArray iContextMonitors;
+ RPointerArray iAddedContextsNames;
+ CContextTypeChecker* iContextTypeChecker;
+ RPacketService& iPacketService;
+ TState iState;
+ RPacketService::TNifInfoV2 iCurrentNifInfo;
+ TInt iInitialNifsCount;
+ TInt iCurrentNifIndex;
+ TBool iFirstContextAdded;
+ MContentionObserver& iCallback;
+ };
+
+class CContextTypeChecker : public CActive
+ {
+public:
+ CContextTypeChecker(RPacketService& aPacketService, MContextEventsObserver& aCallback);
+ ~CContextTypeChecker();
+
+public:
+ void Start(const TName* aContextName);
+ void RunL();
+ TInt RunError(TInt aError);
+ void DoCancel();
+
+private:
+ RPacketService& iPacketService;
+ const TName* iContextName;
+ MContextEventsObserver& iCallback;
+ TInt iCountInNif;
+ };
+
+class CPdpContentionManager : public CContentionManager
+ {
+public:
+ static CPdpContentionManager* NewL(const ESock::CTierManagerBase& aTierManager, RPacketService& aPacketService);
+ ~CPdpContentionManager();
+
+public:
+ void StartMonitoringL();
+
+private:
+ void ConstructL(RPacketService& aPacketService);
+ CPdpContentionManager(const ESock::CTierManagerBase& aTierManager);
+
+private:
+ // from CContentionManager
+ virtual void ContentionResolved(const TContentionRequestItem& aContentionRequest, TBool aResult);
+ virtual void ContentionOccured(ESock::CMetaConnectionProviderBase& aMcpr);
+ virtual void ReportContentionAvailabilityStatus(ESock::CMetaConnectionProviderBase& aMcpr, const ESock::TAvailabilityStatus& aStatus) const;
+
+private:
+ CPrimaryContextsMonitor* iPrimaryContextsMonitor;
+ };
+
+inline TBool CContextStatusMonitor::IsPassedThroughActiveState() const
+ {
+ return iWasActive;
+ }
+#endif
+
+#endif
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/inc/pdpmcpr.h
--- a/telephonyprotocols/pdplayer/inc/pdpmcpr.h Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/inc/pdpmcpr.h Tue Sep 14 17:55:14 2010 +0100
@@ -57,9 +57,11 @@
virtual ~CPdpMetaConnectionProvider();
public:
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
void ContentionResolved(const Messages::TNodeId& aPendingCprId, TBool aResult);
void ContentionOccured();
void ReportContentionAvailabilityStatus(const ESock::TAvailabilityStatus& aStatus) const;
+#endif
protected:
CPdpMetaConnectionProvider(ESock::CMetaConnectionProviderFactoryBase& aFactory, const ESock::TProviderInfo& aProviderInfo);
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/inc/pdptiermanager.h
--- a/telephonyprotocols/pdplayer/inc/pdptiermanager.h Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/inc/pdptiermanager.h Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
using namespace ESock;
class CMBMSEngine;
@@ -37,121 +38,6 @@
virtual void PacketServiceAttachedCallbackL() = 0;
};
-class MContextEventsObserver
- {
-public:
- virtual void PrimaryContextAddedL(const TName* aContextName) = 0;
- virtual void SecondaryContextAdded(const TName* aContextName) = 0;
- virtual void PrimaryContextDeleted(const CContextStatusMonitor* aContextStatusMonitor) = 0;
- virtual void ContextMonitoringError(const CContextStatusMonitor* aContextStatusMonitor, TInt aError) = 0;
- virtual void ContextTypeCheckingError(const TName* aContextName, TInt aError) = 0;
- };
-
-class CContextStatusMonitor : public CActive
- {
-public:
- CContextStatusMonitor(RPacketService& aPacketService, MContextEventsObserver& aCallback);
- ~CContextStatusMonitor();
-
-public:
- TBool StartL(const TName& aContextName);
- inline TBool IsPassedThroughActiveState() const;
-
-private:
- void RunL();
- void DoCancel();
- TInt RunError(TInt aError);
-
-private:
- RPacketService& iPacketService;
- RPacketContext iPacketContext;
- RPacketContext::TContextStatus iContextStatus;
- MContextEventsObserver& iCallback;
- TName iContextName;
- TBool iWasActive;
- };
-
-
-class CPrimaryContextsMonitor : public CActive, MContextEventsObserver
- {
- enum TState {EEnumeratingContexts, EGettingInfo, EListening};
-public:
- CPrimaryContextsMonitor(RPacketService& aPacketService, MContentionObserver& aCallback);
- ~CPrimaryContextsMonitor();
-public:
- void StartL();
-
-// from MContextEventsObserver
- void PrimaryContextAddedL(const TName* aContextName);
- void SecondaryContextAdded(const TName* aContextName);
- void PrimaryContextDeleted(const CContextStatusMonitor* aContextStatusMonitor);
- void ContextMonitoringError(const CContextStatusMonitor* aContextStatusMonitor, TInt aError);
- void ContextTypeCheckingError(const TName* aContextName, TInt aError);
-
-private:
- void RunL();
- void DoCancel();
- TInt RunError(TInt aError);
- void DeleteContextStatusMonitor(const CContextStatusMonitor* aContextStatusMonitor);
- void SwitchStateL();
- void StartContextStatusMonitoringL(const TName& aContextName);
- void RemoveContextNameAndCheckNext(const TName* aContextName);
- void ProcessError(TInt aError);
-
-private:
- RPointerArray iContextMonitors;
- RPointerArray iAddedContextsNames;
- CContextTypeChecker* iContextTypeChecker;
- RPacketService& iPacketService;
- TState iState;
- RPacketService::TNifInfoV2 iCurrentNifInfo;
- TInt iInitialNifsCount;
- TInt iCurrentNifIndex;
- TBool iFirstContextAdded;
- MContentionObserver& iCallback;
- };
-
-class CContextTypeChecker : public CActive
- {
-public:
- CContextTypeChecker(RPacketService& aPacketService, MContextEventsObserver& aCallback);
- ~CContextTypeChecker();
-
-public:
- void Start(const TName* aContextName);
- void RunL();
- TInt RunError(TInt aError);
- void DoCancel();
-
-private:
- RPacketService& iPacketService;
- const TName* iContextName;
- MContextEventsObserver& iCallback;
- TInt iCountInNif;
- };
-
-class CPdpContentionManager : public CContentionManager
- {
-public:
- static CPdpContentionManager* NewL(const ESock::CTierManagerBase& aTierManager, RPacketService& aPacketService);
- ~CPdpContentionManager();
-
-public:
- void StartMonitoringL();
-
-private:
- void ConstructL(RPacketService& aPacketService);
- CPdpContentionManager(const ESock::CTierManagerBase& aTierManager);
-
-private:
- // from CContentionManager
- virtual void ContentionResolved(const TContentionRequestItem& aContentionRequest, TBool aResult);
- virtual void ContentionOccured(ESock::CMetaConnectionProviderBase& aMcpr);
- virtual void ReportContentionAvailabilityStatus(ESock::CMetaConnectionProviderBase& aMcpr, const ESock::TAvailabilityStatus& aStatus) const;
-
-private:
- CPrimaryContextsMonitor* iPrimaryContextsMonitor;
- };
//PDP Tier Manager
class CPDPTierManager : public CCoreTierManager, public MPacketServiceNotifier
@@ -176,13 +62,13 @@
private:
CMBMSEngine* iMBMSEngine;
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
CPdpContentionManager* iPdpContentionManager;
+#endif
+
};
-inline TBool CContextStatusMonitor::IsPassedThroughActiveState() const
- {
- return iWasActive;
- }
+
#endif // SYMBIAN_PDPTIERMANAGER_H
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/inc/psdavailabilitylistener.h
--- a/telephonyprotocols/pdplayer/inc/psdavailabilitylistener.h Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/inc/psdavailabilitylistener.h Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -34,8 +34,11 @@
public:
static CPsdAvailabilityListener* NewL(const Messages::TNodeCtxId& aAvailabilityActivity, const CTSYProvision& aTsyProvision, TUint aApId, TBool aUnavailableDueToContention);
virtual ~CPsdAvailabilityListener();
+
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
void ReportContentionAvailabilityStatusIfRequired(const ESock::TAvailabilityStatus& aAvailabilityStatus);
-
+#endif
+
private:
CPsdAvailabilityListener(const Messages::TNodeCtxId& aAvailabilityActivity, const CTSYProvision& aTsyProvision, TUint aApId, TBool aUnavailableDueToContention);
void StartL();
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/src/PDPCPR.cpp
--- a/telephonyprotocols/pdplayer/src/PDPCPR.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/PDPCPR.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -49,19 +49,12 @@
using namespace ESock;
-
//-=========================================================
//
// CPDPConnectionProvider methods
//
//-=========================================================
-//We reserve space for two preallocated activities that may start concurrently on the CPR
-//node: destroy and data client stop.
-static const TUint KDefaultMaxPreallocatedActivityCount = 2;
-static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>);
-static const TUint KPDPCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize;
-
#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
namespace PDPCprLinkCharacteristicActivity
{
@@ -108,7 +101,7 @@
* @return void
*/
{
- CCoreConnectionProvider::ConstructL(KPDPCPRPreallocatedActivityBufferSize);
+ CCoreConnectionProvider::ConstructL();
}
CPDPConnectionProvider::CPDPConnectionProvider(ESock::CConnectionProviderFactoryBase& aFactory)
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/src/PDPSCPR.cpp
--- a/telephonyprotocols/pdplayer/src/PDPSCPR.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/PDPSCPR.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -42,12 +42,6 @@
using namespace NetStateMachine;
using namespace Factories;
-//We reserve space for two preallocated activities that may start concurrently on the SCPR
-//node: destroy and data client stop.
-static const TUint KDefaultMaxPreallocatedActivityCount = 2;
-static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>);
-static const TUint KPDPSCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize;
-
//-=========================================================
//
// CPDPSubConnectionProvider Activities
@@ -266,7 +260,7 @@
IP SubConnection Provider Second Phase Constructor
*/
{
- CCoreSubConnectionProvider::ConstructL(KPDPSCPRPreallocatedActivityBufferSize);
+ CCoreSubConnectionProvider::ConstructL();
}
void CPDPSubConnectionProvider::Received(TNodeContextBase& aContext)
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp
--- a/telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -1865,10 +1865,13 @@
RCFParameterFamilyBundle newBundle;
newBundle.CreateL();
newBundle.Open(iContext.Node().iParameterBundle);
+ CleanupClosePushL(newBundle);
+
RParameterFamily imcnFamily = newBundle.CreateFamilyL(KSubConnContextDescrParamsFamily);
CSubConImsExtParamSet *imcnFlag = CSubConImsExtParamSet::NewL(imcnFamily,RParameterFamily::EGranted);
- newBundle.Close();
+
+ CleanupStack::PopAndDestroy(&newBundle);
RPacketContext::TProtocolConfigOptionV2* pco = NULL;
switch (gprsProvision->UmtsGprsRelease())
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/src/pdp_contention.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/src/pdp_contention.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,372 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "pdp_contentionTraces.h"
+#endif
+
+
+#include
+#include
+#include
+#include
+#include
+
+CContextTypeChecker::CContextTypeChecker(RPacketService& aPacketService, MContextEventsObserver& aCallback):CActive(EPriorityStandard),
+ iPacketService(aPacketService), iCallback(aCallback)
+ {
+ CActiveScheduler::Add(this);
+ }
+
+CContextTypeChecker::~CContextTypeChecker()
+ {
+ iContextName = NULL;
+ }
+
+void CContextTypeChecker::Start(const TName* aContextName)
+ {
+ iContextName = aContextName;
+ iPacketService.EnumerateContextsInNif(iStatus, *iContextName, iCountInNif);
+ SetActive();
+ }
+
+void CContextTypeChecker::RunL()
+ {
+ User::LeaveIfError(iStatus.Int());
+ if (iCountInNif == 1) // This is a primary context
+ {
+ iCallback.PrimaryContextAddedL(iContextName);
+ }
+ else
+ {
+ iCallback.SecondaryContextAdded(iContextName);
+ }
+ }
+
+void CContextTypeChecker::DoCancel()
+ {
+ iPacketService.CancelAsyncRequest(EPacketEnumerateContextsInNif);
+ }
+
+TInt CContextTypeChecker::RunError(TInt aError)
+ {
+ // Report an error
+ iCallback.ContextTypeCheckingError(iContextName, aError);
+ return KErrNone; // Make ActiveScheduler happy
+ }
+
+
+CPrimaryContextsMonitor::CPrimaryContextsMonitor(RPacketService& aPacketService, MContentionObserver& aCallback) : CActive(EPriorityStandard),
+ iPacketService(aPacketService), iCallback(aCallback)
+ {
+ CActiveScheduler::Add(this);
+ }
+
+CPrimaryContextsMonitor::~CPrimaryContextsMonitor()
+ {
+ Cancel();
+ iContextMonitors.ResetAndDestroy();
+ delete iContextTypeChecker;
+ iAddedContextsNames.ResetAndDestroy();
+ }
+
+void CPrimaryContextsMonitor::StartL()
+ {
+ iContextTypeChecker = new(ELeave) CContextTypeChecker(iPacketService, *this);
+ iState = EEnumeratingContexts;
+ iPacketService.EnumerateNifs(iStatus, iInitialNifsCount);
+ SetActive();
+ }
+
+void CPrimaryContextsMonitor::PrimaryContextAddedL(const TName* aContextName)
+ {
+ // Create new status monitor for this context
+ StartContextStatusMonitoringL(*aContextName);
+ RemoveContextNameAndCheckNext(aContextName);
+ }
+
+void CPrimaryContextsMonitor::SecondaryContextAdded(const TName* aContextName)
+ {
+ // This is not a primary context, just delete its name.
+ RemoveContextNameAndCheckNext(aContextName);
+ }
+
+void CPrimaryContextsMonitor::RemoveContextNameAndCheckNext(const TName* aContextName)
+ {
+ TInt nameIndex = iAddedContextsNames.Find(aContextName);
+ __ASSERT_DEBUG(nameIndex != KErrNotFound, User::Invariant());
+ delete iAddedContextsNames[nameIndex];
+ iAddedContextsNames.Remove(nameIndex);
+
+ if (iAddedContextsNames.Count() > 1)
+ // Should be more than one here, coz we are waiting for new context added all the time,
+ // so the last one item is always empty.
+ {
+ iContextTypeChecker->Start(iAddedContextsNames[0]);
+ }
+ }
+
+void CPrimaryContextsMonitor::PrimaryContextDeleted(const CContextStatusMonitor* aContextStatusMonitor)
+ {
+ if (aContextStatusMonitor->IsPassedThroughActiveState())
+ {
+ iCallback.ContentionResolved();
+ }
+ DeleteContextStatusMonitor(aContextStatusMonitor);
+ }
+
+void CPrimaryContextsMonitor::ContextTypeCheckingError(const TName* aContextName, TInt aError)
+ {
+ RemoveContextNameAndCheckNext(aContextName);
+ ProcessError(aError);
+ }
+
+
+void CPrimaryContextsMonitor::ContextMonitoringError(const CContextStatusMonitor* aContextStatusMonitor, TInt aError)
+ {
+ DeleteContextStatusMonitor(aContextStatusMonitor);
+ ProcessError(aError);
+ }
+
+void CPrimaryContextsMonitor::DeleteContextStatusMonitor(const CContextStatusMonitor* aContextStatusMonitor)
+ {
+ TInt monitorIndex = iContextMonitors.Find(aContextStatusMonitor);
+ __ASSERT_DEBUG(monitorIndex != KErrNotFound, User::Invariant());
+ delete iContextMonitors[monitorIndex];
+ iContextMonitors.Remove(monitorIndex);
+ }
+
+void CPrimaryContextsMonitor::ProcessError(TInt aError)
+ {
+ __ASSERT_DEBUG(aError != KErrNone, User::Invariant());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPRIMARYCONTEXTSMONITOR_PROCESSERROR_1, ("PDP context monitoring error: %d"), aError);
+ (void)aError; //needed for debug builds
+ }
+
+void CPrimaryContextsMonitor::RunL()
+ {
+ User::LeaveIfError(iStatus.Int());
+ SwitchStateL();
+ RPacketService::TNifInfoV2Pckg nifInfoV2Pckg(iCurrentNifInfo);
+ switch(iState)
+ {
+ case EGettingInfo:
+ StartContextStatusMonitoringL(iCurrentNifInfo.iContextName);
+ iPacketService.GetNifInfo(iStatus, iCurrentNifIndex, nifInfoV2Pckg);
+ ++iCurrentNifIndex;
+ SetActive();
+ break;
+ case EListening:
+ // All functions in RPacketService and RPacketContext,
+ // that can be used to check if context is primary, are asynchronous.
+ // We could not call them here, coz can miss some events from NotifyContextAdded
+ // So subscribe to NotifyContextAdded as soon as possible and check context
+ // type using CContextTypeChecker active object
+ TName *contextName = new (ELeave) TName;
+ CleanupStack::PushL(contextName);
+ iAddedContextsNames.AppendL(contextName);
+ CleanupStack::Pop(contextName);
+ // subscribe to NotifyContextAdded
+ iPacketService.NotifyContextAdded(iStatus, *contextName);
+ SetActive();
+ // if there are any items in iAddedContextsNames except that one that has been added above, i.e count > 1
+ // starting asynchronous context type checking
+ if (!iContextTypeChecker->IsActive() && iAddedContextsNames.Count()>1)
+ {
+ iContextTypeChecker->Start(iAddedContextsNames[0]);
+ }
+ break;
+ }
+ }
+void CPrimaryContextsMonitor::DoCancel()
+ {
+ switch(iState)
+ {
+ case EEnumeratingContexts:
+ iPacketService.CancelAsyncRequest(EPacketEnumerateNifs);
+ break;
+ case EGettingInfo:
+ iPacketService.CancelAsyncRequest(EPacketGetNifInfo);
+ break;
+ case EListening:
+ iPacketService.CancelAsyncRequest(EPacketNotifyContextAdded);
+ break;
+ }
+
+ }
+
+TInt CPrimaryContextsMonitor::RunError(TInt aError)
+ {
+ // Process an error
+ ProcessError(aError);
+ return KErrNone; // Make ActiveScheduler happy
+ }
+
+
+void CPrimaryContextsMonitor::SwitchStateL()
+ {
+ if (iState == EEnumeratingContexts)
+ {
+ if (iInitialNifsCount > 0)
+ {
+ iState = EGettingInfo;
+ }
+ else
+ {
+ iState = EListening;
+ }
+ }
+ else if (iState == EGettingInfo && iCurrentNifIndex == iInitialNifsCount)
+ {
+ StartContextStatusMonitoringL(iCurrentNifInfo.iContextName);
+ iState = EListening;
+ }
+ }
+
+void CPrimaryContextsMonitor::StartContextStatusMonitoringL(const TName& aContextName)
+ {
+ CContextStatusMonitor* newStatusMonitor = new (ELeave) CContextStatusMonitor(iPacketService, *this);
+ CleanupStack::PushL(newStatusMonitor);
+ iContextMonitors.AppendL(newStatusMonitor);
+ CleanupStack::Pop(newStatusMonitor);
+ newStatusMonitor->StartL(aContextName);
+ }
+
+CContextStatusMonitor::CContextStatusMonitor(RPacketService& aPacketService, MContextEventsObserver& aCallback):CActive(EPriorityStandard),
+ iPacketService(aPacketService), iCallback(aCallback)
+ {
+ CActiveScheduler::Add(this);
+ }
+
+CContextStatusMonitor::~CContextStatusMonitor()
+ {
+ Cancel();
+ iPacketContext.Close();
+ }
+
+TBool CContextStatusMonitor::StartL(const TName& aContextName)
+ {
+ iContextName.Copy(aContextName);
+ User::LeaveIfError(iPacketContext.OpenExistingContext(iPacketService, iContextName));
+ User::LeaveIfError(iPacketContext.GetStatus(iContextStatus));
+
+ if (iContextStatus == RPacketContext::EStatusDeleted)
+ {
+ return EFalse;
+ }
+
+ if (iContextStatus == RPacketContext::EStatusActive ||
+ iContextStatus == RPacketContext::EStatusSuspended ||
+ iContextStatus == RPacketContext::EStatusDeactivating)
+ {
+ iWasActive = ETrue;
+ }
+
+ iPacketContext.NotifyStatusChange(iStatus, iContextStatus);
+ SetActive();
+ return ETrue;
+ }
+
+void CContextStatusMonitor::RunL()
+ {
+ User::LeaveIfError(iStatus.Int());
+ if (iContextStatus == RPacketContext::EStatusActive)
+ {
+ iWasActive = ETrue;
+ }
+
+ if (iContextStatus == RPacketContext::EStatusDeleted)
+ {
+ iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange);
+ iCallback.PrimaryContextDeleted(this);
+ }
+ else
+ {
+ iPacketContext.NotifyStatusChange(iStatus, iContextStatus);
+ SetActive();
+ }
+ }
+
+void CContextStatusMonitor::DoCancel()
+ {
+ iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange);
+ }
+
+TInt CContextStatusMonitor::RunError(TInt aError)
+ {
+ iCallback.ContextMonitoringError(this, aError);
+ return KErrNone;
+ }
+
+
+CPdpContentionManager* CPdpContentionManager::NewL(const ESock::CTierManagerBase& aTierManager, RPacketService& aPacketService)
+ {
+ CPdpContentionManager* self = new (ELeave) CPdpContentionManager(aTierManager);
+ CleanupStack::PushL(self);
+ self->ConstructL(aPacketService);
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+CPdpContentionManager::CPdpContentionManager(const ESock::CTierManagerBase& aTierManager):
+CContentionManager(aTierManager)
+ {
+ }
+
+CPdpContentionManager::~CPdpContentionManager()
+ {
+ delete iPrimaryContextsMonitor;
+ }
+
+void CPdpContentionManager::ConstructL(RPacketService& aPacketService)
+ {
+ iPrimaryContextsMonitor = new (ELeave) CPrimaryContextsMonitor(aPacketService, *this);
+ }
+
+void CPdpContentionManager::StartMonitoringL()
+ {
+ if (iPrimaryContextsMonitor)
+ {
+ iPrimaryContextsMonitor->StartL();
+ }
+ }
+
+void CPdpContentionManager::ContentionResolved(const TContentionRequestItem& aContentionRequest, TBool aResult)
+ {
+ CPdpMetaConnectionProvider* pdpMcpr = static_cast(aContentionRequest.iMcpr);
+
+ pdpMcpr->ContentionResolved(aContentionRequest.iPendingCprId, aResult);
+ }
+
+void CPdpContentionManager::ContentionOccured(ESock::CMetaConnectionProviderBase& aMcpr)
+ {
+ CPdpMetaConnectionProvider& pdpMcpr = static_cast(aMcpr);
+
+ pdpMcpr.ContentionOccured();
+ }
+
+void CPdpContentionManager::ReportContentionAvailabilityStatus(ESock::CMetaConnectionProviderBase& aMcpr, const ESock::TAvailabilityStatus& aStatus) const
+ {
+ CPdpMetaConnectionProvider& pdpMcpr = static_cast(aMcpr);
+
+ pdpMcpr.ReportContentionAvailabilityStatus(aStatus);
+ }
+
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/src/pdpmcpr.cpp
--- a/telephonyprotocols/pdplayer/src/pdpmcpr.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/pdpmcpr.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -290,6 +290,7 @@
}
}
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
void CPdpMetaConnectionProvider::ContentionOccured()
{
// Send a stop request to the stop activity.
@@ -303,6 +304,7 @@
TRAP_IGNORE(ReceivedL(TNodeId(Id()), TNodeId(Id()), msg));
}
+
void CPdpMetaConnectionProvider::ReportContentionAvailabilityStatus(const TAvailabilityStatus& aAvailabilityStatus) const
{
if (iAvailabilityListener)
@@ -310,4 +312,5 @@
iAvailabilityListener->ReportContentionAvailabilityStatusIfRequired(aAvailabilityStatus);
}
}
+#endif
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/src/pdpservices.cpp
--- a/telephonyprotocols/pdplayer/src/pdpservices.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/pdpservices.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -111,6 +111,7 @@
Cancel();
iObjectBundleOwner->Close();
delete iRetrievePcktMbms;
+ iRequestOriginator.Close();
}
/**
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/src/pdptiermanager.cpp
--- a/telephonyprotocols/pdplayer/src/pdptiermanager.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/pdptiermanager.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -52,344 +52,6 @@
}
-CContextTypeChecker::CContextTypeChecker(RPacketService& aPacketService, MContextEventsObserver& aCallback):CActive(EPriorityStandard),
- iPacketService(aPacketService), iCallback(aCallback)
- {
- CActiveScheduler::Add(this);
- }
-
-CContextTypeChecker::~CContextTypeChecker()
- {
- iContextName = NULL;
- }
-
-void CContextTypeChecker::Start(const TName* aContextName)
- {
- iContextName = aContextName;
- iPacketService.EnumerateContextsInNif(iStatus, *iContextName, iCountInNif);
- SetActive();
- }
-
-void CContextTypeChecker::RunL()
- {
- User::LeaveIfError(iStatus.Int());
- if (iCountInNif == 1) // This is a primary context
- {
- iCallback.PrimaryContextAddedL(iContextName);
- }
- else
- {
- iCallback.SecondaryContextAdded(iContextName);
- }
- }
-
-void CContextTypeChecker::DoCancel()
- {
- iPacketService.CancelAsyncRequest(EPacketEnumerateContextsInNif);
- }
-
-TInt CContextTypeChecker::RunError(TInt aError)
- {
- // Report an error
- iCallback.ContextTypeCheckingError(iContextName, aError);
- return KErrNone; // Make ActiveScheduler happy
- }
-
-CPrimaryContextsMonitor::CPrimaryContextsMonitor(RPacketService& aPacketService, MContentionObserver& aCallback) : CActive(EPriorityStandard),
- iPacketService(aPacketService), iCallback(aCallback)
- {
- CActiveScheduler::Add(this);
- }
-
-CPrimaryContextsMonitor::~CPrimaryContextsMonitor()
- {
- Cancel();
- iContextMonitors.ResetAndDestroy();
- delete iContextTypeChecker;
- iAddedContextsNames.ResetAndDestroy();
- }
-
-void CPrimaryContextsMonitor::StartL()
- {
- iContextTypeChecker = new(ELeave) CContextTypeChecker(iPacketService, *this);
- iState = EEnumeratingContexts;
- iPacketService.EnumerateNifs(iStatus, iInitialNifsCount);
- SetActive();
- }
-
-void CPrimaryContextsMonitor::PrimaryContextAddedL(const TName* aContextName)
- {
- // Create new status monitor for this context
- StartContextStatusMonitoringL(*aContextName);
- RemoveContextNameAndCheckNext(aContextName);
- }
-
-void CPrimaryContextsMonitor::SecondaryContextAdded(const TName* aContextName)
- {
- // This is not a primary context, just delete its name.
- RemoveContextNameAndCheckNext(aContextName);
- }
-
-void CPrimaryContextsMonitor::RemoveContextNameAndCheckNext(const TName* aContextName)
- {
- TInt nameIndex = iAddedContextsNames.Find(aContextName);
- __ASSERT_DEBUG(nameIndex != KErrNotFound, User::Invariant());
- delete iAddedContextsNames[nameIndex];
- iAddedContextsNames.Remove(nameIndex);
-
- if (iAddedContextsNames.Count() > 1)
- // Should be more than one here, coz we are waiting for new context added all the time,
- // so the last one item is always empty.
- {
- iContextTypeChecker->Start(iAddedContextsNames[0]);
- }
- }
-
-void CPrimaryContextsMonitor::PrimaryContextDeleted(const CContextStatusMonitor* aContextStatusMonitor)
- {
- if (aContextStatusMonitor->IsPassedThroughActiveState())
- {
- iCallback.ContentionResolved();
- }
- DeleteContextStatusMonitor(aContextStatusMonitor);
- }
-
-void CPrimaryContextsMonitor::ContextTypeCheckingError(const TName* aContextName, TInt aError)
- {
- RemoveContextNameAndCheckNext(aContextName);
- ProcessError(aError);
- }
-
-
-void CPrimaryContextsMonitor::ContextMonitoringError(const CContextStatusMonitor* aContextStatusMonitor, TInt aError)
- {
- DeleteContextStatusMonitor(aContextStatusMonitor);
- ProcessError(aError);
- }
-
-void CPrimaryContextsMonitor::DeleteContextStatusMonitor(const CContextStatusMonitor* aContextStatusMonitor)
- {
- TInt monitorIndex = iContextMonitors.Find(aContextStatusMonitor);
- __ASSERT_DEBUG(monitorIndex != KErrNotFound, User::Invariant());
- delete iContextMonitors[monitorIndex];
- iContextMonitors.Remove(monitorIndex);
- }
-
-void CPrimaryContextsMonitor::ProcessError(TInt aError)
- {
- __ASSERT_DEBUG(aError != KErrNone, User::Invariant());
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPRIMARYCONTEXTSMONITOR_PROCESSERROR_1, ("PDP context monitoring error: %d"), aError);
- (void)aError; //needed for debug builds
- }
-
-void CPrimaryContextsMonitor::RunL()
- {
- User::LeaveIfError(iStatus.Int());
- SwitchStateL();
- RPacketService::TNifInfoV2Pckg nifInfoV2Pckg(iCurrentNifInfo);
- switch(iState)
- {
- case EGettingInfo:
- StartContextStatusMonitoringL(iCurrentNifInfo.iContextName);
- iPacketService.GetNifInfo(iStatus, iCurrentNifIndex, nifInfoV2Pckg);
- ++iCurrentNifIndex;
- SetActive();
- break;
- case EListening:
- // All functions in RPacketService and RPacketContext,
- // that can be used to check if context is primary, are asynchronous.
- // We could not call them here, coz can miss some events from NotifyContextAdded
- // So subscribe to NotifyContextAdded as soon as possible and check context
- // type using CContextTypeChecker active object
- TName *contextName = new (ELeave) TName;
- CleanupStack::PushL(contextName);
- iAddedContextsNames.AppendL(contextName);
- CleanupStack::Pop(contextName);
- // subscribe to NotifyContextAdded
- iPacketService.NotifyContextAdded(iStatus, *contextName);
- SetActive();
- // if there are any items in iAddedContextsNames except that one that has been added above, i.e count > 1
- // starting asynchronous context type checking
- if (!iContextTypeChecker->IsActive() && iAddedContextsNames.Count()>1)
- {
- iContextTypeChecker->Start(iAddedContextsNames[0]);
- }
- break;
- }
- }
-void CPrimaryContextsMonitor::DoCancel()
- {
- switch(iState)
- {
- case EEnumeratingContexts:
- iPacketService.CancelAsyncRequest(EPacketEnumerateNifs);
- break;
- case EGettingInfo:
- iPacketService.CancelAsyncRequest(EPacketGetNifInfo);
- break;
- case EListening:
- iPacketService.CancelAsyncRequest(EPacketNotifyContextAdded);
- break;
- }
-
- }
-
-TInt CPrimaryContextsMonitor::RunError(TInt aError)
- {
- // Process an error
- ProcessError(aError);
- return KErrNone; // Make ActiveScheduler happy
- }
-
-
-void CPrimaryContextsMonitor::SwitchStateL()
- {
- if (iState == EEnumeratingContexts)
- {
- if (iInitialNifsCount > 0)
- {
- iState = EGettingInfo;
- }
- else
- {
- iState = EListening;
- }
- }
- else if (iState == EGettingInfo && iCurrentNifIndex == iInitialNifsCount)
- {
- StartContextStatusMonitoringL(iCurrentNifInfo.iContextName);
- iState = EListening;
- }
- }
-
-void CPrimaryContextsMonitor::StartContextStatusMonitoringL(const TName& aContextName)
- {
- CContextStatusMonitor* newStatusMonitor = new (ELeave) CContextStatusMonitor(iPacketService, *this);
- CleanupStack::PushL(newStatusMonitor);
- iContextMonitors.AppendL(newStatusMonitor);
- CleanupStack::Pop(newStatusMonitor);
- newStatusMonitor->StartL(aContextName);
- }
-
-CContextStatusMonitor::CContextStatusMonitor(RPacketService& aPacketService, MContextEventsObserver& aCallback):CActive(EPriorityStandard),
- iPacketService(aPacketService), iCallback(aCallback)
- {
- CActiveScheduler::Add(this);
- }
-
-CContextStatusMonitor::~CContextStatusMonitor()
- {
- Cancel();
- iPacketContext.Close();
- }
-
-TBool CContextStatusMonitor::StartL(const TName& aContextName)
- {
- iContextName.Copy(aContextName);
- User::LeaveIfError(iPacketContext.OpenExistingContext(iPacketService, iContextName));
- User::LeaveIfError(iPacketContext.GetStatus(iContextStatus));
-
- if (iContextStatus == RPacketContext::EStatusDeleted)
- {
- return EFalse;
- }
-
- if (iContextStatus == RPacketContext::EStatusActive ||
- iContextStatus == RPacketContext::EStatusSuspended ||
- iContextStatus == RPacketContext::EStatusDeactivating)
- {
- iWasActive = ETrue;
- }
-
- iPacketContext.NotifyStatusChange(iStatus, iContextStatus);
- SetActive();
- return ETrue;
- }
-
-void CContextStatusMonitor::RunL()
- {
- User::LeaveIfError(iStatus.Int());
- if (iContextStatus == RPacketContext::EStatusActive)
- {
- iWasActive = ETrue;
- }
-
- if (iContextStatus == RPacketContext::EStatusDeleted)
- {
- iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange);
- iCallback.PrimaryContextDeleted(this);
- }
- else
- {
- iPacketContext.NotifyStatusChange(iStatus, iContextStatus);
- SetActive();
- }
- }
-
-void CContextStatusMonitor::DoCancel()
- {
- iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange);
- }
-
-TInt CContextStatusMonitor::RunError(TInt aError)
- {
- iCallback.ContextMonitoringError(this, aError);
- return KErrNone;
- }
-
-CPdpContentionManager* CPdpContentionManager::NewL(const ESock::CTierManagerBase& aTierManager, RPacketService& aPacketService)
- {
- CPdpContentionManager* self = new (ELeave) CPdpContentionManager(aTierManager);
- CleanupStack::PushL(self);
- self->ConstructL(aPacketService);
- CleanupStack::Pop(self);
- return self;
- }
-
-CPdpContentionManager::CPdpContentionManager(const ESock::CTierManagerBase& aTierManager):
-CContentionManager(aTierManager)
- {
- }
-
-CPdpContentionManager::~CPdpContentionManager()
- {
- delete iPrimaryContextsMonitor;
- }
-
-void CPdpContentionManager::ConstructL(RPacketService& aPacketService)
- {
- iPrimaryContextsMonitor = new (ELeave) CPrimaryContextsMonitor(aPacketService, *this);
- }
-
-void CPdpContentionManager::StartMonitoringL()
- {
- if (iPrimaryContextsMonitor)
- {
- iPrimaryContextsMonitor->StartL();
- }
- }
-
-void CPdpContentionManager::ContentionResolved(const TContentionRequestItem& aContentionRequest, TBool aResult)
- {
- CPdpMetaConnectionProvider* pdpMcpr = static_cast(aContentionRequest.iMcpr);
-
- pdpMcpr->ContentionResolved(aContentionRequest.iPendingCprId, aResult);
- }
-
-void CPdpContentionManager::ContentionOccured(ESock::CMetaConnectionProviderBase& aMcpr)
- {
- CPdpMetaConnectionProvider& pdpMcpr = static_cast(aMcpr);
-
- pdpMcpr.ContentionOccured();
- }
-
-void CPdpContentionManager::ReportContentionAvailabilityStatus(ESock::CMetaConnectionProviderBase& aMcpr, const ESock::TAvailabilityStatus& aStatus) const
- {
- CPdpMetaConnectionProvider& pdpMcpr = static_cast(aMcpr);
-
- pdpMcpr.ReportContentionAvailabilityStatus(aStatus);
- }
-
/**
The NewL factory function for PDPTierManager.
This function also acts as the single ECom entry point into this object.
@@ -421,8 +83,12 @@
CPDPTierManager::~CPDPTierManager()
{
LOG_NODE_DESTROY(KPDPTierMgrTag, CPDPTierManager);
+
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
delete iPdpContentionManager;
iPdpContentionManager = NULL;
+#endif
+
if (iMBMSEngine)
{
iMBMSEngine->Cancel();
@@ -458,11 +124,14 @@
*/
void CPDPTierManager::PacketServiceAttachedCallbackL()
{
+
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
if (!iPdpContentionManager)
{
iPdpContentionManager = CPdpContentionManager::NewL(*this, iMBMSEngine->GetRPacketService());
}
static_cast(iPdpContentionManager)->StartMonitoringL();
+#endif
}
/**
@@ -516,6 +185,8 @@
User::LeaveIfError(ctx.iReturn);
}
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
+
TBool CPDPTierManager::HandleContentionL(ESock::CMetaConnectionProviderBase* aMcpr, Messages::TNodeId& aPendingCprId, TUint aPriority)
{
User::LeaveIfNull(iMBMSEngine);
@@ -527,10 +198,38 @@
}
TBool CPDPTierManager::IsUnavailableDueToContention(const ESock::CMetaConnectionProviderBase* aMetaConnectionProvider) const
- {
- if (!iPdpContentionManager)
- return EFalse;
- return iPdpContentionManager->IsUnavailableDueToContention(aMetaConnectionProvider);
- }
+ {
+ TBool result(EFalse);
+
+ if (!iPdpContentionManager)
+ {
+ result = EFalse;
+ }
+ else
+ {
+ result = iPdpContentionManager->IsUnavailableDueToContention(aMetaConnectionProvider);
+ }
+ return result;
+ }
+
+#else
+
+/* these are inherited from the tier manager base class in esock so they must be implemented
+ * even if this feature is disabled. If it is disabled, then contention resolution will always
+ * be false. Note: this functionality is done at a higher layer so it is unlikely that this feature
+ * will make (i.e. this code is depreciated).
+ */
+
+TBool CPDPTierManager::HandleContentionL(ESock::CMetaConnectionProviderBase* /*aMcpr */, Messages::TNodeId& /*aPendingCprId */, TUint /* aPriority */)
+ {
+ return EFalse;
+ }
+TBool CPDPTierManager::IsUnavailableDueToContention(const ESock::CMetaConnectionProviderBase* /* aMetaConnectionProvider */) const
+ {
+ return EFalse;
+ }
+
+#endif
+
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/src/psdavailabilitylistener.cpp
--- a/telephonyprotocols/pdplayer/src/psdavailabilitylistener.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/psdavailabilitylistener.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -219,6 +219,7 @@
delete this;
}
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
void CPsdAvailabilityListener::ReportContentionAvailabilityStatusIfRequired(const TAvailabilityStatus& aAvailabilityStatus)
{
if (aAvailabilityStatus.Score() == TAvailabilityStatus::EMinAvailabilityScore && !iUnavailableDueToContention)
@@ -242,4 +243,5 @@
iUnavailableDueToContention = EFalse;
}
}
+#endif
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/traces/fixed_id.definitions
--- a/telephonyprotocols/pdplayer/traces/fixed_id.definitions Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/traces/fixed_id.definitions Tue Sep 14 17:55:14 2010 +0100
@@ -84,10 +84,9 @@
[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x1f8
[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x1f9
[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x1fa
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x1fb
[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x200
[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x201
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x202
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x29e
[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_3=0x203
[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_CANCELMESSAGE_1=0xd
[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_PREPAREBEARERRESULTBUNDLEL_1=0x1a
@@ -108,7 +107,6 @@
[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x1f4
[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x1f5
[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x1f6
-[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x1f7
[TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATE_1=0x292
[TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATE_2=0x293
[TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATIONCOMPLETE_1=0x294
@@ -158,6 +156,7 @@
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET8_2=0x5a
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET9_1=0x5b
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET9_2=0x5c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GETCONTEXTNAME_1=0x29b
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_1=0x49
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_2=0x4a
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_INPUT_1=0x31
@@ -373,7 +372,7 @@
[TRACE]TRACE_INTERNALS[0x88]_CPDPPROVIDERSELECTOR_SELECTL_5=0x25
[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x1fc
[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x1fd
-[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x1fe
+[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x29d
[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_3=0x1ff
[TRACE]TRACE_INTERNALS[0x88]_CPDPTIERMANAGERFACTORY_NEWL_1=0x20
[TRACE]TRACE_INTERNALS[0x88]_CPDPTIERMANAGER_CONSTRUCTL_1=0x1f
@@ -384,7 +383,6 @@
[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_DTOR_1=0x205
[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_1=0x209
[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_2=0x20a
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_3=0x20b
[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_1=0x206
[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_2=0x207
[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_DOCANCEL_1=0x20f
@@ -415,6 +413,9 @@
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_4=0x27b
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_1=0x273
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_2=0x274
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_3=0x2d3
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_4=0x2d4
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_5=0x2d5
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_1=0x275
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_2=0x276
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_3=0x277
@@ -424,11 +425,15 @@
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_4=0x258
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_5=0x259
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_1=0x24e
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_10=0x2cb
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_2=0x24f
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_3=0x296
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_4=0x297
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_5=0x298
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_6=0x299
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_7=0x2c8
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_8=0x2c9
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_9=0x2ca
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_1=0x250
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_2=0x251
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_3=0x252
@@ -439,11 +444,25 @@
[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_3=0x24c
[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_4=0x24d
[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_1=0x242
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_10=0x2bd
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_11=0x2be
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_12=0x2bf
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_13=0x2c0
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_14=0x2c1
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_15=0x2c2
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_16=0x2c3
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_17=0x2c4
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_18=0x2c5
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_19=0x2c6
[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_2=0x243
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_20=0x2c7
[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_3=0x244
[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_4=0x245
[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_5=0x246
[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_6=0x247
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_7=0x2ba
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_8=0x2bb
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_9=0x2bc
[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NOTIFYFSM_1=0x248
[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NOTIFYFSM_2=0x249
[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_1=0x21a
@@ -451,7 +470,17 @@
[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_3=0x21c
[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_4=0x21d
[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_1=0x216
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_10=0x2a7
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_11=0x2a8
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_12=0x2a9
[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_2=0x217
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_3=0x2a0
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_4=0x2a1
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_5=0x2a2
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_6=0x2a3
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_7=0x2a4
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_8=0x2a5
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_9=0x2a6
[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NOTIFYFSM_1=0x218
[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NOTIFYFSM_2=0x219
[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x224
@@ -463,6 +492,11 @@
[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_2=0x21f
[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_3=0x220
[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_4=0x221
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_5=0x2aa
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_6=0x2ab
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_7=0x2ac
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_8=0x2ad
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_9=0x2ae
[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x222
[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x223
[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x22e
@@ -470,6 +504,8 @@
[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_1=0x229
[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_2=0x22a
[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_3=0x22b
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_4=0x2af
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_5=0x2b0
[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x22c
[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x22d
[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x270
@@ -478,12 +514,16 @@
[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_1=0x26b
[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_2=0x26c
[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_3=0x26d
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_4=0x2d0
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_5=0x2d1
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_6=0x2d2
[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x26e
[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x26f
[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_1=0x260
[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_2=0x261
[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_1=0x25a
[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_2=0x25b
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_3=0x2cc
[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_1=0x25c
[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_2=0x25d
[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_3=0x25e
@@ -492,6 +532,12 @@
[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_2=0x280
[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_3=0x281
[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_1=0x27c
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_2=0x2d6
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_3=0x2d7
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_4=0x2d8
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_5=0x2d9
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_6=0x2da
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_7=0x2db
[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_1=0x27d
[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_2=0x27e
[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_1=0x268
@@ -499,6 +545,9 @@
[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_3=0x26a
[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_1=0x262
[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_2=0x263
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_3=0x2cd
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_4=0x2ce
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_5=0x2cf
[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_1=0x264
[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_2=0x265
[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_3=0x266
@@ -507,6 +556,7 @@
[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_CANCELASYNCREQUEST_2=0x215
[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_1=0x210
[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_2=0x211
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_3=0x29f
[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NOTIFYFSM_1=0x212
[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NOTIFYFSM_2=0x213
[TRACE]TRACE_INTERNALS[0x88]_TPDPSELECTORFACTORY_NEWSELECTORL_1=0x26
@@ -650,17 +700,32 @@
[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_CANCELASYNCREQUEST_2=0x235
[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_1=0x230
[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_2=0x231
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_3=0x2b1
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_4=0x2b2
[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NOTIFYFSM_1=0x232
[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NOTIFYFSM_2=0x233
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_1=0x23f
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_2=0x240
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_3=0x241
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_1=0x236
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_10=0x2b5
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_11=0x2b6
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_12=0x2b7
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_13=0x2b8
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_14=0x2b9
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_2=0x237
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_3=0x238
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_4=0x239
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_5=0x23a
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_6=0x23b
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_7=0x23c
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_8=0x2b3
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_9=0x2b4
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_1=0x23d
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_2=0x23e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERNOTIFIER_LOGCONTEXTNAME=0x29c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x1fb
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x202
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x1f7
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x1fe
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_3=0x20b
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -665,3 +665,17 @@
return KErrNone;
}
+/** Get context name
+
+@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
+@return - Context name in a TName
+*/
+const TName& CPdpFsmInterface::GetContextName(TContextId aPdpId)
+ {
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GETCONTEXTNAME_1, ">>CPdpFsmInterface::GetContextName() for context id [%d]", aPdpId);
+
+ ASSERT(iPdpFsmFactory);
+ ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
+ ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
+ return iPdpFsmFactory->GetFsmContext(aPdpId)->GetDataChannelV2().iChannelId;
+ }
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsm.h
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsm.h Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsm.h Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -119,6 +119,11 @@
void EtelCancel (void);
void SpudInput (TInt aNotification, TInt aParam);
+ const RPacketContext::TDataChannelV2& GetDataChannelV2()
+ {
+ return iDataChannelV2;
+ }
+
#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
void Set(MPdpFsmEventHandler& aPdpFsmEventHandler);
#endif
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/spudtel/src/cpdpconfigchangenotifier.cpp
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpconfigchangenotifier.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpconfigchangenotifier.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -136,16 +136,15 @@
*/
void CPdpConfigChangeNotifier::Notify(const TRequestStatus& aStatus)
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_1, "Config Change Notification for Context [%S]", iPdpFsmInterface.GetContextName(iId));
if(aStatus == KErrNone)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_1, "FSM set ConfigGPRS");
iPdpFsmInterface.Set(iId, GetScratchContextAs());
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_2, "FSM input EConfigGPRSChangeNetwork");
iPdpFsmInterface.Input(iId, PdpFsm::EConfigGPRSChangeNetwork);
}
else
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_3, "CPdpConfigChangeNotifier::Notify(), error: %d", aStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_2, "CPdpConfigChangeNotifier::Notify(), error: %d", aStatus.Int());
// Not all TSYs support RPacketContext::NotifyConfigChanged so we handle
// KErrNotSupported silently (PDEF118981).
ASSERT((aStatus == KErrCancel) || (aStatus == KErrNotSupported));
@@ -201,18 +200,16 @@
*/
void CMbmsPdpConfigChangeNotifier::Notify(const TRequestStatus& aStatus)
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1, "MBMS Config Change Notification for Context [%S]", iPdpFsmInterface.GetContextName(iId));
if(aStatus == KErrNone)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1, "FSM set ConfigMbms");
iPdpFsmInterface.Set(iId, iConfigMbms);
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2, "FSM input EConfigMbmsChangeNetwork");
iPdpFsmInterface.Input(iId, PdpFsm::EConfigGPRSChangeNetwork,SpudMan::EMbms);
- //to be discussed...
-
+ //to be discussed...
}
else
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3, "CMbmsPdpConfigChangeNotifier::Notify(), error: %d", aStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2, "CMbmsPdpConfigChangeNotifier::Notify(), error: %d", aStatus.Int());
// Not all TSYs support RPacketContext::NotifyConfigChanged so we handle
// KErrNotSupported silently (PDEF118981).
ASSERT((aStatus == KErrCancel) || (aStatus == KErrNotSupported));
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/spudtel/src/cpdpstatuschangenotifier.cpp
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpstatuschangenotifier.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpstatuschangenotifier.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -82,15 +82,15 @@
*/
void CPdpStatusChangeNotifier::Notify(const TRequestStatus& aStatus)
{
- if(aStatus == KErrNone)
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "Status Change Notification for Context [%S]", iPdpFsmInterface.GetContextName(iId));
+ if(aStatus == KErrNone)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "Notified of context status change");
RPacketContext::TContextStatus aOldContextStatus;
iPdpFsmInterface.Get(iId,aOldContextStatus);
// only notify of change if it has actually changed
if (iContextStatus != aOldContextStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "FSM input EContextStatusChangeNetwork");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "Context status changed from [%d] to [%d]", aOldContextStatus, iContextStatus);
iPdpFsmInterface.Set(iId, iContextStatus);
TInt err = KErrNone;
iPacketContext.GetLastErrorCause(err); // Ignore error return code.
@@ -154,15 +154,16 @@
*/
void CMbmsPdpStatusChangeNotifier::Notify(const TRequestStatus& aStatus)
{
- if(aStatus == KErrNone)
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "MBMS Status Change Notification for Context [%S]", iPdpFsmInterface.GetContextName(iId));
+
+ if(aStatus == KErrNone)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "Notified of context status change");
RPacketContext::TContextStatus aOldContextStatus;
iPdpFsmInterface.Get(iId,aOldContextStatus);
// only notify of change if it has actually changed
if (iContextStatus != aOldContextStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "FSM input EContextStatusChangeNetwork");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "Context status changed from [%d] to [%d]", aOldContextStatus, iContextStatus);
iPdpFsmInterface.Set(iId, iContextStatus);
TInt err = KErrNone;
iMbmsPacketContext.GetLastErrorCause(err); // Ignore error return code.
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/spudtel/src/cqoschangenotifier.cpp
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cqoschangenotifier.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cqoschangenotifier.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -83,9 +83,10 @@
*/
void CQoSChangeNotifier::Notify(const TRequestStatus& aStatus)
{
- if(aStatus == KErrNone)
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_1, "Qos Change Notification for Context [%S]", iPdpFsmInterface.GetContextName(iId));
+
+ if(aStatus == KErrNone)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_1, "FSM set QoSProfile");
#ifdef SYMBIAN_NETWORKING_UMTSR5
iPdpFsmInterface.Set(iId, iProfileBuffer.NegotiatedQoSR5());
@@ -97,15 +98,11 @@
#endif
// SYMBIAN_NETWORKING_UMTSR5
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_2, "FSM input EQoSProfileChangeNetwork");
iPdpFsmInterface.Input(iId, PdpFsm::EQoSProfileChangeNetwork);
}
else
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_3, "CQoSChangeNotifier::Notify(), error: %d", aStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_2, "CQoSChangeNotifier::Notify(), error: %d", aStatus.Int());
ASSERT(aStatus == KErrCancel);
}
}
-
-
-
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -46,14 +46,13 @@
*/
void TOpenStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_1, "TOpenStrategy::Next()");
-
TInt err = KErrNone;
switch(aContext.StrategyStep())
{
case EStartStep:
{
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_1, "TOpenStrategy::Next() - EStartStep - Initialize Phone");
aContext.Phone().Initialise (*aStatus);
aContext.SetStrategyStep(EInitPhoneStep);
break;
@@ -61,13 +60,14 @@
case EInitPhoneStep:
{
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_2, "TOpenStrategy::Next() - EStartStep - TOpenStrategy::Next() - EInitPhoneStep");
aContext.SetStrategyStep(EFinishStep);
break;
}
default:
// incorrect step
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_2, "Incorrect step");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_3, "TOpenStrategy::Next() - EStartStep - TOpenStrategy::Next() - Incorrect step");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -135,7 +135,6 @@
*/
void TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_1, "TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)");
TInt err = KErrNone;
@@ -159,11 +158,13 @@
{
if (aContext.PacketContext().SubSessionHandle())
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_1, "TContextDeleteStrategy::Next() - EStartStep - PacketContext::Deactivate(), contextName = [%S]", aContext.Name());
aContext.PacketContext().Deactivate(*aStatus);
aContext.SetStrategyStep (EDeactivateStep);
}
else
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_2, "TContextDeleteStrategy::Next() - EStartStep - PacketContext::SubSessionHandle() returned error, contextName = [%S]", aContext.Name());
aContext.SetStrategyStep(EDeactivateStep);
User::RequestComplete(aStatus, err);
}
@@ -172,11 +173,13 @@
{
if (aContext.MbmsPacketContext().SubSessionHandle())
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_3, "TContextDeleteStrategy::Next() - EStartStep - MbmsPacketContext::Deactivate(), contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().Deactivate(*aStatus);
aContext.SetStrategyStep (EDeactivateStep);
}
else
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_4, "TContextDeleteStrategy::Next() - EStartStep - MbmsPacketContext::SubSessionHandle() returned error, contextName = [%S]", aContext.Name());
aContext.SetStrategyStep(EDeleteContextStep);
User::RequestComplete(aStatus, err);
}
@@ -190,16 +193,19 @@
{
if (aContext.PacketQoS().SubSessionHandle())
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_5, "TContextDeleteStrategy::Next() - EDeactivateStep - PacketQoS::Close(), contextName = [%S]", aContext.Name());
aContext.PacketQoS().Close();
}
if (aContext.PacketContext().SubSessionHandle())
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_6, "TContextDeleteStrategy::Next() - EDeactivateStep - PacketContext::Delete(), contextName = [%S]", aContext.Name());
aContext.PacketContext().Delete(*aStatus);
aContext.SetStrategyStep(EDeleteContextStep);
}
else
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_7, "TContextDeleteStrategy::Next() - EDeactivateStep - MbmsPacketContext::SubSessionHandle() returned error, contextName = [%S]", aContext.Name());
// jump to next step
aContext.SetStrategyStep(EDeleteContextStep);
User::RequestComplete( aStatus, err);
@@ -209,11 +215,13 @@
{
if (aContext.MbmsPacketContext().SubSessionHandle())
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_8, "TContextDeleteStrategy::Next() - EDeactivateStep - MbmsPacketContext::Delete(), contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().Delete(*aStatus);
aContext.SetStrategyStep(EDeleteContextStep);
}
else
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_9, "TContextDeleteStrategy::Next() - EDeactivateStep - MbmsPacketContext::SubSessionHandle() returned error, contextName = [%S]", aContext.Name());
// jump to next step
aContext.SetStrategyStep(EDeleteContextStep);
User::RequestComplete( aStatus, err);
@@ -227,10 +235,12 @@
{
if (aContext.ContextType() != SpudMan::EMbms)
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_10, "TContextDeleteStrategy::Next() - EDeleteContextStep - PacketContext::Close(), contextName = [%S]", aContext.Name());
aContext.PacketContext().Close();
}
else
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_11, "TContextDeleteStrategy::Next() - EDeleteContextStep - MbmsPacketContext::Close(), contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().Close();
}
// clear the name
@@ -241,7 +251,7 @@
default:
// incorrect step
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_2, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_12, "TContextDeleteStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -328,8 +338,6 @@
*/
void TCreate1ryPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_1, "TCreate1ryPdpContextStrategy::Next()");
-
TInt err = KErrNone;
// possible steps:
@@ -340,13 +348,14 @@
{
case EStartStep:
{
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_1, "TCreate1ryPdpContextStrategy::Next() - EStartStep, PacketContext::OpenNewContext()");
err = aContext.PacketContext().OpenNewContext (aContext.PacketService(), aContext.Name());
if (err)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_2, "PacketContextOpenNewContext returned %d", err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_2, "TCreate1ryPdpContextStrategy::Next() - PacketContext::OpenNewContext() returned %d", err);
break;
}
-
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_3, "TCreate1ryPdpContextStrategy::Next() - PacketContext::InitialiseContext(), contextName = [%S]", aContext.Name());
aContext.PacketContext().InitialiseContext(*aStatus, aContext.DataChannelV2Pckg());
aContext.SetStrategyStep (EInitialiseContextStep);
break;
@@ -357,6 +366,7 @@
// get packet config from fsm
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextPacketDataConfigBase());
// async set config
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_4, "TCreate1ryPdpContextStrategy::Next() - EInitialiseContextStep - PacketContext::SetConfig(), contextName = [%S]", aContext.Name());
aContext.PacketContext().SetConfig (*aStatus, aContext.ContextConfig());
// set next step
aContext.SetStrategyStep (ESetConfigStep);
@@ -365,12 +375,13 @@
case ESetConfigStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_5, "TCreate1ryPdpContextStrategy::Next() - ESetConfigStep - PacketQoS::OpenNewQoS(), contextName = [%S]", aContext.Name());
// QoS name is not used anywhere
TName newName;
err = aContext.PacketQoS().OpenNewQoS (aContext.PacketContext(), newName);
if (err)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_3, "PacketQoS OpenNewQoS returned %d", err);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_6, "TCreate1ryPdpContextStrategy::Next() - ESetConfigStep - PacketQoS::OpenNewQoS() returned %d, contextName = [%S]", err, aContext.Name());
break;
}
@@ -389,19 +400,21 @@
#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
aContext.DumpReqProfileParameters ();
#endif
- aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg());
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_7, "TCreate1ryPdpContextStrategy::Next() - ESetConfigStep - PacketQoS()::SetProfileParameters(), contextName = [%S]", aContext.Name());
+ aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg());
aContext.SetStrategyStep (ESetProfileParamsStep);
break;
}
case ESetProfileParamsStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_8, "TCreate1ryPdpContextStrategy::Next() - ESetProfileParamsStep, contextName = [%S]", aContext.Name());
aContext.SetStrategyStep (EFinishStep);
break;
}
default:
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_4, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_9, "TCreate1ryPdpContextStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -483,8 +496,6 @@
*/
void TCreate2ryPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_1, "TCreate2ryPdpContextStrategy::Next()");
-
TInt err = KErrNone;
// possible steps:
@@ -496,19 +507,22 @@
case EStartStep:
{
const TName& existingContextName = aContext.ExistingContextName();
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_1, "TCreate2ryPdpContextStrategy::Next() - EStartStep - PacketContext::OpenNewSecondaryContext(), existingContextName = [%S]", existingContextName);
aContext.PacketContext().OpenNewSecondaryContext(aContext.PacketService(), existingContextName, aContext.Name());
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_2, "TCreate2ryPdpContextStrategy::Next() - EStartStep - PacketContext::InitialiseContext(), contextName = [%S]", aContext.Name());
aContext.PacketContext().InitialiseContext(*aStatus, aContext.DataChannelV2Pckg());
aContext.SetStrategyStep (EInitialiseContextStep);
break;
}
case EInitialiseContextStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_3, "TCreate2ryPdpContextStrategy::Next() - EInitialiseContextStep - PacketQoS::OpenNewQoS(), contextName = [%S]", aContext.Name());
// QoS name is not used anywhere
TName newName;
err = aContext.PacketQoS().OpenNewQoS (aContext.PacketContext(), newName);
if (err)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_2, "PacketQoS OpenNewQoS returned %d", err);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_4, "TCreate2ryPdpContextStrategy::Next() - EInitialiseContextStep - PacketQoS OpenNewQoS returned %d, contextName = [%S]", err, aContext.Name());
break;
}
aContext.SetStrategyStep (EFinishStep);
@@ -516,7 +530,7 @@
}
default:
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_3, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_5, "TCreate2ryPdpContextStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -571,8 +585,6 @@
*/
void TSetQoSStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_1, "TSetQoSStrategy::Next()");
-
TInt err = KErrNone;
// possible steps:
@@ -581,6 +593,7 @@
{
case EStartStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_1, "TSetQoSStrategy::Next() - EStartStep, contextName = [%S]", aContext.Name());
#ifdef SYMBIAN_NETWORKING_UMTSR5
RPacketQoS::TQoSR5Requested req;
#else
@@ -595,6 +608,7 @@
#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
aContext.DumpReqProfileParameters ();
#endif
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_2, "TSetQoSStrategy::Next() - EStartStep - PacketQoS::SetProfileParameters(), contextName = [%S]", aContext.Name());
aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg());
aContext.SetStrategyStep (ESetProfileParamsStep);
break;
@@ -602,6 +616,7 @@
case ESetProfileParamsStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_3, "TSetQoSStrategy::Next() - ESetProfileParamsStep, contextName = [%S]", aContext.Name());
aContext.SetStrategyStep (EFinishStep);
break;
}
@@ -609,7 +624,7 @@
default:
{
// unexpected
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_2, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_4, "TSetQoSStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -676,8 +691,6 @@
*/
void TSetTftStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_1, "TSetTftStrategy::Next()");
-
TInt err = KErrNone;
// possible steps:
@@ -686,20 +699,22 @@
{
case EStartStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_1, "TSetTftStrategy::Next() - EStartStep, contextName = [%S]", aContext.Name());
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftOperationCode());
switch(aContext.TftOperationCode())
{
case KAddFilters:
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_2, "TftOperationCode - Add Filters %d", aContext.TftInfo().FilterCount());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_2, "TSetTftStrategy::Next() - EStartStep - TftOperationCode - Add Filters %d, contextName = [%S]", aContext.TftInfo().FilterCount(), aContext.Name());
// Set strategy assumes that TFT has to be created on a first place
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_3, "Creating TFT...");
if (aContext.ContextType() != SpudMan::EMbms)
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_3, "TSetTftStrategy::Next() - EStartStep - TftOperationCode - PacketContext::CreateNewTFT(), contextName = [%S]", aContext.Name());
aContext.PacketContext().CreateNewTFT(*aStatus, aContext.TftInfo().FilterCount());
}
else
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_4, "TSetTftStrategy::Next() - EStartStep - TftOperationCode - MbmsPacketContext::CreateNewTFT, contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().CreateNewTFT(*aStatus, aContext.TftInfo().FilterCount());
}
aContext.SetStrategyStep (ECreateNewTFTStep);
@@ -707,17 +722,17 @@
case KRemoveFilters:
err = KErrNotSupported;
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_4, "TftOperationCode - Remove is not supported in a Set strategy, return %d", err);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_5, "TSetTftStrategy::Next() - EStartStep - TftOperationCode - Remove is not supported in a Set strategy, return %d, contextName = [%S]", err, aContext.Name());
break;
case KDeleteTFT:
err = KErrNotSupported;
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_5, "TftOperationCode - Delete is not supported in a Set strategy, return %d", err);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_6, "TSetTftStrategy::Next() - EStartStep - TftOperationCode - Delete is not supported in a Set strategy, return %d, contextName = [%S]", err, aContext.Name());
break;
default:
// wrong case
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_6, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_7, "TSetTftStrategy::Next() - EStartStep - TftOperationCode - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -727,15 +742,18 @@
case ECreateNewTFTStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_8, "TSetTftStrategy::Next() - ECreateNewTFTStep, contextName = [%S]", aContext.Name());
TInt err1st = aContext.FirstFilterV2();
if(err1st == KErrNone)
{
if (aContext.ContextType() != SpudMan::EMbms)
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_9, "TSetTftStrategy::Next() - ECreateNewTFTStep - PacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
}
else
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_10, "TSetTftStrategy::Next() - ECreateNewTFTStep - MbmsPacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
}
aContext.SetStrategyStep (EAddTftStep);
@@ -752,15 +770,18 @@
case EAddTftStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_11, "TSetTftStrategy::Next() - EAddTftStep, contextName = [%S]", aContext.Name());
TInt errV2 = aContext.NextFilterV2();
if(errV2 == KErrNone)
{
if (aContext.ContextType() != SpudMan::EMbms)
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_12, "TSetTftStrategy::Next() - EAddTftStep - PacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
}
else
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_13, "TSetTftStrategy::Next() - EAddTftStep - MbmsPacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
}
aContext.SetStrategyStep (EAddTftStep);
@@ -777,7 +798,7 @@
default:
// unexpected
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_7, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_14, "TSetTftStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -820,15 +841,15 @@
{
case ECreateNewTFTStep:
{
- aContext.PacketQoS().CancelAsyncRequest(EPacketContextCreateNewTFT);
OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketQoS::EPacketContextCreateNewTFT");
+ aContext.PacketQoS().CancelAsyncRequest(EPacketContextCreateNewTFT);
break;
}
case EAddTftStep:
{
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketQoS::EPacketContextAddPacketFilter");
aContext.PacketQoS().CancelAsyncRequest(EPacketContextAddPacketFilter);
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketQoS::EPacketContextAddPacketFilter");
break;
}
@@ -851,30 +872,29 @@
*/
void TChangeTftStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_1, "TChangeTftStrategy::Next()");
-
TInt err = KErrNone;
// special case.
if(EStartStep == aContext.StrategyStep())
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_1, "TChangeTftStrategy::Next() - EStartStep, contextName = [%S]", aContext.Name());
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftOperationCode());
switch(aContext.TftOperationCode())
{
case KAddFilters:
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_2, "TftOperationCode - Add Filters %d", aContext.TftInfo().FilterCount());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_2, "TChangeTftStrategy::Next() - EStartStep - TftOperationCode - Add Filters %d, contextName = [%S]", aContext.TftInfo().FilterCount(), aContext.Name());
aContext.SetStrategyStep (EAddFirstTftStep);
break;
case KRemoveFilters:
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_3, "TftOperationCode - Remove %d Filters", aContext.TftInfo().FilterCount());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_3, "TChangeTftStrategy::Next() - EStartStep - TftOperationCode - Remove %d Filters, contextName = [%S]", aContext.TftInfo().FilterCount(), aContext.Name());
aContext.SetStrategyStep (ERemoveFirstTftStep);
break;
case KDeleteTFT:
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_4, "TftOperationCode - Delete TFT");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_4, "TChangeTftStrategy::Next() - EStartStep - TftOperationCode - PacketContext::DeleteTFT(), contextName = [%S]", aContext.Name());
// delete old TFT
aContext.PacketContext().DeleteTFT(*aStatus);
aContext.SetStrategyStep (EDeleteTftStep);
@@ -883,7 +903,7 @@
default:
// wrong case
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_5, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_5, "TChangeTftStrategy::Next() - EStartStep - TftOperationCode - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -900,6 +920,7 @@
{
case EDeleteTftStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_6, "TChangeTftStrategy::Next() - EDeleteTftStep, contextName = [%S]", aContext.Name());
aContext.SetStrategyStep (EChangeTftFinished);
User::RequestComplete( aStatus, KErrNone);
break;
@@ -907,15 +928,18 @@
case EAddFirstTftStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_7, "TChangeTftStrategy::Next() - EAddFirstTftStep, contextName = [%S]", aContext.Name());
TInt errV2 = aContext.FirstFilterV2();
if(errV2 == KErrNone)
{
if (aContext.ContextType() == SpudMan::EMbms)
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_8, "TChangeTftStrategy::Next() - EAddFirstTftStep - MbmsPacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
}
else
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_9, "TChangeTftStrategy::Next() - EAddFirstTftStep - PacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
}
aContext.SetStrategyStep (EAddTftStep);
@@ -931,15 +955,18 @@
case EAddTftStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_10, "TChangeTftStrategy::Next() - EAddTftStep, contextName = [%S]", aContext.Name());
TInt errV2 = aContext.NextFilterV2();
if(errV2 == KErrNone)
{
if (aContext.ContextType() == SpudMan::EMbms)
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_11, "TChangeTftStrategy::Next() - EAddFirstTftStep - MbmsPacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
}
else
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_12, "TChangeTftStrategy::Next() - EAddFirstTftStep - PacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
}
aContext.SetStrategyStep (EAddTftStep);
@@ -955,15 +982,18 @@
case ERemoveFirstTftStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_13, "TChangeTftStrategy::Next() - ERemoveFirstTftStep, contextName = [%S]", aContext.Name());
TInt errV2 = aContext.FirstFilterV2();
if(errV2 == KErrNone)
{
if (aContext.ContextType() == SpudMan::EMbms)
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_14, "TChangeTftStrategy::Next() - EAddFirstTftStep - MbmsPacketContext::RemovePacketFilter(), contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().RemovePacketFilter( *aStatus, aContext.FilterV2().iId);
}
else
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_15, "TChangeTftStrategy::Next() - EAddFirstTftStep - PacketContext::RemovePacketFilter(), contextName = [%S]", aContext.Name());
aContext.PacketContext().RemovePacketFilter( *aStatus, aContext.FilterV2().iId);
}
aContext.SetStrategyStep (ERemoveTftStep);
@@ -979,15 +1009,18 @@
case ERemoveTftStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_16, "TChangeTftStrategy::Next() - ERemoveTftStep, contextName = [%S]", aContext.Name());
TInt errV2 = aContext.NextFilterV2();
if(errV2 == KErrNone)
{
if (aContext.ContextType() == SpudMan::EMbms)
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_17, "TChangeTftStrategy::Next() - EAddFirstTftStep - MbmsPacketContext::RemovePacketFilter(), contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().RemovePacketFilter( *aStatus, aContext.FilterV2().iId);
}
else
- {
+ {
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_18, "TChangeTftStrategy::Next() - EAddFirstTftStep - PacketContext::RemovePacketFilter(), contextName = [%S]", aContext.Name());
aContext.PacketContext().RemovePacketFilter( *aStatus, aContext.FilterV2().iId);
}
aContext.SetStrategyStep (ERemoveTftStep);
@@ -1003,6 +1036,7 @@
case EChangeTftFinished:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_19, "TChangeTftStrategy::Next() - ERemoveTftStep, contextName = [%S]", aContext.Name());
aContext.SetStrategyStep (EFinishStep);
}
break;
@@ -1010,7 +1044,7 @@
default:
// unexpected
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_6, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_20, "TChangeTftStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1093,15 +1127,13 @@
*/
void TActivatePdpStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_1, "TActivatePdpStrategy::Next()");
-
TInt err = KErrNone;
switch(aContext.StrategyStep())
{
case EStartStep:
- {
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_3, "RPacketContext::Activate()");
+ {
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_1, "TActivatePdpStrategy::Next() - EStartStep - RPacketContext::Activate(), contextName = [%S]", aContext.Name());
aContext.PacketContext().Activate(*aStatus);
aContext.SetStrategyStep (EActivateStep);
break;
@@ -1110,7 +1142,7 @@
case EActivateStep:
case ENotifyStatusChange:
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_4, "RPacketContext::GetStatus()");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_2, "TActivatePdpStrategy::Next() - ENotifyStatusChange - RPacketContext::GetStatus(), contextName = [%S]", aContext.Name());
if (aContext.PacketContext().GetStatus(aContext.ContextStatus()) != KErrNone)
{
@@ -1120,15 +1152,17 @@
switch (aContext.ContextStatus())
{
case RPacketContext::EStatusActive:
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_3, "TActivatePdpStrategy::Next() - ENotifyStatusChange - EStatusActive, contextName = [%S]", aContext.Name());
// Context is now active
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextPacketDataConfigBase());
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_5, "RPacketContext::GetConfig()");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_4, "TActivatePdpStrategy::Next() - ENotifyStatusChange - RPacketContext::GetConfig(), contextName = [%S]", aContext.Name());
aContext.PacketContext().GetConfig (*aStatus, aContext.ContextConfig());
aContext.SetStrategyStep (EGetConfigStep);
break;
case RPacketContext::EStatusInactive:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_5, "TActivatePdpStrategy::Next() - ENotifyStatusChange - EStatusInactive - PacketContext::GetLastErrorCause(), contextName = [%S]", aContext.Name());
// Context is inactive so find out why
TInt errTsy = KErrNone;
TInt rc = aContext.PacketContext().GetLastErrorCause(errTsy);
@@ -1163,7 +1197,7 @@
default:
// Not active, not inactive. Re-request the status and try again
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_6, "RPacketContext::NotifyStatusChange()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_6, "TActivatePdpStrategy::Next() - ENotifyStatusChange - default - RPacketContext::NotifyStatusChange(), status = %d, contextName = [%S]", aContext.ContextStatus(), aContext.Name());
aContext.PacketContext().NotifyStatusChange(*aStatus, aContext.ContextStatus());
aContext.SetStrategyStep (ENotifyStatusChange);
break;
@@ -1173,9 +1207,11 @@
case EGetConfigStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_7, "TActivatePdpStrategy::Next() - EGetConfigStep, contextName = [%S]", aContext.Name());
aContext.PdpFsmInterface().Set (aContext.Id(), aContext.ContextPacketDataConfigBase());
if (KPrimaryContextId == aContext.Id())
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_8, "TActivatePdpStrategy::Next() - EGetConfigStep - PacketQoS::GetProfileParameters(), contextName = [%S]", aContext.Name());
aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());
#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
aContext.DumpNegProfileParameters ();
@@ -1196,6 +1232,7 @@
case EGetProfileParamsStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_9, "TActivatePdpStrategy::Next() - EGetProfileParamsStep, contextName = [%S]", aContext.Name());
// start notifications in case of normal creation of a context
// -- StatusChangeNotifier
// -- QoSChangeNotifier
@@ -1207,7 +1244,7 @@
default:
// unexpected
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_2, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_10, "TActivatePdpStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1312,14 +1349,13 @@
*/
void TGetNegQoSStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_1, "TGetNegQoSStrategy::Next()");
-
TInt err = KErrNone;
switch(aContext.StrategyStep())
{
case EStartStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_1, "TGetNegQoSStrategy::Next() - EStartStep - PacketQoS::GetProfileParameters(), contextName = [%S]", aContext.Name());
aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());
#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
aContext.DumpNegProfileParameters ();
@@ -1330,13 +1366,14 @@
case EGetProfileParamsStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_2, "TGetNegQoSStrategy::Next() - EGetProfileParamsStep, contextName = [%S]", aContext.Name());
aContext.SetStrategyStep (EFinishStep);
break;
}
default:
// unexpected
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_2, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_3, "TGetNegQoSStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1416,8 +1453,6 @@
*/
void TModifyActiveStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_1, "TModifyActiveStrategy::Next()");
-
TInt err = KErrNone;
switch(aContext.StrategyStep())
@@ -1426,11 +1461,13 @@
{
if (aContext.ContextType() != SpudMan::EMbms)
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_1, "TModifyActiveStrategy::Next() - EStartStep - PacketContext::ModifyActiveContext(), contextName = [%S]", aContext.Name());
aContext.PacketContext().ModifyActiveContext(*aStatus);
aContext.SetStrategyStep (EModifyActiveStep);
}
else
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_2, "TModifyActiveStrategy::Next() - EStartStep - MbmsPacketContext::ModifyActiveContext(), contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().ModifyActiveContext(*aStatus);
aContext.SetStrategyStep (EGetProfileParamsStep);
}
@@ -1440,6 +1477,7 @@
case EModifyActiveStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_3, "TModifyActiveStrategy::Next() - EModifyActiveStep - PacketQoS::GetProfileParameters(), contextName = [%S]", aContext.Name());
aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());
#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
aContext.DumpNegProfileParameters ();
@@ -1450,13 +1488,14 @@
case EGetProfileParamsStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_4, "TModifyActiveStrategy::Next() - EGetProfileParamsStep, contextName = [%S]", aContext.Name());
aContext.SetStrategyStep (EFinishStep);
break;
}
default:
// unexpected
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_2, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_5, "TModifyActiveStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1534,12 +1573,6 @@
}
-
-
-
-
-
-
//
// TCreateMbmsPdpContextStrategy
//
@@ -1550,8 +1583,6 @@
*/
void TCreateMbmsPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_1, "TCreateMbmsPdpContextStrategy::Next()");
-
TInt err = KErrNone;
// possible steps:
@@ -1562,13 +1593,14 @@
{
case EStartStep:
{
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_1, "TCreateMbmsPdpContextStrategy::Next() - EStartStep - MbmsPacketContext::OpenNewContext()");
err = aContext.MbmsPacketContext().OpenNewContext (aContext.PacketService(), aContext.Name());
if (err)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_2, "PacketContextOpenNewContext returned for MBMS %d", err);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_2, "TCreateMbmsPdpContextStrategy::Next() - EStartStep - PacketContextOpenNewContext returned for MBMS %d, contextName = [%S]", err, aContext.Name());
break;
}
-
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_3, "TCreateMbmsPdpContextStrategy::Next() - EStartStep - MbmsPacketContext::InitialiseContext(), contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().InitialiseContext(*aStatus, aContext.DataChannelV2Pckg());
aContext.SetStrategyStep (EInitialiseContextStep);
break;
@@ -1576,6 +1608,7 @@
case EInitialiseContextStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_4, "TCreateMbmsPdpContextStrategy::Next() - EInitialiseContextStep - MbmsPacketContext::SetConfig(), contextName = [%S]", aContext.Name());
// get mbms packet config from fsm
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextConfigMbms());
// async set config
@@ -1585,11 +1618,12 @@
break;
}
case ESetConfigStep:
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_5, "TCreateMbmsPdpContextStrategy::Next() - ESetConfigStep, contextName = [%S]", aContext.Name());
aContext.SetStrategyStep (EFinishStep);
break;
default:
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_3, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_6, "TCreateMbmsPdpContextStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1659,14 +1693,13 @@
*/
void TActivateMbmsPdpStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_1, "TActivatePdpStrategy::Next()");
-
TInt err = KErrNone;
switch(aContext.StrategyStep())
{
case EStartStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_1, "TActivatePdpStrategy::Next() - EStartStep - MbmsPacketContext::Activate(), contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().Activate(*aStatus);
aContext.SetStrategyStep (EActivateStep);
break;
@@ -1674,6 +1707,7 @@
case EActivateStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_2, "TActivatePdpStrategy::Next() - EActivateStep - MbmsPacketContext::GetConfig(), contextName = [%S]", aContext.Name());
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextConfigMbms());
aContext.MbmsPacketContext().GetConfig (*aStatus, aContext.ContextConfigMbmsPckg());
aContext.SetStrategyStep (EGetConfigStep);
@@ -1682,6 +1716,7 @@
case EGetConfigStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_3, "TActivatePdpStrategy::Next() - EGetConfigStep - MbmsPacketContext::InitialiseContext(), contextName = [%S]", aContext.Name());
aContext.PdpFsmInterface().Set (aContext.Id(), aContext.ContextConfigMbms());
aContext.MbmsPacketContext().InitialiseContext(*aStatus, aContext.DataChannelV2Pckg());
aContext.SetStrategyStep (EGetProfileParamsStep);
@@ -1691,6 +1726,7 @@
case EGetProfileParamsStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_4, "TActivatePdpStrategy::Next() - EGetProfileParamsStep, contextName = [%S]", aContext.Name());
// start notifications in case of normal creation of a context
// -- StatusChangeNotifier
// -- QoSChangeNotifier
@@ -1702,7 +1738,7 @@
default:
// unexpected
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_2, "ERROR: Incorrect case");
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_5, "TActivatePdpStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1788,13 +1824,12 @@
*/
void TMbmsSessionUpdateStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_1, "TMbmsSessionUpdateStrategy::Next()");
-
TInt err = KErrNone;
switch(aContext.StrategyStep())
{
case EStartStep:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_1, "TMbmsSessionUpdateStrategy::Next() - EStartStep, contextName = [%S]", aContext.Name());
TInt sessionId=KErrNotFound;
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.GetSessionInfo());
TSessionOperatioInfo sessionInfo = aContext.GetSessionInfo();
@@ -1813,18 +1848,21 @@
if ((sessionInfo.iOperation == CSubConMBMSExtensionParamSet::EAddSession)
&& (sessionId != KErrNotFound))
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_2, "TMbmsSessionUpdateStrategy::Next() - EStartStep - MbmsPacketContext::UpdateMbmsSessionList() with EAddEntries, contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().UpdateMbmsSessionList(*aStatus,EAddEntries,sessionId);
break;
}
else if ((sessionInfo.iOperation == CSubConMBMSExtensionParamSet::ERemoveSession)
&& (sessionId != KErrNotFound))
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_3, "TMbmsSessionUpdateStrategy::Next() - EStartStep - MbmsPacketContext::UpdateMbmsSessionList() with ERemoveEntries, contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().UpdateMbmsSessionList(*aStatus,ERemoveEntries,sessionId);
break;
}
else if ((sessionInfo.iOperation == CSubConMBMSExtensionParamSet::ERemoveAll)
&& (sessionId != KErrNotFound))
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_4, "TMbmsSessionUpdateStrategy::Next() - EStartStep - MbmsPacketContext::UpdateMbmsSessionList() with ERemoveAllEntries, contextName = [%S]", aContext.Name());
aContext.MbmsPacketContext().UpdateMbmsSessionList(*aStatus,ERemoveAllEntries,sessionId);
aContext.SetStrategyStep(EUpdateMbmsSessionList);
break;
@@ -1842,6 +1880,7 @@
case EUpdateMbmsSessionList:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_5, "TMbmsSessionUpdateStrategy::Next() - EUpdateMbmsSessionList - CRetrievePcktMbmsSessionList::Start(), contextName = [%S]", aContext.Name());
TRAP_IGNORE(aContext.SetMbmsSession(RPacketMbmsContext::CMbmsSession::NewL()));
TRAP_IGNORE(aContext.SetRetrievePcktMbmsSessionList(CRetrievePcktMbmsSessionList::NewL(aContext.MbmsPacketContext(),*aContext.MbmsSession())));
aContext.RetrievePcktMbmsSessionList()->Start(*aStatus);
@@ -1851,6 +1890,7 @@
case EPrepareSessionList:
{
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_6, "TMbmsSessionUpdateStrategy::Next() - EPrepareSessionList, contextName = [%S]", aContext.Name());
RPacketMbmsContext::CMbmsSession *mbmsSession = aContext.MbmsSession();
if (mbmsSession)
{
@@ -1869,6 +1909,7 @@
}
default:
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_7, "TMbmsSessionUpdateStrategy::Next() - default, contextName = [%S]", aContext.Name());
CRetrievePcktMbmsSessionList *retrievePktMbmsSessionList=aContext.RetrievePcktMbmsSessionList();
if (retrievePktMbmsSessionList)
delete retrievePktMbmsSessionList;
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/test/te_spud/inc/CPdpFsmInterface.h
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/inc/CPdpFsmInterface.h Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/inc/CPdpFsmInterface.h Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
/**
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -157,6 +157,7 @@
return iUmtsRelease;
}
+ const TName& GetContextName(TContextId aPdpId);
protected:
private:
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/test/te_spud/src/CPdpFsmInterface.cpp
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/src/CPdpFsmInterface.cpp Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/src/CPdpFsmInterface.cpp Tue Sep 14 17:55:14 2010 +0100
@@ -786,5 +786,17 @@
return KErrNone;
}
+/** Get context name
+@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
+@return - Context name in a TName
+*/
+const TName& CPdpFsmInterface::GetContextName(TContextId aPdpId)
+ {
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GETCONTEXTNAME_1, ">>CPdpFsmInterface::GetContextName() for context id [%d]", aPdpId);
+ ASSERT(iPdpFsmFactory);
+ ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
+ ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
+ return iPdpFsmFactory->GetFsmContext(aPdpId)->GetDataChannelV2().iChannelId;
+ }
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/test/te_spud/traces/fixed_id.definitions
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/traces/fixed_id.definitions Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/traces/fixed_id.definitions Tue Sep 14 17:55:14 2010 +0100
@@ -77,7 +77,6 @@
[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x192
[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x193
[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x194
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x195
[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x19a
[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x19b
[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x19c
@@ -85,7 +84,6 @@
[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x18e
[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x18f
[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x190
-[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x191
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CLOSE_1=0xb2
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CLOSE_2=0xb3
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CTOR_1=0xac
@@ -111,6 +109,7 @@
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CTOR_2=0x22d
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_DTOR_1=0x22e
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_DTOR_2=0x22f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GETCONTEXTNAME_1=0x26d
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_1=0x24c
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_10_1=0x262
[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_10_2=0x263
@@ -342,7 +341,6 @@
[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_DTOR_1=0x19f
[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_1=0x1a3
[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_2=0x1a4
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_3=0x1a5
[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_1=0x1a0
[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_2=0x1a1
[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_DOCANCEL_1=0x1a9
@@ -382,6 +380,10 @@
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_5=0x1f3
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_1=0x1e8
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_2=0x1e9
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_3=0x269
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_4=0x26a
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_5=0x26b
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_6=0x26c
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_1=0x1ea
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_2=0x1eb
[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_3=0x1ec
@@ -616,3 +618,6 @@
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_7=0x1d6
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_1=0x1d7
[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_2=0x1d8
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x195
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x191
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_3=0x1a5
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_PppSize_config.txt
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_PppSize_config.txt Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-[test0]
-# DefaultContextparamGPRS = , , , , ,
-# ProtocolConfigOption = , , , ,
-# , , ,
-DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
-
-# ContextConfigGPRS = , , , , ,
-# ProtocolConfigOption = , , , ,
-# , , ,
-SetContextConfigGPRS = 0,,,0,2,0,1,RasUser,pass,,,,,1
-# TRel99ContextConfig = , , , ,
-# , ,
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 1
-
-# TFTfilter = 0 1 2 3 4
-# 5 6 7 8 9 10
-# 11
-TFTfilter = 1, 96, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 1031, 0, 0, 0
-
-#TProfileReqR99 = 0 1 2 3 4
-# 5 6 7 8
-# 9 10 11 12
-#
-# 13 14 15 16
-# 17 18
-# 19 20 21 22
-# 23 24
-QosProfileReqR99 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,0,0,0,0, 0, 0
-QosProfileReqR5 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,0,0,0,0, 0, 0,0,0
-#TProfileNegR99 =
-#
-#
-#
-QosProfileNegR99 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3,0,0
-
-
-
-# CommSetup =
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_PppSize_spud.ini
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_PppSize_spud.ini Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-// Parameters configuration for Tpppsize.EXE test
-
-// Comms driver to load at startup
-
-[CommsDrivers]
-WinsPDDname = ECDRV
-WinsLDDname = ECOMM
-WinsLDDFname = ECOMM
-ThumbPDDname = EUART1
-ThumbLDDname = ECOMM
-ThumbLDDFname = FCOMM
-
-
-// Ip Address of the echo server machine
-// Note: this machine must be up and running and listening on the echo port
-// This can be checked on NT4 by typing NETSTAT -a
-
-[AddressInfo]
-TestPPPIPAddr = 192.168.30.13
-
-[MMUInfo]
-TestPPPminMMU = 1
-TestPPPmaxMMU = 1400
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_PppSize_spud.xml
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_PppSize_spud.xml Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,354 +0,0 @@
-
-
-
-
-
-
-
-
-
- NT RAS
-
-
-
-
-
- Actual NT RAS
- OutgoingGPRS.NT RAS
- ModemBearer.Null Modem 115200bps
- Network.NT RAS
- 0
- Location.Office
-
-
-
-
-
- Default Modem
- NULLAGT
- C32Bca
- SIM
- ECUART
- 8
- 1
- NONE
- 115200
- 0
- 0
- 0
- 0
- AUTO
- AFTERDIALUNTILANSWER
- AT
- AT
- AT
- S8=
- L0
- L1
- L2
- M0
- M1
- M2
- M3
- W
- X1
- X2
- X3
- X4
- E0
- V1
- Q0
- Q1
- ;
- O
- Z
- &F
- &C1
- &D2
- &S0
- &K3
- &K4
- +
- S12
- NO DIAL TONE
- BUSY
- NO ANSWER
- CARRIER
- CONNECT
- COMPRESSION:CLASS 5
- COMPRESSION:V.42 bis
- COMPRESSION:NONE
- PROTOCOL:LAPD
- PROTOCOL:ALT
- PROTOCOL:ALT-CELLULAR
- PROTOCOL:NONE
- 32
- 8
- 16
- 0
-
-
-
- Null Modem 115200bps
- C32Bca
- SPUD
- ECUART
- 8
- 1
- NONE
- 115200
- 4
- 0
- 0
- 0
- AUTO
- NEVER
- QUIET
- AT
- AT
- AT
- S8=
- L0
- L1
- L2
- M0
- M1
- M2
- M3
- W
- X1
- X2
- X3
- X4
- E0
- V1
- Q0
- Q1
- ;
- O
- Z
- &F
- &C1
- &D2
- &S0
- &K3
- &K4
- +
- S12
- NO DIAL TONE
- BUSY
- NO ANSWER
- CARRIER
- CONNECT
- COMPRESSION:CLASS 5
- COMPRESSION:V.42 bis
- COMPRESSION:NONE
- PROTOCOL:LAPD
- PROTOCOL:ALT
- PROTOCOL:ALT-CELLULAR
- PROTOCOL:NONE
- 0
- FALSE
- 0
- 15
- 5
- 10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ConnectionPreferencesTable1
- 1
- OUTGOING
- DONOTPROMPT
- PSD
- IAP.Actual NT RAS
-
-
-
-
-
- GlobalSettingsTable1
- 3
- 2
- 1
- 1
- 2
- 2
- 2
- Location.Office
- Location.Office
- GSM
- Network.NT RAS
- mm
-
-
-
-
-
-
-
-
- Default Dial Out ISP
- IPV4
- FALSE
- FALSE
- FALSE
- 2
- 4
- 3
- 3
- 31
- 2
- 4
- 3
- 3
- 31
- FALSE
- FALSE
- FALSE
- 255.255.255.0
- ip
- RasUser
- pass
- 1
- 194.72.6.51
- 194.72.6.51
- FALSE
- FALSE
- FALSE
- UmtsR99QoSAndOn.R99Default1
-
-
-
- NT RAS
- IPV4
- lowernif=PPP
- FALSE
- TRUE
- TRUE
- pass
-
-
-
-
-
-
-
-
- Default Location
- TRUE
- FALSE
- FALSE
- 0
- +
- 0
- 44
-
-
-
- Office
- FALSE
- FALSE
- FALSE
- 0
- 00
- 0
- 44
- 171
- 9,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- R99Default1
- 1
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 1
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/qospolicies.ini
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/qospolicies.ini Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-# ModuleSpecs
-modulespec guqos= {
- STRING module = guqos.prt
- INTEGER id=368
- INTEGER flags = 1
- }
-
-# FlowSpecs
-flowspec override = {
- INTEGER token_rate_uplink = 1500
- }
-
-flowspec default_flow_spec = {
- INTEGER max_transfer_rate_uplink = 1500
- INTEGER token_rate_uplink = 1500
- INTEGER token_bucket_size_uplink = 3000
- INTEGER max_packet_size_uplink = 1500
- INTEGER min_policed_unit_uplink = 1500
- INTEGER priority_uplink = 1
- INTEGER drop_mode_uplink = 8
- INTEGER max_transfer_rate_downlink = 1500
- INTEGER token_rate_downlink = 1500
- INTEGER token_bucket_size_downlink = 3000
- INTEGER max_packet_size_downlink = 1500
- INTEGER min_policed_unit_downlink = 1500
- INTEGER priority_downlink = 1
- INTEGER drop_mode_downlink = 8
- }
-
-# UMTS Specs
-
-# Default APN should always be specified!
-extension_spec default_extension_spec = {
- INTEGER type = 5
- INTEGER extension_type = 5
- INTEGER TrafficClassRequested = 4
- INTEGER MaxBitrateUplinkRequested = 2048
- INTEGER MaxBitrateDownlinkRequested = 2048
- INTEGER GuaBitrateUplinkRequested = 1024
- INTEGER GuaBitrateDownlinkRequested = 1024
- INTEGER HeaderCompressionRequested = 1
- }
-
-extension_spec guqos_default = {
- INTEGER type = 5
- INTEGER extension_type = 5
- # Subscribed
- INTEGER TrafficClassRequested = 1
- # Subscribed
- INTEGER TrafficClassMinimum = 1
- # Subscribed
- INTEGER DeliveryOrderRequested = 1
- # Subscribed
- INTEGER DeliveryOrderMinimum = 1
- # Subscribed
- INTEGER DeliveryOfErroneusSduRequested = 1
- # Subscribed
- INTEGER DeliveryOfErroneusSduMinimum = 1
- # Subscribed
- INTEGER MaxSduSizeRequested = 0
- # Subscribed
- INTEGER MaxSduSizeMinimum = 0
- # Subscribed
- INTEGER MaxBitrateUplinkRequested = 0
- # Subscribed
- INTEGER MaxBitrateDownlinkRequested = 0
- # Subscribed
- INTEGER MaxBitrateUplinkMinimum = 0
- # Subscribed
- INTEGER MaxBitrateDownlinkMinimum = 0
- # iReqBER Subscribed
- INTEGER ResidualBerRequested = 1
- # iMaxBER Subscribed
- INTEGER ResidualBerMinimum = 1
- # ReqSDUErrorratio Subscribed
- INTEGER ErrorRatioRequested = 1
- # MaxSDUErrorratio Subscribed
- INTEGER ErrorRatioMinimum =1
- INTEGER PriorityRequested = 1
- INTEGER PriorityMinimum = 1
- # Subscribed
- INTEGER TransferDelayRequested = 0
- # Subscribed
- INTEGER TransferDelayMinimum = 0
- # Subscribed
- INTEGER GuaBitrateUplinkRequested = 0
- # Subscribed
- INTEGER GuaBitrateUplinkMinimum = 0
- # Subscribed
- INTEGER GuaBitrateDownlinkRequested = 0
- # Subscribed
- INTEGER GuaBitrateDownlinkMinimum = 0
-}
-
-
-
-# Default APN should always be specified!
-extension_spec web = {
- INTEGER type = 5
- INTEGER extension_type = 5
- INTEGER TrafficClassRequested = 3
- INTEGER MaxBitrateUplinkRequested = 2048
- INTEGER MaxBitrateDownlinkRequested = 2048
- INTEGER GuaBitrateUplinkRequested = 1024
- INTEGER GuaBitrateDownlinkRequested = 1024
- INTEGER HeaderCompressionRequested = 1
- }
-
-
-# Module selectors (none)
-#module_policy dst_port 0 dst_port_max 65535 priority 1 = { guqos }
-
-# Flowspec selectors
-flowspec_policy dst_port 9 priority 1 = { default_flow_spec }
-#flowspec_policy dst_port 0 dst_port_max 65535 priority 2 = { override }
-#flowspec_policy dst_port 0 priority 0 = { default }
-
-# GPRS selectors
-# extension_policy src_port 0 src_port_max 65535 priority 0 = { default_extension_spec }
-
-# guqos_default
-extension_policy src_port 0 src_port_max 65535 priority 0 = { guqos_default }
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini Tue Sep 14 17:55:14 2010 +0100
@@ -139,6 +139,11 @@
PrimaryIapId1 = 2
PrimaryActivationErr1 = -19
+[PrimaryActivationFails202]
+SimTsyTestNum = 202
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = -4178
+
[SecondaryActivationFails301]
SimTsyTestNum = 301
SubConnectionCount1 = 0
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt Tue Sep 14 17:55:14 2010 +0100
@@ -842,6 +842,54 @@
# CommSetup =
CommSetup= PKTLOOPBACK, INVALID::1, 18, 0, PRIMARY1
+
+############################################################################
+############################################################################
+################### T E S T 2 0 2 ####################
+############################################################################
+############################################################################
+# Failure to Activate Primary PDP context (too many contexts)
+############################################################################
+[test202]
+# DefaultContextparamGPRS = , , , , ,
+# ProtocolConfigOption = , , , ,
+# , , ,
+DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
+
+# ContextConfigGPRS = , , , , ,
+# ProtocolConfigOption = , , , ,
+# , , ,
+SetContextConfigGPRS = 0,Test,,0,2,0,1,RasUser,,,,,,1
+# TRel99ContextConfig = , , , ,
+# , ,
+R99ContextConfig = PRIMARY1, 0, -4178, 0, 0, 0, 0, 0
+R99ContextConfig = PRIMARY1, 0, -4178, 0, 0, 0, 0, 0
+
+#TProfileReqR99 = 0 1 2 3 4
+# 5 6 7 8
+# 9 10 11 12
+#
+# 13 14 15 16
+# 17 18
+# 19 20 21 22
+# 23 24
+QosProfileReqR99 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+
+QosProfileReqR5 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0, 0
+
+
+#TProfileNegR99 =
+#
+#
+#
+QosProfileNegR99 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+
+QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+
+# CommSetup =
+CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
+
+
############################################################################
############################################################################
################### T E S T 2 1 1 ####################
diff -r ac20d6a0a19d -r b982c3e940f3 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_PppSize_config.txt
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_PppSize_config.txt Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-[test0]
-# DefaultContextparamGPRS = , , , , ,
-# ProtocolConfigOption = , , , ,
-# , , ,
-DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
-
-# ContextConfigGPRS = , , , , ,
-# ProtocolConfigOption = , , , ,
-# , , ,
-SetContextConfigGPRS= 0,,, 0, 2, 0, 0,RasUser,pass,,,,,0
-
-# TRel99ContextConfig = , , , ,
-# , ,
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 1
-
-# TFTfilter = 0 1 2 3 4
-# 5 6 7 8 9 10
-# 11
-TFTfilter = 1, 96, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 1031, 0, 0, 0
-
-#TProfileReqR99 = 0 1 2 3 4