# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284546643 -10800 # Node ID 9200f38b13249e8cb569ef2b1fa4ae02dd9a2f17 # Parent 4814c5a4942818ca582221516f78693ec430a703 Revision: 201036 Kit: 201036 diff -r 4814c5a49428 -r 9200f38b1324 smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp --- a/smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -986,10 +986,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 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/src/PDPSCPR.cpp --- a/telephonyprotocols/pdplayer/src/PDPSCPR.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyprotocols/pdplayer/src/PDPSCPR.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -92,7 +92,7 @@ namespace PDPSCprStopActivity { -DECLARE_DEFINE_CUSTOM_NODEACTIVITY(ECFActivityStopDataClient, Stop, TCFDataClient::TStop, MeshMachine::CNodeRetryActivity::NewL) +DECLARE_DEFINE_CUSTOM_NODEACTIVITY(ECFActivityStopDataClient, Stop, TCFDataClient::TStop, MeshMachine::CPreallocatedNodeRetryActivity::New) FIRST_NODEACTIVITY_ENTRY(PDPSCprStates::TAwaitingDataClientStopOrCancel, MeshMachine::TNoTag) THROUGH_NODEACTIVITY_ENTRY(KNoTag, MeshMachine::TDoNothing, PRDataClientStopActivity::TNoTagOrProviderStoppedBlockedByStart) diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp --- a/telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -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 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/src/pdpservices.cpp --- a/telephonyprotocols/pdplayer/src/pdpservices.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyprotocols/pdplayer/src/pdpservices.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -110,6 +110,7 @@ Cancel(); iObjectBundleOwner->Close(); delete iRetrievePcktMbms; + iRequestOriginator.Close(); } /** diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudnetworkside_mbufexhaust.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudnetworkside_mbufexhaust.ini Wed Sep 15 13:30:43 2010 +0300 @@ -0,0 +1,7 @@ +[MBufExhaustionRx] +SimTsyTestNum = 1 +PrimaryIapId1 = 2 +PrimaryIapId2 = 6 + + + diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudnetworkside_mbufexhaustion.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudnetworkside_mbufexhaustion.cfg Wed Sep 15 13:30:43 2010 +0300 @@ -0,0 +1,1665 @@ +############################################################ +## AUTO-GENERATED CONFIGURATION FILE +## CommsDat Database Dump Utility +## 1.1 +############################################################ + +############################################################ +## Network +## +[Network] +ADD_SECTION +# COMMDB_ID = 1 + Name=Intranet + FIELD_COUNT=1 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=Intranet2 + FIELD_COUNT=1 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=Intranet3 + FIELD_COUNT=1 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=Intranet4 + FIELD_COUNT=1 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=Intranet5 + FIELD_COUNT=1 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=Intranet6 + FIELD_COUNT=1 +END_ADD + + +############################################################ +## ModemBearer +## +[ModemBearer] +ADD_TEMPLATE + Name=Default Loopback Modem + TSYName=SIM + CSYName=PKTLOOPBACK + LastSocketActivityTimeout=180 + LastSessionClosedTimeout=4 + LastSocketClosedTimeout=6 + DataBits=8 + StopBits=1 + Parity=NONE + Rate=115200 + Handshaking=0 + SpecialRate=0 + XonChar=0 + XoffChar=0 + FaxClassPref=AUTO + SpeakerPref=NEVER + SpeakerVolPref=QUIET + ModemInitString=AT + DataInitString=AT + FaxInitString=AT + DialPauseLength=S8= + SpeakerVolContorlLow=L0 + SpeakerVolControlMedium=L1 + SpeakerVolControlHigh=L2 + SpeakerAlwaysOff=M0 + SpeakerOnUntilCarrier=M1 + SpeakerAlwaysOn=M2 + SpeakerOnAfterUntilCarrier=M3 + DialToneWaitModifier=W + CallProgress1=X1 + CallProgress2=X2 + CallProgress3=X3 + CallProgress4=X4 + EchoOff=E0 + VerboseText=V1 + QuietOff=Q0 + QuietOn=Q1 + DialCommandStateModifier=; + OnLine=O + ResetConfiguration=Z + ReturnToFactoryDefs=&F + DCDOnDuringLink=&C1 + DTRHangUp=&D2 + DSRAlwaysOn=&S0 + RTSCTSHandshake=&K3 + XonXoffHandshake=&K4 + EscapeCharacter=+ + EscapeGuardPeriod=S12 + NoDialTone=NO DIAL TONE + Busy=BUSY + NoAnswer=NO ANSWER + Carrier=CARRIER + Connect=CONNECT + CompressionClass5=COMPRESSION:CLASS 5 + CompressionV42bis=COMPRESSION:V.42 bis + CompressionNone=COMPRESSION:NONE + ProtocolLAPD=PROTOCOL:LAPD + ProtocolALT=PROTOCOL:ALT + ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR + ProtocolNone=PROTOCOL:NONE + MessageValidityPeriod=0 + MessageDeliveryReport=FALSE + CommRole=0 + BCAStack=C32Bca + Agent=NULLAGT + FIELD_COUNT=65 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Name=Loopback_RawIP_1 + IfName=RAWIP + PortName=PKTLOOPBACK::504 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=Loopback_SPUD_2 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=Loopback_RawIP_3 + IfName=RAWIP + PortName=PKTLOOPBACK::502 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=Loopback_SPUD_4 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=WinTunnel_SPUD_5 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=Loopback_SPUD_5 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=Loopback_SPUD_6 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=Loopback_SPUD_7 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Name=Loopback_SPUD_8 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + + +############################################################ +## Location +## +[Location] +ADD_TEMPLATE + Name=Default Location + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=8 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Name=Office + IntlPrefixCode=00 + AreaCode=171 + DialOutCode=9, + Mobile=FALSE + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=Mobile + FIELD_COUNT=1 +END_ADD + + +############################################################ +## OutgoingGPRS +## +[OutgoingGPRS] +ADD_TEMPLATE + Name=Default Outgoing GPRS + APN=Test + PDPType=IPV4 + ReqPrecedence=2 + ReqDelay=4 + ReqReliability=3 + ReqPeakThroughput=3 + ReqMeanThroughput=31 + MinPrecedence=2 + MinDelay=4 + MinReliability=3 + MinPeakThroughput=3 + MinMeanThroughput=31 + DataCompression=FALSE + HeaderCompression=FALSE + GprsUseEdge=FALSE + AnonymousAccess=FALSE + IfNetworks=ip + IfPromptForAuth=FALSE + IfAuthName=RasUser + AuthRetries=1 + IpNetMask=255.255.255.0 + IpGateway=0.0.0.1 + IpAddrFromServer=FALSE + IpDNSAddrFromServer=FALSE + IpNameServer1=194.72.6.51 + IpNameServer2=194.72.6.51 + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=30 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Name=RawIP_Bounce_1 + IpAddr=192.168.1.1 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=SPUD_Echo_2 + IfParams=lowernif=RAWIP + IpAddrFromServer=TRUE + IpAddr=192.168.1.2 + IpDNSAddrFromServer=TRUE + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=RawIP_Bounce_3 + IpAddr=192.168.2.3 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=SPUD_Echo_4 + IfParams=lowernif=RAWIP + IpAddr=192.168.2.4 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=SPUD_Multi_1 + IfParams=lowernif=RAWIP + IpAddrFromServer=TRUE + IpAddr=192.168.1.10 + IpDNSAddrFromServer=TRUE + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=SPUD_Multi_2 + IfParams=lowernif=RAWIP + IpAddrFromServer=TRUE + IpAddr=192.168.1.11 + IpDNSAddrFromServer=TRUE + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=SPUD_Multi_3 + IfParams=lowernif=RAWIP + IpAddrFromServer=TRUE + IpAddr=192.168.1.12 + IpDNSAddrFromServer=TRUE + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=SPUD_Multi_4 + IfParams=lowernif=RAWIP + IpAddrFromServer=TRUE + IpAddr=192.168.1.13 + IpDNSAddrFromServer=TRUE + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Name=GPRS_BAD_QOS + IfParams=lowernif=RAWIP + IpAddrFromServer=TRUE + IpAddr=192.168.1.2 + IpDNSAddrFromServer=TRUE + UmtsR99QoSAndOn=5 + FIELD_COUNT=6 +END_ADD + + +############################################################ +## DefaultGPRS +## +[DefaultGPRS] +ADD_SECTION +# COMMDB_ID = 1 + Name=Dummy Default GPRS Settings + Usage=1 + APN=Access point name + PDPType=IPV6 + PDPAddress=www.wid.com + Precedence=1 + Delay=1 + Reliability=1 + PeakThroughput=1 + MeanThroughput=1 + MinPrecedence=1 + MinDelay=1 + MinReliability=1 + MinPeakThroughput=1 + MinMeanThroughput=1 + DataCompression=TRUE + HeaderCompression=TRUE + GprsUseEdge=FALSE + AnonymousAccess=TRUE + FIELD_COUNT=19 +END_ADD + + +############################################################ +## APPrioritySelectionPolicyTable +## +[APPrioritySelectionPolicyTable] +ADD_SECTION +# COMMDB_ID = 254 + Id=20000 + Name=APSelPolNetworkDefault + AP1=Link.AccessPointTable.10003 + APCOUNT=1 + FIELD_COUNT=4 +END_ADD + + +############################################################ +## TierTable +## +[TierTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=2048 + Name=Tier1 + TierImplUid=271064536 + TierThreadName=ESock_IP + TierManagerName=NetworkTierManager + DefaultAccessPoint=Link.AccessPointTable.10000 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=271064560 + Name=Tier2 + TierImplUid=271064560 + TierThreadName=ESock_IP + TierManagerName=ProtoTierManager + DefaultAccessPoint=Link.AccessPointTable.10004 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=271064565 + Name=Tier3 + TierImplUid=271064565 + TierThreadName=ESock_IP + TierManagerName=LinkTierManager + DefaultAccessPoint=Link.AccessPointTable.10000 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=536887799 + Name=Tier4 + TierImplUid=536887799 + TierThreadName=ESock_SIP + TierManagerName=SIPTierManager + DefaultAccessPoint=Link.AccessPointTable.10002 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +## mbufgob layer: this is where we refer to our +## new Tier by its factory implementation UId +ADD_SECTION +# COMMDB_ID = 7 + Id=0x10272F98 + Name=PassThroughTM + TierImplUid=0x10272F98 + TierThreadName=ESock_IP + TierManagerName=mbufgobTierManager +###### Set the default access point to F0 = 240 = PassThrough layer AP + DefaultAccessPoint=0x0E00F000 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + + +############################################################ +## MCprTable +## +[MCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Name=netmcpr + MCprUid=271009095 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=ipprotomcpr + MCprUid=271064558 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=pppmcpr + MCprUid=271064556 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=ethmcpr + MCprUid=271064572 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=rawipmcpr + MCprUid=271064576 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=tunnelmcpr + MCprUid=271064578 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=qospppmcpr + MCprUid=271064556 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=dummynifmcpr + MCprUid=271064580 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Name=hungrynifmcpr + MCprUid=271064580 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Name=pdpmcpr + MCprUid=271065840 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 11 + Name=sipmcpr + MCprUid=536887801 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 13 + Name=panethermcpr + MCprUid=271070626 + FIELD_COUNT=2 +END_ADD + +## mbufgob layer: this is where we refer to our +## new MCPr by its factory implementation UId +ADD_SECTION +# COMMDB_ID = 14 + Name=mbufgobmcpr + MCprUid=0x10272F99 + FIELD_COUNT=2 +END_ADD + + +############################################################ +## CprTable +## +[CprTable] +ADD_SECTION +# COMMDB_ID = 1 + Name=ipcpr + CprUid=270561519 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=ipprotocpr + CprUid=271064531 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=agentcpr + CprUid=271064552 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=vanillacpr + CprUid=271065843 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=sipcpr + CprUid=271010872 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=tunnelagentcpr + CprUid=271080968 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=pdpcpr + CprUid=271065826 + FIELD_COUNT=2 +END_ADD + +## mbufgob layer: this is where we refer to our +## new CPr by its factory implementation UId +ADD_SECTION +# COMMDB_ID = 11 + Name=mbufgobcpr + CprUid=0x10272F9A + FIELD_COUNT=2 +END_ADD + +############################################################ +## SCprTable +## +[SCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Name=qosipscpr + SCprUid=270549768 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=ipprotoscpr + SCprUid=271064529 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=agentscpr + SCprUid=271064554 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=pdpscpr + SCprUid=271065824 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=pppscpr + SCprUid=271065852 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=vanillascpr + SCprUid=271065844 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=qosscpr + SCprUid=271065811 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=sipscpr + SCprUid=271010839 + FIELD_COUNT=2 +END_ADD + +## mbufgob layer: this is where we refer to our +## new SCPr by its factory implementation UId +ADD_SECTION +# COMMDB_ID = 11 + Name=mbufgobscpr + SCprUid=0x10272F9B + FIELD_COUNT=2 +END_ADD + +############################################################ +## ProtocolTable +## +[ProtocolTable] +ADD_SECTION +# COMMDB_ID = 1 + Name=sapshim + ProtocolUid=270496898 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=ipshim4 + ProtocolUid=271064118 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=ppp + ProtocolUid=271064143 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=ethernet + ProtocolUid=271064539 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=rawip + ProtocolUid=271064562 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=tunnel + ProtocolUid=271064567 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=qosppp + ProtocolUid=271064148 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=dummynif + ProtocolUid=271064123 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Name=hungrynif + ProtocolUid=271064125 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Name=panether + ProtocolUid=271070627 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 11 + Name=rawip2 + ProtocolUid=271084280 + FIELD_COUNT=2 +END_ADD + +## mbufgob layer: this is where we refer to our +## new Protocol by its factory implementation UId +ADD_SECTION +# COMMDB_ID = 12 + Name=mbufgobprot + ProtocolUid=0x10272F9C + FIELD_COUNT=2 +END_ADD + + +############################################################ +## BearerTypeTable +## +[BearerTypeTable] +ADD_SECTION +# COMMDB_ID = 1 + Name=ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.3 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.3 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=ethint + Tier=Link.TierTable.271064565 + MCpr=MCprTable.4 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.4 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=tunnelnif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.6 + Cpr=CprTable.7 + SCpr=SCprTable.3 + Protocol=ProtocolTable.6 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=qosppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.7 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.7 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=dummynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.8 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.8 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=hungrynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.9 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.9 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=spud-ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.3 + SCpr=SCprTable.4 + Protocol=ProtocolTable.3 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Name=spud-rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.3 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Name=IPProtoDefaultTemplate + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 11 + Name=NetworkDefaultTemplate + Tier=Link.TierTable.2048 + MCpr=MCprTable.1 + Cpr=CprTable.1 + SCpr=SCprTable.7 + Protocol=ProtocolTable.1 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 12 + Name=rawip2 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.11 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 13 + Name=spud-rawip2 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.11 + FIELD_COUNT=6 +END_ADD + + +############################################################ +## AccessPointTable +## +[AccessPointTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=rawipMappedFromIAP1 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +## mbufgob layer: The access point record for the new layer. +## Uses mbufgob tier, MCPr, CPr, SCPr and protocol +ADD_SECTION +# COMMDB_ID = 240 + Id=20 + Name=PassThroughLayer +### Use record 7 in Tier table (MBufGobblerTierMgr, as defined by the second byte 07) + Tier=0x11800700 +### Use record 14 in MCPr table (MbufGobblerMcpr, as defined by the second byte 0E) + MCpr=0x12000E00 +### Use record 11 in CPr table (MbufGobblerCpr, as defined by the second byte 0B) + Cpr=0x12800B00 +### Use record 11 in SCPr table (MBufGobblerScpr, as defined by the second byte 0B) + SCpr=0x13000B00 +### Use record 12 in Protocol table (MBufGobblerFlow, as defined by the second byte in OC) + Protocol=0x13800C00 + CprConfig=1 + AppSID=0 + CustomSelectionPolicy=1 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=10003 + Name=IPProto_generated_10003 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=1 + CustomSelectionPolicy=20 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=2 + Name=spud-rawipMappedFromIAP2 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.3 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=10004 + Name=IPProto_generated_10004 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=2 + CustomSelectionPolicy=2 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=3 + Name=rawipMappedFromIAP3 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=10005 + Name=IPProto_generated_10005 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=3 + CustomSelectionPolicy=3 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=4 + Name=spud-rawipMappedFromIAP4 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=10006 + Name=IPProto_generated_10006 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=4 + CustomSelectionPolicy=4 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=5 + Name=rawipMappedFromIAP5 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Id=10007 + Name=IPProto_generated_10007 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=5 + CustomSelectionPolicy=5 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 11 + Id=6 + Name=spud-rawipMappedFromIAP6 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.3 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 12 + Id=10008 + Name=IPProto_generated_10008 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=6 + CustomSelectionPolicy=6 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 13 + Id=7 + Name=spud-rawipMappedFromIAP7 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 14 + Id=10009 + Name=IPProto_generated_10009 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=7 + CustomSelectionPolicy=7 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 15 + Id=8 + Name=spud-rawipMappedFromIAP8 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 16 + Id=10010 + Name=IPProto_generated_10010 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=8 + CustomSelectionPolicy=8 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 17 + Id=9 + Name=spud-rawipMappedFromIAP9 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 18 + Id=10011 + Name=IPProto_generated_10011 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=9 + CustomSelectionPolicy=9 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 19 + Id=10 + Name=spud-rawipMappedFromIAP10 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 20 + Id=10012 + Name=IPProto_generated_10012 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=10 + CustomSelectionPolicy=10 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 252 + Id=10002 + Name=SIPDefault + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.536887799 + MCpr=MCprTable.11 + Cpr=CprTable.5 + SCpr=SCprTable.8 + Protocol=ProtocolTable.2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 254 + Id=10000 + Name=NetworkDefault + AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.20000 + Tier=Link.TierTable.2048 + MCpr=MCprTable.1 + Cpr=CprTable.1 + SCpr=SCprTable.7 + Protocol=ProtocolTable.1 + FIELD_COUNT=8 +END_ADD + + +############################################################ +## GlobalSettings +## +[GlobalSettings] +ADD_TEMPLATE + DefaultTier=1 + FIELD_COUNT=1 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Name=DefaultRecordName-1 + ConnectionAttempts=2 + RedialAttempts=3 + SmsReceiveMode=2 + GPRSAttachMode=1 + AcceptIncomingGprs=1 + GPRSClassCBearer=GSM + ModemForDataAndFax=2 + ModemForPhoneServicesAndSMS=2 + LocationForDataAndFax=2 + LocationForPhoneServicesAndSMS=2 + DefaultNetwork=1 + BearerAvailabilityCheckTSY=mm + FIELD_COUNT=13 +END_ADD + + +############################################################ +## IAP +## +[IAP] +ADD_SECTION +# COMMDB_ID = 1 + Name=Loopback_GRPS_1 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=1 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=Loopback_GRPS_2 + IAPServiceType=OutgoingGPRS + IAPService=2 + IAPBearerType=ModemBearer + IAPBearer=2 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=Loopback_GRPS_3 + IAPServiceType=OutgoingGPRS + IAPService=3 + IAPBearerType=ModemBearer + IAPBearer=3 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=Loopback_GRPS_4 + IAPServiceType=OutgoingGPRS + IAPService=4 + IAPBearerType=ModemBearer + IAPBearer=4 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=Loopback_GRPS_5 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=3 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=Loopback_GRPS_6 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=1 + IAPNetwork=3 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=Loopback_GRPS_7 + IAPServiceType=OutgoingGPRS + IAPService=6 + IAPBearerType=ModemBearer + IAPBearer=7 + IAPNetwork=4 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=Loopback_GRPS_8 + IAPServiceType=OutgoingGPRS + IAPService=7 + IAPBearerType=ModemBearer + IAPBearer=8 + IAPNetwork=5 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Name=Loopback_GRPS_9 + IAPServiceType=OutgoingGPRS + IAPService=8 + IAPBearerType=ModemBearer + IAPBearer=9 + IAPNetwork=6 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Name=IAP_GRPS_BAD_QOS + IAPServiceType=OutgoingGPRS + IAPService=9 + IAPBearerType=ModemBearer + IAPBearer=2 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + + +############################################################ +## ConnectionPreferences +## +[ConnectionPreferences] +ADD_SECTION +# COMMDB_ID = 1 + Name=DefaultRecordName-1 + Ranking=1 + Direction=OUTGOING + BearerSet=PSD + DialogPref=DONOTPROMPT + IAP=2 + FIELD_COUNT=6 +END_ADD + + +############################################################ +## UmtsR99QoSAndOn +## +[UmtsR99QoSAndOn] +ADD_SECTION +# COMMDB_ID = 1 + Name=PRIMARY1 + ReqTrafficClass=1 + MinTrafficClass=1 + ReqDeliveryOrder=1 + MinDeliveryOrder=1 + ReqDeliverErroneousSDU=1 + MinDeliverErroneousSDU=1 + ReqMaxSDUSize=0 + MinAcceptableMaxSDUSize=0 + ReqMaxUplinkRate=0 + ReqMinUplinkRate=0 + ReqMaxDownlinkRate=0 + ReqMinDownlinkRate=0 + ReqBER=1 + MaxBER=1 + ReqSDUErrorRatio=1 + MaxSDUErrorRatio=1 + ReqTrafficHandlingPriority=1 + MinTrafficHandlingPriority=1 + ReqTransferDelay=0 + MaxTransferDelay=0 + ReqGuaranteedUplinkRate=0 + MinGuaranteedUplinkRat=0 + ReqGuaranteedDownlinkRate=0 + MinGuaranteedDownlinkRate=0 + SignallingIndication=FALSE + ImCnSignallingIndication=FALSE + SourceStatisticsDescriptor=0 + FIELD_COUNT=28 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=SECONDARY1 + ReqTrafficClass=4 + MinTrafficClass=4 + ReqDeliveryOrder=1 + MinDeliveryOrder=1 + ReqDeliverErroneousSDU=8 + MinDeliverErroneousSDU=8 + ReqMaxSDUSize=768 + MinAcceptableMaxSDUSize=512 + ReqMaxUplinkRate=1024 + ReqMinUplinkRate=1024 + ReqMaxDownlinkRate=1024 + ReqMinDownlinkRate=1024 + ReqBER=0 + MaxBER=0 + ReqSDUErrorRatio=1 + MaxSDUErrorRatio=1 + ReqTrafficHandlingPriority=1 + MinTrafficHandlingPriority=1 + ReqTransferDelay=250 + MaxTransferDelay=250 + ReqGuaranteedUplinkRate=1024 + MinGuaranteedUplinkRat=1024 + ReqGuaranteedDownlinkRate=1024 + MinGuaranteedDownlinkRate=1024 + SignallingIndication=FALSE + ImCnSignallingIndication=FALSE + SourceStatisticsDescriptor=0 + FIELD_COUNT=28 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=PRIMARY2 + ReqTrafficClass=1 + MinTrafficClass=1 + ReqDeliveryOrder=1 + MinDeliveryOrder=1 + ReqDeliverErroneousSDU=1 + MinDeliverErroneousSDU=1 + ReqMaxSDUSize=0 + MinAcceptableMaxSDUSize=0 + ReqMaxUplinkRate=0 + ReqMinUplinkRate=0 + ReqMaxDownlinkRate=0 + ReqMinDownlinkRate=0 + ReqBER=1 + MaxBER=1 + ReqSDUErrorRatio=1 + MaxSDUErrorRatio=1 + ReqTrafficHandlingPriority=1 + MinTrafficHandlingPriority=1 + ReqTransferDelay=0 + MaxTransferDelay=0 + ReqGuaranteedUplinkRate=0 + MinGuaranteedUplinkRat=0 + ReqGuaranteedDownlinkRate=0 + MinGuaranteedDownlinkRate=0 + SignallingIndication=FALSE + ImCnSignallingIndication=FALSE + SourceStatisticsDescriptor=0 + FIELD_COUNT=28 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=SECONDARY2 + ReqTrafficClass=4 + MinTrafficClass=4 + ReqDeliveryOrder=1 + MinDeliveryOrder=1 + ReqDeliverErroneousSDU=8 + MinDeliverErroneousSDU=8 + ReqMaxSDUSize=768 + MinAcceptableMaxSDUSize=512 + ReqMaxUplinkRate=1024 + ReqMinUplinkRate=1024 + ReqMaxDownlinkRate=1024 + ReqMinDownlinkRate=1024 + ReqBER=0 + MaxBER=0 + ReqSDUErrorRatio=1 + MaxSDUErrorRatio=1 + ReqTrafficHandlingPriority=1 + MinTrafficHandlingPriority=1 + ReqTransferDelay=250 + MaxTransferDelay=250 + ReqGuaranteedUplinkRate=1024 + MinGuaranteedUplinkRat=1024 + ReqGuaranteedDownlinkRate=1024 + MinGuaranteedDownlinkRate=1024 + SignallingIndication=FALSE + ImCnSignallingIndication=FALSE + SourceStatisticsDescriptor=0 + FIELD_COUNT=28 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=BAD_QOS + MinTrafficClass=1 + ReqDeliveryOrder=1 + MinDeliveryOrder=1 + ReqDeliverErroneousSDU=1 + MinDeliverErroneousSDU=1 + ReqMaxSDUSize=0 + MinAcceptableMaxSDUSize=0 + ReqMaxUplinkRate=0 + ReqMinUplinkRate=0 + ReqMaxDownlinkRate=0 + ReqMinDownlinkRate=0 + ReqBER=1 + MaxBER=1 + ReqSDUErrorRatio=1 + MaxSDUErrorRatio=1 + ReqTrafficHandlingPriority=1 + MinTrafficHandlingPriority=1 + ReqTransferDelay=0 + MaxTransferDelay=0 + ReqGuaranteedUplinkRate=0 + MinGuaranteedUplinkRat=0 + ReqGuaranteedDownlinkRate=0 + MinGuaranteedDownlinkRate=0 + SignallingIndication=FALSE + ImCnSignallingIndication=FALSE + SourceStatisticsDescriptor=0 + FIELD_COUNT=27 +END_ADD + + +############################################################ +## PolicySelectorTable +## +[PolicySelectorTable] +ADD_SECTION +# COMMDB_ID = 1 + Name=DefaultRecordName-1 + PolicyId=1 + SrcAddress=0.0.0.0 + SrcMask=255.255.255.255 + DstAddress=192.168.1.1 + DstMask=255.255.255.255 + SrcPort=0 + DstPort=3461 + SrcPortMax=1031 + DstPortMax=3461 + ProtocolId=17 + IAPid=2 + Priority=1 + FIELD_COUNT=13 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=DefaultRecordName-2 + PolicyId=2 + SrcPort=0 + SrcPortMax=0 + ProtocolId=1 + IAPid=2 + Priority=1 + FIELD_COUNT=7 +END_ADD + diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudnetworkside_mbufexhaustion_config.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudnetworkside_mbufexhaustion_config.txt Wed Sep 15 13:30:43 2010 +0300 @@ -0,0 +1,153 @@ +############################################################################ +############################################################################ +################### T E S T 1 #################### +############################################################################ +############################################################################ +# Test case for success results +############################################################################ +[test1] +# 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, 0, 0, 0, 0, 0, 0 +R99ContextConfig = PRIMARY2, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = PRIMARY3, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = PRIMARY4, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = PRIMARY5, 0, 0, 0, 0, 0, 0, 0 + +# 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 +TFTfilter = 1, 0, 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 +TFTfilter = 1, 1, 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 +QosProfileReqR99 = PRIMARY2,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0 +QosProfileReqR99 = PRIMARY3,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0 +QosProfileReqR99 = PRIMARY4,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0 +QosProfileReqR99 = PRIMARY5,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 +QosProfileReqR5 = PRIMARY2,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 +QosProfileReqR5 = PRIMARY3,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 +QosProfileReqR5 = PRIMARY4,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 +QosProfileReqR5 = PRIMARY5,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 +QosProfileNegR99 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4 +QosProfileNegR99 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3 +QosProfileNegR99 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3 +QosProfileNegR99 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3 +QosProfileNegR99 = PRIMARY5, 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 +QosProfileNegR5 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0 +QosProfileNegR5 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0 +QosProfileNegR5 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0 +QosProfileNegR5 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0 +QosProfileNegR5 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0 + +#TQosProfileCapsR99 = +# +QosProfileCapsR99= 0x08, 0x04, 0x02, 0x04, 0x02, 0x04 + +QosNetworkNotificationType = PublishSubscribe +# QosNetworkNotification = +# +# +# +QosNetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4 +QosNetworkNotification = PRIMARY2, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4 +QosNetworkNotification = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4 +QosNetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4 +QosNetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4 + + +QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0 +QosR5NetworkNotification = PRIMARY2, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0 +QosR5NetworkNotification = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0 +QosR5NetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0 +QosR5NetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0 + + +#SetProfileFail= +SetProfileFail = NEG_99, 0x04, 0x02 + +#QosprofileReqGPRS= +# +QosProfileReqGPRS= 0x08, 0x04, 0x02, 0x04, 0x02, 0x04, 0x020, 0x080, 0x00004, 0x00020 +QosProfileReqGPRS= 0x04, 0x04, 0x02, 0x04, 0x02, 0x04, 0x020, 0x080, 0x00004, 0x00020 + +#QosProfileNegGPRS= +QosProfileNegGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002 +QosProfileNegGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002 + +#QosProfileCapsGPRS= +QosProfileCapsGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002 + +# QosProfileReq +# = , , , +# , +# , , +# , , , +# , , , , +# , , , + +# QosProfileNeg = , , , , +# , , , , , +# , , +# , + +DefaultContextparamRel99= 3, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2 +# DefaultContextparamRel99 = , , , +# ProtocolConfigOption = , , , , +# , , , + +ReleaseMode = 5, 5 +# Packet Release mode = + +#RegStatus= +RegStatus= 5,3 +RegStatus= 2,5,0 +RegStatus= 2,7,3 +RegStatus= 5,2 +RegStatus= 2,5,0 + +# NetworkRegStatus = , +NetworkRegStatusType = PublishSubscribe +NetworkRegStatus= 5,2 +NetworkRegStatus= 5,1 +NetworkRegStatus= 5,1 + +# CommSetup = +CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1 +CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::501, 18, 0, PRIMARY2 +CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, PRIMARY3 + +############################################################################ +# failure events +# Configure the context's status to be changed using publish and subscribe +NotifyContextStatusChangeType = PublishSubscribe +# NotifyContextStatusChange , , + diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudnetworkside_mbufexhaustion_loopbackcsy.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudnetworkside_mbufexhaustion_loopbackcsy.ini Wed Sep 15 13:30:43 2010 +0300 @@ -0,0 +1,13 @@ +# Defining a loopback between port A and B is as follows: +# Port = ,,,, + +[Defaults] +Port= 0,1,1,10,1500 +Port= 501,502,1050,10,1500 +Port= 503,504,0,10,1500 +Port= 505,506,0,10,1500 +Port= 507,508,0,10,1500 +Port= 509,510,0,10,1500 +Port= 511,512,0,10,1500 +Port= 513,514,0,10,1500 +Port= 515,516,0,10,1500 diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudnetworkside_mbufexhaustion_pdpcpr.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudnetworkside_mbufexhaustion_pdpcpr.cfg Wed Sep 15 13:30:43 2010 +0300 @@ -0,0 +1,1659 @@ +############################################################ +## AUTO-GENERATED CONFIGURATION FILE +## CommsDat Database Dump Utility +## 1.1 +############################################################ + +############################################################ +## Network +## +[Network] +ADD_SECTION +# COMMDB_ID = 1 + Name=Intranet + FIELD_COUNT=1 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=Intranet2 + FIELD_COUNT=1 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=Intranet3 + FIELD_COUNT=1 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=Intranet4 + FIELD_COUNT=1 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=Intranet5 + FIELD_COUNT=1 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=Intranet6 + FIELD_COUNT=1 +END_ADD + + +############################################################ +## ModemBearer +## +[ModemBearer] +ADD_TEMPLATE + Name=Default Loopback Modem + TSYName=SIM + CSYName=PKTLOOPBACK + LastSocketActivityTimeout=180 + LastSessionClosedTimeout=4 + LastSocketClosedTimeout=6 + DataBits=8 + StopBits=1 + Parity=NONE + Rate=115200 + Handshaking=0 + SpecialRate=0 + XonChar=0 + XoffChar=0 + FaxClassPref=AUTO + SpeakerPref=NEVER + SpeakerVolPref=QUIET + ModemInitString=AT + DataInitString=AT + FaxInitString=AT + DialPauseLength=S8= + SpeakerVolContorlLow=L0 + SpeakerVolControlMedium=L1 + SpeakerVolControlHigh=L2 + SpeakerAlwaysOff=M0 + SpeakerOnUntilCarrier=M1 + SpeakerAlwaysOn=M2 + SpeakerOnAfterUntilCarrier=M3 + DialToneWaitModifier=W + CallProgress1=X1 + CallProgress2=X2 + CallProgress3=X3 + CallProgress4=X4 + EchoOff=E0 + VerboseText=V1 + QuietOff=Q0 + QuietOn=Q1 + DialCommandStateModifier=; + OnLine=O + ResetConfiguration=Z + ReturnToFactoryDefs=&F + DCDOnDuringLink=&C1 + DTRHangUp=&D2 + DSRAlwaysOn=&S0 + RTSCTSHandshake=&K3 + XonXoffHandshake=&K4 + EscapeCharacter=+ + EscapeGuardPeriod=S12 + NoDialTone=NO DIAL TONE + Busy=BUSY + NoAnswer=NO ANSWER + Carrier=CARRIER + Connect=CONNECT + CompressionClass5=COMPRESSION:CLASS 5 + CompressionV42bis=COMPRESSION:V.42 bis + CompressionNone=COMPRESSION:NONE + ProtocolLAPD=PROTOCOL:LAPD + ProtocolALT=PROTOCOL:ALT + ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR + ProtocolNone=PROTOCOL:NONE + MessageValidityPeriod=0 + MessageDeliveryReport=FALSE + CommRole=0 + BCAStack=C32Bca + Agent=NULLAGT + FIELD_COUNT=65 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Name=Loopback_RawIP_1 + IfName=RAWIP + PortName=PKTLOOPBACK::504 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=Loopback_SPUD_2 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=Loopback_RawIP_3 + IfName=RAWIP + PortName=PKTLOOPBACK::502 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=Loopback_SPUD_4 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=WinTunnel_SPUD_5 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=Loopback_SPUD_5 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=Loopback_SPUD_6 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=Loopback_SPUD_7 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Name=Loopback_SPUD_8 + IfName=SPUD + FIELD_COUNT=2 +END_ADD + + +############################################################ +## Location +## +[Location] +ADD_TEMPLATE + Name=Default Location + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=8 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Name=Office + IntlPrefixCode=00 + AreaCode=171 + DialOutCode=9, + Mobile=FALSE + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=Mobile + FIELD_COUNT=1 +END_ADD + + +############################################################ +## OutgoingGPRS +## +[OutgoingGPRS] +ADD_TEMPLATE + Name=Default Outgoing GPRS + APN=Test + PDPType=IPV4 + ReqPrecedence=2 + ReqDelay=4 + ReqReliability=3 + ReqPeakThroughput=3 + ReqMeanThroughput=31 + MinPrecedence=2 + MinDelay=4 + MinReliability=3 + MinPeakThroughput=3 + MinMeanThroughput=31 + DataCompression=FALSE + HeaderCompression=FALSE + GprsUseEdge=FALSE + AnonymousAccess=FALSE + IfNetworks=ip + IfPromptForAuth=FALSE + IfAuthName=RasUser + AuthRetries=1 + IpNetMask=255.255.255.0 + IpGateway=0.0.0.1 + IpAddrFromServer=FALSE + IpDNSAddrFromServer=FALSE + IpNameServer1=194.72.6.51 + IpNameServer2=194.72.6.51 + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=30 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Name=RawIP_Bounce_1 + IpAddr=192.168.1.1 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=SPUD_Echo_2 + IfParams=lowernif=RAWIP + IpAddrFromServer=TRUE + IpAddr=192.168.1.2 + IpDNSAddrFromServer=TRUE + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=RawIP_Bounce_3 + IpAddr=192.168.2.3 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=SPUD_Echo_4 + IfParams=lowernif=RAWIP + IpAddr=192.168.2.4 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=SPUD_Multi_1 + IfParams=lowernif=RAWIP + IpAddrFromServer=TRUE + IpAddr=192.168.1.10 + IpDNSAddrFromServer=TRUE + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=SPUD_Multi_2 + IfParams=lowernif=RAWIP + IpAddrFromServer=TRUE + IpAddr=192.168.1.11 + IpDNSAddrFromServer=TRUE + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=SPUD_Multi_3 + IfParams=lowernif=RAWIP + IpAddrFromServer=TRUE + IpAddr=192.168.1.12 + IpDNSAddrFromServer=TRUE + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=SPUD_Multi_4 + IfParams=lowernif=RAWIP + IpAddrFromServer=TRUE + IpAddr=192.168.1.13 + IpDNSAddrFromServer=TRUE + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Name=GPRS_BAD_QOS + IfParams=lowernif=RAWIP + IpAddrFromServer=TRUE + IpAddr=192.168.1.2 + IpDNSAddrFromServer=TRUE + UmtsR99QoSAndOn=5 + FIELD_COUNT=6 +END_ADD + + +############################################################ +## DefaultGPRS +## +[DefaultGPRS] +ADD_SECTION +# COMMDB_ID = 1 + Name=Dummy Default GPRS Settings + Usage=1 + APN=Access point name + PDPType=IPV6 + PDPAddress=www.wid.com + Precedence=1 + Delay=1 + Reliability=1 + PeakThroughput=1 + MeanThroughput=1 + MinPrecedence=1 + MinDelay=1 + MinReliability=1 + MinPeakThroughput=1 + MinMeanThroughput=1 + DataCompression=TRUE + HeaderCompression=TRUE + GprsUseEdge=FALSE + AnonymousAccess=TRUE + FIELD_COUNT=19 +END_ADD + + +############################################################ +## APPrioritySelectionPolicyTable +## +[APPrioritySelectionPolicyTable] +ADD_SECTION +# COMMDB_ID = 254 + Id=20000 + Name=APSelPolNetworkDefault + AP1=Link.AccessPointTable.10003 + APCOUNT=1 + FIELD_COUNT=4 +END_ADD + + +############################################################ +## TierTable +## +[TierTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=2048 + Name=Tier1 + TierImplUid=271064536 + TierThreadName=ESock_IP + TierManagerName=NetworkTierManager + DefaultAccessPoint=Link.AccessPointTable.10000 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=271064560 + Name=Tier2 + TierImplUid=271064560 + TierThreadName=ESock_IP + TierManagerName=ProtoTierManager + DefaultAccessPoint=Link.AccessPointTable.10004 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=271064565 + Name=Tier3 + TierImplUid=271064565 + TierThreadName=ESock_IP + TierManagerName=LinkTierManager + DefaultAccessPoint=Link.AccessPointTable.10000 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=536887799 + Name=Tier4 + TierImplUid=536887799 + TierThreadName=ESock_SIP + TierManagerName=SIPTierManager + DefaultAccessPoint=Link.AccessPointTable.10002 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +## mbufgob layer: this is where we refer to our +## new Tier by its factory implementation UId +ADD_SECTION +# COMMDB_ID = 7 + Id=0x10272F98 + Name=PassThroughTM + TierImplUid=0x10272F98 + TierThreadName=ESock_IP + TierManagerName=mbufgobTierManager +###### Set the default access point to F0 = 240 = PassThrough layer AP + DefaultAccessPoint=0x0E00F000 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + + +############################################################ +## MCprTable +## +[MCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Name=netmcpr + MCprUid=271009095 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=ipprotomcpr + MCprUid=271064558 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=pppmcpr + MCprUid=271064556 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=ethmcpr + MCprUid=271064572 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=rawipmcpr + MCprUid=271064576 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=tunnelmcpr + MCprUid=271064578 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=qospppmcpr + MCprUid=271064556 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=dummynifmcpr + MCprUid=271064580 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Name=hungrynifmcpr + MCprUid=271064580 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Name=pdpmcpr + MCprUid=271065840 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 11 + Name=sipmcpr + MCprUid=536887801 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 13 + Name=panethermcpr + MCprUid=271070626 + FIELD_COUNT=2 +END_ADD + +## mbufgob layer: this is where we refer to our +## new MCPr by its factory implementation UId +ADD_SECTION +# COMMDB_ID = 14 + Name=mbufgobmcpr + MCprUid=0x10272F99 + FIELD_COUNT=2 +END_ADD + +############################################################ +## CprTable +## +[CprTable] +ADD_SECTION +# COMMDB_ID = 1 + Name=ipcpr + CprUid=270561519 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=ipprotocpr + CprUid=271064531 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=agentcpr + CprUid=271064552 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=vanillacpr + CprUid=271065843 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=sipcpr + CprUid=271010872 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=tunnelagentcpr + CprUid=271080968 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=pdpcpr + CprUid=271065826 + FIELD_COUNT=2 +END_ADD + +## mbufgob layer: this is where we refer to our +## new CPr by its factory implementation UId +ADD_SECTION +# COMMDB_ID = 11 + Name=mbufgobcpr + CprUid=0x10272F9A + FIELD_COUNT=2 +END_ADD + +############################################################ +## SCprTable +## +[SCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Name=qosipscpr + SCprUid=270549768 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=ipprotoscpr + SCprUid=271064529 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=agentscpr + SCprUid=271064554 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=pdpscpr + SCprUid=271065824 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=pppscpr + SCprUid=271065852 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=vanillascpr + SCprUid=271065844 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=qosscpr + SCprUid=271065811 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=sipscpr + SCprUid=271010839 + FIELD_COUNT=2 +END_ADD + +## mbufgob layer: this is where we refer to our +## new SCPr by its factory implementation UId +ADD_SECTION +# COMMDB_ID = 11 + Name=mbufgobscpr + SCprUid=0x10272F9B + FIELD_COUNT=2 +END_ADD + +############################################################ +## ProtocolTable +## +[ProtocolTable] +ADD_SECTION +# COMMDB_ID = 1 + Name=sapshim + ProtocolUid=270496898 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=ipshim4 + ProtocolUid=271064118 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=ppp + ProtocolUid=271064143 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=ethernet + ProtocolUid=271064539 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=rawip + ProtocolUid=271064562 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=tunnel + ProtocolUid=271064567 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=qosppp + ProtocolUid=271064148 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=dummynif + ProtocolUid=271064123 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Name=hungrynif + ProtocolUid=271064125 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Name=panether + ProtocolUid=271070627 + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 11 + Name=rawip2 + ProtocolUid=271084280 + FIELD_COUNT=2 +END_ADD + +## mbufgob layer: this is where we refer to our +## new Protocol by its factory implementation UId +ADD_SECTION +# COMMDB_ID = 12 + Name=mbufgobprot + ProtocolUid=0x10272F9C + FIELD_COUNT=2 +END_ADD + + +############################################################ +## BearerTypeTable +## +[BearerTypeTable] +ADD_SECTION +# COMMDB_ID = 1 + Name=ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.3 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.3 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=ethint + Tier=Link.TierTable.271064565 + MCpr=MCprTable.4 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.4 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=tunnelnif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.6 + Cpr=CprTable.7 + SCpr=SCprTable.3 + Protocol=ProtocolTable.6 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=qosppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.7 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.7 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=dummynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.8 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.8 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=hungrynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.9 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.9 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=spud-ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.3 + SCpr=SCprTable.4 + Protocol=ProtocolTable.3 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Name=spud-rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.3 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Name=IPProtoDefaultTemplate + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 11 + Name=NetworkDefaultTemplate + Tier=Link.TierTable.2048 + MCpr=MCprTable.1 + Cpr=CprTable.1 + SCpr=SCprTable.7 + Protocol=ProtocolTable.1 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 12 + Name=rawip2 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.11 + FIELD_COUNT=6 +END_ADD + +ADD_SECTION +# COMMDB_ID = 13 + Name=spud-rawip2 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.11 + FIELD_COUNT=6 +END_ADD + + +############################################################ +## AccessPointTable +## +[AccessPointTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=rawipMappedFromIAP1 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +## mbufgob layer: The access point record for the new layer. +## Uses mbufgob tier, MCPr, CPr, SCPr and protocol +ADD_SECTION +# COMMDB_ID = 240 + Id=20 + Name=PassThroughLayer +### Use record 7 in Tier table (MBufGobblerTierMgr, as defined by the second byte 07) + Tier=0x11800700 + MCpr=MCprTable.14 + Cpr=CprTable.11 + SCpr=SCprTable.11 + Protocol=ProtocolTable.12 + CprConfig=1 + AppSID=0 + CustomSelectionPolicy=1 + FIELD_COUNT=10 +END_ADD +ADD_SECTION +# COMMDB_ID = 2 + Id=10003 + Name=IPProto_generated_10003 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=1 + CustomSelectionPolicy=20 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=2 + Name=spud-rawipMappedFromIAP2 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=10004 + Name=IPProto_generated_10004 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=2 + CustomSelectionPolicy=2 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=3 + Name=rawipMappedFromIAP3 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=10005 + Name=IPProto_generated_10005 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=3 + CustomSelectionPolicy=3 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=4 + Name=spud-rawipMappedFromIAP4 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=10006 + Name=IPProto_generated_10006 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=4 + CustomSelectionPolicy=4 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=5 + Name=rawipMappedFromIAP5 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Id=10007 + Name=IPProto_generated_10007 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=5 + CustomSelectionPolicy=5 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 11 + Id=6 + Name=spud-rawipMappedFromIAP6 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 12 + Id=10008 + Name=IPProto_generated_10008 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=6 + CustomSelectionPolicy=6 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 13 + Id=7 + Name=spud-rawipMappedFromIAP7 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 14 + Id=10009 + Name=IPProto_generated_10009 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=7 + CustomSelectionPolicy=7 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 15 + Id=8 + Name=spud-rawipMappedFromIAP8 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 16 + Id=10010 + Name=IPProto_generated_10010 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=8 + CustomSelectionPolicy=8 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 17 + Id=9 + Name=spud-rawipMappedFromIAP9 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 18 + Id=10011 + Name=IPProto_generated_10011 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=9 + CustomSelectionPolicy=9 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 19 + Id=10 + Name=spud-rawipMappedFromIAP10 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + CprConfig=0 + AppSID=0 + Priority=4294967295 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 20 + Id=10012 + Name=IPProto_generated_10012 + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CprConfig=10 + CustomSelectionPolicy=10 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 252 + Id=10002 + Name=SIPDefault + AccessPointSelectionPolicy=0 + Tier=Link.TierTable.536887799 + MCpr=MCprTable.11 + Cpr=CprTable.5 + SCpr=SCprTable.8 + Protocol=ProtocolTable.2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 254 + Id=10000 + Name=NetworkDefault + AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.20000 + Tier=Link.TierTable.2048 + MCpr=MCprTable.1 + Cpr=CprTable.1 + SCpr=SCprTable.7 + Protocol=ProtocolTable.1 + FIELD_COUNT=8 +END_ADD + + +############################################################ +## GlobalSettings +## +[GlobalSettings] +ADD_TEMPLATE + DefaultTier=1 + FIELD_COUNT=1 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Name=DefaultRecordName-1 + ConnectionAttempts=2 + RedialAttempts=3 + SmsReceiveMode=2 + GPRSAttachMode=1 + AcceptIncomingGprs=1 + GPRSClassCBearer=GSM + ModemForDataAndFax=2 + ModemForPhoneServicesAndSMS=2 + LocationForDataAndFax=2 + LocationForPhoneServicesAndSMS=2 + DefaultNetwork=1 + BearerAvailabilityCheckTSY=mm + FIELD_COUNT=13 +END_ADD + + +############################################################ +## IAP +## +[IAP] +ADD_SECTION +# COMMDB_ID = 1 + Name=Loopback_GRPS_1 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=1 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=Loopback_GRPS_2 + IAPServiceType=OutgoingGPRS + IAPService=2 + IAPBearerType=ModemBearer + IAPBearer=2 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=Loopback_GRPS_3 + IAPServiceType=OutgoingGPRS + IAPService=3 + IAPBearerType=ModemBearer + IAPBearer=3 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=Loopback_GRPS_4 + IAPServiceType=OutgoingGPRS + IAPService=4 + IAPBearerType=ModemBearer + IAPBearer=4 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=Loopback_GRPS_5 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=3 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Name=Loopback_GRPS_6 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=1 + IAPNetwork=3 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Name=Loopback_GRPS_7 + IAPServiceType=OutgoingGPRS + IAPService=6 + IAPBearerType=ModemBearer + IAPBearer=7 + IAPNetwork=4 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Name=Loopback_GRPS_8 + IAPServiceType=OutgoingGPRS + IAPService=7 + IAPBearerType=ModemBearer + IAPBearer=8 + IAPNetwork=5 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Name=Loopback_GRPS_9 + IAPServiceType=OutgoingGPRS + IAPService=8 + IAPBearerType=ModemBearer + IAPBearer=9 + IAPNetwork=6 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Name=IAP_GRPS_BAD_QOS + IAPServiceType=OutgoingGPRS + IAPService=9 + IAPBearerType=ModemBearer + IAPBearer=2 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=2 + FIELD_COUNT=8 +END_ADD + + +############################################################ +## ConnectionPreferences +## +[ConnectionPreferences] +ADD_SECTION +# COMMDB_ID = 1 + Name=DefaultRecordName-1 + Ranking=1 + Direction=OUTGOING + BearerSet=PSD + DialogPref=DONOTPROMPT + IAP=2 + FIELD_COUNT=6 +END_ADD + + +############################################################ +## UmtsR99QoSAndOn +## +[UmtsR99QoSAndOn] +ADD_SECTION +# COMMDB_ID = 1 + Name=PRIMARY1 + ReqTrafficClass=1 + MinTrafficClass=1 + ReqDeliveryOrder=1 + MinDeliveryOrder=1 + ReqDeliverErroneousSDU=1 + MinDeliverErroneousSDU=1 + ReqMaxSDUSize=0 + MinAcceptableMaxSDUSize=0 + ReqMaxUplinkRate=0 + ReqMinUplinkRate=0 + ReqMaxDownlinkRate=0 + ReqMinDownlinkRate=0 + ReqBER=1 + MaxBER=1 + ReqSDUErrorRatio=1 + MaxSDUErrorRatio=1 + ReqTrafficHandlingPriority=1 + MinTrafficHandlingPriority=1 + ReqTransferDelay=0 + MaxTransferDelay=0 + ReqGuaranteedUplinkRate=0 + MinGuaranteedUplinkRat=0 + ReqGuaranteedDownlinkRate=0 + MinGuaranteedDownlinkRate=0 + SignallingIndication=FALSE + ImCnSignallingIndication=FALSE + SourceStatisticsDescriptor=0 + FIELD_COUNT=28 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=SECONDARY1 + ReqTrafficClass=4 + MinTrafficClass=4 + ReqDeliveryOrder=1 + MinDeliveryOrder=1 + ReqDeliverErroneousSDU=8 + MinDeliverErroneousSDU=8 + ReqMaxSDUSize=768 + MinAcceptableMaxSDUSize=512 + ReqMaxUplinkRate=1024 + ReqMinUplinkRate=1024 + ReqMaxDownlinkRate=1024 + ReqMinDownlinkRate=1024 + ReqBER=0 + MaxBER=0 + ReqSDUErrorRatio=1 + MaxSDUErrorRatio=1 + ReqTrafficHandlingPriority=1 + MinTrafficHandlingPriority=1 + ReqTransferDelay=250 + MaxTransferDelay=250 + ReqGuaranteedUplinkRate=1024 + MinGuaranteedUplinkRat=1024 + ReqGuaranteedDownlinkRate=1024 + MinGuaranteedDownlinkRate=1024 + SignallingIndication=FALSE + ImCnSignallingIndication=FALSE + SourceStatisticsDescriptor=0 + FIELD_COUNT=28 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Name=PRIMARY2 + ReqTrafficClass=1 + MinTrafficClass=1 + ReqDeliveryOrder=1 + MinDeliveryOrder=1 + ReqDeliverErroneousSDU=1 + MinDeliverErroneousSDU=1 + ReqMaxSDUSize=0 + MinAcceptableMaxSDUSize=0 + ReqMaxUplinkRate=0 + ReqMinUplinkRate=0 + ReqMaxDownlinkRate=0 + ReqMinDownlinkRate=0 + ReqBER=1 + MaxBER=1 + ReqSDUErrorRatio=1 + MaxSDUErrorRatio=1 + ReqTrafficHandlingPriority=1 + MinTrafficHandlingPriority=1 + ReqTransferDelay=0 + MaxTransferDelay=0 + ReqGuaranteedUplinkRate=0 + MinGuaranteedUplinkRat=0 + ReqGuaranteedDownlinkRate=0 + MinGuaranteedDownlinkRate=0 + SignallingIndication=FALSE + ImCnSignallingIndication=FALSE + SourceStatisticsDescriptor=0 + FIELD_COUNT=28 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Name=SECONDARY2 + ReqTrafficClass=4 + MinTrafficClass=4 + ReqDeliveryOrder=1 + MinDeliveryOrder=1 + ReqDeliverErroneousSDU=8 + MinDeliverErroneousSDU=8 + ReqMaxSDUSize=768 + MinAcceptableMaxSDUSize=512 + ReqMaxUplinkRate=1024 + ReqMinUplinkRate=1024 + ReqMaxDownlinkRate=1024 + ReqMinDownlinkRate=1024 + ReqBER=0 + MaxBER=0 + ReqSDUErrorRatio=1 + MaxSDUErrorRatio=1 + ReqTrafficHandlingPriority=1 + MinTrafficHandlingPriority=1 + ReqTransferDelay=250 + MaxTransferDelay=250 + ReqGuaranteedUplinkRate=1024 + MinGuaranteedUplinkRat=1024 + ReqGuaranteedDownlinkRate=1024 + MinGuaranteedDownlinkRate=1024 + SignallingIndication=FALSE + ImCnSignallingIndication=FALSE + SourceStatisticsDescriptor=0 + FIELD_COUNT=28 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Name=BAD_QOS + MinTrafficClass=1 + ReqDeliveryOrder=1 + MinDeliveryOrder=1 + ReqDeliverErroneousSDU=1 + MinDeliverErroneousSDU=1 + ReqMaxSDUSize=0 + MinAcceptableMaxSDUSize=0 + ReqMaxUplinkRate=0 + ReqMinUplinkRate=0 + ReqMaxDownlinkRate=0 + ReqMinDownlinkRate=0 + ReqBER=1 + MaxBER=1 + ReqSDUErrorRatio=1 + MaxSDUErrorRatio=1 + ReqTrafficHandlingPriority=1 + MinTrafficHandlingPriority=1 + ReqTransferDelay=0 + MaxTransferDelay=0 + ReqGuaranteedUplinkRate=0 + MinGuaranteedUplinkRat=0 + ReqGuaranteedDownlinkRate=0 + MinGuaranteedDownlinkRate=0 + SignallingIndication=FALSE + ImCnSignallingIndication=FALSE + SourceStatisticsDescriptor=0 + FIELD_COUNT=27 +END_ADD + + +############################################################ +## PolicySelectorTable +## +[PolicySelectorTable] +ADD_SECTION +# COMMDB_ID = 1 + Name=DefaultRecordName-1 + PolicyId=1 + SrcAddress=0.0.0.0 + SrcMask=255.255.255.255 + DstAddress=192.168.1.1 + DstMask=255.255.255.255 + SrcPort=0 + DstPort=3461 + SrcPortMax=1031 + DstPortMax=3461 + ProtocolId=17 + IAPid=2 + Priority=1 + FIELD_COUNT=13 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=DefaultRecordName-2 + PolicyId=2 + SrcPort=0 + SrcPortMax=0 + ProtocolId=1 + IAPid=2 + Priority=1 + FIELD_COUNT=7 +END_ADD + diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/BLD.INF --- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/BLD.INF Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/BLD.INF Wed Sep 15 13:30:43 2010 +0300 @@ -128,6 +128,17 @@ ../configs/TE_RawIpSize.cfg z:/testdata/configs/te_rawipsize.cfg #endif +// MBuf Exhaustion Tests +../configs/te_spudnetworkside_mbufexhaust.ini z:/testdata/configs/te_spudnetworkside_mbufexhaust.ini +../configs/te_spudnetworkside_mbufexhaustion_config.txt z:/testdata/configs/te_spudnetworkside_mbufexhaustion_config.txt +../configs/te_spudnetworkside_mbufexhaustion_loopbackcsy.ini z:/testdata/configs/te_spudnetworkside_mbufexhaustion_loopbackcsy.ini +../scripts/te_spudmbufexhaustion.script z:/testdata/scripts/te_spudmbufexhaustion.script +#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW +../configs/te_spudnetworkside_mbufexhaustion_pdpcpr.cfg z:/testdata/configs/te_spudnetworkside_mbufexhaustion.cfg +#else +../configs/te_spudnetworkside_mbufexhaustion.cfg z:/testdata/configs/te_spudnetworkside_mbufexhaustion.cfg +#endif + #endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY TE_spudNetworkSide.iby /epoc32/rom/include/te_spudnetworkside.iby diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby --- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby Wed Sep 15 13:30:43 2010 +0300 @@ -76,4 +76,10 @@ data=EPOCROOT##epoc32\data\z\testdata\configs\te_rawipsize.cfg testdata\configs\te_rawipsize.cfg data=EPOCROOT##epoc32\data\z\testdata\scripts\te_rawipsize.script testdata\scripts\te_rawipsize.script +//MBufExhaustion Tests +data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_mbufexhaust.ini testdata\configs\te_spudnetworkside_mbufexhaust.ini +data=EPOCROOT##epoc32\data\z\TestData\Configs\te_spudnetworkside_mbufexhaustion_loopbackcsy.ini testdata\configs\te_spudnetworkside_mbufexhaustion_loopbackCSY.ini +data=EPOCROOT##epoc32\data\z\TestData\Configs\te_spudnetworkside_mbufexhaustion_config.txt testdata\configs\te_spudnetworkside_mbufexhaustion_config.txt +data=EPOCROOT##epoc32\data\z\TestData\Configs\te_spudnetworkside_mbufexhaustion.cfg testdata\configs\te_spudnetworkside_mbufexhaustion.cfg +data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudmbufexhaustion.script testdata\scripts\te_spudmbufexhaustion.script #endif // TE_SPUD_NETWORK_SIDE_IBY diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/te_spudmbufexhaustion.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/te_spudmbufexhaustion.script Wed Sep 15 13:30:43 2010 +0300 @@ -0,0 +1,53 @@ +// +// 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: +// + +RUN_UTILS MkDir c:\simtsy\ +RUN_UTILS MakeReadWrite c:\simtsy\config.txt +RUN_UTILS MakeReadWrite c:\config.txt +RUN_UTILS MakeReadWrite c:\loopback.ini +RUN_UTILS DeleteFile c:\simtsy\config.txt +RUN_UTILS DeleteFile c:\config.txt +RUN_UTILS DeleteFile c:\loopback.ini + +RUN_UTILS CopyFile z:\TestData\Configs\te_spudnetworkside_mbufexhaustion_config.txt c:\simtsy\config.txt +RUN_UTILS CopyFile z:\TestData\Configs\te_spudnetworkside_mbufexhaustion_config.txt c:\config.txt +RUN_UTILS CopyFile z:\TestData\Configs\te_spudnetworkside_mbufexhaustion_loopbackCSY.ini c:\loopback.ini + +run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script +ced -i z:\testdata\configs\te_spudnetworkside_mbufexhaustion.cfg +run_script z:\TestData\scripts\te_esock_test_loadesock.script + +LOAD_SUITE TE_SpudNetworkSide + +START_TESTCASE CBS-RAWIP-0002 +//! @SYMTestCaseID CBS-RAWIP-0002 +//! @SYMTestCaseDesc Checks that the PDP flow is robust when MBufs are exhausted. +//! @SYMTestActions Connect 2 sockets using loopback, PDP flow receives a packet when MBufs are exhausted, PDP flow subsequently receives a packet when MBufs available. +//! @SYMTestExpectedResults No packet received when MBufs are exhausted, packet received when MBufs available. +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType CIT +RUN_TEST_STEP 2000 TE_SpudNetworkSide CRawIpMBufExhaustionRx z:\testdata\configs\te_spudnetworkside_mbufexhaust.ini MBufExhaustionRx +END_TESTCASE CBS-RAWIP-0002 + +run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script + +RUN_UTILS MakeReadWrite c:\simtsy\config.txt +RUN_UTILS MakeReadWrite c:\config.txt +RUN_UTILS MakeReadWrite c:\loopback.ini +RUN_UTILS DeleteFile c:\simtsy\config.txt +RUN_UTILS DeleteFile c:\config.txt +RUN_UTILS DeleteFile c:\loopback.ini diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideServer.cpp --- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideServer.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideServer.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -249,5 +249,9 @@ { step = new CRawIpMinMaxMMU; } + else if (aStepName == KCRawIpMBufExhaustionRx) + { + step = new CRawIpMBufExhaustionRx; + } return step; } diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.cpp --- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -32,6 +32,9 @@ #include #include +#define SYMBIAN_COMMSFW_MBUF_GOBBLER // include MACRO defined in mbufgobblerproviders.mmp, used to differentiate the MBUFGOBBLER component from the pass through layer which it is based on. +#include + #ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY #include #else @@ -2491,3 +2494,178 @@ return EPass; } + + +enum TVerdict CRawIpMBufExhaustionRx::RunTestStepL() + { + /* + * This test checks that the PDP flow can handle the scenario when it receives a packet but finds that + * the MBuf pool is exhausted. + * + * The test has the following form: + * + * 1) Initialisation + * 1.1) Connections conn1 and conn2 are started. + * 1.2) Socket sock1 is opened against conn1 and socket sock2 is opened against conn2; + * The sockets are logically joined by the packet loopback csy; data which is written by + * sock1 is read by sock2. + * 1.3) Connection conn3 is started. It creates a stack within ESOCK which contains the MBufGobbler layer; + * this is a layer which contains a publish and subscribe function which allows the ESOCK client to control the + * number of MBufs that are available in the MBuf pool. + * + * 2) Test Scenario + * 2.1) The client writes data to sock1 successfully; the packetloopback csy delays forwarding the data to sock2. + * 2.2) The client configures a publish and subscribe attribute which exhausts ESOCK's MBuf pool. + * It uses the MBufGobbler publish / subscribe function contained in the MBufGobbler layer started by conn3. + * 2.3) The packet loopback csy forwards the data to the flow associated with sock2. + * 2.4) The flow is unable to obtain a MBuf from the MBuf pool as the pool is exhausted, so it discards the packet + * and posts a request to receive the next packet. + * 2.5) The client cancels the read request from sock2. + * 2.6) The client configures a publish and subscribe attribute to replenish ESocks's MBuf pool. + * 2.7) The client writes data to sock1 successfully and reads data from sock2 successfully. + * + */ + + //Start 1st context + RConnection* conn1 = new (ELeave) RConnection(); + CleanupClosePushL(*conn1); + + TInt primaryIapId; + if (!GetIntFromConfig(ConfigSection(), _L("PrimaryIapId1"), primaryIapId)) + { + User::Leave(KErrNotFound); + } + + TCommDbConnPref conn1Pref; + conn1Pref.SetIapId(primaryIapId); + + INFO_PRINTF2(_L("Test starting Interface IAP ID == %d"), primaryIapId); + TestL(conn1->Open(iEsock), _L("RConnection::Open the interface")); + TestL(conn1->Start(conn1Pref), _L("RConnection::Start the interface")); + + //Start 2nd context + RConnection* conn2 = new (ELeave) RConnection(); + CleanupClosePushL(*conn2); + + if (!GetIntFromConfig(ConfigSection(), _L("PrimaryIapId2"), primaryIapId)) + { + User::Leave(KErrNotFound); + } + + TCommDbConnPref conn2Pref; + conn2Pref.SetIapId(primaryIapId); + + INFO_PRINTF2(_L("Test starting Interface IAP ID == %d"), primaryIapId); + TestL(conn2->Open(iEsock), _L("RConnection::Open the interface")); + TestL(conn2->Start(conn2Pref), _L("RConnection::Start the interface")); + + TRequestStatus status; + RConnection* conn3 = new (ELeave) RConnection(); + CleanupClosePushL(*conn3); + TestL(conn3->Open(iEsock), _L("RConnection::Open the interface")); + conn3->Start(status); + User::WaitForRequest(status); + TestL(status.Int(), _L("RConnection::Start - start connection containing MBuf Gobbler layer")); + + //Open & Connect 1st Socket + RSocket sock1; + TestL(sock1.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp, *conn1), _L("RSocket::Open")); + CleanupClosePushL(sock1); + TInetAddr localAddr; + localAddr.SetPort(KConfiguredTftFilter1DestPort); + TestL(sock1.Bind(localAddr), _L("Binding the local Socket")); + + TInetAddr dstAddr; + dstAddr.SetPort(KConfiguredTftFilter1SrcPort); + dstAddr.Input(KConfiguredTftFilter1SrcAddr); + sock1.Connect(dstAddr, status); + User::WaitForRequest(status); + TestL(status.Int(), _L("RSocket::Connect status opening 1st socket")); + + //Open & Bind 2nd Socket + RSocket sock2; + TestL(sock2.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp, *conn2), _L("RSocket::Open")); + CleanupClosePushL(sock2); + localAddr.SetPort(KConfiguredTftFilter1SrcPort); + TestL(sock2.Bind(localAddr), _L("Binding the local Socket")); + + //then send & receive data. + const TInt KMaxMMU = 4000; + TBuf8 *sendBuf = new(ELeave) TBuf8(); + CleanupStack::PushL(sendBuf); + + TBuf8 *recvBuf = new(ELeave) TBuf8(); + CleanupStack::PushL(recvBuf); + + TBuf8 *recvBuf2 = new(ELeave) TBuf8(); + CleanupStack::PushL(recvBuf2); + + TRequestStatus readStatus; + + const TInt KOneSecond = 1000000; + const TInt KOneUs = 1; + + sendBuf->Zero(); + sendBuf->Append(Math::Random() & 0x7f); // add a token character + + sock1.Write(*sendBuf, status); // Allow packet to be sent + User::After( KOneSecond ); // Wait for a second to allow time for server/protocol to send + + sock1.CancelSend(); + + User::WaitForRequest(status); + + TInt result = RProperty::Set(TUid::Uid(EMBufGobbler ), EAdjustNumberOfMBufsRemainingInPool , EGobbleAllMBufs); // Allocate all MBuffs + if (result != KErrNone) + { + INFO_PRINTF2(_L("Unable to set gobber publish/subscribe %d"), result); + User::Leave(result); + } + User::After(KOneUs); // Relinquish CPU, to give time for + + sock2.Read(*recvBuf, readStatus); + User::After( KOneSecond ); + + sock2.CancelRecv(); + + User::WaitForRequest( readStatus ); + + if ((status != KErrNone) && (readStatus != KErrCancel)) + { + INFO_PRINTF3(_L("Unexpected error status tx= %d, rx = %d"), status.Int(), readStatus.Int()); + User::Leave(readStatus.Int()); + } + + result = RProperty::Set(TUid::Uid(EMBufGobbler), EAdjustNumberOfMBufsRemainingInPool, EReleaseAllMBufs); // Free all buffers + if (result != KErrNone) + { + INFO_PRINTF2(_L("Unable to set gobber publish/subscribe %d"), result); + User::Leave(result); + } + User::After(KOneUs); // Relinquish CPU to allow time for MBufs to be returned to the pool. + + sock1.Write(*sendBuf, status); + + User::After( KOneSecond ); // Wait for a second to allow time for server/protocol to send + + sock1.CancelSend(); + + User::WaitForRequest(status); + + sock2.Read(*recvBuf, readStatus); + User::After( KOneSecond ); + + sock2.CancelRecv(); + + User::WaitForRequest( readStatus ); + + if ((status != KErrNone) && (readStatus != KErrNone)) + { + INFO_PRINTF3(_L("Unexpected error status tx = %d rx = %d"), status.Int(), readStatus.Int()); + User::Leave(readStatus.Int()); + } + + CleanupStack::PopAndDestroy(8); //conn1, conn2, conn3, sock1, sock2, sendBuf, recvBuf, recvBuf2 + + return EPass; + } diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.h --- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.h Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.h Wed Sep 15 13:30:43 2010 +0300 @@ -244,6 +244,9 @@ //SIP server address retrieve SYMBIAN_SPUD_TEST_CLASS(CIoctlAddressRetrieve) SYMBIAN_SPUD_TEST_CLASS(CRawIpMinMaxMMU) + + //MBuf Exhaustion + SYMBIAN_SPUD_TEST_CLASS(CRawIpMBufExhaustionRx) } #endif diff -r 4814c5a49428 -r 9200f38b1324 telephonyprotocols/rawipnif/src/Receiver.cpp --- a/telephonyprotocols/rawipnif/src/Receiver.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyprotocols/rawipnif/src/Receiver.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -124,25 +124,36 @@ else { _LOG_L1C1(_L8("CReceiver: Data Packet Received")); - - iRMBufPacket.CreateL(iData); - - // Immediately execute new read request. + + // Trap the leave to prevent the flow from being stopped if + // the MBuf pool is temporarily exhausted. + TRAPD(err,iRMBufPacket.CreateL(iData)); + + // Immediately execute new read request, regardless of whether MBufs are + // exhausted or not. (iObserver.Bca())->Read(iStatus, iData); SetActive(); - iRMBufPacket.Pack(); + if (err == KErrNone) + { + iRMBufPacket.Pack(); #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS - TUint16 protocolCode = iObserver.RemoveHeader(iRMBufPacket); + TUint16 protocolCode = iObserver.RemoveHeader(iRMBufPacket); #else - TUint16 protocolCode = 0; + TUint16 protocolCode = 0; #endif // RAWIP_HEADER_APPENDED_TO_PACKETS - // Process the packet - iObserver.GetObserver().Process(iRMBufPacket, protocolCode); - iRMBufPacket.Free(); + // Process the packet + iObserver.GetObserver().Process(iRMBufPacket, protocolCode); + iRMBufPacket.Free(); + } + else + { + // If MBuff Allocation failed then dont process the packet, rely on layers above for recovery + _LOG_L2C2(_L8("CReceiver::RunL MBuff Allocation Failure [err=%d]"), err); + } } } diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/inc/mmcustomtsy/CMmCustomTsy.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmcustomtsy/CMmCustomTsy.h Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmcustomtsy/CMmCustomTsy.h Wed Sep 15 13:30:43 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -1652,6 +1652,15 @@ */ TInt GetIccCallForwardingStatusCancel(); + /** + * Resets an entry in the req handle store + * + * @param aTsyReqHandle req handle + * @param aIpc IPC value + * @return EFalse if req handle not found + */ + virtual TBool ResetReqHandle( const TTsyReqHandle aTsyReqHandle, const TInt aIpc ); + private: enum TSubTsyIdx diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/inc/mmcustomtsy/CMmPacketTsy.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmcustomtsy/CMmPacketTsy.h Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmcustomtsy/CMmPacketTsy.h Wed Sep 15 13:30:43 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -194,6 +194,16 @@ virtual void Complete( TInt aReqHandleType, TInt aError ); #endif // REQHANDLE_TIMER + /** + * Resets an entry in the req handle store + * + * + * @param aTsyReqHandle req handle + * @param aIpc IPC value + * return EFalse if req handle not found + */ + virtual TBool ResetReqHandle(const TTsyReqHandle aTsyReqHandle, const TInt aIpc); + private: /** diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/inc/mmpacket/Cmmpacketservicetsy.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmpacket/Cmmpacketservicetsy.h Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmpacket/Cmmpacketservicetsy.h Wed Sep 15 13:30:43 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -1021,7 +1021,16 @@ const TInt aError ); #endif // TF_LOGGING_ENABLED - + + /** + * Resets an entry in the req handle store + * + * + * @param aTsyReqHandle req handle + * return EFalse if request handle not found + */ + virtual TBool ResetReqHandle( const TTsyReqHandle aTsyReqHandle ); + private: // New functions /** diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/inc/mmutility/CMmSubTsyBase.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/CMmSubTsyBase.h Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/CMmSubTsyBase.h Wed Sep 15 13:30:43 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -135,6 +135,19 @@ return; } + /** + * Resets an entry in the req handle store + * + * + * @param aTsyReqHandle req handle + * @param aIpc IPC value + * return EFalse if req handle not found + */ + virtual TBool ResetReqHandle(const TTsyReqHandle /*aTsyReqHandle*/, const TInt /*aIpc*/) + { + return EFalse; + } + #endif //REHANDLE_TIMER protected: diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/inc/mmutility/CMmTsyBase.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/CMmTsyBase.h Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/CMmTsyBase.h Wed Sep 15 13:30:43 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -163,6 +163,16 @@ const TInt anIpc, const TDataPackage& aPackage); + /** + * Resets an entry in a handle request store for a given request handle + * + * + * @param aTsyReqHandle Request handle + * @param aIpc IPC value + * @return EFalse if req handle not found + */ + virtual TBool ResetReqHandle(const TTsyReqHandle aTsyReqHandle, const TInt aIpc); + }; #endif // CMMTSYBASE_H diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/inc/mmutility/cmmtsyreqhandlestore.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/cmmtsyreqhandlestore.h Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/cmmtsyreqhandlestore.h Wed Sep 15 13:30:43 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -94,7 +94,15 @@ * @param aIndex index which req handle to reset. */ TTsyReqHandle ResetTsyReqHandle( const TInt aIndex ); - + + /** + * Reset TSY request handle by req handle value. + * + * @param aTsyReqHanle req handle to be reset. + * return TInt EFalse if handle not found + */ + TBool FindAndResetTsyReqHandle( const TTsyReqHandle aTsyReqHandle); + #ifdef REQHANDLE_TIMER /** diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -225,9 +225,10 @@ if ( KErrNone != trapError ) { // error handling. Object cannot be created. - ret = trapError; - } - if ( KErrNone != ret ) + ResetReqHandle(aTsyReqHandle, aIpc); + ret = trapError; + } + if ( KErrNone != ret ) { ReqCompleted( aTsyReqHandle, ret ); } @@ -6909,4 +6910,15 @@ return KErrNone; } +TBool CMmCustomTsy::ResetReqHandle( const TTsyReqHandle aTsyReqHandle, TInt aIpc ) + { + TBool ret = CMmTsyBase::ResetReqHandle(aTsyReqHandle, aIpc); + if(!ret) + { + ret = iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); + } + return ret; + } + + // End of File diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -569,6 +569,32 @@ } #endif // REQHANDLE_TIMER +// --------------------------------------------------------------------------- +// CMmPacketTsy::ResetReqHandle +// Resets the request handle in req handle store +// (other items were commented in a header). +// --------------------------------------------------------------------------- +// +TBool CMmPacketTsy::ResetReqHandle(const TTsyReqHandle aTsyReqHandle, const TInt aIpc) + { + //handle has not been reset yet + TInt ret = EFalse; + if(aIpc == ECustomSetAlwaysOnMode) + { + // request handle is set in packet data session + CMmPacketServiceTsy* packetSession = iMmPhone->PacketDataSession(); + if(packetSession) + { + ret = packetSession->ResetReqHandle(aTsyReqHandle); + } + } + else + { + // request handle stored locally + ret = iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle); + } + return ret; + } // End of File diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -182,28 +182,27 @@ if ( KErrNone != trapError ) { + // Reset the request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); ReqCompleted( aTsyReqHandle, trapError ); } - else if ( KErrNone != ret ) { ReqCompleted( aTsyReqHandle, ret ); } - - if ( EMultimodePacketContextReqHandleUnknown != iReqHandleType ) + else if ( EMultimodePacketContextReqHandleUnknown != iReqHandleType ) { #ifdef REQHANDLE_TIMER SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); #else iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); #endif // REQHANDLE_TIMER + } #ifdef ADD_REMOVE_PACKETFILTER_DEFECT_FIXED // search for this up from bottom of file - // We've finished with this value now. Clear it so it doesn't leak - // up to any other instances of this method down the call stack - iReqHandleType = EMultimodePacketContextReqHandleUnknown; + // We've finished with this value now. Clear it so it doesn't leak + // up to any other instances of this method down the call stack + iReqHandleType = EMultimodePacketContextReqHandleUnknown; #endif - } - return KErrNone; } diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -134,26 +134,27 @@ if ( KErrNone != trapError ) { + //reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle); + iReqHandleType = EMultimodePacketQoSReqHandleUnknown; CMmPacketQoSTsy::ReqCompleted( aTsyReqHandle, trapError ); } else if ( KErrNone != ret ) { CMmPacketQoSTsy::ReqCompleted( aTsyReqHandle, ret ); } - - // Save request handle - if ( EMultimodePacketQoSReqHandleUnknown != iReqHandleType ) + else if ( EMultimodePacketQoSReqHandleUnknown != iReqHandleType ) { + // Save request handle #ifdef REQHANDLE_TIMER SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); #else iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); #endif //REQHANDLE_TIMER - // We've finished with this value now. Clear it so it doesn't leak - // up to any other instances of this method down the call stack - iReqHandleType = EMultimodePacketQoSReqHandleUnknown; } - + // We've finished with this value now. Clear it so it doesn't leak + // up to any other instances of this method down the call stack + iReqHandleType = EMultimodePacketQoSReqHandleUnknown; return KErrNone; } diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -1984,14 +1984,15 @@ if ( KErrNone != trapError ) { + //reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle); CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, trapError ); } else if ( KErrNone != ret ) { CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, ret ); } - - if ( EMultimodePacketServiceReqHandleUnknown != iReqHandleType ) + else if ( EMultimodePacketServiceReqHandleUnknown != iReqHandleType ) { // Save request handle type @@ -2000,11 +2001,10 @@ #else iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, iTsyReqHandle ); #endif // REQHANDLE_TIMER - // We've finished with this value now. Clear it so it doesn't leak - // up to any other instances of this method down the call stack - iReqHandleType = EMultimodePacketServiceReqHandleUnknown; } - + // We've finished with this value now. Clear it so it doesn't leak + // up to any other instances of this method down the call stack + iReqHandleType = EMultimodePacketServiceReqHandleUnknown; return KErrNone; } @@ -4107,5 +4107,16 @@ return iMaxActiveServices; } + +//----------------------------------------------------------------------------- +// TBool CMmPacketServiceTsy::ResetReqHandle +// Resets request handle in the req handle store +//----------------------------------------------------------------------------- +// +TBool CMmPacketServiceTsy::ResetReqHandle( const TTsyReqHandle aTsyReqHandle ) + { + return (iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ) > 0); + } + // End of File diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -131,15 +131,15 @@ if ( KErrNone != trapError ) { + // Reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle); ReqCompleted( aTsyReqHandle, trapError ); } - else if ( KErrNone != ret ) { ReqCompleted( aTsyReqHandle, ret ); } - - if ( EMultimodePacketMbmsReqHandleUnknown != iReqHandleType ) + else if ( EMultimodePacketMbmsReqHandleUnknown != iReqHandleType ) { #ifdef REQHANDLE_TIMER SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); @@ -147,7 +147,7 @@ iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); #endif // REQHANDLE_TIMER } - + iReqHandleType = EMultimodePacketMbmsReqHandleUnknown; return KErrNone; } diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -168,11 +168,12 @@ if ( KErrNone != leaveCode ) { - ReqCompleted( aTsyReqHandle, leaveCode ); + // reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle); + ReqCompleted( aTsyReqHandle, leaveCode ); } - // save request handle - if ( EMultimodeBroadcastReqHandleUnknown != iReqHandleType ) + else if ( EMultimodeBroadcastReqHandleUnknown != iReqHandleType ) { #ifdef REQHANDLE_TIMER SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); @@ -181,10 +182,10 @@ iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); #endif // REQHANDLE_TIMER - // We've finished with this value now. Clear it so it doesn't leak - // up to any other instances of this method down the call stack - iReqHandleType = EMultimodeBroadcastReqHandleUnknown; } + // We've finished with this value now. Clear it so it doesn't leak + // up to any other instances of this method down the call stack + iReqHandleType = EMultimodeBroadcastReqHandleUnknown; break; } diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -155,23 +155,24 @@ if ( KErrNone != leaveCode ) { - ReqCompleted( aTsyReqHandle, leaveCode ); + //reset request handle to indicate the request is no longer ongoing + iMmTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); + ReqCompleted( aTsyReqHandle, leaveCode ); } - - // save request handle - if ( CMmSmsTsy::EMultimodeSmsReqHandleUnknown != iReqHandleType ) + else if ( CMmSmsTsy::EMultimodeSmsReqHandleUnknown != iReqHandleType ) { + // save request handle #ifdef REQHANDLE_TIMER iMmSmsTsy->SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); #else // Never comes here. See SetTypeOfResponse. iMmTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); -#endif // REQHANDLE_TIMER - // We've finished with this value now. Clear it so it doesn't leak - // up to any other instances of this method down the call stack - iReqHandleType = CMmSmsTsy::EMultimodeSmsReqHandleUnknown; +#endif // REQHANDLE_TIMER } + // We've finished with this value now. Clear it so it doesn't leak + // up to any other instances of this method down the call stack + iReqHandleType = CMmSmsTsy::EMultimodeSmsReqHandleUnknown; break; } diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -301,11 +301,13 @@ if ( KErrNone != leaveCode ) { TFLOGSTRING3("CMmSmsTsy: Leave trapped!, IPC=%d, error value:%d", aIpc, leaveCode ); - ReqCompleted( aTsyReqHandle, leaveCode ); + //reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); + ReqCompleted( aTsyReqHandle, leaveCode ); } //save request handle - if ( EMultimodeSmsReqHandleUnknown != iReqHandleType ) + else if ( EMultimodeSmsReqHandleUnknown != iReqHandleType ) { #ifdef REQHANDLE_TIMER SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); @@ -314,10 +316,10 @@ iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); #endif // REQHANDLE_TIMER - // We've finished with this value now. Clear it so it doesn't leak - // up to any other instances of this method down the call stack - iReqHandleType = EMultimodeSmsReqHandleUnknown; } + // We've finished with this value now. Clear it so it doesn't leak + // up to any other instances of this method down the call stack + iReqHandleType = EMultimodeSmsReqHandleUnknown; break; } } @@ -1793,69 +1795,63 @@ // structure for all sms parameters and data TSendSmsDataAndAttributes sendData; - + TSmsRequestTypes reqType; + sendData.iAttributes = &msgAttr; sendData.iMsgData = aMsgData; if ( iSmsNoFdnCheckFlag == ESmsNoFdnCheckUsed ) { //set ipc - sendData.iIpc = EMobileSmsMessagingSendMessageNoFdnCheck; + sendData.iIpc = EMobileSmsMessagingSendMessageNoFdnCheck; + reqType = EMultimodeSmsSendMessageNoFdnCheck; } - if ( iSmsNoFdnCheckFlag == ESmsNoFdnCheckNotUsed ) + else //(iSmsNoFdnCheckFlag == ESmsNoFdnCheckNotUsed) { //set ipc - sendData.iIpc = EMobileSmsMessagingSendMessage; + sendData.iIpc = EMobileSmsMessagingSendMessage; + reqType = EMultimodeSmsSendMessage; } // Pack parameters package.PackData( &sendData ); - CSmsSendRequest* smsSendReq = new (ELeave) CSmsSendRequest(); - smsSendReq->SetSmsDataAndAttributes( sendData ); + iSmsSendReq = new (ELeave) CSmsSendRequest(); + iSmsSendReq->SetSmsDataAndAttributes( sendData ); + + TFLOGSTRING("TSY: CMmSmsTsy::SendMessageL: Send request saved"); - // save send request - iSmsSendReq = smsSendReq; -TFLOGSTRING("TSY: CMmSmsTsy::SendMessageL: Send request saved"); +#ifdef REQHANDLE_TIMER + SetTypeOfResponse( reqType, aTsyReqHandle ); +#else + iTsyReqHandleStore->SetTsyReqHandle( reqType, aTsyReqHandle ); +#endif // REQHANDLE_TIMER + TInt leaveCode( KErrNone ); // send request to DOS // packed parameter: TSendSmsDataAndAttributes - if ( iSmsNoFdnCheckFlag == ESmsNoFdnCheckUsed ) - { - ret = iMmPhone->MessageManager()->HandleRequestL( - EMobileSmsMessagingSendMessageNoFdnCheck, &package ); - } - if ( iSmsNoFdnCheckFlag == ESmsNoFdnCheckNotUsed ) - { - ret = iMmPhone->MessageManager()->HandleRequestL( - EMobileSmsMessagingSendMessage, &package ); - } + TRAP(leaveCode, ret = iMmPhone->MessageManager()->HandleRequestL(sendData.iIpc, &package );); - if ( KErrNone == ret ) - { - if ( iSmsNoFdnCheckFlag == ESmsNoFdnCheckUsed ) - { - //set request type - iReqHandleType = EMultimodeSmsSendMessageNoFdnCheck; - } - if ( iSmsNoFdnCheckFlag == ESmsNoFdnCheckNotUsed ) - { - //set request type - iReqHandleType = EMultimodeSmsSendMessage; - } - smsSendReq->IncreaseSendCounter(); - } - else + if ( (leaveCode != KErrNone) || (ret != KErrNone) ) { - // Phonet returned error - delete smsSendReq; // Delete object + iTsyReqHandleStore->ResetTsyReqHandle( reqType ); + delete iSmsSendReq; // Delete object iSmsSendReq = NULL; // Reset pointer - // Message construction failed or phonet sender returned error - ReqCompleted( aTsyReqHandle, ret ); // reset pointer to client memory iSendMessageMsgAttrPckgPtr = NULL; - iSmsNoFdnCheckFlag = ESmsNoFdnCheckUnknown; + if (leaveCode != KErrNone) + { + ReqCompleted( aTsyReqHandle, leaveCode ); + } + else + { + ReqCompleted( aTsyReqHandle, ret ); + } + } + else + { + iSmsSendReq->IncreaseSendCounter(); } } @@ -1932,10 +1928,13 @@ // reset req handle and complete request TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeSmsSendMessage ); - ReqCompleted( reqHandle, extendedError ); - // reset pointer to client memory - iSendMessageMsgAttrPckgPtr = NULL; - iSmsNoFdnCheckFlag = ESmsNoFdnCheckUnknown; + if ( EMultimodeSmsReqHandleUnknown < reqHandle ) + { + ReqCompleted( reqHandle, extendedError ); + // reset pointer to client memory + iSendMessageMsgAttrPckgPtr = NULL; + iSmsNoFdnCheckFlag = ESmsNoFdnCheckUnknown; + } } else if ( ( KErrNone != aError ) && ( KErrTimedOut != aError ) && ( KErrGsmSMSOperationNotAllowed != diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -140,7 +140,9 @@ if ( trapError != KErrNone ) { - // Object cannot be created. + // Object cannot be created. + //reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle); ReqCompleted( aTsyReqHandle, trapError ); } else if ( ret != KErrNone ) diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -327,6 +327,8 @@ if ( trapError != KErrNone ) { // Complete with error if trap error + // Reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); ReqCompleted( aTsyReqHandle, trapError ); } else if ( ret != KErrNone ) @@ -334,21 +336,19 @@ // Complete with error if return value error ReqCompleted( aTsyReqHandle, ret ); } - - // Save request handle - if ( EMultimodeENStoreReqHandleUnknown != iReqHandleType ) + else if ( EMultimodeENStoreReqHandleUnknown != iReqHandleType ) { + // Save request handle #ifdef REQHANDLE_TIMER SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); #else iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); #endif + } // We've finished with this value now. Clear it so it doesn't leak // up to any other instances of this method down the call stack iReqHandleType = EMultimodeENStoreReqHandleUnknown; - } - - return KErrNone; + return KErrNone; } // --------------------------------------------------------------------------- diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -303,16 +303,17 @@ if ( KErrNone != trapError ) { + // Reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); ReqCompleted( aTsyReqHandle, trapError ); } else if ( KErrNone != ret ) { ReqCompleted( aTsyReqHandle, ret ); } - - // Save request handle - if ( EMultimodeONStoreReqHandleUnknown != iReqHandleType ) + else if ( EMultimodeONStoreReqHandleUnknown != iReqHandleType ) { + // Save request handle #ifdef REQHANDLE_TIMER SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); #else // REQHANDLE_TIMER diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -500,27 +500,27 @@ TRAP( trapError, ret = DoExtFuncL( aTsyReqHandle, aIpc, aPackage ); ); if ( KErrNone != trapError ) - { + { + // Reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); ReqCompleted( aTsyReqHandle, trapError ); } else if ( KErrNone != ret ) { ReqCompleted( aTsyReqHandle, ret ); } - - // Save request handle - if ( EMultimodePhoneBookStoreReqHandleUnknown != iReqHandleType ) + else if ( EMultimodePhoneBookStoreReqHandleUnknown != iReqHandleType ) { + // Save request handle #ifdef REQHANDLE_TIMER SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); #else iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); #endif - // We've finished with this value now. Clear it so it doesn't leak - // up to any other instances of this method down the call stack - iReqHandleType = EMultimodePhoneBookStoreReqHandleUnknown; } - + // We've finished with this value now. Clear it so it doesn't leak + // up to any other instances of this method down the call stack + iReqHandleType = EMultimodePhoneBookStoreReqHandleUnknown; return KErrNone; } diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -337,26 +337,27 @@ if ( trapError != KErrNone ) { //error handling. Object cannot be created. + //reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle); ReqCompleted( aTsyReqHandle, trapError ); } else if ( ret != KErrNone ) { ReqCompleted( aTsyReqHandle, ret ); } - //save request handle - if ( EMultimodeCallReqHandleUnknown != iReqHandleType ) + else if ( EMultimodeCallReqHandleUnknown != iReqHandleType ) { + //save request handle #ifdef REQHANDLE_TIMER SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); #else iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); #endif - // We've finished with this value now. Clear it so it doesn't leak - // up to any other instances of this method down the call stack - iReqHandleType = EMultimodeCallReqHandleUnknown; } - + // We've finished with this value now. Clear it so it doesn't leak + // up to any other instances of this method down the call stack + iReqHandleType = EMultimodeCallReqHandleUnknown; } return KErrNone; diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -191,7 +191,10 @@ if ( trapError != KErrNone ) { //error handling. Object cannot be created. - ReqCompleted( 0, trapError ); + //reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle); + iReqHandleType = EMultimodeConferenceCallReqHandleUnknown; + ReqCompleted( aTsyReqHandle, trapError ); } //if return value is not KErrNone else if ( ret != KErrNone ) @@ -199,20 +202,20 @@ //Complete request with this error value ReqCompleted( aTsyReqHandle, ret ); } - - //save request handle - if ( EMultimodeConferenceCallReqHandleUnknown != iReqHandleType ) + else if ( EMultimodeConferenceCallReqHandleUnknown != iReqHandleType ) { + //save request handle #ifdef REQHANDLE_TIMER SetTypeOfResponse ( iReqHandleType, aTsyReqHandle ); #else iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); #endif - // We've finished with this value now. Clear it so it doesn't leak - // up to any other instances of this method down the call stack - iReqHandleType = EMultimodeConferenceCallReqHandleUnknown; } - + + // We've finished with this value now. Clear it so it doesn't leak + // up to any other instances of this method down the call stack + iReqHandleType = EMultimodeConferenceCallReqHandleUnknown; + return KErrNone; } diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -282,16 +282,17 @@ if ( trapError != KErrNone ) { // Object cannot be created. + // Reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); ReqCompleted( aTsyReqHandle, trapError ); } else if ( ret != KErrNone ) { ReqCompleted( aTsyReqHandle, ret ); } - - //save request handle - if ( EMultimodeLineReqHandleUnknown != iReqHandleType ) + else if ( EMultimodeLineReqHandleUnknown != iReqHandleType ) { + //save request handle iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); } diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1153,14 +1153,15 @@ if ( trapError != KErrNone ) { + //reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); ReqCompleted( aTsyReqHandle, trapError ); } else if ( ret != KErrNone ) { ReqCompleted( aTsyReqHandle, ret ); } - - if ( EMultimodePhoneReqHandleUnknown != iReqHandleType ) + else if ( EMultimodePhoneReqHandleUnknown != iReqHandleType ) { #ifdef REQHANDLE_TIMER SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); @@ -1168,10 +1169,10 @@ iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); #endif //REQHANDLE_TIMER - // We've finished with this value now. Clear it so it doesn't leak - // up to any other instances of this method down the call stack - iReqHandleType = EMultimodePhoneReqHandleUnknown; } + // We've finished with this value now. Clear it so it doesn't leak + // up to any other instances of this method down the call stack + iReqHandleType = EMultimodePhoneReqHandleUnknown; } return KErrNone; diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmTsyBase.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmTsyBase.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmTsyBase.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -291,5 +291,32 @@ #endif +// --------------------------------------------------------------------------- +// CMmTsyBase::ResetReqHandle +// Resets the request handle in the right req handle store +// (other items were commented in a header). +// --------------------------------------------------------------------------- +// +TBool CMmTsyBase::ResetReqHandle(const TTsyReqHandle aTsyReqHandle, const TInt aIpc) + { + TInt max = GetMaxNumberOfSubsystems(); + CMmSubTsyBase** subTsyPtr = GetSubsystemArrayPtr(); + TBool ret = EFalse; + + for ( TInt i = 0 ; max > i; i++ ) + { + //check which custom object handles this IPC + if ( ( NULL != subTsyPtr[i] ) + && ( EFalse != subTsyPtr[i]->SupportingIPC( aIpc ) ) ) + { + //call reset handle method of the right custom object + ret = subTsyPtr[i]->ResetReqHandle( aTsyReqHandle, aIpc ); + i = max; + } + } + return ret; + } + + // End of File diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -213,6 +213,27 @@ return ret; } +// --------------------------------------------------------------------------- +// CMmTsyReqHandleStore::FindAndResetTsyReqHandle +// Finds and resets all TSY req handle of a given value. +// (other items were commented in a header). +// --------------------------------------------------------------------------- +// +TBool CMmTsyReqHandleStore::FindAndResetTsyReqHandle( const TTsyReqHandle aTsyReqHandle ) + { + TInt ret = EFalse; + for( TInt i = 0; i < iNumOfRequests ; i++ ) + { + if( *( iReqHandles + i ) == aTsyReqHandle ) + { + //reset req handle + ResetTsyReqHandle(i); + ret = ETrue; + } + } + return ret; + } + #ifdef REQHANDLE_TIMER // ---------------------------------------------------------------------------