# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1274959577 -10800 # Node ID d15a506750838be4ca085792913184c1702c45e3 # Parent e8d041006974ade9b58c10cf1b0dbe88b3f38af7 Revision: 201021 Kit: 2010121 diff -r e8d041006974 -r d15a50675083 linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpractivities.cpp --- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpractivities.cpp Fri May 14 17:24:38 2010 +0300 +++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpractivities.cpp Thu May 27 14:26:17 2010 +0300 @@ -95,6 +95,18 @@ NODEACTIVITY_END() } +#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW +namespace AgentSCprParamRequestActivity +{ +DECLARE_DEFINE_NODEACTIVITY(ECFActivityParamRequest, AgentSCprParamRequest, TCFScpr::TSetParamsRequest) + FIRST_NODEACTIVITY_ENTRY(PRStates::TAwaitingParamRequest, CoreNetStates::TNoTagOrBearerPresent) + NODEACTIVITY_ENTRY(CoreNetStates::KBearerPresent, PRStates::TPassToServiceProvider, CoreNetStates::TAwaitingParamResponse, MeshMachine::TTag) + LAST_NODEACTIVITY_ENTRY(CoreNetStates::KBearerPresent, PRStates::TStoreParamsAndPostToOriginators) + LAST_NODEACTIVITY_ENTRY(KNoTag, PRStates::TRespondWithCurrentParams) +NODEACTIVITY_END() +} +#endif //#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW + namespace AgentSCprDestroyActivity { //Overridden destroy for cleaning up the agent if its still about @@ -125,6 +137,9 @@ ACTIVITY_MAP_ENTRY(AgentSCprStartActivity, AgentSCprStart) ACTIVITY_MAP_ENTRY(AgentSCprStopActivity, AgentSCprStop) ACTIVITY_MAP_ENTRY(AgentSCprDataClientStoppedActivity, AgentSCprDataClientStopped) +#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW + ACTIVITY_MAP_ENTRY(AgentSCprParamRequestActivity, AgentSCprParamRequest) +#endif //#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW ACTIVITY_MAP_END_BASE(SCprActivities, coreSCprActivities) } diff -r e8d041006974 -r d15a50675083 linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcpr.cpp --- a/linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcpr.cpp Fri May 14 17:24:38 2010 +0300 +++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcpr.cpp Thu May 27 14:26:17 2010 +0300 @@ -66,6 +66,15 @@ NODEACTIVITY_END() } +namespace TunnelGoneDownActivity +{ +DECLARE_DEFINE_NODEACTIVITY(ECFActivityGoneDown, TunnelGoneDown, TCFControlClient::TGoneDown) + // Our Service Provider has gone down unexpectedly (we haven't issued a TStop) + FIRST_NODEACTIVITY_ENTRY(CoreNetStates::TAwaitingGoneDown, MeshMachine::TNoTag) + LAST_NODEACTIVITY_ENTRY(KNoTag, MeshMachine::TDoNothing) +NODEACTIVITY_END() +} + #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW namespace TunnelAgentCprNotificationActivity { @@ -78,6 +87,7 @@ { DECLARE_DEFINE_ACTIVITY_MAP(TunnelAgentCprActivities) ACTIVITY_MAP_ENTRY(TunnelAgentCprStartActivity, TunnelCprStart) + ACTIVITY_MAP_ENTRY(TunnelGoneDownActivity, TunnelGoneDown) #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW ACTIVITY_MAP_ENTRY(TunnelAgentCprNotificationActivity, TunnelAgentCprNotification) #endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW diff -r e8d041006974 -r d15a50675083 linklayerprotocols/ethernetnif/EthInt/Ethbase.cpp --- a/linklayerprotocols/ethernetnif/EthInt/Ethbase.cpp Fri May 14 17:24:38 2010 +0300 +++ b/linklayerprotocols/ethernetnif/EthInt/Ethbase.cpp Thu May 27 14:26:17 2010 +0300 @@ -1084,7 +1084,8 @@ void CLANLinkCommon::Destroy() { - ASSERT(iMMState==EStopped); + // PDEF143631: RNDIS driver doesn't override CLANLinkCommon::Destroy() + ASSERT(iMMState==EStarting || iMMState==EStopped); DeleteThisFlow(); } diff -r e8d041006974 -r d15a50675083 networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp --- a/networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp Fri May 14 17:24:38 2010 +0300 +++ b/networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp Thu May 27 14:26:17 2010 +0300 @@ -246,7 +246,7 @@ } #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW iContext.iNodeActivity->PostRequestTo(*iContext.Node().ServiceProvider(), - TCFScpr::TGetParamsRequest(RCFParameterFamilyBundleC()).CRef()); + TCFScpr::TSetParamsRequest(RCFParameterFamilyBundleC()).CRef()); #else iContext.iNodeActivity->PostRequestTo(*iContext.Node().ServiceProvider(), TCFScpr::TParamsRequest(RCFParameterFamilyBundleC()).CRef()); @@ -260,7 +260,9 @@ DECLARE_DEFINE_NODEACTIVITY(ECFActivityStartDataClient, IPDeftBaseSCprDataClientStart, TCFDataClient::TStart ) FIRST_NODEACTIVITY_ENTRY(CoreNetStates::TAwaitingDataClientStart, MeshMachine::TNoTag) #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW - NODEACTIVITY_ENTRY(KNoTag, IPDeftBaseSCprDataClientStartActivity::TGetParams, CoreNetStates::TAwaitingParamResponse, CoreNetStates::TNoTagOrNoDataClients) + //NODEACTIVITY_ENTRY(KNoTag, IPDeftBaseSCprDataClientStartActivity::TGetParams, CoreNetStates::TAwaitingParamResponse, CoreNetStates::TNoTagOrNoDataClients) + NODEACTIVITY_ENTRY(KNoTag, IPDeftBaseSCprDataClientStartActivity::TGetParams, CoreNetStates::TAwaitingParamResponse, MeshMachine::TNoTag) + THROUGH_NODEACTIVITY_ENTRY(KNoTag, PRStates::TStoreParams, CoreNetStates::TNoTagOrNoDataClients) #else NODEACTIVITY_ENTRY(KNoTag, IPDeftBaseSCprDataClientStartActivity::TGetParams, CoreNetStates::TAwaitingParamResponse, MeshMachine::TNoTag) THROUGH_NODEACTIVITY_ENTRY(KNoTag, SCprStates::TStoreParams, CoreNetStates::TNoTagOrNoDataClients) diff -r e8d041006974 -r d15a50675083 networkcontrol/qosfwconfig/qostest/te_qos/configs/te_qossuite_mesh_pdpcpr.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkcontrol/qosfwconfig/qostest/te_qos/configs/te_qossuite_mesh_pdpcpr.cfg Thu May 27 14:26:17 2010 +0300 @@ -0,0 +1,1477 @@ +############################################################ +## HAND-GENERATED CONFIGURATION FILE +## +## Start at the GlobalSettings table and ConnectionPreferences table +############################################################ + +############################################################ +## Network +## +[Network] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Intranet + FIELD_COUNT=2 +END_ADD + + +############################################################ +## ModemBearer +## +[ModemBearer] +ADD_TEMPLATE + Id=0 + Name=Default Loopback Modem + IfName=PPP + PortName=PKTLOOPBACK::502 + TSYName=SIM + CSYName=PKTLOOPBACK + LastSocketActivityTimeout=6 + LastSessionClosedTimeout=180 + LastSocketClosedTimeout=10 + DataBits=8 + StopBits=1 + Parity=NONE + Rate=115200 + Handshaking=0 + SpecialRate=0 + XonChar=0 + XoffChar=0 + FaxClassPref=AUTO + SpeakerPref=AFTERDIALUNTILANSWER + 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 + Agent=NULLAGT + FIELD_COUNT=63 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Name=Loopback_RawIP_1 + IfName=RAWIP + PortName=PKTLOOPBACK::502 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=Loopback_RawIP_3 + IfName=RAWIP + PortName=PKTLOOPBACK::508 + FIELD_COUNT=3 +END_ADD + + + +############################################################ +## LANBearer +## +[LANBearer] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Assabet on-board Ethernet + IfName=ethint + LDDName=not used + PDDName=not used + LastSocketActivityTimeout=-1 + LastSessionClosedTimeout=-1 + LastSocketClosedTimeout=-1 + Agent=nullagent.agt + FIELD_COUNT=9 +END_ADD + + +############################################################ +## Location +## +[Location] +ADD_TEMPLATE + Id=0 + Name=Default Location + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=9 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Office + IntlPrefixCode=00 + NatPrefixCode=0 + NatCode=44 + AreaCode=171 + DialOutCode=9, + Mobile=FALSE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Office Direct Dial + IntlPrefixCode=00 + NatPrefixCode=0 + NatCode=44 + AreaCode=171 + Mobile=FALSE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=Mobile + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=Home + IntlPrefixCode=00 + NatPrefixCode=0 + NatCode=44 + AreaCode=181 + Mobile=FALSE + UsePulseDial=TRUE + WaitForDialTone=TRUE + PauseAfterDialout=0 + FIELD_COUNT=10 +END_ADD + + +############################################################ +## Chargecard +## +[Chargecard] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Dummy BT Chargecard + AccountNumber=144,12345678 + Pin=0000 + LocalRule=HG + NatRule=HFG + IntlRule=HEFG + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Dummy Mercury Chargecard + AccountNumber=0500800800,,12345678 + Pin=**** + LocalRule=HG + NatRule=J,K,0FG + IntlRule=HEFG + FIELD_COUNT=7 +END_ADD + +############################################################ +## GlobalSettings +## +## links to Tier table +## DefaultTier = 271064536 Tier1 ESock_IP NetworkTierManager +## No defaultSnap - therefore 399 selection chosen +## +[GlobalSettings] +ADD_TEMPLATE + DefaultTier=Link.TierTable.2048 + FIELD_COUNT=1 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + ConnectionAttempts=2 + RedialAttempts=3 + SmsBearer=0 + SmsReceiveMode=2 + GPRSAttachMode=1 + AcceptIncomingGprs=1 + GPRSClassCBearer=GSM + ModemForDataAndFax=1 + ModemForPhoneServicesAndSMS=1 + LocationForDataAndFax=1 + LocationForPhoneServicesAndSMS=1 + MaxMBufHeap=41877760 + DefaultNetwork=1 + BearerAvailabilityCheckTSY=SIM + FIELD_COUNT=16 +END_ADD + +############################################################ +## DialOutISP +## +[DialOutISP] +ADD_TEMPLATE + Id=0 + Name=Default Dial Out ISP + DialResolution=TRUE + UseLoginScript=FALSE + PromptForLogin=TRUE + DisplayPCT=FALSE + IfPromptForAuth=TRUE + IfCallbackEnabled=FALSE + IpAddrFromServer=TRUE + IpDNSAddrFromServer=TRUE + EnableIPHeaderComp=FALSE + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + EnableSWComp=FALSE + BearerService=0 + BearerProtocol=UNSPECIFIED + RlpVersion=0 + IwfToMs=0 + MsToIwf=0 + AckTimer=0 + RetransmissionAttempts=0 + ResequencePeriod=0 + V42Compression=0 + V42Codewords=0 + V42MaxLength=0 + Asymmetry=0 + UserInitUpgrade=FALSE + UseEdge=FALSE + FIELD_COUNT=28 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=NT RAS + Type=INTERNETONLY + DialResolution=TRUE + UseLoginScript=TRUE + LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n + PromptForLogin=FALSE + LoginName=RasUser + DisplayPCT=FALSE + IfNetworks=ip + IfPromptForAuth=FALSE + IfAuthName=RasUser + IfAuthPass=pass + AuthRetries=0 + IfCallbackEnabled=FALSE + CallbackTimeout=0 + IpAddrFromServer=TRUE + IpDNSAddrFromServer=TRUE + EnableIPHeaderComp=FALSE + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + EnableSWComp=FALSE + BearerName=ASYNCHRONOUS + BearerSpeed=UNSPECIFIED + BearerCE=UNSPECIFIED + BearerType=CSD + ChannelCoding=UNSPECIFIED + Aiur=0 + RequestedTimeSlots=0 + MaximumTimeSlots=0 + BearerService=0 + BearerProtocol=UNSPECIFIED + RlpVersion=0 + IwfToMs=0 + MsToIwf=0 + AckTimer=0 + RetransmissionAttempts=0 + ResequencePeriod=0 + V42Compression=0 + V42Codewords=0 + V42MaxLength=0 + Asymmetry=0 + UserInitUpgrade=FALSE + UseEdge=FALSE + FIELD_COUNT=44 +END_ADD + + +############################################################ +## DialInISP +## +[DialInISP] +ADD_TEMPLATE + Id=0 + Name=Default Dial In ISP + UseLoginScript=FALSE + IpAddrFromServer=TRUE + IpDNSAddrFromServer=TRUE + EnableIPHeaderComp=FALSE + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + EnableSWComp=FALSE + UseEdge=FALSE + FIELD_COUNT=10 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Dial In CS ISP + UseLoginScript=FALSE + IpAddrFromServer=TRUE + IpDNSAddrFromServer=TRUE + EnableIPHeaderComp=FALSE + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + EnableSWComp=FALSE + UseEdge=FALSE + FIELD_COUNT=10 +END_ADD + + +############################################################ +## OutgoingGPRS +## +[OutgoingGPRS] +ADD_TEMPLATE + Id=0 + 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=194.72.6.1 + IpAddrFromServer=FALSE + IpAddr=192.168.1.1 + IpDNSAddrFromServer=FALSE + IpNameServer1=194.72.6.51 + IpNameServer2=194.72.6.51 + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=32 +END_TEMPLATE + +ADD_SECTION +## +## Links from IAP table +## Links to +## +# COMMDB_ID = 1 + Id=1 + Name=SPUD + PDPType=IPV4 + IfParams=lowernif=RawIP + IfPromptForAuth=FALSE + IpAddrFromServer=FALSE + IpAddr=192.168.1.1 + IpDNSAddrFromServer=FALSE + FIELD_COUNT=8 +END_ADD + + +############################################################ +## IncomingGPRS +## +[IncomingGPRS] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Dummy Incoming GPRS Settings + APN=Test + PDPType=IPV4 + PDPAddress=0.0.0.0 + ReqPrecedence=1 + ReqDelay=1 + ReqReliability=1 + ReqPeakThroughput=1 + ReqMeanThroughput=1 + MinPrecedence=1 + MinDelay=1 + MinReliability=1 + MinPeakThroughput=1 + MinMeanThroughput=1 + DataCompression=FALSE + HeaderCompression=FALSE + GprsUseEdge=FALSE + AnonymousAccess=FALSE + IfNetworks=ip + IfPromptForAuth=FALSE + IfAuthName=RasUser + IfAuthPass=pass + AuthRetries=1 + IpAddrFromServer=FALSE + IpAddr=192.168.1.1 + IpDNSAddrFromServer=FALSE + IpNameServer1=194.72.6.51 + IpNameServer2=194.72.6.51 + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + FIELD_COUNT=30 +END_ADD + + +############################################################ +## DefaultGPRS +## +[DefaultGPRS] +ADD_SECTION +# COMMDB_ID = 1 + 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=20 +END_ADD + + +############################################################ +## CDMA2000PacketServiceTable +## +[CDMA2000PacketServiceTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=test name cdma2000 + IwfName=Test2000 + ServiceOption=HIGHSPEEDCDMA2000DATA + PDPType=IPV4 + ReqFwdPriority=PRIORITY04 + ReqRevPriority=PRIORITY04 + ReqFwdBitrate=32KBPS + ReqRevBitrate=32KBPS + ReqFwdLoss=LOSS1 + ReqRevLoss=LOSS1 + ReqFwdMaxdelay=40MS + ReqRevMaxdelay=40MS + MinFwdBitrate=8KBPS + MinRevBitrate=8KBPS + AccptFwdLoss=LOSS2 + AccptRevLoss=LOSS2 + AccptFwdMaxdelay=120MS + AccptRevMaxdelay=120MS + DataCompression=FALSE + AnonymousAccess=FALSE + IfNetworks=ip + IfPromptForAuth=FALSE + IfAuthName=RasUser + IfAuthPass=pass + AuthRetries=1 + IpNetMask=0.255.255.255 + IpGateway=10.0.0.1 + IpAddrFromServer=TRUE + IpDNSAddrFromServer=TRUE + EnableLCPExtension=TRUE + DisablePlainTextAuth=TRUE + ApType=2 + RlpMode=UNKNOWN + CDMAMobileIP=FALSE + CDMAMobileIPTimeout=10000000 + FIELD_COUNT=36 +END_ADD + + +############################################################ +## LANService +## +[LANService] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Ethernet + IfNetworks=ip,ip6 + IpNetMask=255.255.255.0 + IpGateway=194.72.6.1 + IpAddrFromServer=TRUE + IpAddr=192.168.0.100 + IpDNSAddrFromServer=FALSE + IpNameServer1=194.72.6.51 + IpNameServer2=194.72.6.52 + FIELD_COUNT=10 +END_ADD + +############################################################ +## APPrioritySelectionPolicyTable +## +## Links from AccessPointTable +## Links to the next layer in the AccessPointTable +## +[APPrioritySelectionPolicyTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=SelectionPolicy1 + AP1=Link.AccessPointTable.10001 + APCOUNT=1 + FIELD_COUNT=4 +END_ADD + +############################################################ +## AccessPointTable +## +## Links from TierTable +## When 399 selection selected in GlobalSettings this Links to APPrioritySelectionPolicyTable +## Bearer tier links to IAP table +## +[AccessPointTable] + +ADD_SECTION +## +## Links to IAP table +## Links to nodes in bearer layer +## Id = 1 is IAP1 +## SelectionPolicy zero marks the end of the 399 selection process +## Consistent with spud-rawip BearerTypeTable entry +## +# COMMDB_ID = 251 + Id=1 + Name=MappedFromIAP1 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + AccessPointSelectionPolicy=0 + Cpr=CprTable.8 + CprConfig=1 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +## +## Links to AccessPointTable next layer +## SelectionPolicy AccessPointTable entry 1 and IAP table entry 1 +## +# COMMDB_ID = 253 + Id=10001 + Name=IPProtoDefault + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + AccessPointSelectionPolicy=0 + Cpr=CprTable.2 + CprConfig=1 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CustomSelectionPolicy=1 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +## +## Links from TierTable +## When 399 selection selected in GlobalSettings this Links to APPrioritySelectionPolicyTable +## Id 10000 linked from TierTable +## SelectionPolicy APPrioritySelectionPolicyTable entry 1 +## +# COMMDB_ID = 254 + Id=10000 + Name=NetworkDefault + Tier=Link.TierTable.2048 + MCpr=MCprTable.1 + AccessPointSelectionPolicy=APPrioritySelectionPolicyTable.1 + Cpr=CprTable.1 + SCpr=SCprTable.1 + Protocol=ProtocolTable.1 + FIELD_COUNT=8 +END_ADD + + +############################################################ +## BearerTypeTable +## +## Links from ModemBearer table +## Links to the bearer layer nodes +## Consistent with the selected AccessPointTable +## +## +[BearerTypeTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.3 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.3 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ethint + Tier=Link.TierTable.271064565 + MCpr=MCprTable.4 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.4 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=tunnelnif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.6 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.6 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=qosppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.7 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.7 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=dummynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.8 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.8 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=hungrynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.9 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.9 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=spud-ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.3 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +## +## Links from ModemBearer table +## Links to bearer layer nodes +## Consistent with the selected AccessPointTable +## +# COMMDB_ID = 9 + Id=9 + Name=spud-rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + FIELD_COUNT=7 +END_ADD + +##This record here is the template record for the IPProto level APs generated by CommsDat. +ADD_SECTION +# COMMDB_ID = 10 + ##This name is a predefined name for the template for the IPProto APs. + ##Please don't change it! + Name=IPProtoDefaultTemplate + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + FIELD_COUNT=6 +END_ADD + + +############################################################ +## IAP +## +## Linked from ConnectionPreferences +## Links to several tables +## OutgoingGPRS entry SPUD +## ModemBearer entry 1 Null Modem 115200bps +## +## +[IAP] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=GPRS + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=1 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=Location.1 + FIELD_COUNT=9 +END_ADD + +############################################################ +## Proxies +## +[Proxies] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + ISP=1 + ProxyServiceType=DialOutISP + UseProxyServer=TRUE + ProxyServerName=www.dummyproxy.com + ProtocolName=http + PortNumber=80 + Exceptions=www.dummyproxy.com/exception + FIELD_COUNT=9 +END_ADD + + +############################################################ +## WAPAccessPoint +## +[WAPAccessPoint] +ADD_TEMPLATE + Id=0 + Name=Default Dial In ISP + CurrentBearer=WAPIPBearer + FIELD_COUNT=3 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Dummy WAP Settings + CurrentBearer=WAPIPBearer + StartPage=www.wapstart.com + FIELD_COUNT=4 +END_ADD + + +############################################################ +## WAPIPBearer +## +[WAPIPBearer] +ADD_TEMPLATE + Id=0 + Name=DefaultRecordName-1 + AccessPointId=0 + IAP=0 + WSPOption=CONNECTIONLESS + Security=FALSE + ProxyPortNumber=0 + FIELD_COUNT=7 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-2 + AccessPointId=58654976 + GatewayAddress=www.wapgateway.com + IAP=50266624 + WSPOption=CONNECTIONORIENTED + Security=FALSE + ProxyPortNumber=1 + FIELD_COUNT=8 +END_ADD + + +############################################################ +## WAPSMSBearer +## +[WAPSMSBearer] +ADD_TEMPLATE + Id=0 + Name=DefaultRecordName-1 + AccessPointId=0 + WSPOption=CONNECTIONLESS + Security=FALSE + FIELD_COUNT=5 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-2 + AccessPointId=1 + GatewayAddress=+442079460221 + ServiceCentreAddress=+442079460223 + WSPOption=CONNECTIONORIENTED + Security=FALSE + FIELD_COUNT=7 +END_ADD + + +############################################################ +## SecureSocketTable +## +[SecureSocketTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + ProtocolName=ssl3.0 + ProtoLibrary=ssladaptor.dll + FIELD_COUNT=4 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=DefaultRecordName-2 + ProtocolName=tls1.0 + ProtoLibrary=ssladaptor.dll + FIELD_COUNT=4 +END_ADD + +############################################################ +## TierTable +## +## Links from GlobalSettings +## Links to AccessPointTable +## +[TierTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=2048 + TierImplUid=271064536 + Name=Tier1 + TierThreadName=ESock_IP + TierManagerName=NetworkTierManager + DefaultAccessPoint=Link.AccessPointTable.10000 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=271064560 + TierImplUid=271064560 + Name=Tier2 + TierThreadName=ESock_IP + TierManagerName=ProtoTierManager + DefaultAccessPoint=Link.AccessPointTable.10001 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=271064565 + TierImplUid=271064565 + Name=Tier3 + TierThreadName=ESock_IP + TierManagerName=LinkTierManager +##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check +##on the link layer. However important that once this field has a value it has to be linked to a +##correct accesspoint record in the accesspoint table because this will be checked either. + DefaultAccessPoint=Link.AccessPointTable.1 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + + +############################################################ +## MCprTable +## +[MCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=netmcpr + MCprUid=271009095 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotomcpr + MCprUid=271064558 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=pppmcpr + MCprUid=271064556 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=ethmcpr + MCprUid=271064572 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=rawipmcpr + MCprUid=271064576 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=tunnelmcpr + MCprUid=271064578 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qospppmcpr + MCprUid=271064556 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=dummynifmcpr + MCprUid=271064580 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=hungrynifmcpr + MCprUid=271064580 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Id=10 + Name=pdpmcpr + MCprUid=271065840 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 11 + Id=11 + Name=sipmcpr + MCprUid=536887801 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 12 + Id=12 + Name=btgenericmcpr + MCprUid=271070577 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 13 + Id=13 + Name=panethermcpr + MCprUid=271070626 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## CprTable +## +[CprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ipcpr + CprUid=270561519 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotocpr + CprUid=271064531 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=agentcpr + CprUid=271064552 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=vanillacpr + CprUid=271065843 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=sipcpr + CprUid=271010872 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=avctpcpr + CprUid=271030184 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=tunnelagentcpr + CprUid=271080968 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=pdpcpr + CprUid=271065826 + FIELD_COUNT=3 +END_ADD + +############################################################ +## SCprTable +## +[SCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ipscpr + SCprUid=271065811 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotoscpr + SCprUid=271064529 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=agentscpr + SCprUid=271064554 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=pdpscpr + SCprUid=271065824 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=pppscpr + SCprUid=271065852 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=vanillascpr + SCprUid=271065844 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qosscpr + SCprUid=271065811 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=sipscpr + SCprUid=271010839 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=avctpsaplinksmgr + SCprUid=271030185 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Id=10 + Name=avctpmuxer + SCprUid=271030186 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## ProtocolTable +## +[ProtocolTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=sapshim + ProtocolUid=270496898 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipshim4 + ProtocolUid=271064118 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=ppp + ProtocolUid=271064143 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=ethernet + ProtocolUid=271064539 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=rawip + ProtocolUid=271064562 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=tunnel + ProtocolUid=271064567 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qosppp + ProtocolUid=271064148 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=dummynif + ProtocolUid=271064123 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=hungrynif + ProtocolUid=271064125 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Id=10 + Name=panether + ProtocolUid=271070627 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## ConnectionPreferences +## +## Links to +## IAP = 1 - GPRS - IAPService = SPUD - ModemBearer - Null Modem 115200bps - IAPNetwork = 1 +## BearerSet=PSD +## +[ConnectionPreferences] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + Ranking=0 + Direction=INCOMING + BearerSet=PSD + DialogPref=DONOTPROMPT + IAP=1 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=DefaultRecordName-2 + Ranking=1 + Direction=OUTGOING + BearerSet=PSD + DialogPref=DONOTPROMPT + IAP=1 + FIELD_COUNT=7 +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 + +############################################################ +## 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 e8d041006974 -r d15a50675083 networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf --- a/networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf Fri May 14 17:24:38 2010 +0300 +++ b/networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf Thu May 27 14:26:17 2010 +0300 @@ -17,7 +17,11 @@ PRJ_TESTEXPORTS +#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW +../configs/te_QoSSuite_Mesh_pdpcpr.cfg z:/testdata/configs/te_qossuite_mesh.cfg +#else ../configs/te_QoSSuite_Mesh.cfg z:/testdata/configs/te_qossuite_mesh.cfg +#endif //#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW ../configs/te_QoSSuite_simtsy.txt z:/testdata/configs/te_QoSSuite_simtsy.txt ../configs/te_QoSSuite_LoopbackCsy.ini z:/testdata/configs/te_QoSSuite_loopbackcsy.ini diff -r e8d041006974 -r d15a50675083 networkingtestandutils/ipprobe/group/bld.inf --- a/networkingtestandutils/ipprobe/group/bld.inf Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/ipprobe/group/bld.inf Thu May 27 14:26:17 2010 +0300 @@ -1,35 +1,30 @@ -// Copyright (c) 2005-2009 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: -// bld.inf - probe support -// probe support -// +/* +* Copyright (c) 2009-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: Build information file for project probe +* +*/ - - -/** - @file - @internalComponent -*/ +#include PRJ_PLATFORMS PRJ_TESTEXPORTS +../data/probe.esk /epoc32/data/z/private/101f7989/esock/ip.probe.esk +../data/probe.esk /epoc32/winscw/c/private/101f7989/Esock/ip.probe.esk +../data/probe.esk /epoc32/data/c/private/101f7989/Esock/ip.probe.esk +../group/probe.iby /epoc32/rom/include/probe.iby -../data/probe.esk /epoc32/data/z/private/101f7989/esock/ip.probe.esk -../data/probe.esk /epoc32/winscw/c/private/101f7989/esock/ip.probe.esk - -../group/probe.iby /epoc32/rom/include/probe.iby PRJ_MMPFILES diff -r e8d041006974 -r d15a50675083 networkingtestandutils/ipprobe/group/networking_probe.mrp --- a/networkingtestandutils/ipprobe/group/networking_probe.mrp Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/ipprobe/group/networking_probe.mrp Thu May 27 14:26:17 2010 +0300 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2009-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" diff -r e8d041006974 -r d15a50675083 networkingtestandutils/ipprobe/group/probe.iby --- a/networkingtestandutils/ipprobe/group/probe.iby Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/ipprobe/group/probe.iby Thu May 27 14:26:17 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" diff -r e8d041006974 -r d15a50675083 networkingtestandutils/ipprobe/group/probe.mmp --- a/networkingtestandutils/ipprobe/group/probe.mmp Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/ipprobe/group/probe.mmp Thu May 27 14:26:17 2010 +0300 @@ -1,24 +1,18 @@ -// Copyright (c) 2006-2009 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: -// probe.mmp - probe support MMP file -// probe support -// - - - -/** - @file +/* +* Copyright (c) 2009-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: The project specification file for probe +* */ MACRO EPOC_SDK=0x08000000 @@ -29,6 +23,8 @@ UID 0x10003D38 0x10000895 +CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData // as c32 process + SOURCEPATH ../src SOURCE family.cpp prt.cpp sap.cpp @@ -42,10 +38,9 @@ OS_LAYER_SYSTEMINCLUDE_SYMBIAN #endif +LIBRARY euser.lib esock.lib inhook6.lib nifman.lib +LIBRARY efsrv.lib esocksvr.lib mbufmgr.lib -LIBRARY euser.lib esocksvr.lib mbufmgr.lib inhook6.lib - -CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData MACRO TCPIP6_CAPABILITY diff -r e8d041006974 -r d15a50675083 networkingtestandutils/ipprobe/inc/family.h --- a/networkingtestandutils/ipprobe/inc/family.h Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/ipprobe/inc/family.h Thu May 27 14:26:17 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -19,6 +19,7 @@ /** @internalComponent */ + #ifndef __PROBE_FAMILY_H #define __PROBE_FAMILY_H diff -r e8d041006974 -r d15a50675083 networkingtestandutils/ipprobe/inc/prt.h --- a/networkingtestandutils/ipprobe/inc/prt.h Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/ipprobe/inc/prt.h Thu May 27 14:26:17 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -19,13 +19,16 @@ /** @internalComponent */ + #ifndef __PROBE_PRT_H #define __PROBE_PRT_H #include +#include #include #include + #include "family.h" #include "in_bind.h" #include "posthook.h" @@ -49,11 +52,27 @@ virtual void Process(RMBufChain &aPacket, CProtocolBase* aSrc); virtual CServProviderBase* NewSAPL(TUint aProtocol); - void CancelSAP(const CServProviderBase* aSAP); + void CancelSAP(const CServProviderBase *aSAP); protected: - void Deliver(RMBufChain &aPacket); + void Dump(RMBufChain &aPacket); + void LibcapDumpFileHeader(); + void LibcapDump(const TDesC8& aBuffer, TUint32 aTimeStampSecs, TUint32 aTimeStampMicros); + void Queue(RMBufChain &aPacket); + static TInt DumpCb(TAny* aThisPtr); + void DumpQueuedPackets(); + +protected: + TTime iTimeOrigin; const TUint iId; CProviderProbe *iList; + CAsyncCallBack iDumpCb; + RMBufPktQ iQueue; + RFs iFs; + RFile iFile; + RBuf8 iBuf; + TBool iFileServerOpen; + TBool iFileOpen; + TBool iBufCreated; }; #endif diff -r e8d041006974 -r d15a50675083 networkingtestandutils/ipprobe/inc/sap.h --- a/networkingtestandutils/ipprobe/inc/sap.h Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/ipprobe/inc/sap.h Thu May 27 14:26:17 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -19,6 +19,7 @@ /** @internalComponent */ + #ifndef __PROBE_SAP_H #define __PROBE_SAP_H diff -r e8d041006974 -r d15a50675083 networkingtestandutils/ipprobe/src/family.cpp --- a/networkingtestandutils/ipprobe/src/family.cpp Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/ipprobe/src/family.cpp Thu May 27 14:26:17 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -20,6 +20,10 @@ // // Nothing interesting here... // +GLDEF_C TInt E32Dll() + { + return KErrNone; + } class CProtocolFamilyProbe : public CProtocolFamilyBase { @@ -32,10 +36,12 @@ CProtocolBase* NewProtocolL(TUint /*aSockType*/, TUint aProtocol); }; -extern "C" { IMPORT_C CProtocolFamilyBase* Install(void); } +extern "C" { IMPORT_C CProtocolFamilyBase* Install(); } EXPORT_C CProtocolFamilyBase* Install() { - return new (ELeave) CProtocolFamilyProbe; + // Due to naming convention this cannot leave + // However null return value handled correctly in the caller... + return new CProtocolFamilyProbe; } //---------------------------------------------------------------------- @@ -63,7 +69,9 @@ TUint CProtocolFamilyProbe::ProtocolList(TServerProtocolDesc *& aList) { - aList = new TServerProtocolDesc[2]; + // This function might leave, but it has been taken care of in the calling function + const TInt index =2; + aList = new TServerProtocolDesc[index]; if (aList == NULL) return 0; diff -r e8d041006974 -r d15a50675083 networkingtestandutils/ipprobe/src/prt.cpp --- a/networkingtestandutils/ipprobe/src/prt.cpp Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/ipprobe/src/prt.cpp Thu May 27 14:26:17 2010 +0300 @@ -1,34 +1,50 @@ -// Copyright (c) 2004-2009 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: -// prt.cpp - Packet Probe Hook -// +/* +* Copyright (c) 2009-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: Packet probe hook +* +*/ #include #include +#include +#include #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS #include #endif + #include "family.h" #include "prt.h" #include "sap.h" #include "inet6log.h" +_LIT(KTcpDumpFolder, "tcpdump\\"); +_LIT(KProbeDumpFile, "probe.cap"); +_LIT(KLogFolder, "c:\\logs\\"); -CProtocolProbe::CProtocolProbe(TUint aId) : iId(aId) +CProtocolProbe::CProtocolProbe(TUint aId) : +iId(aId), +iDumpCb(CActive::EPriorityStandard), +iFileServerOpen(EFalse), +iFileOpen(EFalse), +iBufCreated(EFalse) { LOG(Log::Printf(_L("Probe::CProtocolProbe()\r\n"));) + iTimeOrigin.UniversalTime(); + + TCallBack cbFunc(DumpCb, this); + iDumpCb.Set(cbFunc); } void CProtocolProbe::InitL(TDesC& aTag) @@ -37,7 +53,6 @@ CProtocolBase::InitL(aTag); } - void CProtocolProbe::StartL() { // __ASSERT_DEBUG(iProtocol != NULL, User::Leave(KErrGeneral)); @@ -45,20 +60,39 @@ CProtocolProbe::~CProtocolProbe() { - LOG(Log::Printf(_L("Probe::~CProtocolProbe()\r\n"));) + LOG(Log::Printf(_L("Probe::~CProtocolProbe()\r\n"));) + if(iFileOpen) + { + iFile.Close(); + iFileOpen = EFalse; + } + if(iFileServerOpen) + { + iFs.Close(); + iFileServerOpen = EFalse; + } + if(iBufCreated) + { + iBuf.Close(); + iBufCreated = EFalse; + } } - CProtocolProbe *CProtocolProbe::NewL(TUint aId) { + return new (ELeave) CProtocolProbe(aId); } void CProtocolProbe::FillIdentification(TServerProtocolDesc& anEntry, TUint aId) { + anEntry.iName=_S("probe"); if (aId > 1) + { anEntry.iName.AppendNum(aId-1); + } + anEntry.iAddrFamily = KAfProbe; anEntry.iSockType = KSockDatagram; anEntry.iProtocol = aId; @@ -83,7 +117,10 @@ LOG(Log::Printf(_L("Probe::NewSAPL(%d)\r\n"), aProtocol);) if (aProtocol != KSockDatagram) + { User::Leave(KErrNotSupported); + } + CProviderProbe* sap = new (ELeave) CProviderProbe(this); sap->iNext = iList; iList = sap; @@ -97,6 +134,7 @@ // void CProtocolProbe::CancelSAP(const CServProviderBase* aSAP) { + CProviderProbe **h, *sap; for (h = &iList; (sap = *h) != NULL; h = &sap->iNext) if (sap == aSAP) @@ -106,49 +144,218 @@ } } - // CProtocolProbe::NetworkAttachedL // ******************************** // When network becomes available, do the hooking! // void CProtocolProbe::NetworkAttachedL() { + NetworkService()->BindL(this, MIp6Hook::BindPostHook()); NetworkService()->BindL(this, MIp6Hook::BindPostHook()+1); + + // initialise dump file + if(iFileOpen) + { + iFile.Close(); + iFileOpen = EFalse; + } + if(iFileServerOpen) + { + iFs.Close(); + iFileServerOpen = EFalse; + } + + User::LeaveIfError(iFs.Connect()); + iFileServerOpen = ETrue; + TBuf<50> filename; + filename.Append(KLogFolder); + filename.Append(KTcpDumpFolder); + filename.Append(KProbeDumpFile); + User::LeaveIfError(iFile.Replace(iFs, filename, EFileWrite)); + iFileOpen = ETrue; + + // allocate buffer + if(!iBufCreated) + { + const TInt KMaxBufferSize = 65535; + iBuf.CreateL(KMaxBufferSize); + iBufCreated = ETrue; + } + + LibcapDumpFileHeader(); } +void CProtocolProbe::Queue(RMBufChain &aPacket) // -// CProtocolProbe::Deliver -// *********************** -// Generate a copy of the packet to every bound provider +// Takes a copy of aPacket, adds it to the queue and triggers the callback // -void CProtocolProbe::Deliver(RMBufChain &aPacket) { - const RMBufPktInfo *const info = RMBufPacketBase::PeekInfoInChain(aPacket); + + RMBufPacketBase copy; + TRAPD(err, copy.CopyPackedL(aPacket)); + if (err == KErrNone) + { + + // + // Calculate packet time-stamp + // + TTime newTime; + newTime.UniversalTime(); + TTimeIntervalMicroSeconds interval = newTime.MicroSecondsFrom(iTimeOrigin); + + const TInt KMicrosInASecond = 1000000; - for (CProviderProbe* sap = iList; sap != NULL; sap = sap->iNext) + //TUint32 micros = interval.Int64().Low(); + TUint32 micros = I64LOW(interval.Int64());//.Low(); x.Low() -> I64LOW(x) + TUint32 secs = micros / KMicrosInASecond; + micros -= (secs * KMicrosInASecond); + + // + // Reuse the protocol and flags fields of + // RMBufPktInfo to store the time-stamp + // + RMBufPktInfo* info = RMBufPacket::PeekInfoInChain(copy); + info->iProtocol = static_cast(secs); + info->iFlags = static_cast(micros); + + iQueue.Append(copy); + iDumpCb.CallBack(); + } + else { - if (sap->IsReceiving(*info)) - { - RMBufPacketBase copy; - TRAPD(err, copy.CopyPackedL(aPacket)); - if (err == KErrNone) - sap->Process(copy, this); - else - copy.Free(); - } + copy.Free(); } } +// +// CProtocolProbe::Dump +// *********************** +// Log the packet to file +// +void CProtocolProbe::Dump(RMBufChain &aPacket) + { + + RMBufPacket packet; + packet.Assign(aPacket); + RMBufPktInfo* info = packet.Unpack(); + + TUint32 secs = static_cast(info->iProtocol); + TUint32 micros = static_cast(info->iFlags); + + iBuf.SetMax(); + packet.CopyOut(iBuf, 0); + if(iBuf.Length() != info->iLength) + { + iBuf.SetLength(info->iLength); + } + LibcapDump(iBuf, secs, micros); + packet.Free(); + } + TInt CProtocolProbe::Send(RMBufChain &aPacket, CProtocolBase* aSrc) { - Deliver(aPacket); + + Queue(aPacket); return CProtocolPosthook::Send(aPacket, aSrc); } void CProtocolProbe::Process(RMBufChain &aPacket, CProtocolBase* aSrc) { - Deliver(aPacket); + + Queue(aPacket); CProtocolPosthook::Process(aPacket, aSrc); } + +void CProtocolProbe::LibcapDumpFileHeader() +// +// Dump file header in a format compatible with Libcap +// +// Format is: +// +// struct FileHeader +// { +// TUint32 magic; +// TUint16 version_major; +// TUint16 version_minor; +// TUint32 thiszone; /* gmt to local correction */ +// TUint32 sigfigs; /* accuracy of timestamps */ +// TUint32 snaplen; /* max length saved portion of each pkt */ +// TUint32 linktype; /* data link type (LINKTYPE_*) */ +// }; +// +// Note LINKTYPE specified in libpcap/bpf/net/bpf.h (see www.tcpdump.org) +// + { + + TBuf8 fileHeader; + *((TUint32*) &(fileHeader.Ptr()[0])) = 0xa1b2c3d4; + *((TUint16*) &(fileHeader.Ptr()[4])) = 0x02; + *((TUint16*) &(fileHeader.Ptr()[6])) = 0x04; + *((TUint32*) &(fileHeader.Ptr()[8])) = 0x00; + *((TUint32*) &(fileHeader.Ptr()[12])) = 0x00; + *((TUint32*) &(fileHeader.Ptr()[16])) = 0xffff; + *((TUint32*) &(fileHeader.Ptr()[20])) = 12; // DLT_RAW 12 /* raw IP */ + fileHeader.SetLength(fileHeader.MaxLength()); + + iFile.Write(fileHeader); + } + +void CProtocolProbe::LibcapDump(const TDesC8& aBuffer, TUint32 aTimeStampSecs, TUint32 aTimeStampMicros) +// +// Dumps a packet in a format compatbible with Libcap +// +// For each record the format is: +// +// struct record +// { +// TUint32 sec; /* time stamp - secs*/ +// TUint32 usec; /* time stamp - microsecs*/ +// TUint32 captureLen; /* length packet captured */ +// TUint32 packetLen; /* total length of packet*/ +// }; +// +// Byte ordering of the header is little endian +// Byte ordering of the packet is network byte order (big endian) +// + { + + TBuf8 recordHeader; + recordHeader.FillZ(); + + *((TUint32*) &(recordHeader.Ptr()[0])) = aTimeStampSecs; + *((TUint32*) &(recordHeader.Ptr()[4])) = aTimeStampMicros; + *((TUint32*) &(recordHeader.Ptr()[8])) = aBuffer.Length(); + *((TUint32*) &(recordHeader.Ptr()[12])) = aBuffer.Length(); + recordHeader.SetLength(recordHeader.MaxLength()); + + iFile.Write(recordHeader); + iFile.Write(aBuffer); + } + + + +TInt CProtocolProbe::DumpCb(TAny* aThisPtr) +// +// Callback function - calls DumpQueuedPackets() +// + { + + CProtocolProbe* self = static_cast(aThisPtr); + self->DumpQueuedPackets(); + return KErrNone; + } + +void CProtocolProbe::DumpQueuedPackets() +// +// Dumps all packets on the queue to the log file +// + { + + RMBufPacketBase packet; + while(iQueue.Remove(packet)) + { + Dump(packet); + } + } diff -r e8d041006974 -r d15a50675083 networkingtestandutils/ipprobe/src/sap.cpp --- a/networkingtestandutils/ipprobe/src/sap.cpp Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/ipprobe/src/sap.cpp Thu May 27 14:26:17 2010 +0300 @@ -1,21 +1,23 @@ -// Copyright (c) 2004-2009 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: -// sap.cpp - Packet Probe Hook -// +/* +* Copyright (c) 2009-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: Packet probe hook +* +*/ #include "sap.h" + CProviderProbe::CProviderProbe(CProtocolProbe* aProtocol) : iProtocol(aProtocol) { __DECLARE_NAME(_S("CProviderProbe")); diff -r e8d041006974 -r d15a50675083 networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_changedsid_pdpcpr.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_changedsid_pdpcpr.cfg Thu May 27 14:26:17 2010 +0300 @@ -0,0 +1,1043 @@ +############################################################ +## AUTO-GENERATED CONFIGURATION FILE +## CommsDat Database Dump Utility +## 1.1 +############################################################ + +############################################################ +## Network +## +[Network] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Intranet + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Intranet2 + FIELD_COUNT=2 +END_ADD + + +############################################################ +## ModemBearer +## +[ModemBearer] +ADD_TEMPLATE + Id=0 + 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 + Agent=NULLAGT + BCAStack=C32Bca + FIELD_COUNT=66 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Loopback_RawIP_1 + IfName=RAWIP + PortName=PKTLOOPBACK::501 + CSYName=PKTLOOPBACK + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Loopback_SPUD_2 + IfName=SPUD + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=Loopback_RawIP_3 + IfName=RAWIP + PortName=PKTLOOPBACK::503 + CSYName=PKTLOOPBACK + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=Loopback_SPUD_4 + IfName=SPUD + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=WinTunnel_SPUD_5 + IfName=SPUD + Agent=NULLAGT + FIELD_COUNT=4 +END_ADD + + +############################################################ +## Location +## +[Location] +ADD_TEMPLATE + Id=0 + Name=Default Location + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=9 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Office + IntlPrefixCode=00 + NatPrefixCode=0 + NatCode=44 + AreaCode=171 + DialOutCode=9, + Mobile=FALSE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Mobile + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=9 +END_ADD + + +############################################################ +## GlobalSettings +## +[GlobalSettings] +ADD_TEMPLATE + DefaultTier=Link.TierTable.2048 + FIELD_COUNT=1 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + ConnectionAttempts=2 + RedialAttempts=3 + SmsReceiveMode=2 + GPRSAttachMode=1 + AcceptIncomingGprs=1 + GPRSClassCBearer=GSM + ModemForDataAndFax=2 + ModemForPhoneServicesAndSMS=2 + LocationForDataAndFax=41878016 + LocationForPhoneServicesAndSMS=41878016 + MaxMBufHeap=41878016 + DefaultNetwork=33489152 + BearerAvailabilityCheckTSY=mm + FIELD_COUNT=15 +END_ADD + + +############################################################ +## OutgoingGPRS +## +[OutgoingGPRS] +ADD_TEMPLATE + Id=0 + 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 + 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 + Id=1 + Name=RawIP_Bounce_1 + PDPType=IPV4 + IfPromptForAuth=FALSE + IpNetMask=255.255.255.0 + IpAddrFromServer=FALSE + IpAddr=192.168.1.1 + IpDNSAddrFromServer=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=SPUD_Echo_2 + PDPType=IPV4 + IfParams=lowernif=RAWIP + IfPromptForAuth=FALSE + IpNetMask=255.255.255.0 + IpAddrFromServer=TRUE + IpAddr=192.168.1.2 + IpDNSAddrFromServer=TRUE + UmtsR99QoSAndOn=1 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=RawIP_Bounce_3 + PDPType=IPV4 + IfPromptForAuth=FALSE + IpAddrFromServer=FALSE + IpAddr=192.168.2.3 + IpDNSAddrFromServer=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=SPUD_Echo_4 + PDPType=IPV4 + IfParams=lowernif=RAWIP + IfPromptForAuth=FALSE + IpAddrFromServer=FALSE + IpAddr=192.168.2.4 + IpDNSAddrFromServer=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=9 +END_ADD + + +############################################################ +## DefaultGPRS +## +[DefaultGPRS] +ADD_SECTION +# COMMDB_ID = 1 + 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=20 +END_ADD + + +############################################################ +## APPrioritySelectionPolicyTable +## +[APPrioritySelectionPolicyTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=SelectionPolicy1 + AP1=Link.AccessPointTable.10001 + APCOUNT=1 + FIELD_COUNT=4 +END_ADD + +############################################################ +## AccessPointTable +## +[AccessPointTable] +ADD_SECTION +# COMMDB_ID = 243 + Id=5 + Name=rawipMappedFromIAP5 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + AccessPointSelectionPolicy=0 + Cpr=CprTable.3 + CprConfig=5 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 245 + Id=4 + Name=spud-rawipMappedFromIAP4 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + AccessPointSelectionPolicy=0 + Cpr=CprTable.5 + CprConfig=4 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 247 + Id=3 + Name=rawipMappedFromIAP3 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + AccessPointSelectionPolicy=0 + Cpr=CprTable.3 + CprConfig=3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 249 + Id=2 + Name=spud-rawipMappedFromIAP2 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + AccessPointSelectionPolicy=0 + Cpr=CprTable.5 + CprConfig=2 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 251 + Id=1 + Name=rawipMappedFromIAP1 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + AccessPointSelectionPolicy=0 + Cpr=CprTable.3 + CprConfig=1 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 253 + Id=10001 + Name=IPProtoDefault + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + CustomSelectionPolicy=2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 254 + Id=10000 + Name=NetworkDefault + Tier=Link.TierTable.2048 + MCpr=MCprTable.1 + AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.1 + Cpr=CprTable.1 + SCpr=SCprTable.7 + Protocol=ProtocolTable.1 + FIELD_COUNT=8 +END_ADD + + +############################################################ +## BearerTypeTable +## +[BearerTypeTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.3 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.3 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ethint + Tier=Link.TierTable.271064565 + MCpr=MCprTable.4 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.4 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=tunnelnif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.6 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.6 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=qosppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.7 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.7 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=dummynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.8 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.8 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=hungrynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.9 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.9 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=spud-ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.5 + SCpr=SCprTable.4 + Protocol=ProtocolTable.3 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=spud-rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.5 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + FIELD_COUNT=7 +END_ADD + +##This record here is the template record for the IPProto level APs generated by CommsDat. +ADD_SECTION +# COMMDB_ID = 10 + ##This name is a predefined name for the template for the IPProto APs. + ##Please don't change it! + Name=IPProtoDefaultTemplate + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + FIELD_COUNT=6 +END_ADD + + +############################################################ +## IAP +## +[IAP] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Loopback_GRPS_1 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=1 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Loopback_GRPS_2 + IAPServiceType=OutgoingGPRS + IAPService=2 + IAPBearerType=ModemBearer + IAPBearer=2 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=Location.2 + IAPAppSid=538984447 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=Loopback_GRPS_3 + IAPServiceType=OutgoingGPRS + IAPService=3 + IAPBearerType=ModemBearer + IAPBearer=3 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=Loopback_GRPS_4 + IAPServiceType=OutgoingGPRS + IAPService=4 + IAPBearerType=ModemBearer + IAPBearer=4 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=Loopback_GRPS_5 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=3 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + + +############################################################ +## ConnectionPreferences +## +[ConnectionPreferences] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + Ranking=1 + Direction=OUTGOING + BearerSet=PSD + DialogPref=DONOTPROMPT + IAP=2 + FIELD_COUNT=7 +END_ADD + +############################################################ +## UmtsR99QoSAndOn +## +[UmtsR99QoSAndOn] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=R99Default1 + 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=29 +END_ADD + +############################################################ +## TierTable +## +[TierTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=2048 + TierImplUid=271064536 + Name=Tier1 + TierThreadName=ESock_IP + TierManagerName=NetworkTierManager + DefaultAccessPoint=Link.AccessPointTable.10000 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=271064560 + TierImplUid=271064560 + Name=Tier2 + TierThreadName=ESock_IP + TierManagerName=ProtoTierManager + DefaultAccessPoint=Link.AccessPointTable.10001 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=271064565 + TierImplUid=271064565 + Name=Tier3 + TierThreadName=ESock_IP + TierManagerName=LinkTierManager + ##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check + ##on the link layer. However important that once this field has a value it has to be linked to a + ##correct accesspoint record in the accesspoint table because this will be checked either. + DefaultAccessPoint=Link.AccessPointTable.1 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + + +############################################################ +## MCprTable +## +[MCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=netmcpr + MCprUid=271009095 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotomcpr + MCprUid=271064558 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=pppmcpr + MCprUid=271064556 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=ethmcpr + MCprUid=271064572 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=rawipmcpr + MCprUid=271064576 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=tunnelmcpr + MCprUid=271064578 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qospppmcpr + MCprUid=271064556 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=dummynifmcpr + MCprUid=271064580 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=hungrynifmcpr + MCprUid=271064580 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Id=10 + Name=pdpmcpr + MCprUid=271065840 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## CprTable +## +[CprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ipcpr + CprUid=270561519 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotocpr + CprUid=271064531 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=agentcpr + CprUid=271064552 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=vanillacpr + CprUid=271065843 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=pdpcpr + CprUid=271065826 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## SCprTable +## +[SCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ipscpr + SCprUid=0xFFFFFFFF + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotoscpr + SCprUid=271064529 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=agentscpr + SCprUid=271064554 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=pdpscpr + SCprUid=271065824 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=pppscpr + SCprUid=271065852 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=vanillascpr + SCprUid=271065844 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qosscpr + SCprUid=271065811 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=ipqosprotoscpr + SCprUid=271065816 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## ProtocolTable +## +[ProtocolTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=sapshim + ProtocolUid=270496898 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipshim4 + ProtocolUid=271064118 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=ppp + ProtocolUid=271064143 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=ethernet + ProtocolUid=271064539 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=rawip + ProtocolUid=271064562 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=tunnel + ProtocolUid=271064567 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qosppp + ProtocolUid=271064148 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=dummynif + ProtocolUid=271064123 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=hungrynif + ProtocolUid=271064125 + FIELD_COUNT=3 +END_ADD + diff -r e8d041006974 -r d15a50675083 networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_imssi_pdpcpr.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_imssi_pdpcpr.cfg Thu May 27 14:26:17 2010 +0300 @@ -0,0 +1,1041 @@ +############################################################ +## AUTO-GENERATED CONFIGURATION FILE +## CommsDat Database Dump Utility +## 1.1 +############################################################ + +############################################################ +## Network +## +[Network] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Intranet + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Intranet2 + FIELD_COUNT=2 +END_ADD + + +############################################################ +## ModemBearer +## +[ModemBearer] +ADD_TEMPLATE + Id=0 + 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 + Agent=NULLAGT + BCAStack=C32Bca + FIELD_COUNT=66 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Loopback_RawIP_1 + IfName=RAWIP + PortName=PKTLOOPBACK::501 + CSYName=PKTLOOPBACK + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Loopback_SPUD_2 + IfName=SPUD + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=Loopback_RawIP_3 + IfName=RAWIP + PortName=PKTLOOPBACK::503 + CSYName=PKTLOOPBACK + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=Loopback_SPUD_4 + IfName=SPUD + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=WinTunnel_SPUD_5 + IfName=SPUD + Agent=NULLAGT + FIELD_COUNT=4 +END_ADD + + +############################################################ +## Location +## +[Location] +ADD_TEMPLATE + Id=0 + Name=Default Location + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=9 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Office + IntlPrefixCode=00 + NatPrefixCode=0 + NatCode=44 + AreaCode=171 + DialOutCode=9, + Mobile=FALSE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Mobile + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=9 +END_ADD + + +############################################################ +## GlobalSettings +## +[GlobalSettings] +ADD_TEMPLATE + DefaultTier=Link.TierTable.2048 + FIELD_COUNT=1 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + ConnectionAttempts=2 + RedialAttempts=3 + SmsReceiveMode=2 + GPRSAttachMode=1 + AcceptIncomingGprs=1 + GPRSClassCBearer=GSM + ModemForDataAndFax=2 + ModemForPhoneServicesAndSMS=2 + LocationForDataAndFax=41878016 + LocationForPhoneServicesAndSMS=41878016 + MaxMBufHeap=41878016 + DefaultNetwork=33489152 + BearerAvailabilityCheckTSY=mm + FIELD_COUNT=15 +END_ADD + + +############################################################ +## OutgoingGPRS +## +[OutgoingGPRS] +ADD_TEMPLATE + Id=0 + 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 + 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 + Id=1 + Name=RawIP_Bounce_1 + PDPType=IPV4 + IfPromptForAuth=FALSE + IpNetMask=255.255.255.0 + IpAddrFromServer=FALSE + IpAddr=192.168.1.1 + IpDNSAddrFromServer=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=SPUD_Echo_2 + PDPType=IPV4 + IfParams=lowernif=RAWIP + IfPromptForAuth=FALSE + IpNetMask=255.255.255.0 + IpAddrFromServer=TRUE + IpAddr=192.168.1.2 + IpDNSAddrFromServer=TRUE + UmtsR99QoSAndOn=1 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=RawIP_Bounce_3 + PDPType=IPV4 + IfPromptForAuth=FALSE + IpAddrFromServer=FALSE + IpAddr=192.168.2.3 + IpDNSAddrFromServer=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=SPUD_Echo_4 + PDPType=IPV4 + IfParams=lowernif=RAWIP + IfPromptForAuth=FALSE + IpAddrFromServer=FALSE + IpAddr=192.168.2.4 + IpDNSAddrFromServer=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=9 +END_ADD + + +############################################################ +## DefaultGPRS +## +[DefaultGPRS] +ADD_SECTION +# COMMDB_ID = 1 + 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=20 +END_ADD + +############################################################ +## APPrioritySelectionPolicyTable +## +[APPrioritySelectionPolicyTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=SelectionPolicy1 + AP1=Link.AccessPointTable.10001 + APCOUNT=1 + FIELD_COUNT=4 +END_ADD + +############################################################ +## AccessPointTable +## +[AccessPointTable] +ADD_SECTION +# COMMDB_ID = 243 + Id=5 + Name=rawipMappedFromIAP5 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + AccessPointSelectionPolicy=0 + Cpr=CprTable.3 + CprConfig=5 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 245 + Id=4 + Name=spud-rawipMappedFromIAP4 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + AccessPointSelectionPolicy=0 + Cpr=CprTable.5 + CprConfig=4 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 247 + Id=3 + Name=rawipMappedFromIAP3 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + AccessPointSelectionPolicy=0 + Cpr=CprTable.3 + CprConfig=3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 249 + Id=2 + Name=spud-rawipMappedFromIAP2 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + AccessPointSelectionPolicy=0 + Cpr=CprTable.5 + CprConfig=2 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 251 + Id=1 + Name=rawipMappedFromIAP1 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + AccessPointSelectionPolicy=0 + Cpr=CprTable.3 + CprConfig=1 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 253 + Id=10001 + Name=IPProtoDefault + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + CustomSelectionPolicy=2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 254 + Id=10000 + Name=NetworkDefault + Tier=Link.TierTable.2048 + MCpr=MCprTable.1 + AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.1 + Cpr=CprTable.1 + SCpr=SCprTable.7 + Protocol=ProtocolTable.1 + FIELD_COUNT=8 +END_ADD + + +############################################################ +## BearerTypeTable +## +[BearerTypeTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.3 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.3 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ethint + Tier=Link.TierTable.271064565 + MCpr=MCprTable.4 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.4 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=tunnelnif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.6 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.6 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=qosppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.7 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.7 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=dummynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.8 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.8 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=hungrynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.9 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.9 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=spud-ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.5 + SCpr=SCprTable.4 + Protocol=ProtocolTable.3 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=spud-rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.5 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + FIELD_COUNT=7 +END_ADD + +##This record here is the template record for the IPProto level APs generated by CommsDat. +ADD_SECTION +# COMMDB_ID = 10 + ##This name is a predefined name for the template for the IPProto APs. + ##Please don't change it! + Name=IPProtoDefaultTemplate + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + FIELD_COUNT=6 +END_ADD + + +############################################################ +## IAP +## +[IAP] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Loopback_GRPS_1 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=1 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Loopback_GRPS_2 + IAPServiceType=OutgoingGPRS + IAPService=2 + IAPBearerType=ModemBearer + IAPBearer=2 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=Loopback_GRPS_3 + IAPServiceType=OutgoingGPRS + IAPService=3 + IAPBearerType=ModemBearer + IAPBearer=3 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=Loopback_GRPS_4 + IAPServiceType=OutgoingGPRS + IAPService=4 + IAPBearerType=ModemBearer + IAPBearer=4 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=Loopback_GRPS_5 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=3 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + + +############################################################ +## ConnectionPreferences +## +[ConnectionPreferences] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + Ranking=1 + Direction=OUTGOING + BearerSet=PSD + DialogPref=DONOTPROMPT + IAP=2 + FIELD_COUNT=7 +END_ADD + + +############################################################ +## UmtsR99QoSAndOn +## +[UmtsR99QoSAndOn] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=R99Default1 + 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=TRUE + SourceStatisticsDescriptor=0 + FIELD_COUNT=29 +END_ADD + +############################################################ +## TierTable +## +[TierTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=2048 + TierImplUid=271064536 + Name=Tier1 + TierThreadName=ESock_IP + TierManagerName=NetworkTierManager + DefaultAccessPoint=Link.AccessPointTable.10000 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=271064560 + TierImplUid=271064560 + Name=Tier2 + TierThreadName=ESock_IP + TierManagerName=ProtoTierManager + DefaultAccessPoint=Link.AccessPointTable.10001 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=271064565 + TierImplUid=271064565 + Name=Tier3 + TierThreadName=ESock_IP + TierManagerName=LinkTierManager +##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check +##on the link layer. However important that once this field has a value it has to be linked to a +##correct accesspoint record in the accesspoint table because this will be checked either. + DefaultAccessPoint=Link.AccessPointTable.1 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + + +############################################################ +## MCprTable +## +[MCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=netmcpr + MCprUid=271009095 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotomcpr + MCprUid=271064558 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=pppmcpr + MCprUid=271064556 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=ethmcpr + MCprUid=271064572 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=rawipmcpr + MCprUid=271064576 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=tunnelmcpr + MCprUid=271064578 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qospppmcpr + MCprUid=271064556 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=dummynifmcpr + MCprUid=271064580 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=hungrynifmcpr + MCprUid=271064580 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Id=10 + Name=pdpmcpr + MCprUid=271065840 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## CprTable +## +[CprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ipcpr + CprUid=270561519 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotocpr + CprUid=271064531 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=agentcpr + CprUid=271064552 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=vanillacpr + CprUid=271065843 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=pdpcpr + CprUid=271065826 + FIELD_COUNT=3 +END_ADD + +############################################################ +## SCprTable +## +[SCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ipscpr + SCprUid=0xFFFFFFFF + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotoscpr + SCprUid=271064529 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=agentscpr + SCprUid=271064554 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=pdpscpr + SCprUid=271065824 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=pppscpr + SCprUid=271065852 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=vanillascpr + SCprUid=271065844 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qosscpr + SCprUid=271065811 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=ipqosprotoscpr + SCprUid=271065816 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## ProtocolTable +## +[ProtocolTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=sapshim + ProtocolUid=270496898 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipshim4 + ProtocolUid=271064118 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=ppp + ProtocolUid=271064143 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=ethernet + ProtocolUid=271064539 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=rawip + ProtocolUid=271064562 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=tunnel + ProtocolUid=271064567 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qosppp + ProtocolUid=271064148 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=dummynif + ProtocolUid=271064123 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=hungrynif + ProtocolUid=271064125 + FIELD_COUNT=3 +END_ADD + diff -r e8d041006974 -r d15a50675083 networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_nosid_pdpcpr.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_nosid_pdpcpr.cfg Thu May 27 14:26:17 2010 +0300 @@ -0,0 +1,1042 @@ +############################################################ +## AUTO-GENERATED CONFIGURATION FILE +## CommsDat Database Dump Utility +## 1.1 +############################################################ + +############################################################ +## Network +## +[Network] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Intranet + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Intranet2 + FIELD_COUNT=2 +END_ADD + + +############################################################ +## ModemBearer +## +[ModemBearer] +ADD_TEMPLATE + Id=0 + 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 + Agent=NULLAGT + BCAStack=C32Bca + FIELD_COUNT=66 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Loopback_RawIP_1 + IfName=RAWIP + PortName=PKTLOOPBACK::501 + CSYName=PKTLOOPBACK + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Loopback_SPUD_2 + IfName=SPUD + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=Loopback_RawIP_3 + IfName=RAWIP + PortName=PKTLOOPBACK::503 + CSYName=PKTLOOPBACK + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=Loopback_SPUD_4 + IfName=SPUD + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=WinTunnel_SPUD_5 + IfName=SPUD + Agent=NULLAGT + FIELD_COUNT=4 +END_ADD + + +############################################################ +## Location +## +[Location] +ADD_TEMPLATE + Id=0 + Name=Default Location + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=9 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Office + IntlPrefixCode=00 + NatPrefixCode=0 + NatCode=44 + AreaCode=171 + DialOutCode=9, + Mobile=FALSE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Mobile + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=9 +END_ADD + + +############################################################ +## GlobalSettings +## +[GlobalSettings] +ADD_TEMPLATE + DefaultTier=Link.TierTable.2048 + FIELD_COUNT=1 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + ConnectionAttempts=2 + RedialAttempts=3 + SmsReceiveMode=2 + GPRSAttachMode=1 + AcceptIncomingGprs=1 + GPRSClassCBearer=GSM + ModemForDataAndFax=2 + ModemForPhoneServicesAndSMS=2 + LocationForDataAndFax=41878016 + LocationForPhoneServicesAndSMS=41878016 + MaxMBufHeap=41878016 + DefaultNetwork=33489152 + BearerAvailabilityCheckTSY=mm + FIELD_COUNT=15 +END_ADD + + +############################################################ +## OutgoingGPRS +## +[OutgoingGPRS] +ADD_TEMPLATE + Id=0 + 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 + 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 + Id=1 + Name=RawIP_Bounce_1 + PDPType=IPV4 + IfPromptForAuth=FALSE + IpNetMask=255.255.255.0 + IpAddrFromServer=FALSE + IpAddr=192.168.1.1 + IpDNSAddrFromServer=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=SPUD_Echo_2 + PDPType=IPV4 + IfParams=lowernif=RAWIP + IfPromptForAuth=FALSE + IpNetMask=255.255.255.0 + IpAddrFromServer=TRUE + IpAddr=192.168.1.2 + IpDNSAddrFromServer=TRUE + UmtsR99QoSAndOn=1 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=RawIP_Bounce_3 + PDPType=IPV4 + IfPromptForAuth=FALSE + IpAddrFromServer=FALSE + IpAddr=192.168.2.3 + IpDNSAddrFromServer=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=SPUD_Echo_4 + PDPType=IPV4 + IfParams=lowernif=RAWIP + IfPromptForAuth=FALSE + IpAddrFromServer=FALSE + IpAddr=192.168.2.4 + IpDNSAddrFromServer=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=9 +END_ADD + + +############################################################ +## DefaultGPRS +## +[DefaultGPRS] +ADD_SECTION +# COMMDB_ID = 1 + 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=20 +END_ADD + +############################################################ +## APPrioritySelectionPolicyTable +## +[APPrioritySelectionPolicyTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=SelectionPolicy1 + AP1=Link.AccessPointTable.10001 + APCOUNT=1 + FIELD_COUNT=4 +END_ADD + +############################################################ +## AccessPointTable +## +[AccessPointTable] +ADD_SECTION +# COMMDB_ID = 243 + Id=5 + Name=rawipMappedFromIAP5 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + AccessPointSelectionPolicy=0 + Cpr=CprTable.3 + CprConfig=5 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 245 + Id=4 + Name=spud-rawipMappedFromIAP4 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + AccessPointSelectionPolicy=0 + Cpr=CprTable.5 + CprConfig=4 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 247 + Id=3 + Name=rawipMappedFromIAP3 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + AccessPointSelectionPolicy=0 + Cpr=CprTable.3 + CprConfig=3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 249 + Id=2 + Name=spud-rawipMappedFromIAP2 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + AccessPointSelectionPolicy=0 + Cpr=CprTable.5 + CprConfig=2 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 251 + Id=1 + Name=rawipMappedFromIAP1 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + AccessPointSelectionPolicy=0 + Cpr=CprTable.3 + CprConfig=1 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 253 + Id=10001 + Name=IPProtoDefault + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + CustomSelectionPolicy=2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 254 + Id=10000 + Name=NetworkDefault + Tier=Link.TierTable.2048 + MCpr=MCprTable.1 + AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.1 + Cpr=CprTable.1 + SCpr=SCprTable.7 + Protocol=ProtocolTable.1 + FIELD_COUNT=8 +END_ADD + + +############################################################ +## BearerTypeTable +## +[BearerTypeTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.3 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.3 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ethint + Tier=Link.TierTable.271064565 + MCpr=MCprTable.4 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.4 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=tunnelnif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.6 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.6 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=qosppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.7 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.7 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=dummynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.8 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.8 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=hungrynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.9 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.9 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=spud-ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.5 + SCpr=SCprTable.4 + Protocol=ProtocolTable.3 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=spud-rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.5 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + FIELD_COUNT=7 +END_ADD + +##This record here is the template record for the IPProto level APs generated by CommsDat. +ADD_SECTION +# COMMDB_ID = 10 + ##This name is a predefined name for the template for the IPProto APs. + ##Please don't change it! + Name=IPProtoDefaultTemplate + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + FIELD_COUNT=6 +END_ADD + + +############################################################ +## IAP +## +[IAP] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Loopback_GRPS_1 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=1 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Loopback_GRPS_2 + IAPServiceType=OutgoingGPRS + IAPService=2 + IAPBearerType=ModemBearer + IAPBearer=2 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=Loopback_GRPS_3 + IAPServiceType=OutgoingGPRS + IAPService=3 + IAPBearerType=ModemBearer + IAPBearer=3 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=Loopback_GRPS_4 + IAPServiceType=OutgoingGPRS + IAPService=4 + IAPBearerType=ModemBearer + IAPBearer=4 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=Loopback_GRPS_5 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=3 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + + +############################################################ +## ConnectionPreferences +## +[ConnectionPreferences] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + Ranking=1 + Direction=OUTGOING + BearerSet=PSD + DialogPref=DONOTPROMPT + IAP=2 + FIELD_COUNT=7 +END_ADD + + +############################################################ +## UmtsR99QoSAndOn +## +[UmtsR99QoSAndOn] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=R99Default1 + 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=29 +END_ADD + + +############################################################ +## TierTable +## +[TierTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=2048 + TierImplUid=271064536 + Name=Tier1 + TierThreadName=ESock_IP + TierManagerName=NetworkTierManager + DefaultAccessPoint=Link.AccessPointTable.10000 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=271064560 + TierImplUid=271064560 + Name=Tier2 + TierThreadName=ESock_IP + TierManagerName=ProtoTierManager + DefaultAccessPoint=Link.AccessPointTable.10001 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=271064565 + TierImplUid=271064565 + Name=Tier3 + TierThreadName=ESock_IP + TierManagerName=LinkTierManager +##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check +##on the link layer. However important that once this field has a value it has to be linked to a +##correct accesspoint record in the accesspoint table because this will be checked either. + DefaultAccessPoint=Link.AccessPointTable.1 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + + +############################################################ +## MCprTable +## +[MCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=netmcpr + MCprUid=271009095 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotomcpr + MCprUid=271064558 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=pppmcpr + MCprUid=271064556 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=ethmcpr + MCprUid=271064572 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=rawipmcpr + MCprUid=271064576 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=tunnelmcpr + MCprUid=271064578 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qospppmcpr + MCprUid=271064556 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=dummynifmcpr + MCprUid=271064580 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=hungrynifmcpr + MCprUid=271064580 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Id=10 + Name=pdpmcpr + MCprUid=271065840 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## CprTable +## +[CprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ipcpr + CprUid=270561519 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotocpr + CprUid=271064531 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=agentcpr + CprUid=271064552 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=vanillacpr + CprUid=271065843 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=pdpcpr + CprUid=271065826 + FIELD_COUNT=3 +END_ADD + +############################################################ +## SCprTable +## +[SCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ipscpr + SCprUid=0xFFFFFFFF + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotoscpr + SCprUid=271064529 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=agentscpr + SCprUid=271064554 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=pdpscpr + SCprUid=271065824 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=pppscpr + SCprUid=271065852 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=vanillascpr + SCprUid=271065844 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qosscpr + SCprUid=271065811 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=ipqosprotoscpr + SCprUid=271065816 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## ProtocolTable +## +[ProtocolTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=sapshim + ProtocolUid=270496898 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipshim4 + ProtocolUid=271064118 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=ppp + ProtocolUid=271064143 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=ethernet + ProtocolUid=271064539 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=rawip + ProtocolUid=271064562 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=tunnel + ProtocolUid=271064567 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qosppp + ProtocolUid=271064148 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=dummynif + ProtocolUid=271064123 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=hungrynif + ProtocolUid=271064125 + FIELD_COUNT=3 +END_ADD + diff -r e8d041006974 -r d15a50675083 networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_pdpcpr.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_pdpcpr.cfg Thu May 27 14:26:17 2010 +0300 @@ -0,0 +1,1044 @@ +############################################################ +## AUTO-GENERATED CONFIGURATION FILE +## CommsDat Database Dump Utility +## 1.1 +############################################################ + +############################################################ +## Network +## +[Network] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Intranet + FIELD_COUNT=2 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Intranet2 + FIELD_COUNT=2 +END_ADD + + +############################################################ +## ModemBearer +## +[ModemBearer] +ADD_TEMPLATE + Id=0 + 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 + Agent=NULLAGT + BCAStack=C32Bca + FIELD_COUNT=66 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Loopback_RawIP_1 + IfName=RAWIP + PortName=PKTLOOPBACK::501 + CSYName=PKTLOOPBACK + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Loopback_SPUD_2 + IfName=SPUD + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=Loopback_RawIP_3 + IfName=RAWIP + PortName=PKTLOOPBACK::503 + CSYName=PKTLOOPBACK + FIELD_COUNT=5 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=Loopback_SPUD_4 + IfName=SPUD + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=WinTunnel_SPUD_5 + IfName=SPUD + Agent=NULLAGT + FIELD_COUNT=4 +END_ADD + + +############################################################ +## Location +## +[Location] +ADD_TEMPLATE + Id=0 + Name=Default Location + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=9 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Office + IntlPrefixCode=00 + NatPrefixCode=0 + NatCode=44 + AreaCode=171 + DialOutCode=9, + Mobile=FALSE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Mobile + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=9 +END_ADD + + +############################################################ +## GlobalSettings +## +[GlobalSettings] +ADD_TEMPLATE + DefaultTier=Link.TierTable.2048 + FIELD_COUNT=1 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + ConnectionAttempts=2 + RedialAttempts=3 + SmsReceiveMode=2 + GPRSAttachMode=1 + AcceptIncomingGprs=1 + GPRSClassCBearer=GSM + ModemForDataAndFax=2 + ModemForPhoneServicesAndSMS=2 + LocationForDataAndFax=41878016 + LocationForPhoneServicesAndSMS=41878016 + MaxMBufHeap=41878016 + DefaultNetwork=33489152 + BearerAvailabilityCheckTSY=mm + FIELD_COUNT=15 +END_ADD + + +############################################################ +## OutgoingGPRS +## +[OutgoingGPRS] +ADD_TEMPLATE + Id=0 + 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 + 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 + Id=1 + Name=RawIP_Bounce_1 + PDPType=IPV4 + IfPromptForAuth=FALSE + IpNetMask=255.255.255.0 + IpAddrFromServer=FALSE + IpAddr=192.168.1.1 + IpDNSAddrFromServer=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=SPUD_Echo_2 + PDPType=IPV4 + IfParams=lowernif=RAWIP + IfPromptForAuth=FALSE + IpNetMask=255.255.255.0 + IpAddrFromServer=TRUE + IpAddr=192.168.1.2 + IpDNSAddrFromServer=TRUE + UmtsR99QoSAndOn=1 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=RawIP_Bounce_3 + PDPType=IPV4 + IfPromptForAuth=FALSE + IpAddrFromServer=FALSE + IpAddr=192.168.2.3 + IpDNSAddrFromServer=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=SPUD_Echo_4 + PDPType=IPV4 + IfParams=lowernif=RAWIP + IfPromptForAuth=FALSE + IpAddrFromServer=FALSE + IpAddr=192.168.2.4 + IpDNSAddrFromServer=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=9 +END_ADD + + +############################################################ +## DefaultGPRS +## +[DefaultGPRS] +ADD_SECTION +# COMMDB_ID = 1 + 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=20 +END_ADD + +############################################################ +## APPrioritySelectionPolicyTable +## +[APPrioritySelectionPolicyTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=SelectionPolicy1 + AP1=Link.AccessPointTable.10001 + APCOUNT=1 + FIELD_COUNT=4 +END_ADD + +############################################################ +## AccessPointTable +## +[AccessPointTable] +ADD_SECTION +# COMMDB_ID = 243 + Id=5 + Name=rawipMappedFromIAP5 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + AccessPointSelectionPolicy=0 + Cpr=CprTable.3 + CprConfig=5 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 245 + Id=4 + Name=spud-rawipMappedFromIAP4 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + AccessPointSelectionPolicy=0 + Cpr=CprTable.5 + CprConfig=4 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 247 + Id=3 + Name=rawipMappedFromIAP3 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + AccessPointSelectionPolicy=0 + Cpr=CprTable.3 + CprConfig=3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 249 + Id=2 + Name=spud-rawipMappedFromIAP2 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + AccessPointSelectionPolicy=0 + Cpr=CprTable.5 + CprConfig=2 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 251 + Id=1 + Name=rawipMappedFromIAP1 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + AccessPointSelectionPolicy=0 + Cpr=CprTable.3 + CprConfig=1 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 253 + Id=10001 + Name=IPProtoDefault + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + CustomSelectionPolicy=2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + FIELD_COUNT=8 +END_ADD + +ADD_SECTION +# COMMDB_ID = 254 + Id=10000 + Name=NetworkDefault + Tier=Link.TierTable.2048 + MCpr=MCprTable.1 + AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.1 + Cpr=CprTable.1 + SCpr=SCprTable.7 + Protocol=ProtocolTable.1 + FIELD_COUNT=8 +END_ADD + + +############################################################ +## BearerTypeTable +## +[BearerTypeTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.3 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.3 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ethint + Tier=Link.TierTable.271064565 + MCpr=MCprTable.4 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.4 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=tunnelnif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.6 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.6 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=qosppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.7 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.7 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=dummynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.8 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.8 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=hungrynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.9 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.9 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=spud-ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.5 + SCpr=SCprTable.4 + Protocol=ProtocolTable.3 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=spud-rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.5 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + FIELD_COUNT=7 +END_ADD + +##This record here is the template record for the IPProto level APs generated by CommsDat. +ADD_SECTION +# COMMDB_ID = 10 + ##This name is a predefined name for the template for the IPProto APs. + ##Please don't change it! + Name=IPProtoDefaultTemplate + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + FIELD_COUNT=6 +END_ADD + + +############################################################ +## IAP +## +[IAP] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Loopback_GRPS_1 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=1 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=Location.2 + IAPAppSid=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Loopback_GRPS_2 + IAPServiceType=OutgoingGPRS + IAPService=2 + IAPBearerType=ModemBearer + IAPBearer=2 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=Location.2 + IAPAppSid=270548991 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=Loopback_GRPS_3 + IAPServiceType=OutgoingGPRS + IAPService=3 + IAPBearerType=ModemBearer + IAPBearer=3 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=Loopback_GRPS_4 + IAPServiceType=OutgoingGPRS + IAPService=4 + IAPBearerType=ModemBearer + IAPBearer=4 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=Loopback_GRPS_5 + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=3 + IAPNetwork=2 + IAPNetworkWeighting=0 + Location=Location.2 + FIELD_COUNT=9 +END_ADD + + +############################################################ +## ConnectionPreferences +## +[ConnectionPreferences] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + Ranking=1 + Direction=OUTGOING + BearerSet=PSD + DialogPref=DONOTPROMPT + IAP=2 + FIELD_COUNT=7 +END_ADD + + +############################################################ +## UmtsR99QoSAndOn +## +[UmtsR99QoSAndOn] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=R99Default1 + 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=29 +END_ADD + + +############################################################ +## TierTable +## +[TierTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=2048 + TierImplUid=271064536 + Name=Tier1 + TierThreadName=ESock_IP + TierManagerName=NetworkTierManager + DefaultAccessPoint=Link.AccessPointTable.10000 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=271064560 + TierImplUid=271064560 + Name=Tier2 + TierThreadName=ESock_IP + TierManagerName=ProtoTierManager + DefaultAccessPoint=Link.AccessPointTable.10001 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=271064565 + TierImplUid=271064565 + Name=Tier3 + TierThreadName=ESock_IP + TierManagerName=LinkTierManager + ##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check + ##on the link layer. However important that once this field has a value it has to be linked to a + ##correct accesspoint record in the accesspoint table because this will be checked either. + DefaultAccessPoint=Link.AccessPointTable.1 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + + +############################################################ +## MCprTable +## +[MCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=netmcpr + MCprUid=271009095 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotomcpr + MCprUid=271064558 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=pppmcpr + MCprUid=271064556 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=ethmcpr + MCprUid=271064572 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=rawipmcpr + MCprUid=271064576 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=tunnelmcpr + MCprUid=271064578 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qospppmcpr + MCprUid=271064556 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=dummynifmcpr + MCprUid=271064580 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=hungrynifmcpr + MCprUid=271064580 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Id=10 + Name=pdpmcpr + MCprUid=271065840 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## CprTable +## +[CprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ipcpr + CprUid=270561519 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotocpr + CprUid=271064531 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=agentcpr + CprUid=271064552 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=vanillacpr + CprUid=271065843 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=pdpcpr + CprUid=271065826 + FIELD_COUNT=3 +END_ADD + +############################################################ +## SCprTable +## +[SCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ipscpr + SCprUid=0xFFFFFFFF + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotoscpr + SCprUid=271064529 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=agentscpr + SCprUid=271064554 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=pdpscpr + SCprUid=271065824 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=pppscpr + SCprUid=271065852 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=vanillascpr + SCprUid=271065844 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qosscpr + SCprUid=271065811 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=ipqosprotoscpr + SCprUid=271065816 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## ProtocolTable +## +[ProtocolTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=sapshim + ProtocolUid=270496898 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipshim4 + ProtocolUid=271064118 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=ppp + ProtocolUid=271064143 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=ethernet + ProtocolUid=271064539 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=rawip + ProtocolUid=271064562 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=tunnel + ProtocolUid=271064567 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qosppp + ProtocolUid=271064148 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=dummynif + ProtocolUid=271064123 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=hungrynif + ProtocolUid=271064125 + FIELD_COUNT=3 +END_ADD + diff -r e8d041006974 -r d15a50675083 networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/group/bld.inf --- a/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/group/bld.inf Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/group/bld.inf Thu May 27 14:26:17 2010 +0300 @@ -42,10 +42,18 @@ ../scripts/CIT_P635_Setup_QosPolicies2.script z:/testdata/scripts/cit_p635_setup_qospolicies2.script ../scripts/Restore_QosPolicies.script z:/testdata/scripts/restore_qospolicies.script #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY + +#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW +../configs/te_dedicatedsignalling1ryctx_pdpcpr.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx.cfg +../configs/te_dedicatedsignalling1ryctx_changedsid_pdpcpr.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx_changedsid.cfg +../configs/te_dedicatedsignalling1ryctx_imssi_pdpcpr.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx_imssi.cfg +../configs/te_dedicatedsignalling1ryctx_nosid_pdpcpr.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx_nosid.cfg +#else ../configs/te_dedicatedsignalling1ryctx.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx.cfg ../configs/te_dedicatedsignalling1ryctx_changedsid.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx_changedsid.cfg ../configs/te_dedicatedsignalling1ryctx_imssi.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx_imssi.cfg ../configs/te_dedicatedsignalling1ryctx_nosid.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx_nosid.cfg +#endif //#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW ../scripts/te_dedicatedsignalling1ryctx_post401.script z:/testdata/scripts/te_dedicatedsignalling1ryctx.script diff -r e8d041006974 -r d15a50675083 networkingtestandutils/networkingintegrationtest/te_Sblp/configs/te_sblp_mesh_pdpcpr.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkingtestandutils/networkingintegrationtest/te_Sblp/configs/te_sblp_mesh_pdpcpr.cfg Thu May 27 14:26:17 2010 +0300 @@ -0,0 +1,1477 @@ +############################################################ +## HAND-GENERATED CONFIGURATION FILE +## +## Start at the GlobalSettings table and ConnectionPreferences table +############################################################ + +############################################################ +## Network +## +[Network] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Intranet + FIELD_COUNT=2 +END_ADD + + +############################################################ +## ModemBearer +## +[ModemBearer] +ADD_TEMPLATE + Id=0 + Name=Default Loopback Modem + IfName=PPP + PortName=PKTLOOPBACK::502 + TSYName=SIM + CSYName=PKTLOOPBACK + LastSocketActivityTimeout=6 + LastSessionClosedTimeout=180 + LastSocketClosedTimeout=10 + DataBits=8 + StopBits=1 + Parity=NONE + Rate=115200 + Handshaking=0 + SpecialRate=0 + XonChar=0 + XoffChar=0 + FaxClassPref=AUTO + SpeakerPref=AFTERDIALUNTILANSWER + 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 + Agent=NULLAGT + FIELD_COUNT=63 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Name=Loopback_RawIP_1 + IfName=RAWIP + PortName=PKTLOOPBACK::502 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Name=Loopback_RawIP_3 + IfName=RAWIP + PortName=PKTLOOPBACK::508 + FIELD_COUNT=3 +END_ADD + + + +############################################################ +## LANBearer +## +[LANBearer] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Assabet on-board Ethernet + IfName=ethint + LDDName=not used + PDDName=not used + LastSocketActivityTimeout=-1 + LastSessionClosedTimeout=-1 + LastSocketClosedTimeout=-1 + Agent=nullagent.agt + FIELD_COUNT=9 +END_ADD + + +############################################################ +## Location +## +[Location] +ADD_TEMPLATE + Id=0 + Name=Default Location + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=9 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Office + IntlPrefixCode=00 + NatPrefixCode=0 + NatCode=44 + AreaCode=171 + DialOutCode=9, + Mobile=FALSE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=11 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Office Direct Dial + IntlPrefixCode=00 + NatPrefixCode=0 + NatCode=44 + AreaCode=171 + Mobile=FALSE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=Mobile + IntlPrefixCode=+ + NatPrefixCode=0 + NatCode=44 + Mobile=TRUE + UsePulseDial=FALSE + WaitForDialTone=FALSE + PauseAfterDialout=0 + FIELD_COUNT=9 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=Home + IntlPrefixCode=00 + NatPrefixCode=0 + NatCode=44 + AreaCode=181 + Mobile=FALSE + UsePulseDial=TRUE + WaitForDialTone=TRUE + PauseAfterDialout=0 + FIELD_COUNT=10 +END_ADD + + +############################################################ +## Chargecard +## +[Chargecard] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Dummy BT Chargecard + AccountNumber=144,12345678 + Pin=0000 + LocalRule=HG + NatRule=HFG + IntlRule=HEFG + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=Dummy Mercury Chargecard + AccountNumber=0500800800,,12345678 + Pin=**** + LocalRule=HG + NatRule=J,K,0FG + IntlRule=HEFG + FIELD_COUNT=7 +END_ADD + +############################################################ +## GlobalSettings +## +## links to Tier table +## DefaultTier = 271064536 Tier1 ESock_IP NetworkTierManager +## No defaultSnap - therefore 399 selection chosen +## +[GlobalSettings] +ADD_TEMPLATE + DefaultTier=Link.TierTable.2048 + FIELD_COUNT=1 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + ConnectionAttempts=2 + RedialAttempts=3 + SmsBearer=0 + SmsReceiveMode=2 + GPRSAttachMode=1 + AcceptIncomingGprs=1 + GPRSClassCBearer=GSM + ModemForDataAndFax=1 + ModemForPhoneServicesAndSMS=1 + LocationForDataAndFax=1 + LocationForPhoneServicesAndSMS=1 + MaxMBufHeap=41877760 + DefaultNetwork=1 + BearerAvailabilityCheckTSY=SIM + FIELD_COUNT=16 +END_ADD + +############################################################ +## DialOutISP +## +[DialOutISP] +ADD_TEMPLATE + Id=0 + Name=Default Dial Out ISP + DialResolution=TRUE + UseLoginScript=FALSE + PromptForLogin=TRUE + DisplayPCT=FALSE + IfPromptForAuth=TRUE + IfCallbackEnabled=FALSE + IpAddrFromServer=TRUE + IpDNSAddrFromServer=TRUE + EnableIPHeaderComp=FALSE + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + EnableSWComp=FALSE + BearerService=0 + BearerProtocol=UNSPECIFIED + RlpVersion=0 + IwfToMs=0 + MsToIwf=0 + AckTimer=0 + RetransmissionAttempts=0 + ResequencePeriod=0 + V42Compression=0 + V42Codewords=0 + V42MaxLength=0 + Asymmetry=0 + UserInitUpgrade=FALSE + UseEdge=FALSE + FIELD_COUNT=28 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=NT RAS + Type=INTERNETONLY + DialResolution=TRUE + UseLoginScript=TRUE + LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n + PromptForLogin=FALSE + LoginName=RasUser + DisplayPCT=FALSE + IfNetworks=ip + IfPromptForAuth=FALSE + IfAuthName=RasUser + IfAuthPass=pass + AuthRetries=0 + IfCallbackEnabled=FALSE + CallbackTimeout=0 + IpAddrFromServer=TRUE + IpDNSAddrFromServer=TRUE + EnableIPHeaderComp=FALSE + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + EnableSWComp=FALSE + BearerName=ASYNCHRONOUS + BearerSpeed=UNSPECIFIED + BearerCE=UNSPECIFIED + BearerType=CSD + ChannelCoding=UNSPECIFIED + Aiur=0 + RequestedTimeSlots=0 + MaximumTimeSlots=0 + BearerService=0 + BearerProtocol=UNSPECIFIED + RlpVersion=0 + IwfToMs=0 + MsToIwf=0 + AckTimer=0 + RetransmissionAttempts=0 + ResequencePeriod=0 + V42Compression=0 + V42Codewords=0 + V42MaxLength=0 + Asymmetry=0 + UserInitUpgrade=FALSE + UseEdge=FALSE + FIELD_COUNT=44 +END_ADD + + +############################################################ +## DialInISP +## +[DialInISP] +ADD_TEMPLATE + Id=0 + Name=Default Dial In ISP + UseLoginScript=FALSE + IpAddrFromServer=TRUE + IpDNSAddrFromServer=TRUE + EnableIPHeaderComp=FALSE + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + EnableSWComp=FALSE + UseEdge=FALSE + FIELD_COUNT=10 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Dial In CS ISP + UseLoginScript=FALSE + IpAddrFromServer=TRUE + IpDNSAddrFromServer=TRUE + EnableIPHeaderComp=FALSE + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + EnableSWComp=FALSE + UseEdge=FALSE + FIELD_COUNT=10 +END_ADD + + +############################################################ +## OutgoingGPRS +## +[OutgoingGPRS] +ADD_TEMPLATE + Id=0 + 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=194.72.6.1 + IpAddrFromServer=FALSE + IpAddr=192.168.1.1 + IpDNSAddrFromServer=FALSE + IpNameServer1=194.72.6.51 + IpNameServer2=194.72.6.51 + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + UmtsR99QoSAndOn=1 + FIELD_COUNT=32 +END_TEMPLATE + +ADD_SECTION +## +## Links from IAP table +## Links to +## +# COMMDB_ID = 1 + Id=1 + Name=SPUD + PDPType=IPV4 + IfParams=lowernif=RawIP + IfPromptForAuth=FALSE + IpAddrFromServer=FALSE + IpAddr=192.168.1.1 + IpDNSAddrFromServer=FALSE + FIELD_COUNT=8 +END_ADD + + +############################################################ +## IncomingGPRS +## +[IncomingGPRS] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Dummy Incoming GPRS Settings + APN=Test + PDPType=IPV4 + PDPAddress=0.0.0.0 + ReqPrecedence=1 + ReqDelay=1 + ReqReliability=1 + ReqPeakThroughput=1 + ReqMeanThroughput=1 + MinPrecedence=1 + MinDelay=1 + MinReliability=1 + MinPeakThroughput=1 + MinMeanThroughput=1 + DataCompression=FALSE + HeaderCompression=FALSE + GprsUseEdge=FALSE + AnonymousAccess=FALSE + IfNetworks=ip + IfPromptForAuth=FALSE + IfAuthName=RasUser + IfAuthPass=pass + AuthRetries=1 + IpAddrFromServer=FALSE + IpAddr=192.168.1.1 + IpDNSAddrFromServer=FALSE + IpNameServer1=194.72.6.51 + IpNameServer2=194.72.6.51 + EnableLCPExtension=FALSE + DisablePlainTextAuth=FALSE + FIELD_COUNT=30 +END_ADD + + +############################################################ +## DefaultGPRS +## +[DefaultGPRS] +ADD_SECTION +# COMMDB_ID = 1 + 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=20 +END_ADD + +############################################################ +## CDMA2000PacketServiceTable +## +[CDMA2000PacketServiceTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=test name cdma2000 + IwfName=Test2000 + ServiceOption=HIGHSPEEDCDMA2000DATA + PDPType=IPV4 + ReqFwdPriority=PRIORITY04 + ReqRevPriority=PRIORITY04 + ReqFwdBitrate=32KBPS + ReqRevBitrate=32KBPS + ReqFwdLoss=LOSS1 + ReqRevLoss=LOSS1 + ReqFwdMaxdelay=40MS + ReqRevMaxdelay=40MS + MinFwdBitrate=8KBPS + MinRevBitrate=8KBPS + AccptFwdLoss=LOSS2 + AccptRevLoss=LOSS2 + AccptFwdMaxdelay=120MS + AccptRevMaxdelay=120MS + DataCompression=FALSE + AnonymousAccess=FALSE + IfNetworks=ip + IfPromptForAuth=FALSE + IfAuthName=RasUser + IfAuthPass=pass + AuthRetries=1 + IpNetMask=0.255.255.255 + IpGateway=10.0.0.1 + IpAddrFromServer=TRUE + IpDNSAddrFromServer=TRUE + EnableLCPExtension=TRUE + DisablePlainTextAuth=TRUE + ApType=2 + RlpMode=UNKNOWN + CDMAMobileIP=FALSE + CDMAMobileIPTimeout=10000000 + FIELD_COUNT=36 +END_ADD + + +############################################################ +## LANService +## +[LANService] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Ethernet + IfNetworks=ip,ip6 + IpNetMask=255.255.255.0 + IpGateway=194.72.6.1 + IpAddrFromServer=TRUE + IpAddr=192.168.0.100 + IpDNSAddrFromServer=FALSE + IpNameServer1=194.72.6.51 + IpNameServer2=194.72.6.52 + FIELD_COUNT=10 +END_ADD + +############################################################ +## APPrioritySelectionPolicyTable +## +## Links from AccessPointTable +## Links to the next layer in the AccessPointTable +## +[APPrioritySelectionPolicyTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=SelectionPolicy1 + AP1=Link.AccessPointTable.10001 + APCOUNT=1 + FIELD_COUNT=4 +END_ADD + +############################################################ +## AccessPointTable +## +## Links from TierTable +## When 399 selection selected in GlobalSettings this Links to APPrioritySelectionPolicyTable +## Bearer tier links to IAP table +## +[AccessPointTable] + +ADD_SECTION +## +## Links to IAP table +## Links to nodes in bearer layer +## Id = 1 is IAP1 +## SelectionPolicy zero marks the end of the 399 selection process +## Consistent with spud-rawip BearerTypeTable entry +## +# COMMDB_ID = 251 + Id=1 + Name=MappedFromIAP1 + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + AccessPointSelectionPolicy=0 + Cpr=CprTable.8 + CprConfig=1 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + AppSID=0 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +## +## Links to AccessPointTable next layer +## SelectionPolicy AccessPointTable entry 1 and IAP table entry 1 +## +# COMMDB_ID = 253 + Id=10001 + Name=IPProtoDefault + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + AccessPointSelectionPolicy=0 + Cpr=CprTable.2 + CprConfig=1 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + CustomSelectionPolicy=1 + FIELD_COUNT=10 +END_ADD + +ADD_SECTION +## +## Links from TierTable +## When 399 selection selected in GlobalSettings this Links to APPrioritySelectionPolicyTable +## Id 10000 linked from TierTable +## SelectionPolicy APPrioritySelectionPolicyTable entry 1 +## +# COMMDB_ID = 254 + Id=10000 + Name=NetworkDefault + Tier=Link.TierTable.2048 + MCpr=MCprTable.1 + AccessPointSelectionPolicy=APPrioritySelectionPolicyTable.1 + Cpr=CprTable.1 + SCpr=SCprTable.1 + Protocol=ProtocolTable.1 + FIELD_COUNT=8 +END_ADD + + +############################################################ +## BearerTypeTable +## +## Links from ModemBearer table +## Links to the bearer layer nodes +## Consistent with the selected AccessPointTable +## +## +[BearerTypeTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.3 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.3 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ethint + Tier=Link.TierTable.271064565 + MCpr=MCprTable.4 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.4 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.5 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.5 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=tunnelnif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.6 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.6 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=qosppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.7 + Cpr=CprTable.3 + SCpr=SCprTable.5 + Protocol=ProtocolTable.7 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=dummynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.8 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.8 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=hungrynif + Tier=Link.TierTable.271064565 + MCpr=MCprTable.9 + Cpr=CprTable.3 + SCpr=SCprTable.3 + Protocol=ProtocolTable.9 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=spud-ppp + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.4 + SCpr=SCprTable.4 + Protocol=ProtocolTable.3 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +## +## Links from ModemBearer table +## Links to bearer layer nodes +## Consistent with the selected AccessPointTable +## +# COMMDB_ID = 9 + Id=9 + Name=spud-rawip + Tier=Link.TierTable.271064565 + MCpr=MCprTable.10 + Cpr=CprTable.8 + SCpr=SCprTable.4 + Protocol=ProtocolTable.5 + FIELD_COUNT=7 +END_ADD + +##This record here is the template record for the IPProto level APs generated by CommsDat. +ADD_SECTION +# COMMDB_ID = 10 + ##This name is a predefined name for the template for the IPProto APs. + ##Please don't change it! + Name=IPProtoDefaultTemplate + Tier=Link.TierTable.271064560 + MCpr=MCprTable.2 + Cpr=CprTable.2 + SCpr=SCprTable.2 + Protocol=ProtocolTable.2 + FIELD_COUNT=6 +END_ADD + + +############################################################ +## IAP +## +## Linked from ConnectionPreferences +## Links to several tables +## OutgoingGPRS entry SPUD +## ModemBearer entry 1 Null Modem 115200bps +## +## +[IAP] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=GPRS + IAPServiceType=OutgoingGPRS + IAPService=1 + IAPBearerType=ModemBearer + IAPBearer=1 + IAPNetwork=1 + IAPNetworkWeighting=0 + Location=Location.1 + FIELD_COUNT=9 +END_ADD + +############################################################ +## Proxies +## +[Proxies] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + ISP=1 + ProxyServiceType=DialOutISP + UseProxyServer=TRUE + ProxyServerName=www.dummyproxy.com + ProtocolName=http + PortNumber=80 + Exceptions=www.dummyproxy.com/exception + FIELD_COUNT=9 +END_ADD + + +############################################################ +## WAPAccessPoint +## +[WAPAccessPoint] +ADD_TEMPLATE + Id=0 + Name=Default Dial In ISP + CurrentBearer=WAPIPBearer + FIELD_COUNT=3 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=Dummy WAP Settings + CurrentBearer=WAPIPBearer + StartPage=www.wapstart.com + FIELD_COUNT=4 +END_ADD + + +############################################################ +## WAPIPBearer +## +[WAPIPBearer] +ADD_TEMPLATE + Id=0 + Name=DefaultRecordName-1 + AccessPointId=0 + IAP=0 + WSPOption=CONNECTIONLESS + Security=FALSE + ProxyPortNumber=0 + FIELD_COUNT=7 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-2 + AccessPointId=58654976 + GatewayAddress=www.wapgateway.com + IAP=50266624 + WSPOption=CONNECTIONORIENTED + Security=FALSE + ProxyPortNumber=1 + FIELD_COUNT=8 +END_ADD + + +############################################################ +## WAPSMSBearer +## +[WAPSMSBearer] +ADD_TEMPLATE + Id=0 + Name=DefaultRecordName-1 + AccessPointId=0 + WSPOption=CONNECTIONLESS + Security=FALSE + FIELD_COUNT=5 +END_TEMPLATE + +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-2 + AccessPointId=1 + GatewayAddress=+4412345678901 + ServiceCentreAddress=+442071234567 + WSPOption=CONNECTIONORIENTED + Security=FALSE + FIELD_COUNT=7 +END_ADD + + +############################################################ +## SecureSocketTable +## +[SecureSocketTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + ProtocolName=ssl3.0 + ProtoLibrary=ssladaptor.dll + FIELD_COUNT=4 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=DefaultRecordName-2 + ProtocolName=tls1.0 + ProtoLibrary=ssladaptor.dll + FIELD_COUNT=4 +END_ADD + +############################################################ +## TierTable +## +## Links from GlobalSettings +## Links to AccessPointTable +## +[TierTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=2048 + TierImplUid=271064536 + Name=Tier1 + TierThreadName=ESock_IP + TierManagerName=NetworkTierManager + DefaultAccessPoint=Link.AccessPointTable.10000 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=271064560 + TierImplUid=271064560 + Name=Tier2 + TierThreadName=ESock_IP + TierManagerName=ProtoTierManager + DefaultAccessPoint=Link.AccessPointTable.10001 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=271064565 + TierImplUid=271064565 + Name=Tier3 + TierThreadName=ESock_IP + TierManagerName=LinkTierManager +##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check +##on the link layer. However important that once this field has a value it has to be linked to a +##correct accesspoint record in the accesspoint table because this will be checked either. + DefaultAccessPoint=Link.AccessPointTable.1 + PromptUser=0 + FIELD_COUNT=7 +END_ADD + + +############################################################ +## MCprTable +## +[MCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=netmcpr + MCprUid=271009095 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotomcpr + MCprUid=271064558 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=pppmcpr + MCprUid=271064556 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=ethmcpr + MCprUid=271064572 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=rawipmcpr + MCprUid=271064576 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=tunnelmcpr + MCprUid=271064578 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qospppmcpr + MCprUid=271064556 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=dummynifmcpr + MCprUid=271064580 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=hungrynifmcpr + MCprUid=271064580 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Id=10 + Name=pdpmcpr + MCprUid=271065840 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 11 + Id=11 + Name=sipmcpr + MCprUid=536887801 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 12 + Id=12 + Name=btgenericmcpr + MCprUid=271070577 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 13 + Id=13 + Name=panethermcpr + MCprUid=271070626 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## CprTable +## +[CprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ipcpr + CprUid=270561519 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotocpr + CprUid=271064531 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=agentcpr + CprUid=271064552 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=vanillacpr + CprUid=271065843 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=sipcpr + CprUid=271010872 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=avctpcpr + CprUid=271030184 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=tunnelagentcpr + CprUid=271080968 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=pdpcpr + CprUid=271065826 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## SCprTable +## +[SCprTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=ipscpr + SCprUid=271065811 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipprotoscpr + SCprUid=271064529 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=agentscpr + SCprUid=271064554 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=pdpscpr + SCprUid=271065824 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=pppscpr + SCprUid=271065852 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=vanillascpr + SCprUid=271065844 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qosscpr + SCprUid=271065811 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=sipscpr + SCprUid=271010839 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=avctpsaplinksmgr + SCprUid=271030185 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Id=10 + Name=avctpmuxer + SCprUid=271030186 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## ProtocolTable +## +[ProtocolTable] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=sapshim + ProtocolUid=270496898 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=ipshim4 + ProtocolUid=271064118 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 3 + Id=3 + Name=ppp + ProtocolUid=271064143 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 4 + Id=4 + Name=ethernet + ProtocolUid=271064539 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 5 + Id=5 + Name=rawip + ProtocolUid=271064562 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 6 + Id=6 + Name=tunnel + ProtocolUid=271064567 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 7 + Id=7 + Name=qosppp + ProtocolUid=271064148 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 8 + Id=8 + Name=dummynif + ProtocolUid=271064123 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 9 + Id=9 + Name=hungrynif + ProtocolUid=271064125 + FIELD_COUNT=3 +END_ADD + +ADD_SECTION +# COMMDB_ID = 10 + Id=10 + Name=panether + ProtocolUid=271070627 + FIELD_COUNT=3 +END_ADD + + +############################################################ +## ConnectionPreferences +## +## Links to +## IAP = 1 - GPRS - IAPService = SPUD - ModemBearer - Null Modem 115200bps - IAPNetwork = 1 +## BearerSet=PSD +## +[ConnectionPreferences] +ADD_SECTION +# COMMDB_ID = 1 + Id=1 + Name=DefaultRecordName-1 + Ranking=0 + Direction=INCOMING + BearerSet=PSD + DialogPref=DONOTPROMPT + IAP=1 + FIELD_COUNT=7 +END_ADD + +ADD_SECTION +# COMMDB_ID = 2 + Id=2 + Name=DefaultRecordName-2 + Ranking=1 + Direction=OUTGOING + BearerSet=PSD + DialogPref=DONOTPROMPT + IAP=1 + FIELD_COUNT=7 +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 + +############################################################ +## 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 e8d041006974 -r d15a50675083 networkingtestandutils/networkingintegrationtest/te_Sblp/group/bld.inf --- a/networkingtestandutils/networkingintegrationtest/te_Sblp/group/bld.inf Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/networkingintegrationtest/te_Sblp/group/bld.inf Thu May 27 14:26:17 2010 +0300 @@ -17,19 +17,27 @@ PRJ_TESTEXPORTS + +#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW +../configs/te_Sblp_Mesh_pdpcpr.cfg /epoc32/release/wins/udeb/z/testdata/configs/te_sblp_mesh.cfg +../configs/te_Sblp_Mesh_pdpcpr.cfg /epoc32/release/wins/urel/z/testdata/configs/te_sblp_mesh.cfg +../configs/te_Sblp_Mesh_pdpcpr.cfg /epoc32/release/winscw/udeb/z/testdata/configs/te_sblp_mesh.cfg +../configs/te_Sblp_Mesh_pdpcpr.cfg /epoc32/release/winscw/urel/z/testdata/configs/te_sblp_mesh.cfg +#else ../configs/te_Sblp_Mesh.cfg /epoc32/release/wins/udeb/z/testdata/configs/te_sblp_mesh.cfg ../configs/te_Sblp_Mesh.cfg /epoc32/release/wins/urel/z/testdata/configs/te_sblp_mesh.cfg ../configs/te_Sblp_Mesh.cfg /epoc32/release/winscw/udeb/z/testdata/configs/te_sblp_mesh.cfg ../configs/te_Sblp_Mesh.cfg /epoc32/release/winscw/urel/z/testdata/configs/te_sblp_mesh.cfg +#endif //#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW ../configs/te_SblpSuite_simtsy.txt /epoc32/release/wins/udeb/z/testdata/configs/te_sblpsuite_simtsy.txt ../configs/te_SblpSuite_simtsy.txt /epoc32/release/wins/urel/z/testdata/configs/te_sblpsuite_simtsy.txt ../configs/te_SblpSuite_simtsy.txt /epoc32/release/winscw/udeb/z/testdata/configs/te_sblpsuite_simtsy.txt ../configs/te_SblpSuite_simtsy.txt /epoc32/release/winscw/urel/z/testdata/configs/te_sblpsuite_simtsy.txt -../configs/te_Sblp_loopbackcsy.ini /epoc32/release/wins/udeb/z/testdata/configs/te_Sblp_loopbackcsy.ini -../configs/te_Sblp_loopbackcsy.ini /epoc32/release/wins/urel/z/testdata/configs/te_Sblp_loopbackcsy.ini -../configs/te_Sblp_loopbackcsy.ini /epoc32/release/winscw/udeb/z/testdata/configs/te_Sblp_loopbackcsy.ini -../configs/te_Sblp_loopbackcsy.ini /epoc32/release/winscw/urel/z/testdata/configs/te_Sblp_loopbackcsy.ini +../configs/te_Sblp_loopbackcsy.ini /epoc32/release/wins/udeb/z/testdata/configs/te_sblp_loopbackcsy.ini +../configs/te_Sblp_loopbackcsy.ini /epoc32/release/wins/urel/z/testdata/configs/te_sblp_loopbackcsy.ini +../configs/te_Sblp_loopbackcsy.ini /epoc32/release/winscw/udeb/z/testdata/configs/te_sblp_loopbackcsy.ini +../configs/te_Sblp_loopbackcsy.ini /epoc32/release/winscw/urel/z/testdata/configs/te_sblp_loopbackcsy.ini ../scripts/te_SblpSuite.script /epoc32/release/wins/udeb/z/testdata/scripts/te_sblpsuite.script ../scripts/te_SblpSuite.script /epoc32/release/wins/urel/z/testdata/scripts/te_sblpsuite.script ../scripts/te_SblpSuite.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_sblpsuite.script diff -r e8d041006974 -r d15a50675083 networkingtestandutils/networkingintegrationtest/te_Sblp/group/te_SblpSuite.iby --- a/networkingtestandutils/networkingintegrationtest/te_Sblp/group/te_SblpSuite.iby Fri May 14 17:24:38 2010 +0300 +++ b/networkingtestandutils/networkingintegrationtest/te_Sblp/group/te_SblpSuite.iby Thu May 27 14:26:17 2010 +0300 @@ -22,6 +22,7 @@ #include data=EPOCROOT##Epoc32\release\winscw\udeb\z\TestData\configs\te_Sblp_Mesh.cfg TestData\Configs\te_Sblp_Mesh.cfg + data=EPOCROOT##Epoc32\release\winscw\udeb\z\TestData\configs\te_sblpsuite_simtsy.txt TestData\Configs\te_sblpsuite_simtsy.txt data=EPOCROOT##Epoc32\release\winscw\udeb\z\TestData\configs\te_Sblp_loopbackcsy.ini TestData\Configs\te_Sblp_loopbackcsy.ini diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/inc/tcp.h --- a/networkprotocols/tcpipv4v6prt/inc/tcp.h Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/inc/tcp.h Thu May 27 14:26:17 2010 +0300 @@ -236,6 +236,7 @@ void SetRecvWin(TUint aRecvWin) { iRecvBuf = aRecvWin;} TUint GetRecvWinSize() { return iRecvBuf; } TUint RecvMaxWnd() { return iTcpMaxRecvWin;} + TUint RecvBufFromIniFile() { return iRecvBufFromIniFile; } #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW #ifdef _LOG @@ -295,6 +296,7 @@ RMBufAllocator iBufAllocator; #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW TUint iTcpMaxRecvWin; + TUint iRecvBufFromIniFile; #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW }; @@ -442,6 +444,8 @@ TUint32 iShrinkedWindowSize; // Window size set by user. This will override the default values for the bearers TBool iWindowSetByUser; + //Flag for socket startup case. No tcp window expand/shrink in this case. + TBool iSocketStartupCase; #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW // Maximum Segment Sizes diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/src/tcp.cpp --- a/networkprotocols/tcpipv4v6prt/src/tcp.cpp Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/src/tcp.cpp Thu May 27 14:26:17 2010 +0300 @@ -92,6 +92,11 @@ iRecvBuf = GetIniValue(TCPIP_INI_TCP, TCPIP_INI_TCP_RECV_BUF, KTcpDefaultRcvWnd, KTcpMinimumWindow, KTcpMaximumWindow, ETrue); +#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW + iRecvBufFromIniFile = GetIniValue(TCPIP_INI_TCP, TCPIP_INI_TCP_RECV_BUF, + KTcpDefaultRcvWnd, KTcpMinimumWindow, KTcpMaximumWindow, ETrue); +#endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW + iSendBuf = GetIniValue(TCPIP_INI_TCP, TCPIP_INI_TCP_SEND_BUF, KTcpDefaultSndWnd, KTcpMinimumWindow, KTcpMaximumWindow, ETrue); diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp --- a/networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp Thu May 27 14:26:17 2010 +0300 @@ -260,6 +260,13 @@ iRetransTimer->InitL(); iLingerTimer->InitL(); iSockInBufSize = Protocol()->RecvBuf(); +#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW + if(iSockInBufSize == Protocol()->RecvBufFromIniFile()) + iSocketStartupCase = ETrue; + else + iSocketStartupCase = EFalse; +#endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW + iSockOutBufSize = Protocol()->SendBuf(); iSsthresh = KMaxTInt32; iRTO = Protocol()->InitialRTO(); @@ -619,48 +626,137 @@ iSockInBufSize = KTcpMinimumWindow; else { - - //If new TCP window is larger then the previous window, increase the - //iSockInBufSize right now. TCP recv function takes care of - //advertising a new effective TCP window. - if (intValue >= iSockInBufSize) - { - //Make it Zero so TCP could avoid the - //TCP window shrinking processing in Recv. - iNewTcpWindow = 0; - //FreeWindow has to be increased at the same time. - iFreeWindow += intValue - iSockInBufSize; - // Make the new TCP receive buffer change effective now. - iSockInBufSize = intValue; - } - else - { - //This sets iNewTcpWindow to a non-zero value, which indicates - //to the TCP that window is shrunk and process TCP segments - //which are in air before setting a new TCP receive buffer. - //TCP Receive window starts moving only when TCP hidden window - //size exceeds the size of the shrunk window. - - iNewTcpWindow = intValue; - //Even in case of window shrink we can set the receive buffer size - //immediately. This will be helpful, for processing SYN-ACK and other - //receiver side processing. - //For already connected sockets iNewTcpWindow will be taking care - //of shrinking the window size for that TCP session. - iSockInBufSize = iNewTcpWindow; - if( iAdvertisedWindow > iNewTcpWindow ) - { - iShrinkedWindowSize = iAdvertisedWindow - iNewTcpWindow; - } - else - { - // No Need to process TCP receive window processing. - iNewTcpWindow = 0; - } - } - - } - + //If its the startup case, then there should be no algorithm used to shrink + //or expand the window size from the default value provided in the ini file + //the new value should be set directly + if(iSocketStartupCase) + { + //Add the extra window to free window pool + //if the window being set is greater than what is specified in ini file (startup case), then just overwrite the new window. + //Add difference to free window + //else set free window to zero + if(intValue > iSockInBufSize) + iFreeWindow += intValue - iSockInBufSize; + else + iFreeWindow = 0; + //set the buffer + iSockInBufSize = intValue; + //disable startup flag. + iSocketStartupCase = EFalse; + } + else + { + // Check for minimum value + if (intValue < STATIC_CAST(TInt, KTcpMinimumWindow)) + { + intValue = STATIC_CAST(TInt, KTcpMinimumWindow); + } + // Handle the situation where the connection has been established and + // window scaling is not in use + if ( InState( ETcpSynReceived | ETcpEstablished ) && !iRcvWscale ) + { + // Do not allow window sizes larger than 0xFFFF + intValue = Min ( intValue, 0xFFFF ); + } + + // Check whether we are increasing or decreasing window size + if ( intValue >= iSockInBufSize ) + { + // New window is larger than current one, check if a + // shrinking process is active + if ( !iNewTcpWindow ) + { + // Mark new "space" as free, it will be updated to + // peer on next operation. + iFreeWindow += intValue - iSockInBufSize; + } + else + { + // In the middle of shrinking process. + if ( iShrinkedWindowSize <= ( intValue - iSockInBufSize )) + { + // Increment to window size is enough to complete + // shrinking process. Update variables and exit + // from shrinking process. + iFreeWindow = ( intValue - iSockInBufSize ) - iShrinkedWindowSize; + iShrinkedWindowSize = 0; + iNewTcpWindow = 0; + } + else + { + // Not quite there yet but closer. Less to shrink, + // update this, but do not exit from shrinking + // process + iShrinkedWindowSize -= intValue - iSockInBufSize; + iNewTcpWindow = intValue; + } + } + } + else + { + // Requested window is smaller than current one. Start or + // continue shrinking process. RCV window can be occupied + // for two different purpose at the moment + // 1. Client data in iSockInQ not read by application + // 2. Free window "opened" to peer (iAdvertisedWindow) + // When shrinking, we must ensure that when reopening + // the window to client there must be truly empty space + // in the window. Thus, freeze the right edge of the + // window (iRCV.NXT + iRCV.WND stays constant) until + // shrinking is completed. + + if ( iNewTcpWindow ) + { + // There is an ongoing shrink process, add the + // change to the amount to be shrinked + iShrinkedWindowSize += iSockInBufSize - intValue; + iNewTcpWindow = intValue; + } + else + { + // This is a new shrinking process, count how much + // needs to be shrinked + iShrinkedWindowSize = iSockInQLen + iRCV.WND; + if ( iShrinkedWindowSize >= intValue ) + { + // We need to shrink since the currently occupied + // window does not fit to new one + iShrinkedWindowSize -= intValue; + // There is now free space in the window + iFreeWindow = 0; + // iNewTcpWindow is used as a state variable for + // shrinking + iNewTcpWindow = intValue; + } + else + { + // No need to shrink since we can fit the current + // contents to the new window, update free window + // If TCP connection is not yet setup, the free + // window will be updated on connection setup, + // for existing connection it will be used + // next time application reads data + if ( iFreeWindow >= ( iSockInBufSize - intValue )) + { + iFreeWindow -= iSockInBufSize - intValue; + } + else + { + // Something wrong. Try to reevaluate... + iFreeWindow = intValue - iShrinkedWindowSize; + } + iShrinkedWindowSize = 0; + } + } + } + // Even in case of window shrink we can set the receive buffer size + // immediately. This will be helpful, for processing SYN-ACK and other + // receiver side processing. + // For already connected sockets iNewTcpWindow will be taking care + // of shrinking the window size for that TCP session. + iSockInBufSize = intValue; + } + } } break; #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW @@ -1362,32 +1458,23 @@ //if This is true, then it is a case of TCP window shrink and we need //to handle it. if ( iNewTcpWindow ) - { - //Log this message for information, that Window is shrinked - LOG(Log::Printf(_L("\ttcp SAP[%u] TCP window shrinking mode on"), (TInt)this)); - - //Increase the hidden free TCP receive window. - iHiddenFreeWindow += aLength; - - if (iHiddenFreeWindow >= iShrinkedWindowSize) - { - //Disable window shrink processing, so that TCP could switch - //to the normal processing. - iSockInBufSize = iNewTcpWindow; - - //Add the usable window to the free window. - iFreeWindow += iHiddenFreeWindow - iShrinkedWindowSize; - - //There are chances that TCP receive window might further shrink. - iHiddenFreeWindow = 0; - - //TCP Receive window shrink phase is over. - iNewTcpWindow = 0; - - //Log this message for information, that Window is shrinked - LOG(Log::Printf(_L("\ttcp SAP[%u] TCP window shrinking mode off"), (TInt)this)); - } - } + { + // Check if we can complete shrinking process + if ( aLength > iShrinkedWindowSize ) + { + // We can exit from the shrinking process. Reset variables and + // update free window. + iFreeWindow = aLength - iShrinkedWindowSize; + iShrinkedWindowSize = 0; + iNewTcpWindow = 0; + } + else + { + // Substract the needed shrinking amount by the amount of bytes client + // read from the buffer + iShrinkedWindowSize -= aLength; + } + } else #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_edge.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_edge.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_edge.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_gprs.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_gprs.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_gprs.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_hsdpa.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_hsdpa.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_hsdpa.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_umts.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_umts.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_umts.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_gprs_config.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_gprs_config.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_gprs_config.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_hsdpa_config.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_hsdpa_config.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_hsdpa_config.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_umts_config.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_umts_config.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_umts_config.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_edge_config.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_edge_config.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_edge_config.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_hsdpa_config.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_hsdpa_config.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_hsdpa_config.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_umts_config.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_umts_config.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_umts_config.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_edge_config.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_edge_config.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_edge_config.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_gprs_config.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_gprs_config.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_gprs_config.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_umts_config.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_umts_config.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_umts_config.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_edge_config.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_edge_config.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_edge_config.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_gprs_config.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_gprs_config.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_gprs_config.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_hsdpa_config.txt --- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_hsdpa_config.txt Fri May 14 17:24:38 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_hsdpa_config.txt Thu May 27 14:26:17 2010 +0300 @@ -14,7 +14,7 @@ # ContextConfigGPRS = , , , , , # ProtocolConfigOption = , , , , # , , , -SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0 +SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0 #SetContextConfigR5= , , , , , , , , diff -r e8d041006974 -r d15a50675083 networksecurity/tls/test/te_tlsunittest/configs/te_tlsunittest.ini Binary file networksecurity/tls/test/te_tlsunittest/configs/te_tlsunittest.ini has changed diff -r e8d041006974 -r d15a50675083 networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini --- a/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini Fri May 14 17:24:38 2010 +0300 +++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini Thu May 27 14:26:17 2010 +0300 @@ -19,7 +19,7 @@ CipherSuite1=008b ExpectedFinalCipherSuit=008b -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=ETrue diff -r e8d041006974 -r d15a50675083 networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA.ini --- a/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA.ini Fri May 14 17:24:38 2010 +0300 +++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA.ini Thu May 27 14:26:17 2010 +0300 @@ -19,7 +19,7 @@ CipherSuite1=008c ExpectedFinalCipherSuit=008c -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=ETrue diff -r e8d041006974 -r d15a50675083 networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini --- a/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini Fri May 14 17:24:38 2010 +0300 +++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini Thu May 27 14:26:17 2010 +0300 @@ -19,7 +19,7 @@ CipherSuite1=008c ExpectedFinalCipherSuit=0035 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 ExpectedSetCipherError=-5 diff -r e8d041006974 -r d15a50675083 networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_256_CBC_SHA.ini --- a/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_256_CBC_SHA.ini Fri May 14 17:24:38 2010 +0300 +++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_256_CBC_SHA.ini Thu May 27 14:26:17 2010 +0300 @@ -19,7 +19,7 @@ CipherSuite1=008d ExpectedFinalCipherSuit=008d -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=ETrue diff -r e8d041006974 -r d15a50675083 networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_RC4_128_SHA.ini --- a/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_RC4_128_SHA.ini Fri May 14 17:24:38 2010 +0300 +++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_RC4_128_SHA.ini Thu May 27 14:26:17 2010 +0300 @@ -19,7 +19,7 @@ CipherSuite1=008a ExpectedFinalCipherSuit=008a -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=ETrue diff -r e8d041006974 -r d15a50675083 networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_MD5.ini --- a/networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_MD5.ini Fri May 14 17:24:38 2010 +0300 +++ b/networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_MD5.ini Thu May 27 14:26:17 2010 +0300 @@ -20,7 +20,7 @@ ExpectedFinalCipherSuit=0001 UseNullCipher=True -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=ETrue diff -r e8d041006974 -r d15a50675083 networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_SHA.ini --- a/networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_SHA.ini Fri May 14 17:24:38 2010 +0300 +++ b/networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_SHA.ini Thu May 27 14:26:17 2010 +0300 @@ -19,7 +19,7 @@ CipherSuite1=0002 ExpectedFinalCipherSuit=0002 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=True diff -r e8d041006974 -r d15a50675083 networksecurity/tls/ts_tls/scripts/TLS_SNE_MULTIPLE_SERVER.ini --- a/networksecurity/tls/ts_tls/scripts/TLS_SNE_MULTIPLE_SERVER.ini Fri May 14 17:24:38 2010 +0300 +++ b/networksecurity/tls/ts_tls/scripts/TLS_SNE_MULTIPLE_SERVER.ini Thu May 27 14:26:17 2010 +0300 @@ -19,7 +19,7 @@ CipherSuite1=002f ExpectedFinalCipherSuit=002f -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 diff -r e8d041006974 -r d15a50675083 networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER.ini --- a/networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER.ini Fri May 14 17:24:38 2010 +0300 +++ b/networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER.ini Thu May 27 14:26:17 2010 +0300 @@ -18,7 +18,7 @@ NumCipherSuites=0 ExpectedFinalCipherSuit=008D -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=True diff -r e8d041006974 -r d15a50675083 networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER_NEG.ini --- a/networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER_NEG.ini Fri May 14 17:24:38 2010 +0300 +++ b/networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER_NEG.ini Thu May 27 14:26:17 2010 +0300 @@ -21,7 +21,7 @@ UseNullCipher=True -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 diff -r e8d041006974 -r d15a50675083 networksecurity/tlsprovider/Test/tlstest2/scripts/tls_smoke.ini --- a/networksecurity/tlsprovider/Test/tlstest2/scripts/tls_smoke.ini Fri May 14 17:24:38 2010 +0300 +++ b/networksecurity/tlsprovider/Test/tlstest2/scripts/tls_smoke.ini Thu May 27 14:26:17 2010 +0300 @@ -19,7 +19,7 @@ CipherSuite1=008c ExpectedFinalCipherSuit=008c -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=ETrue @@ -30,7 +30,7 @@ CipherSuite1=008c ExpectedFinalCipherSuit=0035 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 ExpectedSetCipherError=-5 @@ -43,7 +43,7 @@ CipherSuite1=008b ExpectedFinalCipherSuit=008b -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=ETrue @@ -54,7 +54,7 @@ CipherSuite1=008a ExpectedFinalCipherSuit=008a -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=ETrue @@ -65,7 +65,7 @@ CipherSuite1=008d ExpectedFinalCipherSuit=008d -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=ETrue @@ -77,7 +77,7 @@ CipherSuite1=0003 ExpectedFinalCipherSuit=0003 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -88,7 +88,7 @@ CipherSuite1=0004 ExpectedFinalCipherSuit=0004 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -98,7 +98,7 @@ CipherSuite1=0005 ExpectedFinalCipherSuit=0005 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -109,7 +109,7 @@ CipherSuite1=0008 ExpectedFinalCipherSuit=0008 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -119,7 +119,7 @@ CipherSuite1=0009 ExpectedFinalCipherSuit=0009 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -130,7 +130,7 @@ CipherSuite1=000a ExpectedFinalCipherSuit=000a -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -140,7 +140,7 @@ CipherSuite1=0011 ExpectedFinalCipherSuit=0011 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -150,7 +150,7 @@ CipherSuite1=0012 ExpectedFinalCipherSuit=0012 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -161,7 +161,7 @@ CipherSuite1=0013 ExpectedFinalCipherSuit=0013 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -171,7 +171,7 @@ CipherSuite1=0014 ExpectedFinalCipherSuit=0014 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -182,7 +182,7 @@ CipherSuite1=0016 ExpectedFinalCipherSuit=0016 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -193,7 +193,7 @@ CipherSuite1=002f ExpectedFinalCipherSuit=002f -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -204,7 +204,7 @@ CipherSuite1=0035 ExpectedFinalCipherSuit=0035 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -216,7 +216,7 @@ NumCipherSuites=0 ExpectedFinalCipherSuit=008D -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=True @@ -233,7 +233,7 @@ CipherSuite1=002f ExpectedFinalCipherSuit=002f -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -252,7 +252,7 @@ UseNullCipher=True -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -272,7 +272,7 @@ ExpectedFinalCipherSuit=0001 UseNullCipher=True -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=ETrue @@ -283,7 +283,7 @@ CipherSuite1=0002 ExpectedFinalCipherSuit=0002 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 UsePsk=True @@ -297,7 +297,7 @@ ExpectedSetCipherError=-5 ExpectedFinalCipherSuit=0035 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 @@ -308,7 +308,7 @@ CipherSuite1=0002 ExpectedFinalCipherSuit=0035 -WebAddress=10.253.27.250 +WebAddress=10.225.171.71 WebPage=hello.html PortNum=1666 ExpectedSetCipherError=-5 diff -r e8d041006974 -r d15a50675083 tcpiputils/dhcp/src/DHCPStateMachine.cpp --- a/tcpiputils/dhcp/src/DHCPStateMachine.cpp Fri May 14 17:24:38 2010 +0300 +++ b/tcpiputils/dhcp/src/DHCPStateMachine.cpp Thu May 27 14:26:17 2010 +0300 @@ -420,10 +420,29 @@ // how could we attempt to handle it anyway?...keep trying??? i think not... // ensure that we have a socket to write down iSocket.Close(); - (void)iSocket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection); - (void)iSocket.SetOpt(KSoInetConfigInterface, KSolInetIfCtrl, configInfo); - // make socket invisible for interface counting - (void)iSocket.SetOpt(KSoKeepInterfaceUp, KSolInetIp, 0); + TInt error = iSocket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection); + + if(error == KErrNone) + { + error = iSocket.SetOpt(KSoInetConfigInterface, KSolInetIfCtrl, configInfo); + if(error == KErrNone) + { + // make socket invisible for interface counting + iSocket.SetOpt(KSoKeepInterfaceUp, KSolInetIp, 0); + if(error != KErrNone) + { + __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L("CDHCPStateMachine::RemoveConfiguredAddress, SetOpt Failed to set KSoKeepInterfaceUp"))); + } + } + else + { + __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L("CDHCPStateMachine::RemoveConfiguredAddress, SetOpt Failed to set KSoInetConfigInterface"))); + } + } + else + { + __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L("CDHCPStateMachine::RemoveConfiguredAddress, Socket Open Failed: Due to KErrNotReady"))); + } } void CDHCPStateMachine::ConfigureInterfaceL( const TSoInet6InterfaceInfo& aInterfaceInfo )