--- a/linklayercontrol/networkinterfacemgr/agentprcore/inc/CAgentAdapter.h Thu Sep 16 13:48:44 2010 +0530
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/inc/CAgentAdapter.h Thu Sep 23 17:23:35 2010 +0530
@@ -99,7 +99,11 @@
// From MLinkCprServiceChangeNotificationApiExt Interface
void RequestServiceChangeNotificationL(const Messages::TNodeId& aSender, ESock::RLegacyResponseMsg& aResponse);
void CancelServiceChangeNotification(const Messages::TNodeId& aSender);
-
+
+ TBool IsAgentInErrorState()
+ {
+ return iAgentErrorState;
+ }
#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
inline CNifAgentBase * Agent() const;
#endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
@@ -135,6 +139,7 @@
TAgentConnectType iAgentConnectType;
Elements::TStateChange iLastProgress;
RPointerArray<CAgentAdapterSessionNotifier> iAgentAdapterSessionNotifiers;
+ TBool iAgentErrorState;
};
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp Thu Sep 16 13:48:44 2010 +0530
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -71,7 +71,7 @@
: iAgentScpr(aAgentScpr),
iAgentState(EDisconnected),
iAgentConnectType(EAgentNone),
- iLastProgress(KFinishedSelection,KErrNone)
+ iLastProgress(KFinishedSelection,KErrNone),iAgentErrorState(EFalse)
{
}
@@ -155,8 +155,11 @@
{
iAgent->CancelReconnect();
}
- iAgentState = EDisconnecting;
- iAgent->Disconnect(aReason);
+ if (iAgentState != EDisconnecting)
+ {
+ iAgentState = EDisconnecting;
+ iAgent->Disconnect(aReason);
+ }
}
@@ -307,6 +310,8 @@
else
{
iLastProgress.iError = aStatus;
+ // set the agent state to EDisconnecting
+ iAgentState = EDisconnecting;
iAgent->Disconnect(aStatus);
}
}
@@ -391,6 +396,7 @@
else
{
iAgentScpr.Error(iLastProgress);
+ iAgentErrorState = ETrue;
}
}
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp Thu Sep 16 13:48:44 2010 +0530
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -88,37 +88,46 @@
*/
EXPORT_C CAgentSubConnectionProvider::~CAgentSubConnectionProvider()
{
+ //check for provisioning info
CleanupProvisioningInfo();
- LOG_NODE_DESTROY(KAgentSCprTag, CAgentSubConnectionProvider);
}
EXPORT_C void CAgentSubConnectionProvider::CleanupProvisioningInfo()
{
- if (iAuthenticateInProgress && AgentProvisionInfo()->AgentAdapter())
- {
- iAuthenticateInProgress = EFalse;
- AgentProvisionInfo()->AgentAdapter()->CancelAuthenticate();
- }
+ //The case for constructL failure is not handled here. Trivial but very important change. If node has
+ //not received any Provision config message, then there is no point, cleaning it up. Case ID for this is ou1cimx1#508527
+ const CAgentProvisionInfo* agentProvisionInfo = AgentProvisionInfo();
+
+ if(agentProvisionInfo)
+ {
+ if (iAuthenticateInProgress && AgentProvisionInfo()->AgentAdapter())
+ {
+ iAuthenticateInProgress = EFalse;
+ AgentProvisionInfo()->AgentAdapter()->CancelAuthenticate();
+ }
- CAgentAdapter* agentAdapter(AgentProvisionInfo()->AgentAdapter());
- const_cast<CAgentProvisionInfo*>(AgentProvisionInfo())->SetAgentAdapter(NULL);
- delete agentAdapter;
+ CAgentAdapter* agentAdapter(AgentProvisionInfo()->AgentAdapter());
+ const_cast<CAgentProvisionInfo*>(AgentProvisionInfo())->SetAgentAdapter(NULL);
+ delete agentAdapter;
- // Remove ourselves from the notification handler, or delete it entirely if we own it
- CAgentNotificationHandler* handler = AgentProvisionInfo()->AgentNotificationHandler();
- if (handler)
- {
- if (iScprOwnedNotificationHandler)
- {
- const_cast<CAgentProvisionInfo*>(AgentProvisionInfo())->SetAgentNotificationHandler(NULL);
- delete handler;
- }
- else
+ // Remove ourselves from the notification handler, or delete it entirely if we own it
+ CAgentNotificationHandler* handler = AgentProvisionInfo()->AgentNotificationHandler();
+ if (handler)
{
- handler->Initialise(NULL);
+ if (iScprOwnedNotificationHandler)
+ {
+ const_cast<CAgentProvisionInfo*>(AgentProvisionInfo())->SetAgentNotificationHandler(NULL);
+ delete handler;
+ }
+ else
+ {
+ handler->Initialise(NULL);
+ }
}
- }
+ //log node destruction, destroy in the case of perfect construction.
+ LOG_NODE_DESTROY(KAgentSCprTag, CAgentSubConnectionProvider);
+ }
}
/**
@@ -296,10 +305,15 @@
}
else
{
- // Agent has stopped and disconnected without this node telling it to
- // Could be an error in the agent initiating a disconnect
- __CFLOG_VAR((KAgentSCprTag, KAgentSCprSubTag, _L8("CAgentSubConnectionProvider::ConnectionDownL() - Agent has stopped unexpectedly")));
- ControlProvider()->PostMessage(Id(), TCFControlProvider::TDataClientGoneDown(KErrDisconnected).CRef());
+ // Verify AgentSCPR is Started, if its started, do not initiate TDataClientGoneDown, else initiate it
+ if(!AgentProvisionInfo()->AgentAdapter()->IsAgentInErrorState())
+ {
+ // Agent has stopped and disconnected without this node telling it to
+ // Could be an error in the agent initiating a disconnect
+ __CFLOG_VAR((KAgentSCprTag, KAgentSCprSubTag, _L8("CAgentSubConnectionProvider::ConnectionDownL() - Agent has stopped unexpectedly")));
+ ControlProvider()->PostMessage(Id(), TCFControlProvider::TDataClientGoneDown(KErrDisconnected).CRef());
+ }
+
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/bwins/csdagttestsu.def Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,3 @@
+EXPORTS
+ ?CreateTestSuite@@YAPAVCTestSuiteCsdAgt@@XZ @ 1 NONAME ; class CTestSuiteCsdAgt * CreateTestSuite(void)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/eabi/csdagttestsu.def Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,11 @@
+EXPORTS
+ _Z15CreateTestSuitev @ 1 NONAME
+ _ZTI16CTestSuiteCsdAgt @ 2 NONAME
+ _ZTI16CsdAgentTestStep @ 3 NONAME
+ _ZTI27CTestStepCsdAgentConnection @ 4 NONAME
+ _ZTI32CTestStepCsdAgtConnectionFailure @ 5 NONAME
+ _ZTV16CTestSuiteCsdAgt @ 6 NONAME
+ _ZTV16CsdAgentTestStep @ 7 NONAME
+ _ZTV27CTestStepCsdAgentConnection @ 8 NONAME
+ _ZTV32CTestStepCsdAgtConnectionFailure @ 9 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/bld.inf Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,39 @@
+// Copyright (c) 2002-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:
+//
+
+
+PRJ_PLATFORMS
+
+DEFAULT
+
+PRJ_EXPORTS
+
+PRJ_TESTEXPORTS
+
+..\group\csdagttests.iby \epoc32\rom\include\csdagttests.iby
+
+..\group\csdagenttest.script \epoc32\release\wins\udeb\z\TestData\Scripts\csdagenttest.script
+..\group\csdagenttest.script \epoc32\release\winscw\udeb\z\TestData\Scripts\csdagenttest.script
+..\group\connection_start.script \epoc32\release\wins\udeb\z\TestData\Scripts\connection_start.script
+..\group\connection_start.script \epoc32\release\winscw\udeb\z\TestData\Scripts\connection_start.script
+..\group\connection_start_failure.script \epoc32\release\wins\udeb\z\TestData\Scripts\connection_start_failure.script
+..\group\connection_start_failure.script \epoc32\release\winscw\udeb\z\TestData\Scripts\connection_start_failure.script
+..\group\cedout.cfg \epoc32\release\wins\udeb\z\TestData\Configs\cedout.cfg
+..\group\cedout.cfg \epoc32\release\winscw\udeb\z\TestData\Configs\cedout.cfg
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+csdagenttests.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/cedout.cfg Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,3148 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+##
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=Intranet
+ FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=mRouter
+ FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=Vodafone
+ FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=Orange
+ FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=O2
+ FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Name=TMobile
+ FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=Airtel
+ FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Name=Hutch
+ FIELD_COUNT=1
+END_ADD
+
+
+############################################################
+## ModemBearer
+##
+[ModemBearer]
+ADD_TEMPLATE
+ Name=Default Modem
+ IfName=PPP
+ PortName=COMM::1
+ TSYName=MM
+ CSYName=ECUART
+ LastSocketActivityTimeout=600
+ LastSessionClosedTimeout=600
+ LastSocketClosedTimeout=600
+ 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
+ IspInitString=*99***1#
+ 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
+ MessageCentreNumber=+44123456789
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ CommRole=0
+ ControlChannelPortName=COMM::0
+ SIRSettings=0
+ Agent=CSD.agt
+ FIELD_COUNT=71
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=GsmPhone1
+ PortName=COMM::0
+ Handshaking=4
+ XonChar=17
+ XoffChar=19
+ MessageCentreNumber=+447973100973
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=NTRAS (Com0) Null Modem 115200bps
+ PortName=COMM::0
+ TSYName=NTRAS
+ Handshaking=4
+ MessageDeliveryReport=TRUE
+ FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=NTRAS (Com1) Null Modem 115200bps
+ TSYName=NTRAS
+ Handshaking=4
+ MessageDeliveryReport=TRUE
+ FIELD_COUNT=4
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=GsmPhone2
+ Handshaking=4
+ MessageDeliveryReport=TRUE
+ FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Name=SimulatorPhone
+ PortName=COMM::0
+ TSYName=SIM
+ Rate=19200
+ Handshaking=196
+ XonChar=17
+ XoffChar=19
+ ModemInitString=ATZ
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=GsmPhone3
+ PortName=COMM::0
+ Handshaking=4
+ XonChar=17
+ XoffChar=19
+ ModemInitString=ATZ
+ MessageCentreNumber=+447973100973
+ Agent=PSD.agt
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Name=GsmPhone4
+ PortName=COMM::0
+ TSYName=DMM
+ Rate=19200
+ Handshaking=196
+ XonChar=17
+ XoffChar=19
+ ModemInitString=ATZ
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+ Name=mRouterWinsBearer
+ PortName=WINS::0
+ CSYName=WINSCSY
+ LastSocketActivityTimeout=9999
+ LastSessionClosedTimeout=180
+ LastSocketClosedTimeout=30
+ Handshaking=4
+ Agent=mRouterAgent.agt
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+ Name=mRouterUsbBearer
+ PortName=ACM::0
+ CSYName=ECACM
+ LastSocketActivityTimeout=9999
+ LastSessionClosedTimeout=180
+ LastSocketClosedTimeout=30
+ Handshaking=4
+ Agent=mRouterAgent.agt
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+ Name=trpat_psd
+ IfName=rawip
+ PortName=not used
+ TSYName=TRPAT
+ CSYName=CSY27010
+ LastSocketActivityTimeout=300
+ LastSessionClosedTimeout=300
+ LastSocketClosedTimeout=300
+ Handshaking=4
+ MessageCentreNumber=+447973100973
+ BCAStack=C32Bca
+ Agent=trp.agt
+ FIELD_COUNT=12
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+ Name=trpat_csd
+ PortName=not used
+ TSYName=TRPAT
+ CSYName=CSY27010
+ LastSocketActivityTimeout=300
+ LastSessionClosedTimeout=300
+ LastSocketClosedTimeout=300
+ Handshaking=4
+ MessageCentreNumber=+447973100973
+ Agent=csd.agt
+ FIELD_COUNT=10
+END_ADD
+
+
+############################################################
+## LANBearer
+##
+[LANBearer]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=Ethernet 001
+ IfName=ethint
+ LDDFilename=enet
+ LDDName=Ethernet
+ PDDFilename=ethernet
+ PDDName=ethernet.wins
+ PacketDriverName=EtherPkt.drv
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=-1
+ LastSocketClosedTimeout=-1
+ Agent=nullagt.agt
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=Ethernet 002
+ IfName=ethint
+ LDDName=EtherCard
+ PDDName=EtherWins
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=-1
+ LastSocketClosedTimeout=-1
+ Agent=nullagt.agt
+ FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## Location
+##
+[Location]
+ADD_TEMPLATE
+ Name=Default Location
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ AreaCode=44
+ DialOutCode=44
+ DisableCallWaitingCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+ FIELD_COUNT=11
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=Office
+ IntlPrefixCode=00
+ AreaCode=171
+ DialOutCode=9,
+ DisableCallWaitingCode=9,
+ Mobile=FALSE
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=Office Direct Dial
+ IntlPrefixCode=00
+ AreaCode=171
+ DialOutCode=171
+ DisableCallWaitingCode=171
+ Mobile=FALSE
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=Mobile
+ FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=Home
+ IntlPrefixCode=00
+ AreaCode=181
+ DialOutCode=181
+ DisableCallWaitingCode=181
+ Mobile=FALSE
+ UsePulseDial=TRUE
+ WaitForDialTone=TRUE
+ FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## Chargecard
+##
+[Chargecard]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=Dummy BT Chargecard
+ AccountNumber=144,12345678
+ Pin=0000
+ LocalRule=HG
+ NatRule=HFG
+ IntlRule=HEFG
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=Dummy Mercury Chargecard
+ AccountNumber=0500800800,,12345678
+ Pin=****
+ LocalRule=HG
+ NatRule=J,K,0FG
+ IntlRule=HEFG
+ FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## DialOutISP
+##
+[DialOutISP]
+ADD_TEMPLATE
+ Name=Default Dial Out ISP
+ DialResolution=TRUE
+ UseLoginScript=FALSE
+ PromptForLogin=TRUE
+ DisplayPCT=FALSE
+ IfPromptForAuth=TRUE
+ IfCallbackEnabled=FALSE
+ CallbackTimeout=0
+ 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 = 2
+ Name=Pipex CSD
+ Description=Pipex Service Provider
+ Type=INTERNETONLY
+ DefaultTelNum=08450885336
+ PromptForLogin=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=solabf75
+ IfAuthPass=oodifama
+ AuthRetries=0
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=158.43.128.1
+ IpNameServer2=158.43.192.1
+ BearerName=ASYNCHRONOUS
+ BearerSpeed=UNSPECIFIED
+ BearerCE=UNSPECIFIED
+ BearerType=CSD
+ ChannelCoding=UNSPECIFIED
+ Aiur=0
+ RequestedTimeSlots=0
+ MaximumTimeSlots=0
+ FIELD_COUNT=21
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=NT RAS
+ Description=Test
+ Type=INTERNETONLY
+ 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
+ IfNetworks=ip,ip6
+ IfPromptForAuth=FALSE
+ IfAuthName=RasUser
+ IfAuthPass=pass
+ AuthRetries=0
+ BearerName=ASYNCHRONOUS
+ BearerSpeed=UNSPECIFIED
+ BearerCE=UNSPECIFIED
+ BearerType=CSD
+ ChannelCoding=UNSPECIFIED
+ Aiur=0
+ RequestedTimeSlots=0
+ MaximumTimeSlots=0
+ FIELD_COUNT=19
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=WSP Test CSD
+ Description=Symbian WSP Test Server
+ Type=INTERNETANDWAP
+ DefaultTelNum=02071541211
+ PromptForLogin=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=wapusr
+ IfAuthPass=train2
+ AuthRetries=0
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=158.43.128.1
+ IpNameServer2=158.43.192.1
+ BearerName=ASYNCHRONOUS
+ BearerSpeed=UNSPECIFIED
+ BearerCE=UNSPECIFIED
+ BearerType=CSD
+ ChannelCoding=UNSPECIFIED
+ Aiur=0
+ RequestedTimeSlots=0
+ MaximumTimeSlots=0
+ FIELD_COUNT=21
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=Auth CSD
+ Description=Authentication Service Provider
+ Type=INTERNETONLY
+ DefaultTelNum=+358331520777
+ UseLoginScript=TRUE
+ PromptForLogin=FALSE
+ LoginName=mailtst1
+ LoginPass=mailtest1
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=mailtst1
+ IfAuthPass=mailtest1
+ AuthRetries=0
+ BearerName=ASYNCHRONOUS
+ BearerSpeed=UNSPECIFIED
+ BearerCE=UNSPECIFIED
+ BearerType=CSD
+ ChannelCoding=UNSPECIFIED
+ Aiur=0
+ RequestedTimeSlots=0
+ MaximumTimeSlots=0
+ UseEdge=TRUE
+ FIELD_COUNT=22
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Name=IP6 Dial Test
+ Description=4th Floor Test Lab
+ Type=INTERNETONLY
+ DefaultTelNum=02071541455
+ PromptForLogin=FALSE
+ IfNetworks=ip,ip6
+ IfPromptForAuth=FALSE
+ IfAuthName=ipv6test
+ IfAuthPass=Symbian
+ AuthRetries=0
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=192.168.10.2
+ IpNameServer2=192.168.20.2
+ BearerName=ASYNCHRONOUS
+ BearerSpeed=UNSPECIFIED
+ BearerCE=UNSPECIFIED
+ BearerType=CSD
+ ChannelCoding=UNSPECIFIED
+ Aiur=0
+ RequestedTimeSlots=0
+ MaximumTimeSlots=0
+ FIELD_COUNT=21
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=USIM Test NT RAS
+ Type=INTERNETONLY
+ 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
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=RasUser
+ IfAuthPass=pass
+ FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Name=CityOnlines CSD India
+ Description=CityOnlines Indian Service Provider
+ Type=INTERNETONLY
+ DefaultTelNum=+9180172388
+ UseLoginScript=TRUE
+ PromptForLogin=FALSE
+ LoginName=ktl1@blr.cityonlines.com
+ LoginPass=1234
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=ktl1
+ IfAuthPass=1234
+ AuthRetries=0
+ BearerName=ASYNCHRONOUS
+ BearerSpeed=UNSPECIFIED
+ BearerCE=UNSPECIFIED
+ BearerType=CSD
+ ChannelCoding=UNSPECIFIED
+ Aiur=0
+ RequestedTimeSlots=0
+ MaximumTimeSlots=0
+ UseEdge=TRUE
+ FIELD_COUNT=22
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+ Name=Vodafone WAP GSM
+ Description=Vodafone WAP GSM
+ Type=INTERNETANDWAP
+ DefaultTelNum=+447836900808
+ PromptForLogin=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=user@vodafone.net
+ IfAuthPass=user
+ AuthRetries=0
+ BearerProtocol=V110
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+ Name=Orange WAP GSM
+ Description=Orange WAP GSM
+ Type=INTERNETANDWAP
+ DefaultTelNum=+447973100500
+ PromptForLogin=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=Orange
+ IfAuthPass=Multimedia
+ AuthRetries=0
+ BearerProtocol=V110
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+ Name=O2 WAP GSM
+ Description=O2 WAP GSM
+ Type=INTERNETANDWAP
+ DefaultTelNum=+447712927927
+ PromptForLogin=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=O2wap
+ IfAuthPass=password
+ AuthRetries=0
+ BearerProtocol=V110
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+ Name=Test Network CSD
+ Description=Symbian Test Network
+ Type=INTERNETONLY
+ DefaultTelNum=02071541259
+ PromptForLogin=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=Systemtest09
+ IfAuthPass=l33ds
+ AuthRetries=0
+ BearerName=ASYNCHRONOUS
+ BearerSpeed=UNSPECIFIED
+ BearerCE=UNSPECIFIED
+ BearerType=CSD
+ ChannelCoding=UNSPECIFIED
+ Aiur=0
+ RequestedTimeSlots=0
+ MaximumTimeSlots=0
+ FIELD_COUNT=18
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+ Name=IP6 Dial Test
+ Description=Symbian Test Network
+ Type=INTERNETONLY
+ DefaultTelNum=02077248525
+ PromptForLogin=FALSE
+ IfNetworks=ip,ip6
+ IfPromptForAuth=FALSE
+ IfAuthName=ipv6test
+ IfAuthPass=Symbian
+ AuthRetries=0
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=192.168.10.2
+ IpNameServer2=192.168.20.2
+ BearerName=ASYNCHRONOUS
+ BearerSpeed=UNSPECIFIED
+ BearerCE=UNSPECIFIED
+ BearerType=CSD
+ ChannelCoding=UNSPECIFIED
+ Aiur=0
+ RequestedTimeSlots=0
+ MaximumTimeSlots=0
+ FIELD_COUNT=21
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+ Name=mRouterDialOutIsp
+ Description=mRouterDialOutIsp
+ Type=INTERNETONLY
+ PromptForLogin=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=IfAuthPass=
+ IfAuthPass=AuthRetries=0
+ AuthRetries=0
+ FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## DialInISP
+##
+[DialInISP]
+ADD_TEMPLATE
+ Name=Default Dial In ISP
+ UseLoginScript=FALSE
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ EnableIPHeaderComp=FALSE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ EnableSWComp=FALSE
+ UseEdge=FALSE
+ FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=Dial In ISP01
+ FIELD_COUNT=1
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+##
+[OutgoingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=Vodafone GPRS
+ APN=internet
+ PDPType=IPV4
+ ReqPrecedence=0
+ ReqDelay=0
+ ReqReliability=0
+ ReqPeakThroughput=0
+ ReqMeanThroughput=0
+ MinPrecedence=0
+ MinDelay=0
+ MinReliability=0
+ MinPeakThroughput=0
+ MinMeanThroughput=0
+ DataCompression=FALSE
+ HeaderCompression=FALSE
+ GprsUseEdge=FALSE
+ AnonymousAccess=FALSE
+ IfParams=nullagt
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=web
+ IfAuthPass=web
+ AuthRetries=1
+ IpNetMask=255.255.255.0
+ IpGateway=1.2.3.4
+ IpAddrFromServer=TRUE
+ IpAddr=0.0.0.0
+ IpDNSAddrFromServer=TRUE
+ Ip6DNSAddrFromServer=TRUE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ GprsAccessPointType=0
+ QosWarningTimeout=0
+ FIELD_COUNT=33
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=Vodafone WAP GPRS
+ APN=wap.vodafone.co.uk
+ PDPType=IPV4
+ ReqPrecedence=1
+ ReqDelay=1
+ ReqReliability=1
+ ReqPeakThroughput=1
+ ReqMeanThroughput=1
+ MinPrecedence=8
+ MinDelay=16
+ MinReliability=32
+ MinPeakThroughput=2
+ MinMeanThroughput=2
+ DataCompression=FALSE
+ HeaderCompression=FALSE
+ GprsUseEdge=FALSE
+ AnonymousAccess=FALSE
+ IfParams=nullagt
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=wap
+ IfAuthPass=wap
+ AuthRetries=1
+ IpNetMask=255.255.255.0
+ IpGateway=1.2.3.4
+ IpAddrFromServer=TRUE
+ IpAddr=0.0.0.0
+ IpDNSAddrFromServer=TRUE
+ Ip6DNSAddrFromServer=TRUE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ GprsAccessPointType=0
+ QosWarningTimeout=0
+ FIELD_COUNT=33
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=Orange GPRS
+ APN=orangeinternet
+ PDPType=IPV4
+ ReqPrecedence=1
+ ReqDelay=1
+ ReqReliability=1
+ ReqPeakThroughput=1
+ ReqMeanThroughput=1
+ MinPrecedence=8
+ MinDelay=16
+ MinReliability=32
+ MinPeakThroughput=2
+ MinMeanThroughput=2
+ DataCompression=FALSE
+ HeaderCompression=FALSE
+ GprsUseEdge=FALSE
+ AnonymousAccess=FALSE
+ IfParams=nullagt
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ AuthRetries=1
+ IpNetMask=255.255.255.0
+ IpGateway=1.2.3.4
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ GprsAccessPointType=0
+ QosWarningTimeout=0
+ FIELD_COUNT=29
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=Orange WAP GPRS
+ APN=orangewap
+ PDPType=IPV4
+ ReqPrecedence=1
+ ReqDelay=1
+ ReqReliability=1
+ ReqPeakThroughput=1
+ ReqMeanThroughput=1
+ MinPrecedence=8
+ MinDelay=16
+ MinReliability=32
+ MinPeakThroughput=2
+ MinMeanThroughput=2
+ DataCompression=FALSE
+ HeaderCompression=FALSE
+ GprsUseEdge=FALSE
+ AnonymousAccess=FALSE
+ IfParams=nullagt
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ AuthRetries=1
+ IpNetMask=255.255.255.0
+ IpGateway=1.2.3.4
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ GprsAccessPointType=0
+ QosWarningTimeout=0
+ FIELD_COUNT=29
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=O2 GPRS
+ APN=mobile.o2.co.uk
+ PDPType=IPV4
+ ReqPrecedence=1
+ ReqDelay=1
+ ReqReliability=1
+ ReqPeakThroughput=1
+ ReqMeanThroughput=1
+ MinPrecedence=8
+ MinDelay=16
+ MinReliability=32
+ MinPeakThroughput=2
+ MinMeanThroughput=2
+ DataCompression=FALSE
+ HeaderCompression=FALSE
+ GprsUseEdge=FALSE
+ AnonymousAccess=FALSE
+ IfParams=nullagt
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=web
+ IfAuthPass=password
+ AuthRetries=1
+ IpNetMask=255.255.255.0
+ IpGateway=1.2.3.4
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=0.0.0.0
+ IpNameServer2=0.0.0.0
+ Ip6DNSAddrFromServer=TRUE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ GprsAccessPointType=0
+ QosWarningTimeout=0
+ FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Name=O2 WAP GPRS
+ APN=wap.o2.co.uk
+ PDPType=IPV4
+ ReqPrecedence=1
+ ReqDelay=1
+ ReqReliability=1
+ ReqPeakThroughput=1
+ ReqMeanThroughput=1
+ MinPrecedence=8
+ MinDelay=16
+ MinReliability=32
+ MinPeakThroughput=2
+ MinMeanThroughput=2
+ DataCompression=FALSE
+ HeaderCompression=FALSE
+ GprsUseEdge=FALSE
+ AnonymousAccess=FALSE
+ IfParams=nullagt
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=o2wap
+ IfAuthPass=o2wap
+ AuthRetries=1
+ IpNetMask=255.255.255.0
+ IpGateway=1.2.3.4
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=0.0.0.0
+ IpNameServer2=0.0.0.0
+ Ip6DNSAddrFromServer=TRUE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ GprsAccessPointType=0
+ QosWarningTimeout=0
+ FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=Hutch GPRS
+ APN=portalnmms
+ PDPType=IPV4
+ ReqPrecedence=1
+ ReqDelay=1
+ ReqReliability=1
+ ReqPeakThroughput=1
+ ReqMeanThroughput=1
+ MinPrecedence=8
+ MinDelay=16
+ MinReliability=32
+ MinPeakThroughput=2
+ MinMeanThroughput=2
+ DataCompression=FALSE
+ HeaderCompression=FALSE
+ GprsUseEdge=FALSE
+ AnonymousAccess=FALSE
+ IfParams=nullagt
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ AuthRetries=1
+ IpGateway=10.10.1.100
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ GprsAccessPointType=0
+ QosWarningTimeout=0
+ FIELD_COUNT=28
+END_ADD
+
+
+############################################################
+## IncomingGPRS
+##
+[IncomingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=Incoming GPRS Settings PlaceHolder
+ 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=TRUE
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=0.0.0.0
+ IpNameServer2=0.0.0.0
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ FIELD_COUNT=29
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+##
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=Dummy Default GPRS Settings
+ Usage=1
+ APN=Access point name
+ PDPType=IPV6
+ PDPAddress=www.wid.com
+ Precedence=1
+ Delay=150
+ Reliability=1
+ PeakThroughput=1
+ MinReliability=1
+ MinPeakThroughput=1
+ MinMeanThroughput=1
+ DataCompression=FALSE
+ HeaderCompression=FALSE
+ GprsUseEdge=FALSE
+ AnonymousAccess=TRUE
+ FIELD_COUNT=16
+END_ADD
+
+
+############################################################
+## LANService
+##
+[LANService]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=IP4 DHCP Ethernet
+ IfNetworks=ip
+ IpNetMask=255.255.252.0
+ IpGateway=10.192.203.254
+ IpAddrFromServer=TRUE
+ IpAddr=10.192.200.59
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=10.192.59.6
+ IpNameServer2=10.192.58.49
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=IP6 Ethernet
+ IfNetworks=ip,ip6
+ IpNetMask=255.255.255.0
+ IpGateway=194.72.6.1
+ IpAddrFromServer=TRUE
+ IpAddr=192.168.0.100
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=192.168.10.2
+ IpNameServer2=192.168.20.2
+ FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## APPrioritySelectionPolicyTable
+##
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 254
+ Id=20000
+ Name=APSelPolNetworkDefault
+ AP1=Link.AccessPointTable.10026
+ APCOUNT=1
+ FIELD_COUNT=4
+END_ADD
+
+
+############################################################
+## TierTable
+##
+[TierTable]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=2048
+ Name=Tier1
+ TierImplUid=271064536
+ TierThreadName=ESock_IP
+ TierManagerName=NetworkTierManager
+ DefaultAccessPoint=Link.AccessPointTable.10000
+ PromptUser=0
+ FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Id=271064560
+ Name=Tier2
+ TierImplUid=271064560
+ TierThreadName=ESock_IP
+ TierManagerName=ProtoTierManager
+ DefaultAccessPoint=Link.AccessPointTable.10026
+ PromptUser=0
+ FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Id=271064565
+ Name=Tier3
+ TierImplUid=271064565
+ TierThreadName=ESock_IP
+ TierManagerName=LinkTierManager
+ DefaultAccessPoint=Link.AccessPointTable.10000
+ PromptUser=0
+ FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Id=536887799
+ Name=Tier4
+ TierImplUid=536887799
+ TierThreadName=ESock_SIP
+ TierManagerName=SIPTierManager
+ DefaultAccessPoint=Link.AccessPointTable.10002
+ PromptUser=0
+ FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## MCprTable
+##
+[MCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=netmcpr
+ MCprUid=271009095
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=ipprotomcpr
+ MCprUid=271064558
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=pppmcpr
+ MCprUid=271064556
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=ethmcpr
+ MCprUid=271064572
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=rawipmcpr
+ MCprUid=271064576
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Name=tunnelmcpr
+ MCprUid=271064578
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=qospppmcpr
+ MCprUid=271064556
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Name=dummynifmcpr
+ MCprUid=271064580
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+ Name=hungrynifmcpr
+ MCprUid=271064580
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+ Name=pdpmcpr
+ MCprUid=271065840
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+ Name=sipmcpr
+ MCprUid=536887801
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+ Name=panethermcpr
+ MCprUid=271070626
+ FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## CprTable
+##
+[CprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=ipcpr
+ CprUid=270561519
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=ipprotocpr
+ CprUid=271064531
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=agentcpr
+ CprUid=271064552
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=vanillacpr
+ CprUid=271065843
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=sipcpr
+ CprUid=271010872
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=tunnelagentcpr
+ CprUid=271080968
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Name=pdpcpr
+ CprUid=271065826
+ FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## SCprTable
+##
+[SCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=qosipscpr
+ SCprUid=270549768
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=ipprotoscpr
+ SCprUid=271064529
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=agentscpr
+ SCprUid=271064554
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=pdpscpr
+ SCprUid=271065824
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=pppscpr
+ SCprUid=271065852
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Name=vanillascpr
+ SCprUid=271065844
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=qosscpr
+ SCprUid=271065811
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Name=sipscpr
+ SCprUid=271010839
+ FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## ProtocolTable
+##
+[ProtocolTable]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=sapshim
+ ProtocolUid=270496898
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=ipshim4
+ ProtocolUid=271064118
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=ppp
+ ProtocolUid=271064143
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=ethernet
+ ProtocolUid=271064539
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=rawip
+ ProtocolUid=271064562
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Name=tunnel
+ ProtocolUid=271064567
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=qosppp
+ ProtocolUid=271064148
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Name=dummynif
+ ProtocolUid=271064123
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+ Name=hungrynif
+ ProtocolUid=271064125
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+ Name=panether
+ ProtocolUid=271070627
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+ Name=rawip2
+ ProtocolUid=271084280
+ FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## VirtualBearer
+##
+[VirtualBearer]
+ADD_TEMPLATE
+ Name=Default VPN Bearer
+ IfName=VPN.nif
+ LastSocketActivityTimeout=600
+ LastSessionClosedTimeout=600
+ LastSocketClosedTimeout=600
+ Agent=VPN.agt
+ FIELD_COUNT=6
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=VPN Bearer1
+ IfName=ppp.nif
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=-1
+ LastSocketClosedTimeout=-1
+ Agent=ntras.agt
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=VPN Bearer2
+ IfName=tunnelnif
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=-1
+ LastSocketClosedTimeout=-1
+ Agent=vpnconnagt.agt
+ FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## BearerTypeTable
+##
+[BearerTypeTable]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=ppp
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=ethint
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.4
+ Cpr=CprTable.3
+ SCpr=SCprTable.3
+ Protocol=ProtocolTable.4
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=rawip
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.5
+ Cpr=CprTable.3
+ SCpr=SCprTable.3
+ Protocol=ProtocolTable.5
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=tunnelnif
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.6
+ Cpr=CprTable.7
+ SCpr=SCprTable.3
+ Protocol=ProtocolTable.6
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=qosppp
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.7
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.7
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Name=dummynif
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.8
+ Cpr=CprTable.3
+ SCpr=SCprTable.3
+ Protocol=ProtocolTable.8
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=hungrynif
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.9
+ Cpr=CprTable.3
+ SCpr=SCprTable.3
+ Protocol=ProtocolTable.9
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Name=spud-ppp
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.10
+ Cpr=CprTable.3
+ SCpr=SCprTable.4
+ Protocol=ProtocolTable.3
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+ Name=spud-rawip
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.10
+ Cpr=CprTable.3
+ SCpr=SCprTable.4
+ Protocol=ProtocolTable.5
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+ Name=IPProtoDefaultTemplate
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+ Name=NetworkDefaultTemplate
+ Tier=Link.TierTable.2048
+ MCpr=MCprTable.1
+ Cpr=CprTable.1
+ SCpr=SCprTable.7
+ Protocol=ProtocolTable.1
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+ Name=rawip2
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.10
+ Cpr=CprTable.8
+ SCpr=SCprTable.4
+ Protocol=ProtocolTable.11
+ FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+ Name=spud-rawip2
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.10
+ Cpr=CprTable.8
+ SCpr=SCprTable.4
+ Protocol=ProtocolTable.11
+ FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## AccessPointTable
+##
+[AccessPointTable]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=pppMappedFromIAP1
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Id=10003
+ Name=IPProto_generated_10003
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=1
+ CustomSelectionPolicy=1
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Id=2
+ Name=ethintMappedFromIAP2
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.4
+ Cpr=CprTable.3
+ SCpr=SCprTable.3
+ Protocol=ProtocolTable.4
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Id=10004
+ Name=IPProto_generated_10004
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=2
+ CustomSelectionPolicy=2
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Id=3
+ Name=pppMappedFromIAP3
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Id=10005
+ Name=IPProto_generated_10005
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=3
+ CustomSelectionPolicy=3
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Id=4
+ Name=pppMappedFromIAP4
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Id=10006
+ Name=IPProto_generated_10006
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=4
+ CustomSelectionPolicy=4
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+ Id=5
+ Name=pppMappedFromIAP5
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+ Id=10007
+ Name=IPProto_generated_10007
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=5
+ CustomSelectionPolicy=5
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+ Id=6
+ Name=pppMappedFromIAP6
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+ Id=10008
+ Name=IPProto_generated_10008
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=6
+ CustomSelectionPolicy=6
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+ Id=7
+ Name=pppMappedFromIAP7
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+ Id=10009
+ Name=IPProto_generated_10009
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=7
+ CustomSelectionPolicy=7
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+ Id=8
+ Name=pppMappedFromIAP8
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 16
+ Id=10010
+ Name=IPProto_generated_10010
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=8
+ CustomSelectionPolicy=8
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 17
+ Id=9
+ Name=ethintMappedFromIAP9
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.4
+ Cpr=CprTable.3
+ SCpr=SCprTable.3
+ Protocol=ProtocolTable.4
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 18
+ Id=10011
+ Name=IPProto_generated_10011
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=9
+ CustomSelectionPolicy=9
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 19
+ Id=10
+ Name=pppMappedFromIAP10
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 20
+ Id=10012
+ Name=IPProto_generated_10012
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=10
+ CustomSelectionPolicy=10
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 21
+ Id=11
+ Name=pppMappedFromIAP11
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 22
+ Id=10013
+ Name=IPProto_generated_10013
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=11
+ CustomSelectionPolicy=11
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 23
+ Id=12
+ Name=pppMappedFromIAP12
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 24
+ Id=10014
+ Name=IPProto_generated_10014
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=12
+ CustomSelectionPolicy=12
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 25
+ Id=13
+ Name=pppMappedFromIAP13
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 26
+ Id=10015
+ Name=IPProto_generated_10015
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=13
+ CustomSelectionPolicy=13
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 27
+ Id=14
+ Name=pppMappedFromIAP14
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 28
+ Id=10016
+ Name=IPProto_generated_10016
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=14
+ CustomSelectionPolicy=14
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 29
+ Id=15
+ Name=pppMappedFromIAP15
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 30
+ Id=10017
+ Name=IPProto_generated_10017
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=15
+ CustomSelectionPolicy=15
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 31
+ Id=16
+ Name=pppMappedFromIAP16
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 32
+ Id=10018
+ Name=IPProto_generated_10018
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=16
+ CustomSelectionPolicy=16
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 33
+ Id=17
+ Name=pppMappedFromIAP17
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 34
+ Id=10019
+ Name=IPProto_generated_10019
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=17
+ CustomSelectionPolicy=17
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 35
+ Id=18
+ Name=pppMappedFromIAP18
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 36
+ Id=10020
+ Name=IPProto_generated_10020
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=18
+ CustomSelectionPolicy=18
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 37
+ Id=19
+ Name=pppMappedFromIAP19
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 38
+ Id=10021
+ Name=IPProto_generated_10021
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=19
+ CustomSelectionPolicy=19
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 39
+ Id=20
+ Name=pppMappedFromIAP20
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 40
+ Id=10022
+ Name=IPProto_generated_10022
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=20
+ CustomSelectionPolicy=20
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 41
+ Id=21
+ Name=pppMappedFromIAP21
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 42
+ Id=10023
+ Name=IPProto_generated_10023
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=21
+ CustomSelectionPolicy=21
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 43
+ Id=22
+ Name=pppMappedFromIAP22
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 44
+ Id=10024
+ Name=IPProto_generated_10024
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=22
+ CustomSelectionPolicy=22
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 45
+ Id=23
+ Name=pppMappedFromIAP23
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 46
+ Id=10025
+ Name=IPProto_generated_10025
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=23
+ CustomSelectionPolicy=23
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 47
+ Id=24
+ Name=pppMappedFromIAP24
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 48
+ Id=10026
+ Name=IPProto_generated_10026
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=24
+ CustomSelectionPolicy=24
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 49
+ Id=25
+ Name=pppMappedFromIAP25
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 50
+ Id=10027
+ Name=IPProto_generated_10027
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=25
+ CustomSelectionPolicy=25
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 51
+ Id=26
+ Name=tunnelnifMappedFromIAP26
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.6
+ Cpr=CprTable.7
+ SCpr=SCprTable.3
+ Protocol=ProtocolTable.6
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 52
+ Id=10028
+ Name=IPProto_generated_10028
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=26
+ CustomSelectionPolicy=26
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 53
+ Id=27
+ Name=pppMappedFromIAP27
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 54
+ Id=10029
+ Name=IPProto_generated_10029
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=27
+ CustomSelectionPolicy=27
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 55
+ Id=28
+ Name=pppMappedFromIAP28
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 56
+ Id=10030
+ Name=IPProto_generated_10030
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=28
+ CustomSelectionPolicy=28
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 57
+ Id=29
+ Name=pppMappedFromIAP29
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064565
+ MCpr=MCprTable.3
+ Cpr=CprTable.3
+ SCpr=SCprTable.5
+ Protocol=ProtocolTable.3
+ CprConfig=0
+ AppSID=0
+ Priority=4294967295
+ FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 58
+ Id=10031
+ Name=IPProto_generated_10031
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.271064560
+ MCpr=MCprTable.2
+ Cpr=CprTable.2
+ SCpr=SCprTable.2
+ Protocol=ProtocolTable.2
+ CprConfig=29
+ CustomSelectionPolicy=29
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 252
+ Id=10002
+ Name=SIPDefault
+ AccessPointSelectionPolicy=0
+ Tier=Link.TierTable.536887799
+ MCpr=MCprTable.11
+ Cpr=CprTable.5
+ SCpr=SCprTable.8
+ Protocol=ProtocolTable.2
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 254
+ Id=10000
+ Name=NetworkDefault
+ AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.20000
+ Tier=Link.TierTable.2048
+ MCpr=MCprTable.1
+ Cpr=CprTable.1
+ SCpr=SCprTable.7
+ Protocol=ProtocolTable.1
+ FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## GlobalSettings
+##
+[GlobalSettings]
+ADD_TEMPLATE
+ DefaultTier=1
+ FIELD_COUNT=1
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=DefaultRecordName-1
+ WAPAccessPoint=1
+ ConnectionAttempts=2
+ RedialAttempts=3
+ SmsBearer=1
+ SmsReceiveMode=2
+ GPRSAttachMode=1
+ AcceptIncomingGprs=1
+ GPRSClassCBearer=GSM
+ ModemForDataAndFax=2
+ ModemForPhoneServicesAndSMS=2
+ LocationForDataAndFax=2
+ LocationForPhoneServicesAndSMS=2
+ MaxMBufHeap=2
+ DefaultNetwork=1
+ BearerAvailabilityCheckTSY=mm
+ FIELD_COUNT=16
+END_ADD
+
+
+############################################################
+## IAP
+##
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=Pipex CSD
+ IAPServiceType=DialOutISP
+ IAPService=2
+ IAPBearerType=ModemBearer
+ IAPBearer=2
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=Ethernet IP4
+ IAPServiceType=LANService
+ IAPService=1
+ IAPBearerType=LANBearer
+ IAPBearer=1
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=2
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=NT RAS Com 0
+ IAPServiceType=DialOutISP
+ IAPService=3
+ IAPBearerType=ModemBearer
+ IAPBearer=3
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=3
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=NT RAS Com 1
+ IAPServiceType=DialOutISP
+ IAPService=3
+ IAPBearerType=ModemBearer
+ IAPBearer=4
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=3
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=WSP Test CSD
+ IAPServiceType=DialOutISP
+ IAPService=4
+ IAPBearerType=ModemBearer
+ IAPBearer=2
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Name=Msg Test CSD
+ IAPServiceType=DialOutISP
+ IAPService=2
+ IAPBearerType=ModemBearer
+ IAPBearer=2
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=Msg Test Auth CSD
+ IAPServiceType=DialOutISP
+ IAPService=5
+ IAPBearerType=ModemBearer
+ IAPBearer=2
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Name=WinTunnel on Epoc Com1
+ IAPServiceType=DialOutISP
+ IAPService=3
+ IAPBearerType=ModemBearer
+ IAPBearer=5
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=3
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+ Name=Ethernet IP6
+ IAPServiceType=LANService
+ IAPService=2
+ IAPBearerType=LANBearer
+ IAPBearer=2
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=2
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+ Name=IP6 Dial
+ IAPServiceType=DialOutISP
+ IAPService=6
+ IAPBearerType=ModemBearer
+ IAPBearer=2
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+ Name=GSMPhone1
+ IAPServiceType=DialOutISP
+ IAPService=2
+ IAPBearerType=ModemBearer
+ IAPBearer=2
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+ Name=USIM Test
+ IAPServiceType=DialOutISP
+ IAPService=7
+ IAPBearerType=ModemBearer
+ IAPBearer=6
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+ Name=Vodafone GPRS
+ IAPServiceType=OutgoingGPRS
+ IAPService=1
+ IAPBearerType=ModemBearer
+ IAPBearer=7
+ IAPNetwork=3
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+ Name=Vodafone WAP GPRS
+ IAPServiceType=OutgoingGPRS
+ IAPService=2
+ IAPBearerType=ModemBearer
+ IAPBearer=7
+ IAPNetwork=3
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+ Name=Orange GPRS
+ IAPServiceType=OutgoingGPRS
+ IAPService=3
+ IAPBearerType=ModemBearer
+ IAPBearer=7
+ IAPNetwork=4
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 16
+ Name=Orange WAP GPRS
+ IAPServiceType=OutgoingGPRS
+ IAPService=4
+ IAPBearerType=ModemBearer
+ IAPBearer=7
+ IAPNetwork=4
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 17
+ Name=O2 GPRS
+ IAPServiceType=OutgoingGPRS
+ IAPService=5
+ IAPBearerType=ModemBearer
+ IAPBearer=7
+ IAPNetwork=5
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 18
+ Name=O2 WAP GPRS
+ IAPServiceType=OutgoingGPRS
+ IAPService=6
+ IAPBearerType=ModemBearer
+ IAPBearer=7
+ IAPNetwork=5
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 19
+ Name=CityOnlines CSD India
+ IAPServiceType=DialOutISP
+ IAPService=8
+ IAPBearerType=ModemBearer
+ IAPBearer=2
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 20
+ Name=Hutch GPRS
+ IAPServiceType=OutgoingGPRS
+ IAPService=7
+ IAPBearerType=ModemBearer
+ IAPBearer=7
+ IAPNetwork=6
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 21
+ Name=Vodafone WAP GSM
+ IAPServiceType=DialOutISP
+ IAPService=9
+ IAPBearerType=ModemBearer
+ IAPBearer=2
+ IAPNetwork=3
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 22
+ Name=Orange WAP GSM
+ IAPServiceType=DialOutISP
+ IAPService=10
+ IAPBearerType=ModemBearer
+ IAPBearer=2
+ IAPNetwork=4
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 23
+ Name=O2 WAP GSM
+ IAPServiceType=DialOutISP
+ IAPService=11
+ IAPBearerType=ModemBearer
+ IAPBearer=2
+ IAPNetwork=5
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 24
+ Name=Test Network CSD
+ IAPServiceType=DialOutISP
+ IAPService=12
+ IAPBearerType=ModemBearer
+ IAPBearer=2
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 25
+ Name=Test Network CSD IP6
+ IAPServiceType=DialOutISP
+ IAPService=13
+ IAPBearerType=ModemBearer
+ IAPBearer=2
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 26
+ Name=Cisco VPN IAP
+ IAPServiceType=VpnService
+ IAPService=3
+ IAPBearerType=VirtualBearer
+ IAPBearer=3
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 27
+ Name=DUMMY TSY
+ IAPServiceType=DialOutISP
+ IAPService=3
+ IAPBearerType=ModemBearer
+ IAPBearer=8
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 28
+ Name=mRouter USB
+ IAPServiceType=DialOutISP
+ IAPService=14
+ IAPBearerType=ModemBearer
+ IAPBearer=10
+ IAPNetwork=2
+ IAPNetworkWeighting=0
+ Location=2
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 29
+ Name=mRouter Wins
+ IAPServiceType=DialOutISP
+ IAPService=14
+ IAPBearerType=ModemBearer
+ IAPBearer=9
+ IAPNetwork=2
+ IAPNetworkWeighting=0
+ Location=2
+ FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+##
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=DefaultRecordName-1
+ Ranking=1
+ Direction=OUTGOING
+ BearerSet=CSD
+ DialogPref=DONOTPROMPT
+ IAP=24
+ FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## Proxies
+##
+[Proxies]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=DefaultRecordName-1
+ ISP=4
+ ProxyServiceType=DialOutISP
+ UseProxyServer=TRUE
+ ProxyServerName=www.dummyproxy.com
+ ProtocolName=http
+ PortNumber=80
+ Exceptions=www.dummyproxy.com/exception
+ FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## WAPAccessPoint
+##
+[WAPAccessPoint]
+ADD_TEMPLATE
+ Name=Default Dial In ISP
+ CurrentBearer=WAPIPBearer
+ FIELD_COUNT=2
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=Vodafone WAP GPRS
+ StartPage=wap:1999/vodafone.wml
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=Orange WAP GPRS
+ StartPage=orange.multimedia
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=O2 WAP GPRS
+ StartPage=wap.o2.co.uk
+ FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## WAPIPBearer
+##
+[WAPIPBearer]
+ADD_TEMPLATE
+ Name=DefaultRecordName-1
+ GatewayAddress=0
+ WSPOption=CONNECTIONLESS
+ Security=FALSE
+ ProxyPortNumber=0
+ ProxyLogin=0
+ ProxyPassword=0
+ FIELD_COUNT=7
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=DefaultRecordName-2
+ AccessPointId=2
+ GatewayAddress=wap.closedtest.intra
+ IAP=24
+ WSPOption=CONNECTIONORIENTED
+ ProxyPortNumber=1
+ ProxyLogin=1
+ ProxyPassword=1
+ FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## WAPSMSBearer
+##
+[WAPSMSBearer]
+ADD_TEMPLATE
+ Name=DefaultRecordName-1
+ GatewayAddress=0
+ ServiceCentreAddress=0
+ WSPOption=CONNECTIONLESS
+ Security=FALSE
+ FIELD_COUNT=5
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=DefaultRecordName-2
+ AccessPointId=2
+ GatewayAddress=+4412345678901
+ ServiceCentreAddress=+442071234567
+ WSPOption=CONNECTIONORIENTED
+ FIELD_COUNT=5
+END_ADD
+
+
+############################################################
+## SecureSocketTable
+##
+[SecureSocketTable]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=DefaultRecordName-1
+ ProtocolName=ssl3.0
+ ProtoLibrary=ssladaptor.dll
+ FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=DefaultRecordName-2
+ ProtocolName=tls1.0
+ ProtoLibrary=ssladaptor.dll
+ FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## VpnService
+##
+[VpnService]
+ADD_TEMPLATE
+ Name=Default VPN
+ Policy=DefaultVPNpolicy
+ HomeIAP=1
+ FIELD_COUNT=3
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=VPN1
+ Policy=VPNpolicy1
+ HomeIAP=2
+ HomeNetwork=1
+ FIELD_COUNT=4
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=cisco tunnel
+ Policy=cisco_all
+ HomeIAP=8
+ HomeNetwork=1
+ FIELD_COUNT=4
+END_ADD
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/connection_start.script Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,28 @@
+//
+// Copyright (c) 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:
+//
+//Create the CommDb required for the AgentAdapter tests & Run PPP Connection Start Tests
+
+RUN_SCRIPT z:\TestData\scripts\esock_test_unloadesockForced.script
+ced z:\TestData\configs\te_pppsize.xml ppp.log
+
+RUN_SCRIPT z:\TestData\scripts\esock_test_loadesock.script
+
+load_suite CSDAGTTESTS.DLL
+
+heap_mark
+run_test_step 0, CSDAGTTESTS, Connection
+heap_markend
+test_complete
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/connection_start_failure.script Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,27 @@
+//
+// Copyright (c) 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:
+//
+//Create the CommDb required for the AgentAdapter tests & Run PPP Connection Start Failure Tests
+
+RUN_SCRIPT z:\TestData\scripts\esock_test_unloadesockForced.script
+ced z:\TestData\configs\cedout.cfg ced.log
+RUN_SCRIPT z:\TestData\scripts\esock_test_loadesock.script
+
+load_suite CSDAGTTESTS.DLL
+
+heap_mark
+run_test_step 0, CSDAGTTESTS, ConnectionStartFailure
+heap_markend
+test_complete
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/csdagenttest.script Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,19 @@
+//
+// Copyright (c) 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:
+//
+//Split script files with those that need and doesnt need TestNetwork
+PRINT Run AgentAdapterTest
+run_script z:\TestData\scripts\connection_start.script
+run_script z:\TestData\scripts\connection_start_failure.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/csdagenttests.mmp Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) 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:
+*
+*/
+TARGET csdagttests.dll
+TARGETTYPE DLL
+UID 0x1000008d 0x10003d9a
+VENDORID 0x70000001
+// UIDs need updating
+
+
+SOURCEPATH ../src
+
+SOURCE csdAgent_Connection.cpp
+SOURCE csdAgent_ConnectionFailure.cpp
+SOURCE csdAgent_TestSteps.cpp
+SOURCE csdAgent_TestSuite.cpp
+
+
+SYSTEMINCLUDE ../inc
+
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+SYSTEMINCLUDE /epoc32/include
+#else
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+#endif
+
+LIBRARY euser.lib integrationtestutils.lib esock.lib insock.lib commdb.lib c32root.lib efsrv.lib
+
+
+START WINS
+BASEADDRESS 0x59100000
+END
+
+
+CAPABILITY ALL -Tcb
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/csdagttests.iby Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,33 @@
+/*
+* Copyright (c) 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:
+*
+*/
+#ifndef __CSDAGTTESTS_IBY__
+#define __CSDAGTTESTS_IBY__
+
+REM KIPPER - LAN AGT
+
+#include <nullagt.iby>
+
+file=ABI_DIR\DEBUG_DIR\csdagttests.dll System\Libs\csdagttests.dll
+
+// Scripts
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\csdagenttest.script testdata\scripts\csdagenttest.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\connection_start.script testdata\scripts\connection_start.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\connection_start_failure.script testdata\scripts\connection_start_failure.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\cedout.cfg TestData\configs\cedout.cfg
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSteps.h Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,78 @@
+// Copyright (c) 2002-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:
+// Contains the declarations of the test suite classes used to test
+// the CSD Agent Connection/Connection Failure steps
+//
+//
+
+
+/**
+ @file
+ @internalTechnology
+*/
+#ifndef __CSDAGENTTESTSTEPS_H__
+#define __CSDAGENTTESTSTEPS_H__
+
+#include "CsdAgentTestSuite.h"
+#include <networking/teststep.h>
+#include "es_sock.h"
+
+
+class CsdAgentTestStep : public CTestStep
+ {
+ public:
+ CsdAgentTestStep();
+ virtual ~CsdAgentTestStep();
+
+ private:
+ enum TVerdict doTestStepPreambleL();
+
+ protected:
+ TInt OpenConnection(RConnection& conn, RSocketServ& ss);
+ void CloseConnection(RConnection& conn);
+ TInt EnumerateConnections(RConnection& conn, TUint& num);
+ TInt WaitForAllInterfacesToCloseL(RSocketServ& ss);
+ };
+
+
+_LIT(KSrcPath, "z:\\testdata\\configs\\agentdialog.ini");
+_LIT(KDestPath, "c:\\private\\101f7989\\esock\\agentdialog.ini");
+
+class CTestStepCsdAgentConnection: public CsdAgentTestStep
+ {
+ public:
+ CTestStepCsdAgentConnection(TPtrC aName);
+ void ConstructL() {};
+ virtual ~CTestStepCsdAgentConnection() {};
+
+ // called by framework to do the test
+ virtual enum TVerdict doTestStepL(void);
+
+ private:
+ };
+
+class CTestStepCsdAgtConnectionFailure: public CsdAgentTestStep
+ {
+ public:
+ CTestStepCsdAgtConnectionFailure(TPtrC aName);
+ void ConstructL() {};
+ virtual ~CTestStepCsdAgtConnectionFailure() {};
+
+ // called by framework to do the test
+ virtual enum TVerdict doTestStepL(void);
+
+ private:
+ };
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSuite.h Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,36 @@
+// Copyright (c) 2002-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:
+// Contains the declarations of the test suite classes used to test
+// the CSD Agent using the integration test framework (scheduleTest)
+//
+//
+
+#ifndef __CSDAGENTTESTSUITE_H__
+#define __CSDAGENTTESTSUITE_H__
+
+#include <networking/testsuite.h>
+
+class CTestSuiteCsdAgt : public CTestSuite
+ {
+ public:
+ void InitialiseL(void);
+ CTestSuiteCsdAgt::~CTestSuiteCsdAgt() {};
+ TPtrC GetVersion(void);
+ private:
+ };
+
+IMPORT_C CTestSuiteCsdAgt *CreateTestSuite(void);
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_Connection.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,67 @@
+// Copyright (c) 2002-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:
+// Contain the implementation of the class for generic CSD agent test
+//
+//
+#include "CsdAgentTestSteps.h"
+#include "es_sock.h"
+#include "in_sock.h"
+#include "commdbconnpref.h"
+
+CTestStepCsdAgentConnection::CTestStepCsdAgentConnection(TPtrC aName)
+{
+ iTestStepName=aName;
+}
+
+enum TVerdict CTestStepCsdAgentConnection::doTestStepL(void)
+ {
+
+ __UHEAP_MARK;
+ TInt err;
+ RSocketServ server;
+ RConnection connection;
+ TRequestStatus status;
+
+ err = server.Connect();
+ TESTEL(err == KErrNone, err);
+ CleanupClosePushL(server);
+
+ err = connection.Open(server,KAfInet);
+ TESTEL(err == KErrNone, err);
+ CleanupClosePushL(connection);
+
+ //connection_start.script
+ //TestCase1: Start the connection (outgoing) which results in 0, KErrNone, it pulls pppLcp for te_ppsize.xml
+ // Verifies AgentAdapter state transition from EConnecting to EConnected
+ TCommDbConnPref prefs;
+ prefs.SetIapId(0);
+ prefs.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+
+ connection.Start(prefs, status);
+ User::WaitForRequest(status);
+ TESTEL(status.Int() == KErrNone, status.Int());
+
+ // Verifies AgentAdapter state transition from EConnected to EDisconnecting
+ err = connection.Stop();
+ TESTEL(err == KErrNone, err);
+ CleanupStack::Pop();
+
+ // close the socket server
+ server.Close();
+ CleanupStack::Pop();
+
+ __UHEAP_MARKEND;
+
+ return iTestStepResult;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_ConnectionFailure.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,66 @@
+// Copyright (c) 2002-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:
+// Contain the implementation of the class for generic CSD agent test
+//
+//
+#include "CsdAgentTestSteps.h"
+#include "es_sock.h"
+#include "in_sock.h"
+
+
+CTestStepCsdAgtConnectionFailure::CTestStepCsdAgtConnectionFailure(TPtrC aName)
+{
+ iTestStepName=aName;
+}
+
+enum TVerdict CTestStepCsdAgtConnectionFailure::doTestStepL(void)
+ {
+ __UHEAP_MARK;
+ TInt err;
+ RSocketServ server;
+ RConnection connection;
+ TRequestStatus status;
+
+ err = server.Connect();
+ TESTEL(err == KErrNone, err);
+ CleanupClosePushL(server);
+
+ err = connection.Open(server,KAfInet);
+ TESTEL(err == KErrNone, err);
+ CleanupClosePushL(connection);
+
+ // Connection_Start_Failure.script
+ // Test Case2: Start the connection (outgoing) which results in a -1 Failure, it pulls pppLcp record from cedout.cfg
+ // It verifies AgentAdapter State transition from EConnecting to EDisconnecting state
+ connection.Start(status);
+ User::WaitForRequest(status);
+ TESTEL(status.Int() == KErrNotFound, status.Int());
+
+ // Verifies the AgentAdapter State is in EDisconnecting State, Upon Agent Start ending in a failure
+ // Try to stop connection that failed to start
+ err = connection.Stop();
+ TESTEL(err == KErrNotReady, err);
+ CleanupStack::Pop();
+
+ // close the socket server
+ server.Close();
+ CleanupStack::Pop();
+
+ __UHEAP_MARKEND;
+
+ return iTestStepResult;
+ }
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_TestSteps.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,111 @@
+// Copyright (c) 2002-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:
+// Contain the implementation of the class for generic CSD agent test
+//
+//
+#include <f32file.h>
+#include "CsdAgentTestSteps.h"
+
+CsdAgentTestStep::CsdAgentTestStep()
+ {
+
+ }
+
+CsdAgentTestStep::~CsdAgentTestStep()
+ {
+
+ }
+
+enum TVerdict CsdAgentTestStep::doTestStepPreambleL()
+ {
+ enum TVerdict result = EPass;
+
+ RSocketServ ss;
+ ss.Connect();
+ CleanupClosePushL(ss);
+
+ if(KErrNone == WaitForAllInterfacesToCloseL(ss))
+ result = EPass;
+ else
+ result = EFail;
+
+ ss.Close();
+ CleanupStack::Pop();
+ return result;
+ }
+
+TInt CsdAgentTestStep::WaitForAllInterfacesToCloseL(RSocketServ& ss)
+ {
+ TInt err;
+ TUint numOfConnections;
+ TUint count =0;
+
+ RConnection conn;
+
+ err = OpenConnection(conn,ss);
+ TESTEL(KErrNone == err,err);
+ CleanupClosePushL(conn);
+
+ err = EnumerateConnections(conn,numOfConnections);
+ TESTEL(KErrNone == err,err);
+
+ while((0 !=numOfConnections) && (count <60))
+ {
+ count++;
+ User::After(1000000);
+ err = EnumerateConnections(conn,numOfConnections);
+ }
+
+ CloseConnection(conn);
+
+ CleanupStack::Pop();
+
+ if(numOfConnections !=0)
+ {
+ return KErrTimedOut;
+ }
+ return KErrNone;
+ }
+
+ TInt CsdAgentTestStep::OpenConnection(RConnection& conn, RSocketServ& ss)
+/*
+ * Open the connection using the socket server too
+ * @param conn the connection to open
+ * @param ss the socket server within which the connection is to be opened
+ * @return system wide error code
+ */
+{
+ return (conn.Open(ss));
+}
+
+TInt CsdAgentTestStep::EnumerateConnections(RConnection& conn, TUint& num)
+/*
+ * Read how many connections (==interfaces?) exist at the moment
+ * @param conn - to be used to read the count
+ * @param num - on completion holds the number of connections
+ * @return system wide error code
+ */
+{
+ return (conn.EnumerateConnections(num));
+}
+
+void CsdAgentTestStep::CloseConnection(RConnection& conn)
+/*
+ * Close a connection
+ * @param conn the connection to close
+ * @return system wide error code
+ */
+{
+ conn.Close();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_Testsuite.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -0,0 +1,45 @@
+// Copyright (c) 2002-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:
+// Contain the Test Steps for Connection/Connection Failure tests for CSD agent
+//
+//
+#include <CsdAgentTestSuite.h>
+#include <CsdAgentTestSteps.h>
+
+#include "c32comm.h"
+
+EXPORT_C CTestSuiteCsdAgt* CreateTestSuite(void)
+{
+ return new (ELeave) CTestSuiteCsdAgt();
+}
+
+void CTestSuiteCsdAgt::InitialiseL()
+ {
+ _LIT(KPhbkSyncCMI, "phbsync.cmi");
+ TInt ret = StartC32WithCMISuppressions(KPhbkSyncCMI);
+
+ if ( KErrNone != ret && KErrAlreadyExists != ret )
+ {
+ User::Leave( ret );
+ }
+
+ AddTestStepL(new (ELeave) CTestStepCsdAgentConnection(_L("Connection")) );
+ AddTestStepL(new (ELeave) CTestStepCsdAgtConnectionFailure(_L("ConnectionStartFailure")) );
+ }
+
+TPtrC CTestSuiteCsdAgt::GetVersion(void)
+{
+ _LIT(KVersion, "1.0");
+ return KVersion();
+}
--- a/linklayercontrol/nullagt/group/bld.inf Thu Sep 16 13:48:44 2010 +0530
+++ b/linklayercontrol/nullagt/group/bld.inf Thu Sep 23 17:23:35 2010 +0530
@@ -49,4 +49,5 @@
PRJ_TESTMMPFILES
../TS_nullagt/group/nullagttests.mmp
+#include "../TS_AgentAdapter/group/bld.inf"
--- a/networkcontrol/ipnetworklayer/src/IPProtoCprStates.cpp Thu Sep 16 13:48:44 2010 +0530
+++ b/networkcontrol/ipnetworklayer/src/IPProtoCprStates.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -409,14 +409,21 @@
TCFMessage::TSubConnDataTransferred wholeConnMsg(KNifEMCompatibilityLayerEntireSubConnectionUid, dmProvider->DataVolumesPtr()->iSentBytes, dmProvider->DataVolumesPtr()->iReceivedBytes);
TCFMessage::TSubConnDataTransferred defaultSubConnMsg(KNifEMCompatibilityLayerFakeSubConnectionId, dmProvider->DataVolumesPtr()->iSentBytes, dmProvider->DataVolumesPtr()->iReceivedBytes);
- RNodeInterface* ctrlClient = iContext.Node().GetFirstClient<TDefaultClientMatchPolicy>(TClientType(TCFClientType::ECtrl));
- if(ctrlClient)
- { // Can't send this if the client's gone
- ctrlClient->PostMessage(iContext.NodeId(), wholeConnMsg);
- ctrlClient->PostMessage(iContext.NodeId(), defaultSubConnMsg);
-
- iContext.Node().iSubConnEventDataSent = ETrue;
- }
+ // Sending data clent status change message to all the control clients
+ TClientIter<TDefaultClientMatchPolicy> ccIter = iContext.Node().GetClientIter<TDefaultClientMatchPolicy>(TClientType(TCFClientType::ECtrl), TClientType(0, TCFClientType::ELeaving));
+ RNodeInterface* ctrlClient;
+ TBool ctrlClientPresent = false;
+ while ((ctrlClient = ccIter++) != NULL)
+ {
+ //If any cntl clinet is present setting the variable ctrlClientPresent as true.
+ ctrlClientPresent = true;
+ ctrlClient->PostMessage(iContext.NodeId(), wholeConnMsg);
+ ctrlClient->PostMessage(iContext.NodeId(), defaultSubConnMsg);
+ }
+ if(ctrlClientPresent)
+ {
+ iContext.Node().iSubConnEventDataSent = ETrue;
+ }
}
}
--- a/networkingsrv_info/networkingrom/group/NetworkTest.iby Thu Sep 16 13:48:44 2010 +0530
+++ b/networkingsrv_info/networkingrom/group/NetworkTest.iby Thu Sep 23 17:23:35 2010 +0530
@@ -134,7 +134,7 @@
#endif //NW_TEST_ROM_2
// FTP Tests
-//#include <tftp_e.iby>
+#include <tftp_e.iby>
// IntegrationTest framework
#ifdef NW_TEST_ROM_1
@@ -144,6 +144,8 @@
// NULL AGT Tests
#ifdef NW_TEST_ROM_1
#include <nullagttests.iby>
+// Agent Adapter Tests
+#include <csdagttests.iby>
#endif
// Useful Internet Utilities for all test roms
--- a/networksecurity/tls/protocol/applicationdata.cpp Thu Sep 16 13:48:44 2010 +0530
+++ b/networksecurity/tls/protocol/applicationdata.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -35,7 +35,7 @@
LOG(Log::Printf(_L("self %x - %x"), self, (TUint)self + sizeof( CSendAppData ));)
CleanupStack::PushL( self );
self->ConstructL( aRecordComposer );
- CleanupStack::Pop();
+ CleanupStack::Pop(self);
return self;
}
@@ -167,7 +167,7 @@
LOG(Log::Printf(_L("self %x - %x"), self, (TUint)self + sizeof( CRecvAppData ));)
CleanupStack::PushL( self );
self->ConstructL( aTlsConnection );
- CleanupStack::Pop();
+ CleanupStack::Pop(self);
return self;
}
--- a/networksecurity/tls/protocol/handshakereceiveevents.cpp Thu Sep 16 13:48:44 2010 +0530
+++ b/networksecurity/tls/protocol/handshakereceiveevents.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -448,7 +448,7 @@
HBufC8* buf = listPtr.AllocL();
CleanupStack::PushL(buf);
User::LeaveIfError(cryptoAttributes.iDistinguishedCANames.Append(buf) );
- CleanupStack::Pop();
+ CleanupStack::Pop(buf);
listNode = listNode->Next();
}
iTlsProvider->Attributes()->iClientAuthenticate = ETrue;
--- a/networksecurity/tls/protocol/recordprotocolevents.cpp Thu Sep 16 13:48:44 2010 +0530
+++ b/networksecurity/tls/protocol/recordprotocolevents.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -234,7 +234,11 @@
{
iActiveTlsSession->CancelRequest();
}
- ReConstructL();
+ TRAPD(ret, ReConstructL());
+ if ( ret != KErrNone )
+ {
+ LOG(Log::Printf(_L("ReConstructL() returned the error %d"), ret);)
+ }
}
void CRecordParser::DispatchData()
--- a/networksecurity/tls/protocol/tlsconnection.cpp Thu Sep 16 13:48:44 2010 +0530
+++ b/networksecurity/tls/protocol/tlsconnection.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -53,7 +53,7 @@
CleanupStack::PushL(self);
self->ConstructL(aSocket, aProtocol);
- CleanupStack::Pop();
+ CleanupStack::Pop(self);
return self;
}
@@ -78,7 +78,7 @@
CleanupStack::PushL(self);
self->ConstructL(aSocket, aProtocol);
- CleanupStack::Pop();
+ CleanupStack::Pop(self);
return self;
}
@@ -1190,12 +1190,18 @@
return EFalse;
}
else
- {//delete data path in case it's re-negotiation what's failed
- delete iSendAppData;
- iSendAppData = NULL;
- delete iRecvAppData;
- iRecvAppData = NULL;
- ResetCryptoAttributes();
+ {
+ if (aStateMachine->LastError() != KErrEof)
+ {
+ }
+ else
+ {
+ delete iSendAppData;
+ iSendAppData = NULL;
+ delete iRecvAppData;
+ iRecvAppData = NULL;
+ ResetCryptoAttributes();
+ }
}
}
else
--- a/networksecurity/tls/protocol/tlshandshake.cpp Thu Sep 16 13:48:44 2010 +0530
+++ b/networksecurity/tls/protocol/tlshandshake.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -55,7 +55,7 @@
LOG(Log::Printf(_L("self %x - %x"), self, (TUint)self + sizeof( CHandshake ));)
CleanupStack::PushL(self);
self->ConstructL(aTlsConnection);
- CleanupStack::Pop();
+ CleanupStack::Pop(self);
return self;
}
--- a/networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp Thu Sep 16 13:48:44 2010 +0530
+++ b/networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -136,7 +136,7 @@
CTlsCryptoAttributes* tPtr = new (ELeave)CTlsCryptoAttributes;
CleanupStack::PushL(tPtr);
tPtr->iPublicKeyParams = new (ELeave)CTLSPublicKeyParams;
- CleanupStack::Pop();
+ CleanupStack::Pop(tPtr);
return tPtr;
}
@@ -1267,9 +1267,10 @@
case EGetSessionInterface:
{
+ if (iPtrTokenSearch)
iPtrTokenSearch->CancelRequest();
+ }
break;
- }
case EGetCiphers:
{
if(iListAllTokensAndTypes[iCurrentTokentype].iProviderInterface)
@@ -1321,6 +1322,7 @@
#ifdef _USESECDLGSV_
iDialogServ.Cancel();
#else
+ if (iSecurityDialog)
iSecurityDialog->Cancel();
#endif
}
--- a/networksecurity/tlsprovider/source/tlsprovider/Ctlsbrowsetoken.cpp Thu Sep 16 13:48:44 2010 +0530
+++ b/networksecurity/tlsprovider/source/tlsprovider/Ctlsbrowsetoken.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -183,7 +183,10 @@
if ( !tempObj || iListAllTokensAndTypes->Append(*tempObj) != KErrNone )
{
delete tempObj;
+ if (iTokenHandle)
+ {
iTokenHandle->Release();
+ }
iTokenHandle = NULL;
User::Leave( KErrNoMemory );
}
@@ -192,7 +195,10 @@
Tokens.iTokenInfo = new CTokenInfo;
if ( !Tokens.iTokenInfo )
{
+ if (iTokenHandle)
+ {
iTokenHandle->Release();
+ }
iTokenHandle = NULL;
User::Leave( KErrNoMemory );
}
@@ -307,24 +313,39 @@
switch (iCurrentState)
{
case EGetTokenList:
+ {
+ if (iPtrTokenType)
iPtrTokenType->CancelList();
+ }
break;
case EOpenToken:
+ {
+ if (iPtrTokenType)
iPtrTokenType->CancelOpenToken();
+ }
break;
case EGetProviderInterface:
+ {
+ if (iTokenHandle)
iTokenHandle->CancelGetInterface();
+ }
break;
case EGetSessionInterface:
+ {
+ if (iTokenProvider)
(iTokenProvider->Token()).CancelGetInterface();
+ }
break;
case EGetCiphers:
+ if (iTokenInterface)
+ {
MTLSTokenProvider* provider = static_cast<MTLSTokenProvider*>(iTokenInterface);
provider->CancelCryptoCapabilities();
+ }
break;
}
--- a/networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp Thu Sep 16 13:48:44 2010 +0530
+++ b/networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp Thu Sep 23 17:23:35 2010 +0530
@@ -249,6 +249,7 @@
*/
EXPORT_C void CTLSProvider::CancelRequest()
{
+ if (iTlsProviderImpl)
iTlsProviderImpl->CancelRequest();
}
@@ -645,11 +646,13 @@
*/
EXPORT_C void CTLSSession::CancelRequest()
{
+ if (iTlsSessionImpl)
iTlsSessionImpl->CancelRequest();
}
EXPORT_C CTLSSession::~CTLSSession()
{
delete iTlsSessionImpl;
+ iTlsSessionImpl = NULL;
}