--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/build.config.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+ name CDATA #REQUIRED
+ levels CDATA #IMPLIED
+ span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset
+ name CDATA #REQUIRED
+ levels CDATA #IMPLIED
+ span CDATA #IMPLIED
+ level CDATA #IMPLIED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+ name CDATA #REQUIRED
+ level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+ unitID ID #REQUIRED
+ name CDATA #REQUIRED
+ mrp CDATA #REQUIRED
+ filter CDATA #IMPLIED
+ bldFile CDATA #REQUIRED
+ priority CDATA #IMPLIED
+ contract CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+ name CDATA #REQUIRED
+ mrp CDATA #REQUIRED
+ filter CDATA #IMPLIED
+ contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+ name CDATA #REQUIRED
+ version CDATA #REQUIRED
+ late (Y|N) #IMPLIED
+ filter CDATA #IMPLIED
+ contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+ name ID #REQUIRED
+ description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+ name ID #REQUIRED
+ description CDATA #REQUIRED
+ target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+ name ID #REQUIRED
+ abldTarget CDATA #REQUIRED
+ description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+ name ID #REQUIRED
+ abldOption CDATA #REQUIRED
+ description CDATA #REQUIRED
+ enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+ name ID #REQUIRED
+ description CDATA #REQUIRED
+ filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+ command CDATA #REQUIRED
+ targetList IDREFS #IMPLIED
+ unitParallel (Y | N | y | n) #REQUIRED
+ targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+ name CDATA #REQUIRED
+ cwd CDATA #REQUIRED
+ command CDATA #REQUIRED>
+ <!ENTITY layer_real_source_path "sf/os/networkingsrv">
+]>
+
+<SystemDefinition name="networkingsrv" schema="1.4.0">
+ <systemModel>
+ <layer name="os_layer">
+ <module name="networkingsrv">
+ <unit unitID="production1" mrp="" bldFile="sf\os\networkingsrv\group" name="production1" />
+ </module>
+ </layer>
+ <layer name="api_test_layer">
+ <module name="networkingsrv_test">
+ <unit unitID="test50" mrp="" bldFile="sf\os\networkingsrv\group" name="test50" />
+ <unit unitID="test1" mrp="" bldFile="sf\os\commsfw\commsconfig\commsdatabaseshim\group" name="test1" />
+ <unit unitID="test2" mrp="" bldFile="sf\os\commsfw\commsfwtools\preparedefaultcommsdatabase\group" name="test2" />
+ <unit unitID="test3" mrp="" bldFile="sf\os\commsfw\commsfwtools\preparedefaultcommsdatabase\defaultcommdb\group" name="test3" />
+ <unit unitID="test4" mrp="" bldFile="sf\os\commsfw\commsfwtools\preparedefaultcommsdatabase\installdefaultcommdb\group" name="test4" />
+ <unit unitID="test5" mrp="" bldFile="sf\os\commsfw\commsfwsupport\commselements\commsfw\group" name="test5" />
+ <unit unitID="test6" mrp="" bldFile="sf\os\commsfw\commsfwsupport\commselements\group" name="test6" />
+ <unit unitID="test7" mrp="" bldFile="sf\os\commsfw\commsfwtools\commstools\group" name="test7" />
+ <unit unitID="test8" mrp="" bldFile="sf\os\commsfw\commsfwtools\commstools\messageinterceptregister\group" name="test8" />
+ <unit unitID="test9" mrp="" bldFile="sf\os\persistentdata\loggingservices\filelogger\group" name="test9" />
+ <unit unitID="test10" mrp="" bldFile="sf\os\commsfw\commsfwutils\commsbufs\group" name="test10" />
+ <unit unitID="test11" mrp="" bldFile="sf\os\networkingsrv\linklayercontrol\networkinterfacemgr\group" name="test11" />
+ <unit unitID="test12" mrp="" bldFile="sf\os\commsfw\commsprocess\commsrootserverconfig\group" name="test12" />
+ <unit unitID="test13" mrp="" bldFile="sf\os\networkingsrv\networkingtestandutils\ipv6to4tunnel\group" name="test13" />
+ <unit unitID="test14" mrp="" bldFile="sf\os\cellularsrv\basebandabstraction\basebandchanneladaptor\group" name="test14" />
+ <unit unitID="test15" mrp="" bldFile="sf\os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group" name="test15" />
+ <unit unitID="test16" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\umtsgprsscpr\group" name="test16" />
+ <unit unitID="test17" mrp="" bldFile="sf\os\cellularsrv\smsprotocols\smsstack\group" name="test17" />
+ <unit unitID="test18" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\csdagt\group" name="test18" />
+ <unit unitID="test19" mrp="" bldFile="sf\os\cellularsrv\telephonyserver\etelpacketdata\group" name="test19" />
+ <unit unitID="test20" mrp="" bldFile="sf\os\commsfw\datacommsserver\networkingdialogapi\group" name="test20" />
+ <unit unitID="test21" mrp="" bldFile="sf\os\commsfw\datacommsserver\networkingdialogapi\default" name="test21" />
+ <unit unitID="test22" mrp="" bldFile="sf\os\commsfw\datacommsserver\esockserver\group" name="test22" />
+ <unit unitID="test23" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group" name="test23" />
+ <unit unitID="test24" mrp="" bldFile="sf\os\commsfw\datacommsserver\networkcontroller\group" name="test24" />
+ <unit unitID="test25" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\group" name="test25" />
+ <unit unitID="test26" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\group" name="test26" />
+ <unit unitID="test27" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\psdagt\group" name="test27" />
+ <unit unitID="test28" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\qosextnapi\group" name="test28" />
+ <unit unitID="test29" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\qos3gppcpr\group" name="test29" />
+ <unit unitID="test30" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\rawipnif\group" name="test30" />
+ <unit unitID="test31" mrp="" bldFile="sf\mw\netprotocols\applayerprotocols\telnetengine\group" name="test31" />
+ <unit unitID="test32" mrp="" bldFile="sf\os\networkingsrv\linklayerprotocols\tunnelnif\group" name="test31" />
+ <unit unitID="test33" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group" name="test33" />
+ <unit unitID="test34" mrp="" bldFile="sf\os\commsfw\serialserver\packetloopbackcsy\group" name="test34" />
+ <unit unitID="test35" mrp="" bldFile="sf\os\commsfw\serialserver\c32serialserver\group" name="test35" />
+ <unit unitID="test36" mrp="" bldFile="sf\os\commsfw\serialserver\c32serialserverconfig" name="test36" />
+ <unit unitID="test37" mrp="" bldFile="sf\mw\netprotocols\wapstack\wapmessageapi\group" name="test37" />
+ <unit unitID="test38" mrp="" bldFile="sf\os\security\cryptomgmtlibs\cryptotokenfw\group" name="test38" />
+ <unit unitID="test39" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\Te_UmtsGprsSCPR\group" name="test39" />
+ <unit unitID="test40" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_mbms\group" name="test40" />
+ <unit unitID="test41" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spud\group" name="test41" />
+ <unit unitID="test42" mrp="" bldFile="sf\mw\netprotocols\applayerprotocols\ftpengine\group" name="test42" />
+ <unit unitID="test43" mrp="" bldFile="sf\mw\netprotocols\applayerprotocols\ftpengine\group" name="test43" />
+ <unit unitID="test44" mrp="" bldFile="sf\os\commsfw\commsfwtools\commstools\messageinterceptregister\group" name="test44" />
+ <unit unitID="test45" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\Te_UmtsGprsSCPR\group" name="test45" />
+ <unit unitID="test46" mrp="" bldFile="sf\os\commsfw\datacommsserver\networkingdialogapi\agentnotifier\group" name="test46" />
+ <unit unitID="test47" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_mbms\group" name="test47" />
+ <unit unitID="test48" mrp="" bldFile="sf\os\security\authorisation\userpromptutils\group" name="test48" />
+<!-- <unit unitID="test49" mrp="" bldFile="sf\os\commsfw\commsfwtools\preparedefaultcommsdatabase\Tools\ced\te_ced\group" name="test49" /> -->
+ </module>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- a/esockapiextensions/internetsockets/inc/in_sock.h Thu Aug 19 11:25:30 2010 +0300
+++ b/esockapiextensions/internetsockets/inc/in_sock.h Tue Aug 31 16:45:15 2010 +0300
@@ -32,71 +32,6 @@
#include <in_sock_internal.h>
#endif
-// Constants and typedef's for domain suffix support on interface
-const TInt KMaxDomainSuffixLength = 254; // Leaving space for minimum 1 letter hostname + '.' on maximum hostname length
-const TInt KMaxHostNameLength = 256;
-typedef TBuf<KMaxDomainSuffixLength> TSuffixName;
-typedef RArray<TSuffixName> RInetSuffixList;
-
-// Enumeration on type of operation done on the interface
-// for the domain suffix using RSocket::SetOpt
-enum TSoInetDomainSuffixFunction
- {
- EInetFunctionUndefined,
- EInetAddSuffix,
- EInetDeleteSuffix,
- EInetDeleteAllSuffixes
- };
-
-/**
-* Interface domain name structure
-* Used in TSoInetInterfaceInfoExtnDnsSuffix for adding/removing
-* Domain name suffices to an active interface using RSocket::SetOpt
-*
-* @publishedAll
-* @released
-*/
-class TInetSuffix
-{
-private:
- inline TInt AssignValue(const TDesC& aValue)
- {
- if (aValue.Length() > KMaxDomainSuffixLength)
- return KErrTooBig;
- iSuffixName.Copy(aValue);
- return KErrNone;
- }
-
-public:
- TInetSuffix() { iDomainSuffixFunction = EInetFunctionUndefined; }
-
- inline TInt Copy(const TDesC& aValue)
- {
- TInt err = AssignValue(aValue);
- if (err == KErrNone)
- iDomainSuffixFunction = EInetAddSuffix;
- return err;
- }
-
- inline TInt Delete(const TDesC& aValue)
- {
- TInt err = AssignValue(aValue);
- if (err == KErrNone)
- iDomainSuffixFunction = EInetDeleteSuffix;
- return err;
- }
-
- inline void DeleteAll()
- {
- iDomainSuffixFunction = EInetDeleteAllSuffixes;
- }
-
-public:
- TSuffixName iSuffixName;
- TUint8 iDomainSuffixFunction;
-
-};
-
/**
* @name TCP/IP Protocol and address family
*
@@ -804,42 +739,6 @@
const TUint KSoInetStartInterface = 0x217;
/**
-* @name Interface control socket options
-*
-* Level: #KSolInetIfCtrl
-*
-* Enumerating & Configuring Domain suffix on an using TSoInetInterfaceInfoExtnDnsSuffix
-*/
-//@{
-/**
-* Begin enumeration of domain suffixes on an enumerated interface.
-*
-* This option should be set before enumerating domain suffices with #KSoInetNextDomainSuffix.
-* As a pre-condition, the enumeration should be initiated on an active enumeration of interface
-*
-* This option is for use with RSocket::SetOpt() only.
-*/
-const TUint KSoInetEnumDomainSuffix = 0x218;
-
-/**
-* Return details of the next domain suffix in an enumeration started by setting the
-* option #KSoInetEnumDomainSuffix.
-*
-* This option is for use with RSocket::GetOpt() only.
-*
-* Option data type is TSoInetInterfaceInfoExtnDnsSuffix.
-*
-* @note
-* If the interface has multiple domain suffices, then each domain name
-* is returned as a separate instance of TSoInetInterfaceInfoExtnDnsSuffix
-* (only domain suffix name is different each time).
-* @note
-* If the interface has no domain suffix, then SetOpt call
-* returns with error KErrNotFound
-*/
-const TUint KSoInetNextDomainSuffix = 0x219;
-
-/**
* Trigger link local creation.
*
* Option data type is TSoInet6InterfaceInfo.
@@ -1159,27 +1058,7 @@
*/
TUint iDoProxy:1;
};
-
-/**
-* Extension class for TSoInet6InterfaceInfo. Available in Symbian OS vtb92 and later.
-*
-* Optionally used with the following interface level #KSolInetIfCtrl options:
-* @li #KSoInetConfigInterface
-* @li #KSoInetChangeInterface
-* @li #KSoInetEnumInterface
-*
-* Provides specialised fields for the interface object that generally
-* supplement extended behaviors for certain applications
-*
-* @publishedAll
-* @released
-*/
-class TSoInetInterfaceInfoExtnDnsSuffix : public TSoInet6InterfaceInfo
- {
-public:
- /** Interface domain suffix (if any). Used by DND for name resolution */
- TInetSuffix iDomainSuffix;
- };
+//@}
/**
* @name Interface query socket options
@@ -1292,12 +1171,6 @@
*/
TInetScopeIds iZone;
};
-
-/*class TSoInetSupplIfQuery : public TSoInetIfQuery
- {
- TInetSuffixList iSuffixList;
- };*/
-
/**
* Get information for the interface specified by the destination address (iDstAddr)
* field of the passed packaged TSoInetIfQuery.
@@ -1966,17 +1839,6 @@
* @since 7.0s
*/
const TUint KSoNoSourceAddressSelect = 0x40b;
-
-/**
- * Store the port number on which application to the Hook listens to.
- *
- * This port number will be used to be set as the destination address which
- * performing the UDP encapsulation from tunnel nif application to third party application.
- * The same port number if used to identify the packets orignated from the application towards
- * the Tunnel Nif.
- */
-const TUint KSoTunnelPort = 0x40c;
-
/**
* Retrieve last error information.
*
--- a/linklayercontrol/networkinterfacemgr/agentprcore/inc/CAgentAdapter.h Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/inc/CAgentAdapter.h Tue Aug 31 16:45:15 2010 +0300
@@ -99,11 +99,7 @@
// 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
@@ -139,7 +135,6 @@
TAgentConnectType iAgentConnectType;
Elements::TStateChange iLastProgress;
RPointerArray<CAgentAdapterSessionNotifier> iAgentAdapterSessionNotifiers;
- TBool iAgentErrorState;
};
--- a/linklayercontrol/networkinterfacemgr/agentprcore/inc/agentscpr.h Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/inc/agentscpr.h Tue Aug 31 16:45:15 2010 +0300
@@ -122,7 +122,7 @@
TBool iAuthenticateInProgress;
TBool iStopRequested; // ETrue means an agent stop has been requested - not that the SCPr has received a TCFDataClient::TStop
TInt iStoppingReason;
-
+
Elements::TStateChange iLastProgress;
TBuf<KCommsDbSvrMaxUserIdPassLength> iUsername;
TBuf<KCommsDbSvrMaxUserIdPassLength> iPassword;
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -71,7 +71,7 @@
: iAgentScpr(aAgentScpr),
iAgentState(EDisconnected),
iAgentConnectType(EAgentNone),
- iLastProgress(KFinishedSelection,KErrNone),iAgentErrorState(EFalse)
+ iLastProgress(KFinishedSelection,KErrNone)
{
}
@@ -148,18 +148,15 @@
void CAgentAdapter::DisconnectAgent(TInt aReason)
{
if (iAgentState == EConnecting)
- {
+ {
iAgent->CancelConnect();
}
else if (iAgentState == EReconnecting)
{
iAgent->CancelReconnect();
}
- if (iAgentState != EDisconnecting)
- {
- iAgentState = EDisconnecting;
- iAgent->Disconnect(aReason);
- }
+ iAgentState = EDisconnecting;
+ iAgent->Disconnect(aReason);
}
@@ -310,8 +307,6 @@
else
{
iLastProgress.iError = aStatus;
- // set the agent state to EDisconnecting
- iAgentState = EDisconnecting;
iAgent->Disconnect(aStatus);
}
}
@@ -353,9 +348,9 @@
{
#ifdef __CFLOG_ACTIVE
TRAPD(err,
+ //iAgentScpr.ProgressL(KConnectionUninitialised);
iAgentState = EDisconnected;
iAgentScpr.ConnectionDownL();
- // iAgentScpr.ProgressL(KConnectionUninitialised);
);
if (err != KErrNone)
{
@@ -364,9 +359,9 @@
}
#else
TRAP_IGNORE(
+ //iAgentScpr.ProgressL(KConnectionUninitialised);
iAgentState = EDisconnected;
iAgentScpr.ConnectionDownL();
- //iAgentScpr.ProgressL(KConnectionUninitialised);
);
#endif
}
@@ -396,7 +391,6 @@
else
{
iAgentScpr.Error(iLastProgress);
- iAgentErrorState = ETrue;
}
}
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -296,15 +296,10 @@
}
else
{
- // 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());
- }
-
+ // 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());
}
}
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpractivities.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpractivities.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -106,26 +106,26 @@
NODEACTIVITY_END()
}
#endif //#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+
namespace AgentSCprDestroyActivity
{
//Overridden destroy for cleaning up the agent if its still about
DECLARE_DEFINE_CUSTOM_NODEACTIVITY(ECFActivityDestroy, AgentSCprDestroy, Messages::TEChild::TDestroy, CoreActivities::CDestroyActivity::New)
- FIRST_NODEACTIVITY_ENTRY(MeshMachine::TAwaitingDestroy, CoreActivities::CDestroyActivity::TNoTagBlockedByActivitiesOrLeavingDataClient)
+ FIRST_NODEACTIVITY_ENTRY(MeshMachine::TAwaitingDestroy, CoreActivities::CDestroyActivity::TNoTagBlockedByActivitiesOrLeavingDataClient)
ROUTING_NODEACTIVITY_ENTRY(KNoTag, AgentSCprStates::TNoTagOrProviderStopped)
NODEACTIVITY_ENTRY(KNoTag, AgentSCprStates::TStopAgent, AgentSCprStates::TAwaitingAgentDown, MeshMachine::TTag<CoreNetStates::KProviderStopped>)
ROUTING_NODEACTIVITY_ENTRY(CoreNetStates::KProviderStopped, CoreStates::TNoTagOrNoClients)
-
+
//The node mustn't go out of scope with clients present. The node must get rid of them first.
NODEACTIVITY_ENTRY(KNoTag, CoreActivities::CDestroyActivity::TMakeClientsLeaveOrProcessClientLeave, CoreStates::TAwaitingClientLeave, CoreActivities::CDestroyActivity::TNoTagOrNoTagBackwards)
THROUGH_NODEACTIVITY_ENTRY(KNoTag, CoreActivities::CDestroyActivity::TProcessClientLeave, TTag<CoreNetStates::KNoClients>)
THROUGH_NODEACTIVITY_ENTRY(CoreNetStates::KNoClients, PRStates::TProcessDestroy, MeshMachine::TNoTag)
- NODEACTIVITY_ENTRY(KNoTag, MeshMachine::TDoNothing, MeshMachine::TAwaitingLeaveComplete, CoreActivities::CDestroyActivity::TNoTagOrNoTagBackwards)
- LAST_NODEACTIVITY_ENTRY(KNoTag, CoreNetStates::TSendClientLeavingAndRemoveControlProvider)
+ NODEACTIVITY_ENTRY(KNoTag, MeshMachine::TDoNothing, MeshMachine::TAwaitingLeaveComplete, CoreActivities::CDestroyActivity::TNoTagOrNoTagBackwards)
+ LAST_NODEACTIVITY_ENTRY(KNoTag, CoreNetStates::TSendClientLeavingAndRemoveControlProvider)
NODEACTIVITY_END()
}
-
// Activity Map
namespace AgentSCprActivities
{
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscprstates.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscprstates.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -235,7 +235,7 @@
}
else
{
- // coming from destroy
+ // coming from destroy
reason = KErrAbort;
}
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcprstates.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcprstates.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -103,7 +103,7 @@
//SP are peers added with TClientType ((TCFClientType::EServProvider, CFClientType::EActive))
RNodeInterface* sp = iContext.Node().AddClientL(realIapNodeId, TClientType(TCFClientType::EServProvider, TCFClientType::EActive));
-
+
__ASSERT_DEBUG(sp != NULL, User::Panic(KTunnelAgentCPRPanic, ETunnelAgentCprNoServiceProvider));
iContext.iNodeActivity->PostRequestTo(
realIapNodeId,
--- a/linklayercontrol/networkinterfacemgr/inc/nifman_internal.h Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/inc/nifman_internal.h Tue Aug 31 16:45:15 2010 +0300
@@ -24,10 +24,12 @@
#define __NIFMAN_INTERNAL_H__
#include <es_prot.h>
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-//#include <es_prot_internal.h>
-//#include <es_sock_partner.h>
-#endif
+
+// public headers not to include platform headers
+// #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+// #include <es_prot_internal.h>
+// #include <es_sock_partner.h>
+// #endif
/**
--- a/linklayercontrol/networkinterfacemgr/netcfgext/src/netcfgextnotify.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/netcfgext/src/netcfgextnotify.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -39,7 +39,6 @@
{
iScpr = NULL;
}
-
void CNetCfgExtNotify::IfProgress(TInt aStage, TInt aError)
{
TStateChange change(aStage, aError);
--- a/linklayercontrol/nullagt/TS_AgentAdapter/bwins/csdagttestsu.def Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- ?CreateTestSuite@@YAPAVCTestSuiteCsdAgt@@XZ @ 1 NONAME ; class CTestSuiteCsdAgt * CreateTestSuite(void)
-
--- a/linklayercontrol/nullagt/TS_AgentAdapter/eabi/csdagttestsu.def Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-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
-
--- a/linklayercontrol/nullagt/TS_AgentAdapter/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// 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
--- a/linklayercontrol/nullagt/TS_AgentAdapter/group/cedout.cfg Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3148 +0,0 @@
-############################################################
-## 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
-
--- a/linklayercontrol/nullagt/TS_AgentAdapter/group/connection_start.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-//
-// 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
--- a/linklayercontrol/nullagt/TS_AgentAdapter/group/connection_start_failure.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-//
-// 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
--- a/linklayercontrol/nullagt/TS_AgentAdapter/group/csdagenttest.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-//
-// 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
--- a/linklayercontrol/nullagt/TS_AgentAdapter/group/csdagenttests.mmp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* 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
--- a/linklayercontrol/nullagt/TS_AgentAdapter/group/csdagttests.iby Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* 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
-
--- a/linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSteps.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-// 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
--- a/linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSuite.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// 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
-
--- a/linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_Connection.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-// 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;
- }
--- a/linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_ConnectionFailure.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-// 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;
- }
-
-
-
--- a/linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_TestSteps.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-// 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();
-}
--- a/linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_Testsuite.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// 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 Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/nullagt/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -49,4 +49,4 @@
PRJ_TESTMMPFILES
../TS_nullagt/group/nullagttests.mmp
-#include "../TS_AgentAdapter/group/bld.inf"
+
--- a/linklayercontrol/nullagt/src/NullAgent.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/nullagt/src/NullAgent.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -22,7 +22,7 @@
#include <cdbcols.h> // CommDB access
#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
-#include <networking\cfbearers.h>
+#include <networking/cfbearers.h>
#endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
/**
--- a/linklayerprotocols/ethernetnif/EthInt/Ethbase.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayerprotocols/ethernetnif/EthInt/Ethbase.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1084,7 +1084,7 @@
void CLANLinkCommon::Destroy()
{
- // DEF134153: RNDIS doesn't override CLANLinkCommon::Destroy()
+ // PDEF143631: RNDIS driver doesn't override CLANLinkCommon::Destroy()
ASSERT(iMMState==EStarting || iMMState==EStopped);
DeleteThisFlow();
}
--- a/linklayerprotocols/pppnif/te_ppp/te_pppcomp/src/dummyPppFsm.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayerprotocols/pppnif/te_ppp/te_pppcomp/src/dummyPppFsm.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -68,6 +68,7 @@
// Upcall from Timer
//
+EXPORT_C
void MPppFsm::TimerComplete(TInt /*aStatus*/)
{
}
@@ -76,19 +77,22 @@
// Upcalls from Recvr
//
+EXPORT_C
void MPppFsm::LowerLayerUp()
{
}
-
+EXPORT_C
void MPppFsm::LowerLayerDown(TInt )
{
}
+EXPORT_C
void MPppFsm::FrameError()
{
}
+EXPORT_C
void MPppFsm::KillProtocol()
{
//
@@ -98,6 +102,7 @@
//
}
+EXPORT_C
TBool MPppFsm::RecvFrame(RMBufChain& )
{
return EFalse;
--- a/linklayerprotocols/pppnif/te_ppp/te_pppcomp/src/dummyPppMisc.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayerprotocols/pppnif/te_ppp/te_pppcomp/src/dummyPppMisc.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -31,6 +31,7 @@
{
}
+EXPORT_C
void MPppRecvr::FlowOn()
{
}
--- a/linklayerprotocols/pppnif/te_ppp/te_vjcomp/src/dummyPppFsm.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayerprotocols/pppnif/te_ppp/te_vjcomp/src/dummyPppFsm.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -68,7 +68,7 @@
// Upcall from Timer
//
-void MPppFsm::TimerComplete(TInt /*aStatus*/)
+EXPORT_C void MPppFsm::TimerComplete(TInt /*aStatus*/)
{
}
@@ -76,20 +76,20 @@
// Upcalls from Recvr
//
-void MPppFsm::LowerLayerUp()
+EXPORT_C void MPppFsm::LowerLayerUp()
{
}
-void MPppFsm::LowerLayerDown(TInt )
+EXPORT_C void MPppFsm::LowerLayerDown(TInt )
{
}
-void MPppFsm::FrameError()
+EXPORT_C void MPppFsm::FrameError()
{
}
-void MPppFsm::KillProtocol()
+EXPORT_C void MPppFsm::KillProtocol()
{
//
// This came to light as a result of the CCP work
@@ -98,7 +98,7 @@
//
}
-TBool MPppFsm::RecvFrame(RMBufChain& )
+EXPORT_C TBool MPppFsm::RecvFrame(RMBufChain& )
{
return EFalse;
}
--- a/linklayerprotocols/pppnif/te_ppp/te_vjcomp/src/dummyPppMisc.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayerprotocols/pppnif/te_ppp/te_vjcomp/src/dummyPppMisc.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -31,7 +31,7 @@
{
}
-void MPppRecvr::FlowOn()
+EXPORT_C void MPppRecvr::FlowOn()
{
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcpr/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,26 @@
+// 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:
+//
+
+#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
+
+PRJ_EXPORTS
+../group/ipcpr.iby /epoc32/rom/include/ipcpr.iby
+
+PRJ_MMPFILES
+ipcpr.mmp
+
+PRJ_TESTMMPFILES
+
+#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcpr/group/ipcpr.iby Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,25 @@
+/*
+* 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 __IPCPR_IBY__
+#define __IPCPR_IBY__
+
+REM IP Connection Provider
+
+ECOM_PLUGIN(ipcpr.dll,102070ED.rss)
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcpr/group/ipcpr.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,52 @@
+// 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:
+// ipcpr.MMP New IP Connection Provider ECOM plugin with BM support
+//
+//
+
+/**
+ @file
+*/
+
+TARGET ipcpr.dll
+TARGETTYPE PLUGIN
+
+UID 0x10009D8D 0x102070ED
+VENDORID 0x70000001
+
+SOURCEPATH ../src
+SOURCE ipcprprovider.cpp ipcprfactory.cpp
+
+USERINCLUDE ../inc
+
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/ecom
+SYSTEMINCLUDE /epoc32/include/comms-infras
+
+START RESOURCE 102070ED.rss
+TARGET ipcpr.rsc
+END
+
+LIBRARY euser.lib esock.lib esocksvr.lib eintsock.lib insock.lib
+LIBRARY netmeta.lib
+LIBRARY agentdialog.lib
+LIBRARY commsdat.lib
+
+#include "comms-infras/commsdebugutility.mmh"
+
+CAPABILITY ALL -Tcb
+
+UNPAGED
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcpr/group/networking_ipcpr.history.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<relnotes schema="1.0.0" name="Connection Provider Plugin" purpose="" type="component">
+ <revision major="1" functional="0" minor="0" date="20070802">
+ <ref name="PDEF110098" type="defect"/>
+ <description>Enabling IAP commsdat records to be protected with the ECDPrivate attribute. This requires that the DHCP and DND components are assigned the ReadDeviceData privilege and that various changes are made to ensure hidden IAP records are visible to networking components which need to be able to read them.</description>
+ </revision>
+ <purpose>
+ </purpose>
+ <defect number="PDEF102399" title="S60_MuDo_2006_wk49: Reconnecting to live video stream fails" revision="001">
+ Cause reconnect when RConnection::Start collides with Idle Timer Stop
+ </defect>
+</relnotes>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcpr/group/networking_ipcpr.mrp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,25 @@
+#
+# 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:
+#
+
+component networking_ipcpr
+source \sf\os\networkingsrv\networkcontrol\ipcpr
+binary \sf\os\networkingsrv\networkcontrol\ipcpr\group all
+exports \sf\os\networkingsrv\networkcontrol\ipcpr\group
+notes_source \component_defs\release.src
+
+
+ipr E
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcpr/inc/MAppIdInfo.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,40 @@
+// 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:
+// MAppIdInfo definition file.
+//
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+#ifndef MAPPID_INFO_H
+#define MAPPID_INFO_H
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+const TUint32 KConnectionAppInfoInterfaceId = 0x102070EF;
+class MConnectionAppIdInfo
+/**
+ @internalComponent
+ @released Since 9.3
+ */
+{
+public:
+ // This function is used the get Secure ID of the application
+
+ virtual TUint32 GetAppSecureId() = 0;
+};
+#endif // SYMBIAN_NETWORKING_UMTSR5
+
+#endif // MAPPID_INFO_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcpr/inc/ipcprfactory.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,136 @@
+/**
+* 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:
+*
+*/
+
+
+
+/**
+ @file IPCPRFACTORY.H
+ @internalComponent
+*/
+
+#if !defined(__IPCPRFACTORY_H__)
+#define __IPCPRFACTORY_H__
+
+#include <ss_connprov.h> // CConnectionProviderFactoryBase, MCommsFactoryQuery
+#include <in_sock.h> // KAfInet
+#include <agentdialog.h> // RGenConAgentDialogServer
+#include <commsdebugutility.h> // __FLOG_DECLARATION_MEMBER
+
+const TUint KIPConnectionProviderFactoryId = KAfInet;
+
+class XConnectionIPFactoryQuery : public MCommsFactoryQuery
+ {
+public:
+ XConnectionIPFactoryQuery( CConnectionProviderBase* aConnectionProviderBase ) :
+ iConnectionProviderBase( aConnectionProviderBase )
+ {
+ }
+
+protected:
+ CConnectionProviderBase* iConnectionProviderBase;
+
+public:
+ virtual TMatchResult Match( TFactoryObjectInfo& aConnectionInfo );
+ };
+
+class CIPNetworkProviderFactory : public CConnectionProviderFactoryBase
+ {
+public:
+ static CIPNetworkProviderFactory* NewL(TAny* aParentContainer);
+
+protected:
+ CIPNetworkProviderFactory(TUint aFactoryId, CConnectionFactoryContainer& aParentContainer);
+ virtual CConnectionProviderBase* DoCreateProviderL();
+ virtual MProviderSelector* DoSelectProvider( Meta::SMetaData& aPreferences, ISelectionNotify& aSelectionNotify, const RMessagePtr2* aMessage );
+ virtual MProviderSelector* DoSelectNextLayerProvider( Meta::SMetaData& aPreferences, ISelectionNotify& aSelectionNotify, const RMessagePtr2* aMessage );
+ virtual void DoEnumerateConnectionsL(RPointerArray<TConnectionInfo>& aConnectionInfoPtrArray);
+ };
+
+class TCommIdList;
+namespace ESock
+ {
+ class CConnStart;
+ }
+namespace CommsDat
+ {
+ class CMDBSession;
+ class CCDGlobalSettingsRecord;
+ class CCDIAPPrioritySelectionPolicyRecord;
+ }
+
+class CIPConnectionSelector : public CActive, public MProviderSelector
+/** IP-layer connection selector. IP level factory creates
+these to intercept and complete the Shim layer selection
+it triggers.
+
+@internalComponent
+@released Since 9.1
+*/
+ {
+public:
+ TInt Select(Meta::SMetaData& aPreferences, const RMessagePtr2* aMessage);
+ void SelectComplete(CConnectionProviderBase* aConnProvider, TInt aError);
+ void ProgressNotification(TInt aStage, TInt aError);
+ void LayerUp(TInt aError);
+ void ServiceChangeNotification(TUint32 aId, const TDesC& aType);
+ void SubConnectionEvent(CSubConnectionProviderBase* aSubConnNextLayerProvider, const TSubConnectionEvent& aSubConnectionEvent);
+ void Detach();
+
+ virtual TInt Cancel();
+ virtual TInt Cancel(TInt aReason, const RMessage2* aMessage);
+
+ //Only my own factory can create me but the constructor may be public because noone can link against it anyway.
+ //My factory could be my friend and the constructor priate but then my factory could mistakenly delete me!
+ CIPConnectionSelector(ISelectionNotify& aNotify, CIPNetworkProviderFactory& aFactory);
+
+private:
+ virtual ~CIPConnectionSelector(); //Nobody should delete me! Only I can delete myself.
+
+ // From CActive
+ virtual void DoCancel();
+ virtual void RunL();
+ virtual TInt RunError(TInt aError);
+
+ // Helper functions
+ static TInt DestroyMyself(TAny* aSelf);
+ void SelectL(Meta::SMetaData& aPreferences);
+ void SelectLinkLayerL();
+ void FillListL(CommsDat::CCDIAPPrioritySelectionPolicyRecord& aPolicy);
+ CommsDat::CCDGlobalSettingsRecord* LoadGlobalSettingsRecordLC();
+ CommsDat::CCDIAPPrioritySelectionPolicyRecord* LoadPolicyRecordLC(TInt aAccessPoint);
+
+private:
+ //ISelectionNotify must be stored by value, cos' it's just a short-lived wrapper class.
+ //It doesn't exist as a someone that waits for the completion, but stores refereneces
+ //to the one that does.
+ ISelectionNotify iNotify;
+ CIPNetworkProviderFactory& iFactory;
+ MProviderSelector* iNextLayerSelector;
+ RGenConAgentDialogServer iDlgServ;
+ TUint32 iAPid;
+ RMessagePtr2 iSelectMessage;
+ CAsyncCallBack iAsyncDestructor;
+ CommsDat::CMDBSession* iDbs;
+ ESock::CConnStart* iConnStart;
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ TSecureId iAppSecureId;
+#endif
+ __FLOG_DECLARATION_MEMBER;
+ TConnPref* iPrefs;
+ };
+
+#endif // __IPCPRFACTORY_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcpr/inc/ipcprprovider.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,141 @@
+/**
+* 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:
+* This class is an example implementation of a bearer-mobile network session layer. It is intended as a guide only and does
+* not employ any advanced bearer selection algorithms.
+* This is part of an ECOM plug-in
+*
+*
+*/
+
+
+
+/**
+ @file IPCPRPROVIDER.H
+ @internalComponent
+*/
+
+#if !defined(__SS_IPCPRPROVIDER_H__)
+#define __SS_IPCPRPROVIDER_H__
+
+#include "ipcprfactory.h" // for CIPConnectionSelector
+#include <es_sock.h>
+#include <es_prot.h>
+#include <ss_connprov.h> // for CConnectionProviderBase and MConnectionControlClient
+#include <comms-infras/ss_log.h> // for KESockConnectionTag
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+
+#include "MAppIdInfo.h"
+
+#endif
+
+#define KIpcprTag KESockConnectionTag
+_LIT8(KIpcprSubTag, "ipcpr"); // logging tag
+
+
+
+
+class CConnectionSettings;
+/**
+ @internalComponent
+ @released Since 9.1
+ */
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+NONSHARABLE_CLASS(CIPNetworkConnectionProvider) : public CConnectionProviderBase, public MConnectionControlClient,
+ public MConnectionAppIdInfo
+ {
+#else // SYMBIAN_NETWORKING_UMTSR5
+
+NONSHARABLE_CLASS(CIPNetworkConnectionProvider) : public CConnectionProviderBase, public MConnectionControlClient
+ {
+
+#endif // SYMBIAN_NETWORKING_UMTSR5
+
+public:
+ static CIPNetworkConnectionProvider* NewL(CConnectionProviderFactoryBase& aFactory);
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ // Interface from MConnectionAppIdInfo
+ virtual TUint32 GetAppSecureId();
+
+ void SetAppSecurId(TUint32 aSecureId);
+#endif // SYMBIAN_NETWORKING_UMTSR5
+
+protected:
+ CIPNetworkConnectionProvider(CConnectionProviderFactoryBase& aFactory) :
+ CConnectionProviderBase(aFactory)
+ {
+ __CFLOG_VAR((KIpcprTag, KIpcprSubTag, _L8("CIPNetworkConnectionProvider [this=%08x]:\tCIPNetworkConnectionProvider [MConnectionControlClient=%08x]"),
+ this, (MConnectionControlClient*)this));
+ }
+ ~CIPNetworkConnectionProvider();
+
+ /////////////////////////////////////////////////////////////////////////////
+ // from MConnectionControlClient
+ virtual void ConnectionGoingDown(CConnectionProviderBase& aConnProvider);
+ virtual void ProgressNotification(TInt aStage, TInt aError);
+ virtual void ConnectionError(TInt aStage, TInt aError);
+ virtual void ServiceChangeNotification(TUint32 aId, const TDesC& aType);
+ virtual void SubConnectionEvent(CSubConnectionProviderBase* aSubConnNextLayerProvider, const TSubConnectionEvent& aSubConnectionEvent);
+ virtual void LayerUp(TInt aError);
+ virtual TCtlType CtlType() const;
+
+ ////////////////////////////////////////////////////////////////////////////
+ // from CConnectionProviderBase
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ virtual TAny* DoFetchInterfaceInstanceL( const STypeId& aTid );
+#endif
+
+ virtual void DoDataClientJoiningL(MConnectionDataClient& aDataClient);
+ virtual void DoDataClientLeaving(MConnectionDataClient& aDataClient);
+ virtual void DoControlClientJoiningL(MConnectionControlClient& aControlClient);
+ virtual void DoControlClientLeaving(MConnectionControlClient& aControlClient);
+
+ virtual void DoStartL(Meta::SMetaData& aParams, const RMessagePtr2* aMessage);
+ virtual TInt DoStop(TInt aError, const RMessagePtr2* aMessage);
+
+ virtual void DoProgressL(Meta::SMetaData& aBuffer) const;
+ virtual void DoLastProgressError(Meta::SMetaData& aBuffer);
+ virtual void DoRequestServiceChangeNotificationL();
+ virtual void DoCancelServiceChangeNotification();
+ virtual void DoControlL(TUint aOptionLevel, TUint aOptionName, Meta::SMetaData& aOption, const RMessagePtr2* aMessage);
+ virtual TInt DoAllSubConnectionNotificationEnable();
+ virtual TInt DoCancelAllSubConnectionNotification();
+ virtual void DoSendIoctlMessageL(const RMessage2& aMessage);
+ virtual void DoSendCancelIoctl();
+ virtual TInt DoEnumerateSubConnectionsL(TUint& aCount);
+ virtual TUint DoEnumerateClientsL(HBufC8*& aClientInfoBuffer, TEnumClients aClientType);
+ virtual void DoConnectionControlActivityL( TControlActivity aControlActivity, const Meta::SMetaData* aData, const RMessagePtr2* aMessage );
+
+ virtual CConnectionSettings& DoSettingsAccessL();
+
+ virtual TInt DoCanDoSubConnection(RSubConnection::TSubConnType aSubConnType) const;
+
+ virtual CConnectionProviderBase* DoNextLayer() const;
+ virtual void DoJoinNextLayerL(CConnectionProviderBase* aNextLayer);
+
+protected:
+ void UpdateUsageProfile(MConnectionControlClient* aControlClient);
+
+private:
+ CConnectionProviderBase* iShimCpr;
+ TMetaDes8* iMDes;
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ // Added as per the requirements of PREQ 635 to block sockets
+ TUint32 iAppSecureId;
+#endif // SYMBIAN_NETWORKING_UMTSR5
+ };
+
+#endif // __SS_IPCPRPROVIDER_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcpr/src/102070ED.rss Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,60 @@
+// 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:
+// Registry info for IP Networking Connection Provider plug-in
+//
+//
+
+/**
+ @file 102070ED.RSS
+*/
+
+#include <ecom/registryinfo.rh>
+
+RESOURCE REGISTRY_INFO theInfo
+{
+dll_uid = 0x102070ED;
+interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = 0x102070EE;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x102070EF;
+ version_no = 1;
+ display_name = "IP Networking Connection Provider Factory";
+ default_data = "IpConnectionProviderFactory";
+ opaque_data = "";
+ }
+ };
+ },
+ INTERFACE_INFO
+ {
+ interface_uid = 0x102070F0;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x102070F1;
+ version_no = 1;
+ display_name = "IP Networking Connection Provider";
+ default_data = "IpConnectionProvider";
+ opaque_data = "";
+ }
+ };
+ }
+ };
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcpr/src/ipcprfactory.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,486 @@
+// 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:
+// This is part of an ECOM plug-in
+//
+//
+
+#include <implementationproxy.h>
+#include "ipcprfactory.h" // CIPNetworkProviderFactory
+#include "ipcprprovider.h"
+#include <es_sock.h> // KCommsNetworkLayerId
+#include <ss_glob.h>
+#include <shimcprfactory.h>
+#include <esockmessages.h>
+#include <commdbconnpref.h> // TConnPref
+#include <commsdattypesv1_1.h> // CommsDat
+#include <es_connpref.h>
+#include <in_sock.h> //KAfInet
+
+using namespace CommsDat;
+using namespace ESock;
+
+const TInt KIPConnectionProviderImplementationUid=0x102070EF;
+
+/**
+Data required for instantiating ECOM Plugin
+*/
+const TImplementationProxy ImplementationTable[] =
+ {
+ IMPLEMENTATION_PROXY_ENTRY(KIPConnectionProviderImplementationUid, CIPNetworkProviderFactory::NewL)
+ };
+
+/**
+ECOM Implementation Factory
+*/
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
+ {
+ aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+ return ImplementationTable;
+ }
+
+CIPNetworkProviderFactory* CIPNetworkProviderFactory::NewL(TAny* aParentContainer)
+ {
+ return new (ELeave) CIPNetworkProviderFactory(KIPConnectionProviderFactoryId, *(reinterpret_cast<CConnectionFactoryContainer*>(aParentContainer)));
+ }
+
+CIPNetworkProviderFactory::CIPNetworkProviderFactory(TUint aFactoryId, CConnectionFactoryContainer& aParentContainer)
+ : CConnectionProviderFactoryBase(aFactoryId,aParentContainer)
+ {
+ }
+
+CConnectionProviderBase* CIPNetworkProviderFactory::DoCreateProviderL()
+ {
+ return CIPNetworkConnectionProvider::NewL(*this);
+ }
+
+MProviderSelector* CIPNetworkProviderFactory::DoSelectProvider( Meta::SMetaData& aPreferences, ISelectionNotify& aSelectionNotify, const RMessagePtr2* aMessage )
+ {
+ //create self destructing object to select a provider
+ CIPConnectionSelector* selector = new CIPConnectionSelector(aSelectionNotify,*this);
+ TInt error;
+ if (selector == 0)
+ {
+ error = KErrNoMemory;
+ }
+ else
+ {
+ error = selector->Select(aPreferences, aMessage);
+ }
+
+ if (error != KErrNone)
+ {
+ aSelectionNotify.SelectComplete(0, error);
+ selector = NULL; //The selector will delete itself.
+ }
+
+
+ return selector;
+ }
+
+MProviderSelector* CIPNetworkProviderFactory::DoSelectNextLayerProvider( Meta::SMetaData& aPreferences, ISelectionNotify& aSelectionNotify, const RMessagePtr2* /*aMessage*/ )
+ {//at the moment always uses the CConnectionProviderFactoryShim::SelectProviderL
+ (void)aPreferences;
+ (void)aSelectionNotify;
+ return NULL;
+ }
+
+void CIPNetworkProviderFactory::DoEnumerateConnectionsL(RPointerArray<TConnectionInfo>& aConnectionInfoPtrArray)
+ {
+ CConnectionFactoryContainer* connectionFactories = SockManGlobals::Get()->iConnectionFactories;
+ ASSERT(connectionFactories);
+ CConnectionProviderFactoryBase* factory = connectionFactories->FindFactory(KShimConnectionProviderFactoryId);
+ ASSERT(factory);
+ factory->EnumerateConnectionsL(aConnectionInfoPtrArray);
+ }
+
+
+//CIPConnectionSelector--
+TInt CIPConnectionSelector::Cancel()
+ {
+ return Cancel(KErrCancel,NULL);
+ }
+
+TInt CIPConnectionSelector::Cancel(TInt aReason, const RMessage2* aMessage)
+ {
+ CActive::Cancel(); // There may be an outstanding selection request.
+
+ //CIPConnectionSelector will be deleted from Detach().
+ //Detach will always be called as a result of Cancel() in the same call stack,
+ //but only after all progress notifications have been passed up towards the
+ //CConnection.
+ TInt ret = KErrNotReady;
+ if(iNextLayerSelector !=NULL)
+ {
+ ret = iNextLayerSelector->Cancel(aReason, aMessage);
+ }
+
+ iNotify.Detach(); //"PrevLayer"::Detach() will be called only once in the same call stack.
+ return ret;
+ }
+
+TInt CIPConnectionSelector::Select(Meta::SMetaData& aPreferences, const RMessagePtr2* aMessage)
+ {
+ __FLOG_OPEN(KIpcprTag, KIpcprSubTag);
+ __FLOG_1(_L8("CIPConnectionSelector::Select() %08x"), this);
+
+ STypeId tId = STypeId::CreateSTypeId(aPreferences.GetTypeId());
+ ASSERT(tId.iUid.iUid == KESockMessagesImplementationUid);
+ ASSERT(tId.iType == EESockMessageConnStart);
+
+ if (aMessage)
+ iSelectMessage = *aMessage; // aMessage will be passed on to shim
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ //Here secure Id of application is stored and will be kept with
+ if(!iSelectMessage.IsNull())
+ {
+ iAppSecureId=iSelectMessage.SecureId();
+ }
+#endif // SYMBIAN_NETWORKING_UMTSR5
+
+ TRAPD(r, SelectL(aPreferences));
+
+ if (r!=KErrNone && iNextLayerSelector==NULL)
+ {
+ __FLOG_1(_L8("Error during selection of current - should detech now %08x"), this);
+ Detach();
+ return r;
+ }
+
+ TRAP(r,SelectLinkLayerL());
+ if (r != KErrNone)
+ {
+ __FLOG_1(_L8("Error during select of link layer - detach should be called by the link layer %08x"), this);
+ }
+
+ return r;
+ }
+
+void CIPConnectionSelector::SelectL(Meta::SMetaData& aPreferences)
+ {
+ ASSERT(iDbs==0);
+#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
+ iDbs = CMDBSession::NewL(KCDVersion1_2);
+#else
+ iDbs = CMDBSession::NewL(KCDVersion1_1);
+#endif
+
+ // Reveal hidden or private IAP records if a licensee has chosen to protect a record
+ // using one of these flags - the API to do this is public so internal components
+ // have to support the use of such records.
+ iDbs->SetAttributeMask( ECDHidden | ECDPrivate );
+
+ ASSERT(iConnStart==0);
+ iConnStart = CConnStart::NewL();
+ iConnStart->Copy(aPreferences);
+
+ // Get "defaultSnap" and "promptForSnap" from CommsDat.
+ CCDGlobalSettingsRecord* gs = LoadGlobalSettingsRecordLC();
+ TBool promptForSnap = gs->iPromptForSnap;
+ iAPid = gs->iDefaultSnap; // Unless reassigned, iAPid becomes the default access point.
+ CleanupStack::PopAndDestroy(gs);
+
+ __FLOG_STMT(_LIT(K, "SelectL() Prompt%d Def%d"));
+ __FLOG_2(K, promptForSnap, iAPid);
+
+ if (iAPid != 0)
+ // System is access point aware.
+ {
+ TConnStartType selectType(iConnStart->StartType());
+ TConnPref* selectPrefs = iConnStart->ConnPrefs();
+
+ if (selectType == EConnStartImplicit ||
+ selectPrefs == 0 || selectPrefs->ExtensionId() == TConnPref::EConnPrefUnknown)
+ // Use default access point or dialogue if enabled.
+ {
+ __FLOG_STMT(_LIT(K, "SelectL() Default Type%d Prefs%d"));
+ __FLOG_2(K, selectType, selectPrefs);
+
+ // Use the default access point unless promptForSnap is ETrue in which case prompt
+ // for the access point.
+ if (promptForSnap)
+ {
+ User::LeaveIfError(iDlgServ.Connect());
+ iDlgServ.AccessPointConnection(iAPid,KAfInet,iStatus);
+ SetActive();
+ return; // Don't do selection until RunL() gets the dialogue results.
+ }
+
+ CCDIAPPrioritySelectionPolicyRecord* policy = LoadPolicyRecordLC(iAPid);
+ FillListL(*policy);
+ CleanupStack::PopAndDestroy(policy);
+ }
+ else if (selectPrefs && selectPrefs->ExtensionId() == TConnPref::EConnPrefSnap)
+ // Use access point id from preferences.
+ {
+ iAPid = static_cast<const TCommSnapPref*>(selectPrefs)->Snap();
+
+ __FLOG_STMT(_LIT(K, "SelectL() Type%d TConnPrefSnap AccessPoint%d "));
+ __FLOG_2(K, selectType, iAPid);
+
+ CCDIAPPrioritySelectionPolicyRecord* policy = LoadPolicyRecordLC(iAPid);
+ FillListL(*policy);
+ CleanupStack::PopAndDestroy(policy);
+ }
+ }
+ }
+
+void CIPConnectionSelector::FillListL(CCDIAPPrioritySelectionPolicyRecord& aPolicy)
+ {
+ __FLOG_0(_L("FillListL()"));
+
+ // Make sure we have the TCommIdList.
+
+ // Create the new Prefs on the heap so that they are always available
+ // even in the asynchronous promptForSnap Active Object callback
+ // The copy of the original Prefs are overwritten here
+ // The original Prefs are deleted in esock.
+ // The new Prefs are deleted on destruction of CIPConnectionSelector
+
+ iConnStart->SetConnPrefs(NULL);
+ iConnStart->SetConnPrefs(new (ELeave) TCommIdList);
+
+ // Store Prefs for deletion on destruction of CIPConnectionSelector
+ ASSERT(iPrefs==0);
+ iPrefs = iConnStart->ConnPrefs();
+
+ TCommIdList& list = *static_cast<TCommIdList*>(iPrefs);
+
+ CMDBRecordLink<CCDIAPRecord>* theIap = &aPolicy.iIap1;
+ CMDBField<TUint32>* theCount = &aPolicy.iIapCount;
+ TInt count = static_cast<TInt>(*theCount);
+ if (count > CCDIAPPrioritySelectionPolicyRecord::EMaxNrOfIaps)
+ {
+ // The number of IAP's specified is more than allowed. Fix your table :-)
+ ASSERT(EFalse);
+ count = CCDIAPPrioritySelectionPolicyRecord::EMaxNrOfIaps;
+ }
+ for (TInt i = 0; i < count; i++, theIap++)
+ {
+ TInt theIapNumber = static_cast<TInt>(*theIap);
+ ASSERT(theIapNumber>0);
+ __FLOG_STMT(_LIT(K, "aList[%d].Append(%d)"));
+ __FLOG_2(K, list.Count(), theIapNumber);
+ list.Append(theIapNumber);
+ }
+ }
+
+void CIPConnectionSelector::SelectLinkLayerL()
+ {
+ CConnectionFactoryContainer* connectionFactories = SockManGlobals::Get()->iConnectionFactories;
+ ASSERT(connectionFactories);
+ CConnectionProviderFactoryBase* factory = connectionFactories->FindFactory(KShimConnectionProviderFactoryId);
+ ASSERT(factory);
+ ISelectionNotify selectNotify( this, TSelectionNotify<CIPConnectionSelector>::SelectComplete,
+ TProgressNotify<CIPConnectionSelector>::ProgressNotification,
+ TServiceChangeNotify<CIPConnectionSelector>::ServiceChangeNotification,
+ TLayerUp<CIPConnectionSelector>::LayerUp,
+ TSubConnectionEventTmpl<CIPConnectionSelector>::SubConnectionEvent, NULL);
+ selectNotify.RegisterDetach(TDetachNotify<CIPConnectionSelector>::Detach);
+
+ if (iNextLayerSelector!=NULL)
+ iNextLayerSelector->Cancel();
+
+ // Select next (link) layer's provider.
+ ASSERT(iNextLayerSelector==NULL);
+ ASSERT(iConnStart!=NULL);
+
+ iNextLayerSelector = factory->SelectProvider(*iConnStart, selectNotify, iSelectMessage.IsNull()? NULL : &iSelectMessage);
+
+ if (iNextLayerSelector == NULL)
+ {
+ User::Leave(KErrGeneral);
+ }
+
+ }
+
+void CIPConnectionSelector::SelectComplete(CConnectionProviderBase* aConnProvider, TInt aError)
+ {
+ CIPNetworkConnectionProvider* connProvider = NULL;
+ if (aError == KErrNone)
+ {
+ ASSERT(aConnProvider);
+ XConnectionIPFactoryQuery query(aConnProvider);
+
+ TRAP( aError, connProvider = static_cast<CIPNetworkConnectionProvider*>(iFactory.FindOrCreateProviderL(query)));
+ if (aError == KErrNone && connProvider->NextLayer() == NULL)
+ {
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ // This piece of code is added to keep the information about the application secure ID in the
+ // IP Connection provider. So that when the information is required form the subconnection provider
+ // we can do a fetch interface and get the App Secure ID to decide on to the Socket Blocking
+
+ connProvider->SetAppSecurId(iAppSecureId.iId);
+
+
+#endif // SYMBIAN_NETWORKING_UMTSR5
+
+ // The factory returned a new instance - must set the lower layer.
+ TRAP(aError,connProvider->JoinNextLayerL(aConnProvider));
+ }
+ }
+ iNotify.SelectComplete(connProvider, aError);
+ }
+
+void CIPConnectionSelector::ProgressNotification(TInt aStage, TInt aError)
+ {
+ //The original ISelectionNotifier (iNotify) might be interested in the
+ //progress, but we aren't.
+ iNotify.ProgressNotification(aStage, aError);
+ }
+
+void CIPConnectionSelector::LayerUp(TInt aError)
+ {
+ iNotify.LayerUp(aError);
+ }
+
+void CIPConnectionSelector::SubConnectionEvent(CSubConnectionProviderBase* aSubConnNextLayerProvider, const TSubConnectionEvent& aSubConnectionEvent)
+ {
+ iNotify.SubConnectionEvent(aSubConnNextLayerProvider, aSubConnectionEvent);
+ }
+
+void CIPConnectionSelector::ServiceChangeNotification(TUint32 aId, const TDesC& aType)
+ {
+ //The original ISelectionNotifier (iNotify) might be interested in the
+ //notification, but we aren't.
+ iNotify.ServiceChangeNotification(aId, aType);
+ }
+
+void CIPConnectionSelector::Detach()
+ {
+ iNextLayerSelector = NULL;
+ //Ensure the asynch destructor is ready to use.
+ //If its not, then we have probably been already deleted which should never happen.
+ //Detach is the only place we should be deleted from.
+ ASSERT(!iAsyncDestructor.IsActive());
+ __FLOG_1(_L8("CIPConnectionSelector %08x::Detach()"), this);
+ iAsyncDestructor.Call();
+ }
+
+CIPConnectionSelector::CIPConnectionSelector(ISelectionNotify& aNotify, CIPNetworkProviderFactory& aFactory)
+: CActive(CActive::EPriorityUserInput),
+ iNotify(aNotify),
+ iFactory(aFactory),
+ iAsyncDestructor(CActive::EPriorityLow)
+ {
+ __FLOG_1(_L8("CIPConnectionSelector %08x::CIPConnectionSelector()"), this);
+ CActiveScheduler::Add(this);
+ iAsyncDestructor.Set(TCallBack(CIPConnectionSelector::DestroyMyself, this));
+
+ }
+
+TInt CIPConnectionSelector::DestroyMyself(TAny* aSelf)
+ {
+ delete static_cast<CIPConnectionSelector*>(aSelf);
+ return KErrNone;
+ }
+
+CIPConnectionSelector::~CIPConnectionSelector()
+ {
+ __FLOG_CLOSE;
+ CActive::Cancel(); // There may be an outstanding selection request.
+
+ // This destructor is private and is meant to be called asynchronously via Detach() or Cancel() only.
+ // If is was called from anywhere else, the iNextLayerSelector would not be deleted!
+ // Please note that deleting iNextLayerSelector here needs revision on the link layer selectors,
+ // and specifically of the shim selector which - in such case - must not call Detach from its
+ // synchronous destructor!
+ ASSERT(iNextLayerSelector==NULL); // If still a valid pointer - probably not called via Detach() or Cancel().
+
+ delete iDbs;
+
+ // Tidy up iConnStart and related objects
+ delete iPrefs;
+ delete iConnStart;
+
+ iDlgServ.Close();
+
+ // Notify detach.
+ iNotify.Detach();
+ }
+
+void CIPConnectionSelector::RunL()
+ // The dialogue has been presented.
+ // Normally completes with KErrNone or KErrCancel
+ // Could, however, complete with another system error e.g. KErrOutOfMemory
+ {
+ __FLOG_STMT(_LIT(K, "RunL() Err%d Snap%d"));
+ __FLOG_2(K, iStatus.Int(), iAPid);
+
+ User::LeaveIfError(iStatus.Int());
+ ASSERT(iAPid); //Should not be 0 now.
+ CCDIAPPrioritySelectionPolicyRecord* policy = LoadPolicyRecordLC(iAPid);
+ FillListL(*policy);
+ CleanupStack::PopAndDestroy(policy);
+ SelectLinkLayerL();
+ }
+
+TInt CIPConnectionSelector::RunError(TInt aError)
+ // Either the dialogue, the FillListL() or the SelectLinkLayerL() failed.
+ // In each case the selection request is completed with the apropriate result code.
+ {
+ iNotify.SelectComplete(0, aError);
+
+ //If we have failed before the call to iNextLayerSelector->Select() or it wasn't successful
+ //we need to initiate the detach sequence by calling Detach().
+ if (iNextLayerSelector==NULL)
+ {
+ Detach(); //It will result in self deletion.
+ }
+ return KErrNone;
+ }
+
+void CIPConnectionSelector::DoCancel()
+ {
+ iDlgServ.CancelAccessPointConnection();
+ }
+
+CCDGlobalSettingsRecord* CIPConnectionSelector::LoadGlobalSettingsRecordLC()
+ {
+ CCDGlobalSettingsRecord* gs = static_cast<CCDGlobalSettingsRecord*>(CCDConnectionPrefsRecord::RecordFactoryL(KCDTIdGlobalSettingsRecord));
+ CleanupStack::PushL(gs);
+ gs->SetRecordId(1);
+ gs->LoadL(*iDbs);
+ ASSERT(gs->iDefaultSnap.TypeId() == KCDTIdDefaultSnap); // Panics if built against incorrect CommsDat.
+ return gs;
+ }
+
+CCDIAPPrioritySelectionPolicyRecord* CIPConnectionSelector::LoadPolicyRecordLC(TInt aAccessPoint)
+ {
+ // Get access point from CommsDat.
+ CCDAccessPointRecord* apRecord = static_cast<CCDAccessPointRecord*>
+ (CCDConnectionPrefsRecord::RecordFactoryL(KCDTIdAccessPointRecord));
+ CleanupStack::PushL(apRecord);
+ apRecord->SetRecordId(aAccessPoint);
+ apRecord->LoadL(*iDbs);
+ TUint32 policyNumber = apRecord->iSelectionPolicy;
+ CleanupStack::PopAndDestroy(apRecord);
+
+ ASSERT((policyNumber & KCDMaskShowRecordType) == KCDTIdIapPrioritySelectionPolicyRecord);
+
+ CCDIAPPrioritySelectionPolicyRecord* policy = static_cast<CCDIAPPrioritySelectionPolicyRecord*>
+ (CCDConnectionPrefsRecord::RecordFactoryL(KCDTIdIapPrioritySelectionPolicyRecord));
+ CleanupStack::PushL(policy);
+ policy->SetElementId(policyNumber);
+ policy->LoadL(*iDbs);
+ return policy;
+ }
+
+MCommsFactoryQuery::TMatchResult XConnectionIPFactoryQuery::Match( TFactoryObjectInfo& aProviderInfo )
+ {
+ CConnectionProviderBase* prov = static_cast<CConnectionProviderBase*>(aProviderInfo.iInfo.iFactoryObject);
+ //if the next layer is the same as the one returned by the shim selection we have a match
+ return prov->NextLayer() == iConnectionProviderBase ? EMatch : EContinue;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcpr/src/ipcprprovider.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,411 @@
+// 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:
+// This class is an example implementation of a bearer-mobile network session. It is intended as a guide only and does
+// not employ any advanced bearer selection algorithms. It is envisaged that users of these classes will want to derive their own
+// implementations from CIPNetworkSession.
+// This is part of an ECOM plug-in
+//
+//
+
+#include "ipcprprovider.h" // for CIPNetworkConnectionProvider
+#include <comms-infras/ss_log.h>
+
+CIPNetworkConnectionProvider* CIPNetworkConnectionProvider::NewL(CConnectionProviderFactoryBase& aFactory)
+ {
+ CIPNetworkConnectionProvider* p = new (ELeave) CIPNetworkConnectionProvider(aFactory);
+ CleanupStack::PushL(p);
+ p->iMDes = TMetaDes8::NewL(NULL);
+ CleanupStack::Pop(p);
+ __CFLOG_VAR((KIpcprTag, KIpcprSubTag, _L8("CIPNetworkConnectionProvider::NewL() %08x"), p));
+ return p;
+ }
+
+CIPNetworkConnectionProvider::~CIPNetworkConnectionProvider()
+ {
+ __CFLOG_VAR((KIpcprTag, KIpcprSubTag, _L8("CIPNetworkConnectionProvider %08x:\t~CIPNetworkConnectionProvider"), this));
+ delete iMDes;
+ if (iShimCpr)
+ {
+ iShimCpr->Leave(*this);
+ }
+ }
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+
+TUint32 CIPNetworkConnectionProvider::GetAppSecureId()
+ {
+ return iAppSecureId;
+ }
+
+void CIPNetworkConnectionProvider::SetAppSecurId(TUint32 aSecureId)
+ {
+ iAppSecureId = aSecureId;
+ }
+
+TAny* CIPNetworkConnectionProvider::DoFetchInterfaceInstanceL( const STypeId& aTid )
+ {
+ STypeId typeId = STypeId::CreateSTypeId(KConnectionAppInfoInterfaceId,0);
+ if (typeId == aTid)
+ {
+ MConnectionAppIdInfo* ipcpr = static_cast<MConnectionAppIdInfo*>(this);
+ return ipcpr;
+ }
+ return NULL;
+ }
+
+#endif // SYMBIAN_NETWORKING_UMTSR5
+//
+// from MConnectionControlClient
+void CIPNetworkConnectionProvider::ConnectionGoingDown(CConnectionProviderBase& aConnProvider)
+ {
+ __CFLOG_VAR((KIpcprTag, KIpcprSubTag, _L8("CIPNetworkConnectionProvider %08x:\tConnectionGoingDown(aConnProvider %08x)"), this, &aConnProvider));
+ if (&aConnProvider == iShimCpr)
+ {
+ iShimCpr = NULL;
+ DeleteMeNow();
+ }
+ }
+
+void CIPNetworkConnectionProvider::ProgressNotification(TInt aStage, TInt aError)
+ {
+ __CFLOG_VAR((KIpcprTag, KIpcprSubTag, _L8("CIPNetworkConnectionProvider %08x:\tProgressNotification(aStage %d aError %d)"), this, aStage, aError));
+ TInt max = iControlClients.Count();
+ for (TInt i = max - 1 ; i >= 0 ; i--)
+ {
+ iControlClients[i]->ProgressNotification(aStage, aError);
+ }
+ }
+
+void CIPNetworkConnectionProvider::ConnectionError(TInt aStage, TInt aError)
+ {
+ __CFLOG_VAR((KIpcprTag, KIpcprSubTag, _L8("CIPNetworkConnectionProvider %08x:\tConnectionError(aStage %d aError %d)"), this, aStage, aError));
+ TInt max = iControlClients.Count();
+ for (TInt i = max - 1 ; i >= 0 ; i--)
+ {
+ iControlClients[i]->ConnectionError(aStage, aError);
+ }
+ max = iDataClients.Count();
+ for (TInt i = max - 1 ; i >= 0 ; i--)
+ {
+ iDataClients[i]->ConnectionError(aStage, aError);
+ }
+ }
+
+void CIPNetworkConnectionProvider::ServiceChangeNotification(TUint32 aId, const TDesC& aType)
+ {
+ __CFLOG_VAR((KIpcprTag, KIpcprSubTag, _L8("CIPNetworkConnectionProvider %08x:\tServiceChangeNotification(aId %u aType %s)"), this, aId, &aType));
+ TInt max = iControlClients.Count();
+ for (TInt i = max - 1 ; i >= 0 ; i--)
+ {
+ iControlClients[i]->ServiceChangeNotification(aId, aType);
+ }
+ }
+
+void CIPNetworkConnectionProvider::SubConnectionEvent(CSubConnectionProviderBase* aSubConnNextLayerProvider, const TSubConnectionEvent& aSubConnectionEvent)
+ {
+ TInt max = iControlClients.Count();
+ for (TInt i = max - 1 ; i >= 0 ; i--)
+ {
+ iControlClients[i]->SubConnectionEvent(aSubConnNextLayerProvider, aSubConnectionEvent);
+ }
+ }
+
+void CIPNetworkConnectionProvider::LayerUp(TInt aError)
+ {
+ TInt max = iControlClients.Count();
+ for (TInt i = max - 1 ; i >= 0 ; --i)
+ {
+ iControlClients[i]->LayerUp(aError);
+ }
+
+ // broadcast the event to the data clients also, sideways
+ max = iDataClients.Count();
+ for (TInt j = max - 1; j >= 0 ; --j)
+ {
+ iDataClients[j]->Notify(MConnectionDataClient::ENotifyLayerUp, this, aError, NULL);
+ }
+ }
+
+MConnectionControlClient::TCtlType CIPNetworkConnectionProvider::CtlType() const
+ {
+ return MConnectionControlClient::ENormal;
+ }
+
+//
+// from CConnectionProviderBase
+void CIPNetworkConnectionProvider::DoDataClientJoiningL(MConnectionDataClient& aDataClient)
+ {
+ (void)(aDataClient);
+ UpdateUsageProfile(NULL);
+ __CFLOG_VAR((KIpcprTag, KIpcprSubTag, _L8("CIPNetworkConnectionProvider [this=%08x]:\tDoDataClientJoiningL [iDataClients.Count=%d] [aDataClient=%08x]"), this, iDataClients.Count(), &aDataClient));
+ }
+
+void CIPNetworkConnectionProvider::DoDataClientLeaving(MConnectionDataClient& aDataClient)
+ {
+ (void)(aDataClient);
+ UpdateUsageProfile(NULL);
+ __CFLOG_VAR((KIpcprTag, KIpcprSubTag, _L8("CIPNetworkConnectionProvider [this=%08x]:\tDoDataClientLeaving [iDataClients.Count=%d] [aDataClient=%08x]"), this, iDataClients.Count(), &aDataClient));
+ }
+
+void CIPNetworkConnectionProvider::DoControlClientJoiningL(MConnectionControlClient& aControlClient)
+ {
+ (void)(aControlClient);
+ UpdateUsageProfile(NULL);
+ __CFLOG_VAR((KIpcprTag, KIpcprSubTag, _L8("CIPNetworkConnectionProvider [this=%08x]:\tDoControlClientJoiningL [iControlClients.Count=%d] [aControlClient=%08x]"), this, iControlClients.Count(), &aControlClient));
+ }
+
+void CIPNetworkConnectionProvider::DoControlClientLeaving(MConnectionControlClient& aControlClient)
+ {
+ UpdateUsageProfile(&aControlClient);
+ __CFLOG_VAR((KIpcprTag, KIpcprSubTag, _L8("CIPNetworkConnectionProvider [this=%08x]:\tDoControlClientLeaving [iControlClients.Count=%d] [aControlClient=%08x]"), this, iControlClients.Count(), &aControlClient));
+ }
+
+void CIPNetworkConnectionProvider::UpdateUsageProfile(MConnectionControlClient* aControlClient)
+/**
+Update the Usage Profile if there has been a change in the RConnection's or Sessions associated
+with this provider.
+@param aControlClient A control client that should be ignored when calculating the usage profile.
+*/
+ {
+ TUint usageProfile = 0;
+ TInt ignoredClient = 0;
+
+ TInt max = iControlClients.Count();
+ TInt nConnectionMonitorCount = 0;
+ TInt nSessionCount = 0;
+ for (TInt n = 0; n < max; n++)
+ {
+ MConnectionControlClient* client = iControlClients[n];
+
+ // Ignore the control client passed as argument (it is the one about to leave).
+ if (!aControlClient || aControlClient != client)
+ {
+ MConnectionControlClient::TCtlType type = client->CtlType();
+ switch (type)
+ {
+ case MConnectionControlClient::EMonitor:
+ nConnectionMonitorCount++;
+ break;
+ case MConnectionControlClient::ESession:
+ nSessionCount++;
+ break;
+ }
+ }
+ else
+ {
+ ASSERT(ignoredClient == 0);
+ ignoredClient = 1;
+ }
+ }
+
+ // Assert that aControlClient, if specified, is in iControlClients[]
+ ASSERT(aControlClient == NULL || ignoredClient == 1);
+
+ if (max - ignoredClient > nConnectionMonitorCount)
+ usageProfile |= KConnProfileMedium;
+
+ if (nSessionCount > 0)
+ usageProfile |= KConnProfileLong;
+
+ if (iShimCpr)
+ {
+ TBuf8<sizeof(TUint)> buf;
+ buf.AppendNum(usageProfile);
+
+ //Meta derived buffer (iMDes) is only used here to pass
+ //the usageProfile down to the shimcpr
+ iMDes->iDes = &buf;
+
+ //ESetUsageProfile operation cannot leave in fact=>
+ //=>the trap here just to make leavescan happy
+ TRAP_IGNORE(iShimCpr->ConnectionControlActivityL(ESetUsageProfile, iMDes, NULL));
+
+ //iMDes->iDes will not be used ever again but we clean it so that it is clear
+ iMDes->iDes = NULL;
+ }
+ }
+
+void CIPNetworkConnectionProvider::DoStartL(Meta::SMetaData& aParams, const RMessagePtr2* aMessage)
+ {
+ if (iShimCpr)
+ {
+ iShimCpr->StartL(aParams, aMessage);
+ }
+ else
+ {
+ User::Leave(KErrNotReady);
+ }
+ }
+
+TInt CIPNetworkConnectionProvider::DoStop(TInt aError, const RMessagePtr2* aMessage)
+ {
+ return iShimCpr ? iShimCpr->Stop(aError, aMessage) : KErrNotReady;
+ }
+
+void CIPNetworkConnectionProvider::DoProgressL(Meta::SMetaData& aBuffer) const
+ {
+ if (iShimCpr)
+ {
+ iShimCpr->ProgressL(aBuffer);
+ }
+ }
+
+void CIPNetworkConnectionProvider::DoLastProgressError(Meta::SMetaData& aBuffer)
+ {
+ if (iShimCpr)
+ {
+ iShimCpr->LastProgressError(aBuffer);
+ }
+ }
+
+void CIPNetworkConnectionProvider::DoRequestServiceChangeNotificationL()
+ {
+ if (iShimCpr)
+ {
+ iShimCpr->RequestServiceChangeNotificationL();
+ }
+ }
+
+void CIPNetworkConnectionProvider::DoCancelServiceChangeNotification()
+ {
+ if (iShimCpr)
+ {
+ iShimCpr->CancelServiceChangeNotification();
+ }
+ }
+
+void CIPNetworkConnectionProvider::DoControlL(TUint aOptionLevel, TUint aOptionName, Meta::SMetaData& aOption, const RMessagePtr2* aMessage)
+ {
+ if (iShimCpr)
+ {
+ iShimCpr->ControlL(aOptionLevel, aOptionName, aOption, aMessage);
+ }
+ else
+ {
+ User::Leave(KErrNotReady);
+ }
+ }
+
+TInt CIPNetworkConnectionProvider::DoEnumerateSubConnectionsL(TUint& aCount)
+ {
+ return iShimCpr ? iShimCpr->EnumerateSubConnectionsL(aCount) : KErrNotReady;
+ }
+
+TUint CIPNetworkConnectionProvider::DoEnumerateClientsL(HBufC8*& aClientInfoBuffer, TEnumClients aClientType)
+/**
+Returns information about the clients of this Interface
+
+@param aCount on return contains the number of clients using this Interface
+@param aClientInfoBuffer on return contains a TPckg<> containing information about each client
+@exception leaves with KErrNoMemory if memory allocation fails
+*/
+ {
+ const TInt KInfoBufMaxLength = 1024; //is this large enough?
+ TBuf8<KInfoBufMaxLength> infoBuf;
+
+ TUint count = 0;
+ STypeId tid = STypeId::CreateSTypeId(KConnectionClientExtUid,EConnectionClientDesc);
+ TInt max = iControlClients.Count();
+ for ( TInt n = 0; n < max; n++ )
+ {
+ MConnectionClientDesc* intf = reinterpret_cast<MConnectionClientDesc*>(iControlClients[n]->FetchInterfaceInstanceL(*this,tid));
+ if ( intf )
+ {
+ TConnectionProcessInfo cinfo;
+ cinfo.GetInfoL(aClientType, count, *intf, infoBuf);
+ }
+ }
+ STypeId tid2 = STypeId::CreateSTypeId(KConnectionClientExtUid,EConnectionEnumerateClients);
+ max = iDataClients.Count();
+ for ( TInt n = 0; n < max; n++ )
+ {
+ MConnectionEnumerateClients* intf = reinterpret_cast<MConnectionEnumerateClients*>(iDataClients[n]->FetchInterfaceInstanceL(*this,tid2));
+ if ( intf )
+ {
+ intf->EnumerateClientsL(count, infoBuf, aClientType);
+ }
+ }
+
+ aClientInfoBuffer = infoBuf.AllocL();
+ return count;
+ }
+
+void CIPNetworkConnectionProvider::DoConnectionControlActivityL( CConnectionProviderBase::TControlActivity aControlActivity, const Meta::SMetaData* aData, const RMessagePtr2* aMessage )
+ {
+ if (iShimCpr)
+ {
+ iShimCpr->ConnectionControlActivityL(aControlActivity, aData, aMessage);
+ }
+ }
+
+CConnectionSettings& CIPNetworkConnectionProvider::DoSettingsAccessL()
+ {
+ if (iShimCpr == NULL)
+ {
+ User::Leave(KErrNotReady);
+ }
+ return iShimCpr->SettingsAccessL();
+ }
+
+TInt CIPNetworkConnectionProvider::DoAllSubConnectionNotificationEnable()
+ {
+ return !iShimCpr ? KErrNotReady : iShimCpr->AllSubConnectionNotificationEnable();
+ }
+
+TInt CIPNetworkConnectionProvider::DoCancelAllSubConnectionNotification()
+ {
+ return !iShimCpr ? KErrNotReady : iShimCpr->CancelAllSubConnectionNotification();
+ }
+
+void CIPNetworkConnectionProvider::DoSendIoctlMessageL(const RMessage2& aMessage)
+ {
+ if (iShimCpr)
+ {
+ iShimCpr->SendIoctlMessageL(aMessage);
+ }
+ else
+ {
+ User::Leave(KErrNotReady);
+ }
+ }
+
+void CIPNetworkConnectionProvider::DoSendCancelIoctl()
+ {
+ if (iShimCpr)
+ {
+ iShimCpr->SendCancelIoctl();
+ }
+ }
+
+TInt CIPNetworkConnectionProvider::DoCanDoSubConnection(RSubConnection::TSubConnType /*aSubConnType*/) const
+ {
+ return ETrue;
+ }
+
+void CIPNetworkConnectionProvider::DoJoinNextLayerL(CConnectionProviderBase* aNextLayer)
+ {
+ ASSERT( !iShimCpr );
+ ASSERT( aNextLayer );
+ iShimCpr = aNextLayer;
+ SetConnectionInfo(iShimCpr->ConnectionInfo());
+ // join ourselves as a connection control client to the lower provider
+ iShimCpr->JoinL(*this);
+ }
+
+CConnectionProviderBase* CIPNetworkConnectionProvider::DoNextLayer() const
+ {
+ return iShimCpr;
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,36 @@
+// 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:
+//
+
+#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
+
+PRJ_EXPORTS
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../inc/shimcpr.h
+#endif
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../inc/shimcprfactory.h
+#endif
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../inc/shimclient.h /epoc32/include/comms-infras/shimclient.h
+#endif
+
+../group/shimcpr.iby /epoc32/rom/include/shimcpr.iby
+
+PRJ_MMPFILES
+shimcpr.mmp
+
+PRJ_TESTMMPFILES
+
+#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/group/networking_shimcpr.history.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<relnotes name="Connection Provider Plugin">
+ <purpose>
+ </purpose>
+
+ <defect number="DEF101532" title="connection DataSentNotificationRequest returns before correct vol of data sent" revision="002">
+ Correct case whereby data monitoring thresholds did not work with multiple RConnection objects referring to the same underlying object.
+ </defect>
+
+ <defect number="DEF098373" title="TE_ESock_OOM tests aborting and causing panic in Esock_IP, OOM Testing" revision="001">
+ E_ESock_OOM tests aborting and causing panic in Esock_IP, OOM Testing
+ </defect>
+</relnotes>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/group/networking_shimcpr.mrp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,25 @@
+#
+# 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:
+#
+
+component networking_shimcpr
+source \sf\os\networkingsrv\networkcontrol\ipcprshim
+binary \sf\os\networkingsrv\networkcontrol\ipcprshim\group all
+exports \sf\os\networkingsrv\networkcontrol\ipcprshim\group
+notes_source \component_defs\release.src
+
+
+ipr E
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/group/shimcpr.iby Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,25 @@
+/*
+* 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 __SHIMCPR_IBY__
+#define __SHIMCPR_IBY__
+
+REM IP Connection Provider Shim
+
+ECOM_PLUGIN(shimcpr.dll,102070FD.rss)
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/group/shimcpr.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,57 @@
+// 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:
+// shimcpr.MMP New IP Connection Provider Shim ECOM plugin with BM support
+//
+//
+
+/**
+ @file
+*/
+
+#include <cflog.mmh>
+
+TARGET shimcpr.dll
+TARGETTYPE PLUGIN
+
+UID 0x10009D8D 0x102070FD
+VENDORID 0x70000001
+
+SOURCEPATH ../src
+SOURCE shimcpr.cpp shimcprfactory.cpp shimconnsettings.cpp connectionSelectorShim.cpp
+SOURCE shimdatatransfer.cpp shimclient.cpp shimnifmansconn.cpp
+
+USERINCLUDE ../inc
+
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/ecom
+SYSTEMINCLUDE /epoc32/include/comms-infras
+
+START RESOURCE 102070FD.rss
+TARGET shimcpr.rsc
+END
+LIBRARY euser.lib esock.lib esocksvr.lib eintsock.lib insock.lib netmeta.lib nifman.lib commsfw.lib
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+
+LIBRARY commdb.lib commsdat.lib
+#endif //SYMBIAN_NETWORKING_UMTSR5
+
+
+#include "comms-infras/commsdebugutility.mmh"
+
+CAPABILITY ALL -Tcb
+
+UNPAGED
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/inc/shimclient.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,62 @@
+/**
+* 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:
+*
+*/
+
+
+
+/**
+ @file SHIMCLIENT.H
+ @internalComponent
+*/
+
+#if !defined(__SHIMCLIENT_H__)
+#define __SHIMCLIENT_H__
+
+#include <e32def.h>
+#include <e32base.h>
+#include <comms-infras/metadata.h>
+
+class TNifProgress;
+class MShimControlClient
+/**
+ the former CSubConnection down-calls (interface seen by ESOCK and used to comunicate sub-connection
+ related calls made via RConnection using either id or index.
+
+ @internalComponent
+ */
+ {
+public:
+ //former CConnection::StopSubConnectionL(const RMessage2& aMessage);
+ virtual TBool StopL(const RMessage2& aMessage) = 0;
+ // Former calls from CConnection::GetSubConnectionInfo
+ virtual TInt GetSubConnectionInfo(const RMessage2& aMessage) = 0;
+ // Former Calls from RConnection via CSubConnection
+ virtual TInt GetCurrentProgress(TNifProgress& aProgress) = 0;
+ virtual TBool DataTransferredL(const RMessage2& aMessage) = 0;
+ virtual TBool DataTransferredCancel(const RMessage2& aMessage) = 0;
+ virtual TBool RequestSubConnectionProgressNotificationL(const RMessage2& aMessage) = 0;
+ virtual TBool CancelSubConnectionProgressNotification(const RMessage2& aMessage) = 0;
+ virtual TBool DataSentNotificationRequestL(const RMessage2& aMessage) = 0;
+ virtual TBool DataSentNotificationCancel(const RMessage2& aMessage) = 0;
+ virtual TBool DataReceivedNotificationRequestL(const RMessage2& aMessage) = 0;
+ virtual TBool DataReceivedNotificationCancel(const RMessage2& aMessage) = 0;
+ virtual TBool IsSubConnectionActiveRequestL(const RMessage2& aMessage) = 0;
+ virtual TBool IsSubConnectionActiveCancel(const RMessage2& aMessage) = 0;
+
+ virtual TInt ReturnCode() const = 0;
+ };
+
+#endif // __SHIMCLIENT_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/inc/shimconnsettings.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,51 @@
+/**
+* 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:
+*
+*/
+
+
+
+/**
+ @file SS_SHIMCONNSETTINGS.H
+ @internalComponent
+*/
+
+#if !defined(__SS_SHIMCONNSETTINGS_H__)
+#define __SS_SHIMCONNSETTINGS_H__
+
+#include "ss_connsettings.h"
+
+class CConnectionProvdBase;
+class CConnectionSettingsShim : public CConnectionSettings
+ {
+
+public:
+ CConnectionSettingsShim( CConnectionProvdBase& aConnectionProvdBase ) :
+ iConnectionProvdBase( aConnectionProvdBase )
+ {
+ }
+
+protected:
+ virtual void DoGetBoolSettingL(const TDesC& aSettingName, TBool& aValue, const RMessagePtr2* aMessage );
+ virtual void DoGetDes16SettingL(const TDesC& aSettingName, TDes16& aValue, const RMessagePtr2* aMessage );
+ virtual void DoGetDes8SettingL(const TDesC& aSettingName, TDes8& aValue, const RMessagePtr2* aMessage );
+ virtual void DoGetIntSettingL(const TDesC& aSettingName, TUint32& aValue, const RMessagePtr2* aMessage );
+ virtual HBufC* DoGetLongDesSettingLC(const TDesC& aSettingName, const RMessagePtr2* aMessage );
+
+private:
+ CConnectionProvdBase& iConnectionProvdBase;
+ };
+
+#endif // __SS_CONNSETTINGS_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/inc/shimcpr.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,174 @@
+/**
+* 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:
+* This temporary shim layer contanis the interfaces defined by MConnectionNotify, CConnectionProvdBase and CInterface.
+* However only the connection-related part of CInterface appears here, the rest is in CNifManSubConnectionShim.
+*
+*
+*/
+
+
+
+/**
+ @file SHIMCPR.H
+ @internalComponent
+*/
+
+#if !defined(__SS_SHIMCPR_H__)
+#define __SS_SHIMCPR_H__
+
+#include <ss_connprov.h> // for CConnectionProviderFactoryBase
+#include <cflog.h>
+#include <es_prot.h> // for MConnectionNotify and CConnectionProvdBase
+#include <comms-infras/ss_log.h> // for KESockConnectionTag
+
+#define KShimCprTag KESockConnectionTag
+_LIT8(KShimCprSubTag, "shimcpr"); // logging tag
+
+
+class CConnectionProvdBase;
+class CNifManSubConnectionShim;
+class CConnectionProviderFactoryShim;
+class CConnectionSettingsShim;
+class CConnection;
+class MProviderSelector;
+class CSubConnectionLinkShimClient;
+class CConnectionSelectorShim;
+NONSHARABLE_CLASS(CConnectionProviderShim) : public CConnectionProviderBase, MConnectionNotify
+ {
+ friend class CConnectionProviderFactoryShim;
+ friend class CConnectionSelectorShim; //to get/set the aggregarted CConnectionProvdBase
+
+
+public:
+ CConnectionProvdBase& Provider()
+ {
+ ASSERT(iProvider);
+ return *iProvider;
+ }
+ CSubConnectionLinkShimClient* QuerySubSessions(TInt32 aTypeId, const CConnection* aConnection);
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ // The public function which will set the pointer to the factiory
+ void SetFactoryIfactory(CConnectionProviderFactoryShim *aFactoryShim);
+#endif // SYMBIAN_NETWORKING_UMTSR5
+
+protected:
+ virtual ~CConnectionProviderShim();
+
+
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ CConnectionProviderShim(CConnectionProviderFactoryBase& aFactory)
+ : CConnectionProviderBase(aFactory), iSubConnectionType(KInvalidFactoryId)
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tCConnectionProviderShim()"),
+ this));
+ }
+#else
+ CConnectionProviderShim(CConnectionProviderFactoryBase& aFactory)
+ : CConnectionProviderBase(aFactory)
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tCConnectionProviderShim()"),
+ this));
+ }
+#endif
+// SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+
+
+ void ConstructL();
+ static CConnectionProviderShim* NewL(CConnectionProviderFactoryBase& aFactory);
+
+ void ConnectionJoiningL( const CConnection& aConnection );
+ void ConnectionLeaving( const CConnection& aConnection );
+
+
+
+protected:
+ // Define methods from the interface specified by MConnectionNotify
+ virtual void SelectionComplete(TInt aError, const TDesC8& aSelectionInfo);
+ virtual void ConnectionError(TInt aError);
+ virtual void LinkLayerOpen(TInt aError);
+ virtual void LinkLayerClosed(TInt aError);
+ virtual void ProgressNotification(TInt aStage, TInt aError);
+ virtual void ProgressNotification(TSubConnectionUniqueId aSubConnectionUniqueId, TInt aStage, TInt aError);
+ virtual void ServiceChangeNotification(TUint32 aId, const TDesC& aType);
+ virtual void InterfaceStateChangeNotification(TDesC8& aInfo);
+ virtual void NotifyDataSent(TSubConnectionUniqueId aSubConnectionUniqueId, TUint aUplinkVolume);
+ virtual void NotifyDataReceived(TSubConnectionUniqueId aSubConnectionUniqueId, TUint aDownlinkVolume);
+ virtual void SubConnectionEvent(const TSubConnectionEvent& aSubConnectionEvent);
+
+ virtual TBool ShouldIDeleteNow();
+
+protected:
+ //CConnectionProviderBase virtuals
+ virtual void DoDataClientJoiningL(MConnectionDataClient& aDataClient);
+ virtual void DoDataClientLeaving(MConnectionDataClient& aDataClient);
+ virtual void DoControlClientJoiningL(MConnectionControlClient& aControlClient);
+ virtual void DoControlClientLeaving(MConnectionControlClient& aControlClient);
+
+ virtual void DoStartL(Meta::SMetaData& aParams, const RMessagePtr2* aMessage);
+ virtual TInt DoStop(TInt aError, const RMessagePtr2* aMessage);
+
+ virtual TInt DoCanDoSubConnection(RSubConnection::TSubConnType aSubConnType) const;
+
+ virtual CConnectionProviderBase* DoNextLayer() const ;
+ virtual void DoJoinNextLayerL(CConnectionProviderBase* aNextLayer);
+
+ virtual void DoProgressL(Meta::SMetaData& aBuffer) const;
+ virtual void DoLastProgressError(Meta::SMetaData& aBuffer);
+ virtual void DoRequestServiceChangeNotificationL();
+ virtual void DoCancelServiceChangeNotification();
+ virtual void DoControlL(TUint aOptionLevel, TUint aOptionName, Meta::SMetaData& aOption, const RMessagePtr2* aMessage);
+ virtual TInt DoAllSubConnectionNotificationEnable();
+ virtual TInt DoCancelAllSubConnectionNotification();
+ virtual void DoSendIoctlMessageL(const RMessage2& aMessage);
+ virtual void DoSendCancelIoctl();
+ virtual TInt DoEnumerateSubConnectionsL(TUint& aCount);
+ virtual TUint DoEnumerateClientsL(HBufC8*& aClientInfoBuffer, TEnumClients aClientType);
+ virtual void DoConnectionControlActivityL( TControlActivity aControlActivity, const Meta::SMetaData* aData, const RMessagePtr2* aMessage );
+ virtual CConnectionSettings& DoSettingsAccessL();
+
+ CConnectionProvdBase* GetNifSession();
+ void InitialiseL(CConnectionProvdBase* aStarterSession);
+ void SetBlockProgressesL(CConnectionProvdBase* aStarterSession);
+ void AddRefL(CConnectionSelectorShim* aSelector);
+ void ReleaseRef(CConnectionSelectorShim* aSelector);
+
+private:
+ CNifManSubConnectionShim* FindSubConnection(TSubConnectionUniqueId aId);
+ void ReleaseRef();
+
+private:
+ CConnectionProvdBase *iProvider; // Enable access to 'old' NIFMAN layer
+ CConnectionSettingsShim* iConnectionSettings;
+ TUint iUsageProfile;
+ RPointerArray<const CConnection> iConnections;
+ // TInt iRefCount; //to keep a connection up while selection is going on
+ RPointerArray<CNifManSubConnectionShim> iNifManSubConnections;
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ TInt iSubConnectionType;
+#endif // SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ RPointerArray<CConnectionSelectorShim> iSelectors;
+ TBool iHasAnyControlClientJoined:1;
+ TBool iIsAlreadyUninitialised:1;
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ // The handle to the factory object that creates the CConnectionProviderShim
+ CConnectionProviderFactoryShim *iFactoryShim;
+#endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
+
+
+};
+
+#endif
+// __SS_SHIMCPR_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/inc/shimcprfactory.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,113 @@
+/**
+* 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:
+*
+*/
+
+
+
+/**
+ @file SHIMCPRFACTORY.H
+ @internalComponent
+*/
+
+#if !defined(__SHIMCPRFACTORY_H__)
+#define __SHIMCPRFACTORY_H__
+
+#include <ss_connprov.h> // for CConnectionProviderFactoryBase
+#include <cflog.h>
+
+__CFLOG_STMT(_LIT8(KLogSubSysESOCK, "ESOCK");) // subsystem name
+
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+
+// The class CConnectionProviderFactoryShim implements this interface as part of the 635 IAP locking mechanism. Since
+// each RConn::Start(), will instantiate its own selector, its then become the resposiblity of the factory to store the
+// status related to the IAP locking. This interface has the functions called by the selectors with the status of IAP lockied
+// and the IAP number to be locked
+
+class MIAPLockInfo
+{
+public:
+ virtual void SetIAPLockStatus(TBool aLockStatus, TInt aLockedIAP)=0;
+ virtual void GetIAPLockStatus(TBool &aLockStatus, TInt &aLockedIAP)=0;
+};
+
+#endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
+
+class CSubConnectioProviderLinkShim;
+
+const TUint KShimConnectionProviderFactoryId = 0x10207104; //the same as CSubConnectionProviderFactoryShim
+
+class CSubConnectionFactoryContainer;
+NONSHARABLE_CLASS(CConnectionProviderFactoryShim) : public CConnectionProviderFactoryBase, public MConnectionNotify
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ , public MIAPLockInfo
+#endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
+ {
+public:
+ static CConnectionProviderFactoryShim* NewL(TAny* aConstructionParameters);
+ ~CConnectionProviderFactoryShim();
+
+
+protected:
+ void ConstructL();
+ CConnectionProviderFactoryShim(TUint aFactoryId, CConnectionFactoryContainer& aParentContainer);
+
+ virtual CConnectionProviderBase* DoCreateProviderL();
+ virtual MProviderSelector* DoSelectProvider( Meta::SMetaData& aPreferences, ISelectionNotify& aSelectionNotify, const RMessagePtr2* aMessage );
+ virtual MProviderSelector* DoSelectNextLayerProvider( Meta::SMetaData& aPreferences, ISelectionNotify& aSelectionNotify, const RMessagePtr2* aMessage );
+
+ virtual void DoEnumerateConnectionsL(RPointerArray<TConnectionInfo>& aConnectionInfoPtrArray);
+
+ //CCommsFactoryBase
+ virtual TInt DoReceiveMessage( NetMessages::CMessage& aNetMessage );
+
+ //MConnectionNotify interface to catch the global events
+ virtual void SelectionComplete(TInt aError, const TDesC8& aSelectionInfo);
+ virtual void ConnectionError(TInt aError);
+ virtual void LinkLayerOpen(TInt aError);
+ virtual void LinkLayerClosed(TInt aError);
+ virtual void ProgressNotification(TInt aStage, TInt aError);
+ virtual void ProgressNotification(TSubConnectionUniqueId aSubConnectionUniqueId, TInt aStage, TInt aError);
+ virtual void ServiceChangeNotification(TUint32 aId, const TDesC& aType);
+ virtual void InterfaceStateChangeNotification(TDesC8& aInfo);
+ virtual void NotifyDataSent(TSubConnectionUniqueId aSubConnectionUniqueId, TUint aUplinkVolume);
+ virtual void NotifyDataReceived(TSubConnectionUniqueId aSubConnectionUniqueId, TUint aDownlinkVolume);
+
+ virtual void SubConnectionEvent(const TSubConnectionEvent& aSubConnectionEvent);
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+public:
+
+ // Interface MIAPLockInfo functions to store the status of IAP locking
+ virtual void SetIAPLockStatus(TBool aLockStatus, TInt aLockedIAP);
+ virtual void GetIAPLockStatus (TBool &aLockStatus, TInt &aLockedIAP);
+
+#endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
+
+
+protected:
+ CConnectionProvdBase* iNifmanSession;
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+
+ // This variable will tell the status whether the IAP is locked or not
+ TBool iIsIAPLocked;
+ // This variable will store the IAP number that is being locked.
+ TInt iLockedIAP;
+
+#endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
+ };
+
+#endif // __SHIMCPRFACTORY_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/inc/shimdatatransfer.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,78 @@
+/**
+* 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:
+*
+*/
+
+
+
+/**
+ @file SHIMDATATRANSFER.H
+ @internalComponent
+*/
+
+#if !defined(__SHIMDATATRANSFER_H__)
+#define __SHIMDATATRANSFER_H__
+
+#include <e32def.h>
+#include <e32base.h>
+#include "ss_datatransfer.h"
+
+class CConnectionProvdBase;
+class CNifManSubConnectionShim;
+class CConnDataTransferShim : public CConnDataTransfer
+ {
+public:
+ CConnDataTransferShim(CNifManSubConnectionShim& aSubConnectionProviderShim);
+ ~CConnDataTransferShim();
+
+public:
+ //up-calls from the CNifManSubConnectionShim
+ TInt NotifyDataTransferred(TUint aUplinkVolume, TUint aDownlinkVolume);
+ TInt NotifyDataSent(TUint aUplinkVolume);
+ TInt NotifyDataReceived(TUint aDownlinkVolume);
+
+protected:
+ //down-calls clients requests
+ virtual TInt DoDataTransferred(TUint& aUplinkVolume, TUint& aDownlinkVolume);
+ virtual TInt DoDataTransferredCancel();
+ virtual TInt DoDataSentNotificationRequest(TUint aRequestedGranularity, TUint aRequestedNotificationVolume);
+ virtual TInt DoDataSentNotificationCancel();
+ virtual TInt DoDataReceivedNotificationRequest(TUint aRequestedGranularity, TUint aRequestedNotificationVolume);
+ virtual TInt DoDataReceivedNotificationCancel();
+
+protected:
+ TInt CalculateNewUplinkGranularity(TUint aRequestedGranularity);
+ TInt CalculateNewDownlinkGranularity(TUint aRequestedGranularity);
+
+ TInt SetNextUplinkGranularity();
+ TInt SetNextDownlinkGranularity();
+
+ TInt SetUplinkGranularity(TUint aRequestedGranularity);
+ TInt SetDownlinkGranularity(TUint aRequestedGranularity);
+
+protected:
+ static TInt CalculateNewGranularity(TInt aRequestedGranularity, TUint aCurrentGranularity, RArray<TUint>& aGranularities, TUint& aNewGranularity);
+
+private:
+ CNifManSubConnectionShim& iSubConnectionProviderShim;
+
+ RArray<TUint> iUplinkGranularities; // ordered lists of deltas for the granularities
+ RArray<TUint> iDownlinkGranularities;
+
+ TUint iCurrentUplinkGranularity; // the aggregate notification granularity calculated from all the CConnection requests
+ TUint iCurrentDownlinkGranularity;
+ };
+
+#endif // __SHIMDATATRANSFER_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/inc/shimnifmansconn.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,219 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+
+#if !defined(__SHIMNIFMANSCONN_H__)
+#define __SHIMNIFMANSCONN_H__
+
+#include <comms-infras/ss_log.h>
+#include "shimdatatransfer.h"
+#include "shimclient.h"
+#include "shimcpr.h" //access to the CConnectionProviderShim::Provider() fn
+
+//const TInt KSubConnectionProviderShimImplementationUid = 0x10207106;
+
+#define KShimScprTag KESockSubConnectionTag
+_LIT8(KShimScprSubTag, "shimscpr");
+_LIT8(KShimScprDataTag, "shimscprData");
+_LIT8(KShimScprClientTag, "shimscprClient");
+
+//Former CInterface CSubConnection related up-calls so that CConnectionProviderShim
+//doesn't have to link against the sub-connection shim
+class CConnection;
+class MSubInterfaceShim : public MConnDataTransferNotify
+ {
+public:
+ virtual TInt ProgressNotification(TInt aStage, TInt aError, const TDesC8& aInfo) = 0;
+ virtual TSubConnectionUniqueId Id() = 0;
+ virtual void SetSubConnectionUniqueId( TSubConnectionUniqueId aSubConnectionUniqueId ) = 0;
+ virtual void ConnectionJoiningL(const CConnection& aConnection) = 0;
+ virtual void ConnectionLeaving(const CConnection& aConnection) = 0;
+ };
+
+//class CSubConnectionProviderFactoryShim;
+class CSubConnectionLinkShimClient;
+
+NONSHARABLE_CLASS(CNifManSubConnectionShim) : public CBase, public MConnectionDataClient, public MSubInterfaceShim
+/**
+ @internalComponent
+ */
+ {
+
+public:
+ CNifManSubConnectionShim(CConnectionProviderShim& aProviderShim);
+ ~CNifManSubConnectionShim();
+
+ // MSubInterfaceShim impl
+ virtual TInt ProgressNotification(TInt aStage, TInt aError, const TDesC8& aInfo);
+ virtual TInt NotifyDataTransferred(TUint aUplinkVolume, TUint aDownlinkVolume);
+ virtual TInt NotifyDataSent(TUint aUplinkVolume, TUint aCurrentGranularity);
+ virtual TInt NotifyDataReceived(TUint aDownlinkVolume, TUint aCurrentGranularity);
+ virtual TSubConnectionUniqueId Id();
+ virtual void SetSubConnectionUniqueId( TSubConnectionUniqueId aSubConnectionUniqueId );
+ virtual void ConnectionJoiningL(const CConnection& aConnection);
+ virtual void ConnectionLeaving(const CConnection& aConnection);
+
+ CConnectionProvdBase& Provider()
+ {
+ return static_cast<CConnectionProviderShim*>(iConnectionProvider)->Provider();
+ }
+ CConnDataTransferShim* DataTransferShim()
+ {
+ return iConnDataTransferShim;
+ }
+ CSubConnectionLinkShimClient* ShimClient( TInt aIndex )
+ {
+ return aIndex < iShimClients.Count() ? iShimClients[aIndex] : NULL;
+ }
+ void DeleteAsync();
+protected:
+ //MConnectionDataClient
+ virtual void ConnectionGoingDown(CConnectionProviderBase& aConnProvider);
+ virtual void ConnectionError(TInt aStage, TInt aError);
+ virtual void Notify(TNotify aNotifyType, CConnectionProviderBase* aConnProvider, TInt aError, const CConNotificationEvent* aConNotificationEvent);
+ virtual void AttachToNext(CSubConnectionProviderBase* aSubConnProvider);
+
+
+ TInt FindClient(const CConnection& aConnection);
+ CConnDataTransfer& CreateDataTransferL();
+
+protected:
+ RPointerArray<CSubConnectionLinkShimClient> iShimClients;
+ TSubConnectionUniqueId iSubConnectionsUniqueId;
+ CConnDataTransferShim* iConnDataTransferShim;
+ CConnectionProviderBase* iConnectionProvider;
+ CAsyncCallBack iAsyncDestructor;
+private:
+ static TInt AsyncDestructorCb(TAny* aInstance);
+ };
+
+NONSHARABLE_CLASS(CSubConnectionLinkShimClient) : public CBase, public MConnDataTransferNotify, public MShimControlClient
+/**
+ Handle subconnection-related asynchronous client requests that may not complete immediately, it effectively
+ represents the old CSubConnection
+ @internalComponent
+ */
+ {
+public:
+ CSubConnectionLinkShimClient(const CConnection& aConnection, CNifManSubConnectionShim& aSubConnectionShim);
+ ~CSubConnectionLinkShimClient();
+
+ //MConnDataTransferNotify interface towards CConnDataTransfer
+ virtual TInt NotifyDataTransferred(const TUint aUplinkVolume, const TUint aDownlinkVolume);
+ virtual TInt NotifyDataSent(TUint aUplinkVolume, TUint aCurrentGranularity);
+ virtual TInt NotifyDataReceived(TUint aDownlinkVolume, TUint aCurrentGranularity);
+
+ void ProgressNotification(TInt aStage, TInt aError, const TDesC8& aInfo);
+
+ //MShimControlClient interface towards ESOCK
+ //former CConnection::StopSubConnectionL(const RMessage2& aMessage);
+ virtual TBool StopL(const RMessage2& aMessage);
+ // Former calls from CConnection::GetSubConnectionInfo
+ virtual TInt GetSubConnectionInfo(const RMessage2& aMessage);
+ // Former Calls from RConnection via CSubConnection
+ virtual TInt GetCurrentProgress(TNifProgress& aProgress);
+ virtual TBool DataTransferredL(const RMessage2& aMessage);
+ virtual TBool DataTransferredCancel(const RMessage2& aMessage);
+ virtual TBool RequestSubConnectionProgressNotificationL(const RMessage2& aMessage);
+ virtual TBool CancelSubConnectionProgressNotification(const RMessage2& aMessage);
+ virtual TBool DataSentNotificationRequestL(const RMessage2& aMessage);
+ virtual TBool DataSentNotificationCancel(const RMessage2& aMessage);
+ virtual TBool DataReceivedNotificationRequestL(const RMessage2& aMessage);
+ virtual TBool DataReceivedNotificationCancel(const RMessage2& aMessage);
+ virtual TBool IsSubConnectionActiveRequestL(const RMessage2& aMessage);
+ virtual TBool IsSubConnectionActiveCancel(const RMessage2& aMessage);
+ TBool Match(const CConnection& aConnection) const;
+ TSubConnectionUniqueId Id();
+ virtual TInt ReturnCode() const;
+
+ void SetReturnCode(TInt aErr)
+ {
+ iReturnCode = aErr;
+ }
+
+ /**
+ Callback from activity timer
+ */
+ void CheckSubConnectionActivity();
+
+ NONSHARABLE_CLASS(CActivityTimer) : public CTimer
+ /**
+ @internalComponent
+ */
+ {
+ public:
+ static CActivityTimer* NewL(CSubConnectionLinkShimClient* aOwner, TInt aPriority);
+ virtual inline ~CActivityTimer() {};
+ void RunL();
+ private:
+ inline CActivityTimer(CSubConnectionLinkShimClient* aOwner, TInt aPriority);
+ private:
+ CSubConnectionLinkShimClient* iOwner;
+ };
+
+
+private:
+ const CConnection& iConnection;
+ CNifManSubConnectionShim& iSubConnectionShim;
+
+ TUint iUplinkDataVolume;
+ TUint iDownlinkDataVolume;
+ TUint iUplinkDataNotificationVolume;
+ TUint iDownlinkDataNotificationVolume;
+ TInt iRemainingUplinkGranularity;
+ TInt iRemainingDownlinkGranularity;
+
+ TBool iDataSentNotificationsInAbsoluteMode;
+ TBool iDataReceivedNotificationsInAbsoluteMode;
+
+ TNifProgress iCurrentProgress;
+ TInt iLastProgressToClient;
+ TInt iClientRequestedProgress;
+ CActivityTimer* iActivityTimer;
+ TInt iRequestedClientTimerPeriod;
+ TBool iClientBelievesSubConnectionActive;
+ TUint iPreviousUplinkDataVolume;
+ TUint iPreviousDownlinkDataVolume;
+
+ TBool iOutstandingProgressNotification:1;
+ TBool iOutstandingDataSentNotification:1;
+ TBool iOutstandingDataReceivedNotification:1;
+ TBool iOutstandingSubConnectionActivity:1;
+
+ RMessage2 iOutstandingProgressNotificationMessage;
+ RMessage2 iOutstandingDataSentNotificationMessage;
+ RMessage2 iOutstandingDataReceivedNotificationMessage;
+ RMessage2 iOutstandingSubConnectionActivityMessage;
+
+ TInt iReturnCode;
+ };
+
+inline CSubConnectionLinkShimClient::CActivityTimer::CActivityTimer(CSubConnectionLinkShimClient* aOwner, TInt aPriority)
+: CTimer(aPriority), iOwner(aOwner)
+/**
+Set up the activity timer for subconnection activity
+
+@param aOwner, The owing subconnection
+@param aPriority, The priority of the active object
+*/
+ { CActiveScheduler::Add(this); };
+
+#endif
+// __SHIMNIFMANSCONN_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/src/102070FD.rss Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,60 @@
+// 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:
+// Registry info for IP Networking Connection Provider plug-in
+//
+//
+
+/**
+ @file 102070FD.RSS
+*/
+
+#include <ecom/registryinfo.rh>
+
+RESOURCE REGISTRY_INFO theInfo
+{
+dll_uid = 0x102070FD;
+interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = 0x102070EE;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x102070FF;
+ version_no = 1;
+ display_name = "IP Connection Provider Factory Shim";
+ default_data = "IpConnectionFactoryShim";
+ opaque_data = "";
+ }
+ };
+ },
+ INTERFACE_INFO
+ {
+ interface_uid = 0x102070F0;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10207101;
+ version_no = 1;
+ display_name = "IP Connection Provider Shim";
+ default_data = "IpConnectionShim";
+ opaque_data = "";
+ }
+ };
+ }
+ };
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/src/connectionSelectorShim.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,557 @@
+
+// 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:
+// Implementation file for the CConnectionSelectorShim
+//
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+
+#include <nifman.h>
+#include <ss_glob.h>
+#ifndef SYMBIAN_NETWORKING_UMTSR5
+#include <comms-infras/nifif.h>
+#endif //SYMBIAN_NETWORKING_UMTSR5
+#include <connpref.h>
+#include <cdblen.h>
+#include <esockmessages.h>
+#include "shimcprfactory.h"
+#include "connectionSelectorShim.h"
+#include "shimcpr.h"
+
+using namespace ESock;
+
+//PREQ399_REMOVE
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+#include <nullagtprog.h>
+#endif
+//SYMBIAN_NETWORKING_3GPPDEFAULTQOS //PREQ399_REMOVE
+
+TInt CConnectionSelectorShim::AsyncDestructorCb(TAny* aInstance)
+ {
+ CConnectionSelectorShim* selector = reinterpret_cast<CConnectionSelectorShim*>(aInstance);
+ delete selector;
+ return KErrNone;
+ }
+
+CConnectionSelectorShim::CConnectionSelectorShim(ISelectionNotify& aNotify) :
+ iNotify(aNotify),
+ iAsyncDestructor(CActive::EPriorityStandard + 1),
+ iConnProvider(NULL)
+/**
+C'tor.
+
+The priority of the async destructor is specifically set one higher than normal
+to cater for the case whereby an RConnection is started asynchronously and
+immediately closed. This ensures that the async destructor is called before
+NetCon begins the selection procedure, and hence can cancel the NetCon request
+before it starts. This causes immediate cancellation of the connection start
+procedure. Otherwise, NetCon gets in first, the connection comes all the way
+and then times out in the short timer.
+
+@param aNotify the ISelectionNotify that should be notified about the
+selection progress.
+*/
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tCConnectionSelectorShim"), this));
+ iAsyncDestructor.Set(TCallBack(AsyncDestructorCb, this));
+ }
+
+CConnectionSelectorShim::~CConnectionSelectorShim()
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\t~CConnectionSelectorShim"), this));
+
+ iNotify.Detach(); //"PrevLayer"::Detach() will be called only once.
+
+ delete iSelectorSession;
+
+ iSelectionInfo.Close();
+ }
+
+
+void CConnectionSelectorShim::DeleteAsync()
+ {
+ if (!iAsyncDestructor.IsActive())
+ {
+ if (iConnProvider)
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tDeleteAsync() RelaseRef(this)"), this));
+ iConnProvider->ReleaseRef(this);
+ }
+ iAsyncDestructor.CallBack();
+ }
+ }
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+void CConnectionSelectorShim::SetFactoryIface(MIAPLockInfo * aFactoryIface)
+ {
+ iFactoryIface = aFactoryIface;
+ }
+
+#endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
+
+TInt CConnectionSelectorShim::Cancel()
+ {
+ return Cancel(KErrCancel,NULL);
+ }
+
+TInt CConnectionSelectorShim::Cancel(TInt aReason, const RMessage2* aMessage)
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tCancel(aReason %d)"), this, aReason));
+ TInt error = KErrNone;
+ if (iSelectorSession)
+ {
+ error = iSelectorSession->Stop(aReason, aMessage);
+ delete iSelectorSession;
+ iSelectorSession = NULL;
+ }
+
+ //"PrevLayer"::Detach() will be called only once.
+ //It is important to call iNotify.Detach() after all progress notifications
+ //resulting from NifSession::Stop() have been passed up towards the CConnection.
+ iNotify.Detach();
+ DeleteAsync();
+ return error;
+ }
+
+TInt CConnectionSelectorShim::Select(Meta::SMetaData& aPreferences, const RMessagePtr2* aMessage)
+/** Implements CConnectorSelector::Select (async). The shim layer (this layer)
+delegates the selection to NIFMAN. NIFMAN cannot be asked just to perform the
+selection, as the selection is tighly coupled with starting connection provider.
+
+@param aPreferences connection preferences.
+*/
+ {
+ //Assume this is a TConnStart (as defined in ss_connprov.h)
+ STypeId type = aPreferences.GetTypeId();
+ ASSERT(type.iUid.iUid == KESockMessagesImplementationUid);
+ ASSERT(type.iType == EESockMessageConnStart);
+
+ const TConnPref* connPrefs = NULL;
+ TConnStartType stype = EConnStartImplicit;
+
+ if (type.iType == EESockMessageConnStart)
+ {
+ connPrefs = reinterpret_cast<CConnStart&>(aPreferences).ConnPrefs();
+ stype = reinterpret_cast<CConnStart&>(aPreferences).StartType();
+ if (connPrefs && connPrefs->ExtensionId() == TConnPref::EConnPrefSnap)
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tSelect() with not supported preferences EConnPrefSnap"), this));
+ iNotify.SelectComplete(NULL, KErrNotSupported);
+ DeleteAsync();
+ return KErrNotSupported;
+ }
+ }
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+
+ // The code here will check the secure ID of the application which is expected with the aMessage Ptr.
+ // The logic used here is that if a General purpose application locks an IAP then no other application
+ // should be allowed to start the connection ans should return with KErrAccessDenied.
+ if(aMessage!=NULL)
+ {
+ iAppSecureId = aMessage->SecureId();
+ }
+ #endif //SYMBIAN_NETWORKING_UMTSR5
+
+ TRAPD(ret,
+ iSelectorSession = Nif::NewConnectionL(this, 0);
+ if (connPrefs)
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tSelect() with preferences, iSelectorSession %x"), this, iSelectorSession));
+ iSelectorSession->StartL(stype, *connPrefs, aMessage );
+ }
+ else
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tSelect() no preferences, iSelectorSession %x"), this, iSelectorSession));
+ iSelectorSession->StartL(stype, aMessage );
+ }
+ );
+ if (ret != KErrNone)
+ {
+ iNotify.SelectComplete(NULL, ret);
+ DeleteAsync();
+ }
+ return ret;
+ }
+
+
+void CConnectionSelectorShim::SelectionComplete(TInt aError, const TDesC8& aSelectionInfo)
+/** Called by NIFMAN when the selection (previously triggered by CConnectionSelectorShim::SelectL)
+completes the selection. There are two methods NIFMAN will use to indicate progress to its client. This
+method and the generic ::ProgressNotification. This method forwards selection complete to
+this->ProgressNotification(KFinishedSelection).
+
+@param aError operation result.
+@param aSelectionInfo selection info (to be converted to TSoIfConnectionInfo {iIAPId; iNetworkId;})
+*/
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tSelectionComplete(), aError: %d"), this, aError));
+ iSelectionInfo.Close();
+ TInt err;
+ if((err = iSelectionInfo.Create(aSelectionInfo)) != KErrNone)
+ {
+ aError = err;
+ }
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ // The following line will extract connection information which is sent by nifman after agent selection.The information contains IAP , iNetworkId
+ //and connection information.
+
+ Mem::Copy(&iConnectionInfo, aSelectionInfo.Ptr(),sizeof(iConnectionInfo));
+#endif
+ ProgressNotification(KFinishedSelection, aError);
+ }
+
+void CConnectionSelectorShim::CreateProviderL()
+ {
+ ASSERT(iSelectionInfo.Length());//this should only happen after the agent's been selected
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tCreateProviderL() iConnProvider %x"), this, iConnProvider));
+ if (iConnProvider)
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tCreateProviderL() iConnProvider->GetNifSession() %x"), this, iConnProvider->GetNifSession()));
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tCreateProviderL() iConnProvider->ConnectionInfo() %S"), this, &iConnProvider->ConnectionInfo()));
+ }
+ //if we have a provider already and it's the existing one we have to check whether the conn info still matches since there could've been
+ //a reconnection
+ if ( iConnProvider && iConnProvider->GetNifSession() && iConnProvider->ConnectionInfo() != iSelectionInfo )
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tCreateProviderL() -> ReleaseRef()"), this));
+ iConnProvider->ReleaseRef(this);
+ iConnProvider = NULL;
+ }
+ if ( !iConnProvider )
+ {
+ TSockManData* sockManData = SockManGlobals::Get();
+ ASSERT(sockManData);
+
+ CConnectionFactoryContainer* connectionFactories = sockManData->iConnectionFactories;
+ ASSERT(connectionFactories);
+
+ CConnectionProviderFactoryBase* factory = connectionFactories->FindFactory(KShimConnectionProviderFactoryId);
+ ASSERT(factory);
+ if (IsConnectionStoppingL())
+ {
+ // We must force the creation of a new provider because the old one is on its way out.
+ // This is required to ensure that we do not receive progresses generated as the connection
+ // comes down. We are only interested in progresses generated when the connection subsequently
+ // starts coming up again. Upper layers starting a connection just as it is coming down will
+ // otherwise receive these progresses. In particular, progresses with an error will otherwise
+ // be mistaken for an indication that the connection startup failed.
+ iConnProvider = (CConnectionProviderShim*)factory->CreateProviderL();
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tCreateProviderL() - connection stopping, iConnProvider %x"), this, iConnProvider));
+ }
+ else
+ {
+ XConnectionFactoryQueryInfo query(NULL, iSelectionInfo);
+ iConnProvider = (CConnectionProviderShim*)factory->FindOrCreateProviderL(query);
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tCreateProviderL() - found/created iConnProvider %x"), this, iConnProvider));
+ }
+ //and keep provider up during the selection
+ iConnProvider->AddRefL(this);
+ }
+ }
+
+TBool CConnectionSelectorShim::IsConnectionStoppingL()
+ {
+ TPckg<TBool> stopping(EFalse);
+ iSelectorSession->ControlL(KCOLProvider, KNifSessionGetStopping, stopping, NULL);
+ return stopping();
+ }
+
+void CConnectionSelectorShim::HandleSelectionL()
+ {
+ // HandleSelection will set up the provider
+
+ // Set default factory as the CConnectionProviderFactoryShim
+ CreateProviderL();
+ if (iSelectorSession && !iConnProvider->GetNifSession())
+ {
+ iConnProvider->SetConnectionInfo(iSelectionInfo);
+ //
+ // The factory didn't find an existing provider that matched the query.
+ // It's returned a brand new instance of CConnectionProviderShim.
+ // Hence we'll call Initialise. this will do 2 things:
+ //
+ // 1. Create a secure nif(man) session for the provider
+ // 2. Call ConnectionControlActivity for the provider so that
+ //
+ iConnProvider->InitialiseL(iSelectorSession);
+ iConnProvider->SetBlockProgressesL(iSelectorSession);
+ iSetProviderNull = ETrue;
+ }
+ }
+
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+void CConnectionSelectorShim::MaybeLockIapL()
+ {
+ //The value of Secure ID is fetched from DataBase againt IAP.Iap is taken agent selection is over.This will look
+ //into the database if secureID feild is NULL or not if it is NULL then IAP will not be locked
+ CMDBSession* cmdbSession;
+ CCDIAPRecord* ptrIapRecord;
+ ptrIapRecord = static_cast<CCDIAPRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord));
+ CleanupStack::PushL(ptrIapRecord);
+
+ // Create a new CMDB session Object
+ cmdbSession = CMDBSession::NewL(KCDVersion1_1);
+ // If successm Get and Load the record.
+ CleanupStack::PushL(cmdbSession);
+
+ ptrIapRecord->SetRecordId(iConnectionInfo.iIAPId);
+ ptrIapRecord->LoadL(*cmdbSession);
+ // Although the SecureID of the application is numerical, we have to take it into the string buffer
+ // because of the limitations of the CommsDat, which dont support hexadeciaml values, and truncate
+ // decimal values after 8 digits, for some unknown reasons.
+ // Because of the current project schedule, its not feasible to rectify commsdat as of now, so decided
+ // to take on string Buffers to be used for Secure Ids from commsdat
+ TUint32 secureId;
+ secureId=ptrIapRecord->iAppSid;
+
+ if(secureId==iAppSecureId.iId && iAppSecureId.iId!=NULL)
+ {
+ // Inform the Factory that the Ids match so IAP will be locked. The IAP number is also given to
+ // the factory so that the application can start connection on other IAPs which are not locked
+ // by the program
+ iFactoryIface->SetIAPLockStatus(ETrue,iConnectionInfo.iIAPId);
+ }
+
+ CleanupStack::Pop(cmdbSession);
+ delete cmdbSession;
+ CleanupStack::Pop(ptrIapRecord);
+ delete ptrIapRecord;
+
+ }
+#endif
+
+void CConnectionSelectorShim::ProgressNotification(TInt aStage, TInt aError)
+/**
+
+@param
+*/
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tProgressNotification(%d, %d)"),
+ this, aStage, aError));
+
+ // In all cases we must pass the new progress up the chain of selectors
+ if (aError == KErrNone)
+ {
+ aError = iError;
+ }
+ //
+ // Depending on the progress and the progress error, we need to handle situations differently
+ //
+ // Normally, if progress has reached KFinishedSelection, we stop propogating the progress
+ // up, because, we would have already setup the provide (iProvider) with a new nif session
+ // pointing to the same agent as iSelectorSession, hence further messages from agent and
+ // nifman will be forwared to the provider.
+ //
+ // However, there are two exceptions to this situation:
+ // We have a provider that's already been initialized with a nif session
+ // signified by !iSetProviderNull, in which case, we forward the message up
+ // whether or not we have finished selection. Same goes for situations when
+ // we have progress error, instead of waiting for the provider to propogate the
+ // message upwards, we use iNotify to do that, since the client would expect the
+ // message (e.g. Stop) to be completed with error immidiately
+ //
+
+ // Any error means that the selection (and startup of the interface) will be abandoned and reported to the client.
+ if (aError != KErrNone)
+ {
+ iNotify.ProgressNotification(aStage, aError);
+ iNotify.SelectComplete(NULL, aError);
+ DeleteAsync();
+ }
+ else if (aStage <= KFinishedSelection || !iSetProviderNull)
+ {
+ iNotify.ProgressNotification(aStage, aError);
+ }
+
+ if (aStage == KFinishedSelection && aError == KErrNone)
+ {
+ // The selection is complete so we want to reach the situation where the selector (this object) is
+ // joined by the appropriate provider. The provider will be set up with a pointer to the CNifSession
+ // allowing the calls to methods such as EnumerateSubConnections to work between KFinishedSelection and
+ // KLinkLayerOpen. The provider will be accessible from the selector until KLinkLayerOpen is reached
+ // (when the selector will be destroyed).
+ TRAP(aError,HandleSelectionL());
+ if (aError == KErrNone)
+ {
+ iNotify.SelectComplete(iConnProvider, aError);
+ }
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+
+ // First Check IAP Locked, if yes Return,
+ TBool IapLocked = EFalse;
+ TInt IapNumber = -1;
+
+ iFactoryIface->GetIAPLockStatus(IapLocked, IapNumber);
+
+ if (IapLocked && IapNumber == iConnectionInfo.iIAPId)
+ {
+ //iNotify.ProgressNotification(aStage, KErrPermissionDenied);
+ iNotify.SelectComplete(iConnProvider, KErrPermissionDenied);
+ DeleteAsync();
+ return;
+ }
+#endif //SYMBIAN_NETWORKING_UMTSR5
+
+ }
+ else if (aStage == KConnectionUninitialised)
+ {
+ //KConnectionUninitialised means that the interface has been stopped.
+ DeleteAsync();
+ }
+ else if (aStage == KLinkLayerOpen && !iIsLinkLayerOpen)
+ {
+ // Calling iNotify.LayerUp when we have a provider setup with a nif session already
+ // follows from the logic above justifying propogating progress up when we have a
+ // provider setup with a nif session
+ iNotify.LayerUp(aError);
+ DeleteAsync(); // The interface has successfully started and all responsibility should be taken over by the the provider.
+ }
+
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ else if ( aStage == ENullAgtConnecting && aError == KErrNone )
+ {
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+
+ TRAPD(ret,MaybeLockIapL());
+#ifdef __CFLOG_ACTIVE
+ if(ret!=KErrNone)
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tMaybeLockIap left with %d"),
+ this, ret));
+ }
+#endif
+ (void)ret; //TRAP is safe to ignore becuase if MaybeLockIapL: leave the correct behaviour is to leave Iap unlocked.
+ //We can safely ignore the trap because the function will only lock IAP. One should not be effected if someth
+#endif //SYMBIAN_NETWORKING_UMTSR5
+ }
+
+#endif //SYMBIAN_NETWORKING_3GPPDEFAULTQOS //PREQ399_REMOVE
+ }
+
+
+void CConnectionSelectorShim::SubConnectionEvent(const TSubConnectionEvent& /*aSubConnectionEvent*/)
+/**
+
+@param
+*/
+ {
+ }
+
+void CConnectionSelectorShim::ServiceChangeNotification(TUint32 aId, const TDesC& aType)
+/**
+
+@param
+*/
+ {
+ iNotify.ServiceChangeNotification(aId, aType);
+ }
+
+void CConnectionSelectorShim::LinkLayerOpen(TInt aError)
+/**
+
+@param
+*/
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tLinkLayerOpen(aError %d)"),
+ this, aError));
+ iIsLinkLayerOpen = ETrue;
+ if (aError == KErrNone)
+ {
+ if (iSetProviderNull)
+ {
+ ASSERT(iConnProvider->GetNifSession());
+ iConnProvider->ReleaseRef(this);
+ iConnProvider = NULL;
+ iSetProviderNull = EFalse;
+ }
+
+ DeleteAsync();
+ }
+ else
+ {
+ iNotify.SelectComplete(NULL, aError);
+ }
+ }
+
+void CConnectionSelectorShim::SetProviderNull()
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionSelectorShim %08x:\tSetProviderNull() iConnProvider %x"), this, iConnProvider));
+ iConnProvider = NULL;
+ }
+
+void CConnectionSelectorShim::ConnectionError(TInt /*aError*/)
+/**
+
+@param
+*/
+ {
+ //ignore the event
+ }
+
+
+void CConnectionSelectorShim::LinkLayerClosed(TInt /*aError*/)
+/**
+
+@param
+*/
+ {
+ //ignore the event
+ }
+
+
+
+void CConnectionSelectorShim::ProgressNotification(TSubConnectionUniqueId /*aSubConnectionUniqueId*/, TInt /*aStage*/, TInt /*aError*/)
+/**
+
+@param
+*/
+ {
+ }
+
+void CConnectionSelectorShim::InterfaceStateChangeNotification(TDesC8& /*aInfo*/)
+/**
+
+@param
+*/
+ {
+ //ignore the event
+ }
+
+
+void CConnectionSelectorShim::NotifyDataSent(TSubConnectionUniqueId /*aSubConnectionUniqueId*/, TUint /*aUplinkVolume*/)
+/**
+
+@param
+*/
+ {
+ //ignore the event
+ }
+
+
+void CConnectionSelectorShim::NotifyDataReceived(TSubConnectionUniqueId /*aSubConnectionUniqueId*/, TUint /*aDownlinkVolume*/)
+/**
+
+@param
+*/
+ {
+ //ignore the event
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/src/connectionSelectorShim.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,120 @@
+/**
+* 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:
+*
+*/
+
+
+
+/**
+ @file CONNECTIONSELECTORSHIM.H
+ @internalComponent
+*/
+
+#if !defined(__CONNECTIONSELECTORSHIM_H__)
+#define __CONNECTIONSELECTORSHIM_H__
+
+#include <ss_fact.h>
+#include <ss_select.h>
+#include <ss_connprov.h>
+#include <es_prot.h>
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+#include <comms-infras/nifif.h>
+#include <comms-infras/dbaccess.h>
+#include <commdbconnpref.h>
+#include "shimcprfactory.h"
+#endif //SYMBIAN_NETWORKING_UMTSR5
+
+class CConnectionProviderShim;
+class CConnectionSelectorShim : public CBase, public MProviderSelector, public MConnectionNotify
+/**
+@internalTechnology
+@released Since 9.1
+*/
+ {
+ friend class CConnectionProviderFactoryShim;
+
+public:
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+
+ // This function will be called by the ShimCprFactory to set its interface for the information
+ // pertaining to the IAP lock status
+ void SetFactoryIface(MIAPLockInfo * aFactoryIface);
+
+#endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
+
+protected:
+ CConnectionSelectorShim(ISelectionNotify& aNotify);
+ virtual ~CConnectionSelectorShim();
+ void DeleteAsync();
+
+public:
+ TInt Select(Meta::SMetaData& aPreferences, const RMessagePtr2* aMessage);
+
+ // From MConnectionNotify
+ virtual void SelectionComplete(TInt aError, const TDesC8& aSelectionInfo);
+ virtual void ConnectionError(TInt aError);
+ virtual void LinkLayerOpen(TInt aError);
+ virtual void LinkLayerClosed(TInt aError);
+ virtual void ProgressNotification(TInt aStage, TInt aError);
+ virtual void ProgressNotification(TSubConnectionUniqueId aSubConnectionUniqueId, TInt aStage, TInt aError);
+ virtual void ServiceChangeNotification(TUint32 aId, const TDesC& aType);
+ virtual void InterfaceStateChangeNotification(TDesC8& aInfo);
+ virtual void NotifyDataSent(TSubConnectionUniqueId aSubConnectionUniqueId, TUint aUplinkVolume);
+ virtual void NotifyDataReceived(TSubConnectionUniqueId aSubConnectionUniqueId, TUint aDownlinkVolume);
+ virtual void SubConnectionEvent(const TSubConnectionEvent& aSubConnectionEvent);
+
+ //MProviderSelector
+ virtual TInt Cancel(TInt aReason, const RMessage2* aMessage);
+ virtual TInt Cancel();
+ void SetProviderNull();
+private:
+ static TInt AsyncDestructorCb(TAny* aInstance);
+ void CreateProviderL();
+ void HandleSelectionL();
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ void MaybeLockIapL();
+#endif
+ TBool IsConnectionStoppingL();
+
+private:
+ CConnectionProvdBase* iSelectorSession;
+ ISelectionNotify iNotify;
+ CAsyncCallBack iAsyncDestructor;
+ RBuf8 iSelectionInfo;
+ CConnectionProviderShim* iConnProvider;
+ TInt iError;
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ TBool iSetProviderNull;
+ TBool iIsLinkLayerOpen;
+#else
+ TBool iSetProviderNull:1;
+ TBool iIsLinkLayerOpen:1;
+#endif
+ // New Variables added as required by 635 to achieve IAP locking
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ // The Connection Info, IAP , etc.
+ TSoIfConnectionInfo iConnectionInfo;
+ // The Secure ID of the current Application
+ TSecureId iAppSecureId;
+ // Interface to the Factor which Stores and get the IAP Lock Status
+ MIAPLockInfo* iFactoryIface;
+#endif
+
+ };
+
+
+#endif // __CONNECTIONSELECTORSHIM_H__
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/src/shimclient.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,733 @@
+// 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:
+// This is part of an ECOM plug-in
+//
+//
+
+#include <ss_std.h>
+#include "shimnifmansconn.h"
+#include "es_prot.h"
+
+
+/**
+@internalComponent
+*/
+const TUint KMicrosecondsInASecond = 1000000;
+const TInt KMaxTimerPeriod = KMaxTInt32/KMicrosecondsInASecond; //< max period of a CTimer using After()
+
+
+CSubConnectionLinkShimClient::CSubConnectionLinkShimClient(const CConnection& aConnection, CNifManSubConnectionShim& aSubConnectionShim) :
+ iConnection(aConnection),
+ iSubConnectionShim(aSubConnectionShim),
+ iOutstandingProgressNotification(EFalse),
+ iOutstandingDataSentNotification(EFalse),
+ iOutstandingDataReceivedNotification(EFalse),
+ iOutstandingSubConnectionActivity(EFalse)
+/**
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tCSubConnectionLinkShimClient() created for id %d, iConnection %08x"),
+ this, aSubConnectionShim.Id(), &iConnection));
+ }
+
+CSubConnectionLinkShimClient::~CSubConnectionLinkShimClient()
+/**
+Complete all outstanding RMessages
+
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\t~CSubConnectionLinkShimClient(), id %d, iSubConnectionShim %08x"),
+ this, iSubConnectionShim.Id(), this, &iSubConnectionShim));
+
+ if(iActivityTimer)
+ {
+ iActivityTimer->Cancel();
+ delete iActivityTimer;
+ iActivityTimer = NULL;
+ }
+
+ if(iOutstandingProgressNotification)
+ iOutstandingProgressNotificationMessage.Complete(KErrCancel);
+ if(iOutstandingDataSentNotification)
+ iOutstandingDataSentNotificationMessage.Complete(KErrCancel);
+ if(iOutstandingDataReceivedNotification)
+ iOutstandingDataReceivedNotificationMessage.Complete(KErrCancel);
+ if(iOutstandingSubConnectionActivity)
+ iOutstandingSubConnectionActivityMessage.Complete(KErrCancel);
+ if (iSubConnectionShim.DataTransferShim())
+ {
+ iSubConnectionShim.DataTransferShim()->DeRegisterClient(*this);
+ }
+ }
+
+TBool CSubConnectionLinkShimClient::Match(const CConnection& aConnection) const
+ {
+ return &iConnection == &aConnection;
+ }
+
+TSubConnectionUniqueId CSubConnectionLinkShimClient::Id()
+ {
+ return iSubConnectionShim.Id();
+ }
+
+TInt CSubConnectionLinkShimClient::ReturnCode() const
+ {
+ return iReturnCode;
+ }
+
+TInt CSubConnectionLinkShimClient::GetCurrentProgress(TNifProgress& aProgress)
+/**
+Return the current progress state
+
+@param aProgress On return, contains the current progress from the subconnection
+@return KErrNone if successful; otherwise one of the system-wide error codes
+*/
+ {
+ aProgress = iCurrentProgress;
+
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tGetCurrentProgress() => (%d, %d)"),
+ this, aProgress.iStage, aProgress.iError));
+ return KErrNone;
+ }
+
+TBool CSubConnectionLinkShimClient::StopL(const RMessage2& aMessage)
+ {
+ TInt stopCode = 0;
+ RConnection::TConnStopType stopType = static_cast<RConnection::TConnStopType>(aMessage.Int1());
+ switch (stopType)
+ {
+ case RConnection::EStopNormal:
+ stopCode = KErrCancel;
+ break;
+ case RConnection::EStopAuthoritative:
+ stopCode = KErrConnectionTerminated;
+ break;
+ default:
+ stopCode = KErrCancel; // to remove compile warning
+ User::Leave(KErrArgument);
+ }
+
+ TInt ret = iSubConnectionShim.Provider().Stop(iSubConnectionShim.Id(), stopCode, &aMessage);
+ if (ret != KErrNone)
+ {
+ User::Leave(ret);
+ }
+ return ETrue;
+ }
+
+TBool CSubConnectionLinkShimClient::DataTransferredL(const RMessage2& aMessage)
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tDataTransferredL(), id %d"),
+ this, iSubConnectionShim.Id()));
+
+ TUint uplinkDataVolume;
+ TUint downlinkDataVolume;
+
+ TInt ret = iSubConnectionShim.DataTransferShim()->DataTransferred(uplinkDataVolume, downlinkDataVolume);
+
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tDataTransferredL(), ret %d, uplink %d, downlink %d"),
+ this, ret, uplinkDataVolume, downlinkDataVolume));
+
+ if (KErrNone == ret)
+ {
+ TPckg<TUint> uplinkDataVolumePckg(uplinkDataVolume);
+ TPckg<TUint> downlinkDataVolumePckg(downlinkDataVolume);
+
+ aMessage.WriteL(1, uplinkDataVolumePckg);
+ aMessage.WriteL(2, downlinkDataVolumePckg);
+ }
+ SetReturnCode(ret);
+ return ETrue;
+ }
+
+TBool CSubConnectionLinkShimClient::DataTransferredCancel(const RMessage2& /*aMessage*/)
+ {
+ return ETrue;
+ }
+
+TBool CSubConnectionLinkShimClient::RequestSubConnectionProgressNotificationL(const RMessage2& aMessage)
+/**
+Request from client for notification of new progress
+
+@pre No outstanding request for data sent notifications for this subconnection on this RConnection
+@param aMessage The client message
+@return ETrue if the client message is to be completed immediately
+@leave leaves with KErrInUse if there is already an outstanding RMessage for progress notification
+*/
+ {
+ if(iOutstandingProgressNotification)
+ User::Leave(KErrInUse);
+
+ TInt clientRequestedProgress = 0;
+ clientRequestedProgress = static_cast<TUint>(aMessage.Int2());
+ // if - the last progress we sent to the client differs from the current one
+ // and - the current progress is the same as the client requested progress OR
+ // the client has no requested progress...
+ if(iLastProgressToClient!=iCurrentProgress.iStage &&
+ (iCurrentProgress.iStage == clientRequestedProgress || clientRequestedProgress==0))
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tRequestSubConnectionProgressNotificationL() returning progress (%d, %d)"),
+ this, iCurrentProgress.iStage, iCurrentProgress.iError));
+
+ // ...send the current progress back
+ TPckg<TNifProgress> prog(iCurrentProgress);
+ aMessage.WriteL(1, prog);
+ return ETrue;
+ }
+ else // store the client message until the next progress value arrives
+ {
+ //__FLOG_STATIC1(_L("ESock: "), _L("CSubConnectionLinkShimClient"),
+ // _L("[id: %d]: client requested progress notification; storing client message for later completion"),
+ // iSubConnectionsUniqueId);
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tRequestSubConnectionProgressNotificationL() storing client message for later completion"), this));
+
+ iClientRequestedProgress = clientRequestedProgress; // may be 0
+ iOutstandingProgressNotificationMessage = aMessage;
+ iOutstandingProgressNotification = ETrue;
+ return EFalse;
+ }
+ }
+
+TBool CSubConnectionLinkShimClient::CancelSubConnectionProgressNotification(const RMessage2& /*aMessage*/)
+/**
+Complete outstanding progress notification RMessage
+
+@param aMessage The client message
+@return ETrue if the client message is to be completed immediately
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tCancelSubConnectionProgressNotification(), id %d, iSubConnectionShim %08x"),
+ iSubConnectionShim.Id(), this));
+
+ if(iOutstandingProgressNotification)
+ {
+ iOutstandingProgressNotificationMessage.Complete(KErrCancel);
+ iOutstandingProgressNotification = EFalse;
+ }
+ return ETrue;
+ }
+
+TBool CSubConnectionLinkShimClient::DataSentNotificationRequestL(const RMessage2& aMessage)
+/**
+Request notification when the specified (absolute or relative) volume of data has been sent
+
+@pre No outstanding request for data sent notifications for this subconnection on this RConnection
+@param aMessage The client message
+@return ETrue if the client message is to be completed immeadiately
+@leave leaves with KErrInUse if there is already an outstanding RMessage for data sent notification
+*/
+ {
+ if(iOutstandingDataSentNotification)
+ User::Leave(KErrInUse);
+
+ TUint requestedUplinkGranularity = static_cast<TUint>(aMessage.Int1());
+ if(requestedUplinkGranularity) // the client is working in relative mode
+ {
+ iRemainingUplinkGranularity = requestedUplinkGranularity;
+ iDataSentNotificationsInAbsoluteMode = EFalse;
+
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tDataSentNotificationRequestL(), id %d (relative mode: %d bytes)"),
+ this, iSubConnectionShim.Id(), iRemainingUplinkGranularity));
+ }
+ else // the client is working in absolute mode
+ {
+ TPckg<TUint> iUplinkVolumeBuf(iUplinkDataNotificationVolume);
+ aMessage.ReadL(2, iUplinkVolumeBuf);
+ iDataSentNotificationsInAbsoluteMode = ETrue;
+
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tDataSentNotificationRequestL() id %d (absolute mode: %d bytes)"),
+ this, iSubConnectionShim.Id(), iUplinkDataNotificationVolume));
+
+ if(iUplinkDataNotificationVolume >= iUplinkDataVolume) // we've already sent this amount of data
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tDataSentNotificationRequestL() id %d (completed immediately"),
+ this, iSubConnectionShim.Id()));
+ return ETrue;
+ }
+ }
+
+ iOutstandingDataSentNotificationMessage = aMessage;
+ iOutstandingDataSentNotification = ETrue;
+
+ iSubConnectionShim.DataTransferShim()->DataSentNotificationRequest(requestedUplinkGranularity, iUplinkDataNotificationVolume);
+
+ return EFalse;
+ }
+
+TBool CSubConnectionLinkShimClient::DataSentNotificationCancel(const RMessage2& /*aMessage*/)
+/**
+Complete outstanding data sent notification RMessage
+
+@param aMessage The client message
+@return ETrue if the client message is to be completed immediately
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tDataSentNotificationCancel() id %d"),
+ this, iSubConnectionShim.Id()));
+ iSubConnectionShim.DataTransferShim()->DataSentNotificationCancel();
+
+ if(iOutstandingDataSentNotification)
+ {
+ iOutstandingDataSentNotificationMessage.Complete(KErrCancel);
+ iOutstandingDataSentNotification= EFalse;
+ }
+ return ETrue;
+ }
+
+TBool CSubConnectionLinkShimClient::DataReceivedNotificationRequestL(const RMessage2& aMessage)
+/**
+Request notification when the specified (absolute or relative) volume of data has been sent
+
+@pre No outstanding request for data sent notifications for this subconnection on this RConnection
+@param aMessage The client message
+@return ETrue if the client message is to be completed immediately
+@leave leaves with KErrInUse if there is already an outstanding RMessage for data received notification
+*/
+ {
+
+ if(iOutstandingDataReceivedNotification)
+ User::Leave(KErrInUse);
+
+ TUint requestedDownlinkGranularity = static_cast<TUint>(aMessage.Int1());
+ if(requestedDownlinkGranularity) // the client is working in relative mode
+ {
+ iRemainingDownlinkGranularity = requestedDownlinkGranularity;
+ iDataReceivedNotificationsInAbsoluteMode = EFalse;
+
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tDataReceivedNotificationRequestL() id %d (relative mode: %d bytes)"),
+ this, iSubConnectionShim.Id(), iRemainingDownlinkGranularity));
+ }
+ else // the client is working in absolute mode
+ {
+ TPckg<TUint> iDownlinkVolumeBuf(iDownlinkDataNotificationVolume);
+ aMessage.ReadL(2, iDownlinkVolumeBuf);
+ iDataReceivedNotificationsInAbsoluteMode = ETrue;
+
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tDataReceivedNotificationRequestL() id %d (absolute mode: %d bytes)"),
+ this, iSubConnectionShim.Id(), iDownlinkDataNotificationVolume));
+
+ if(iDownlinkDataNotificationVolume >= iDownlinkDataVolume) // we've already received this amount of data
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tDataReceivedNotificationRequestL() id %d(completed immediately)"),
+ this, iSubConnectionShim.Id()));
+ return ETrue;
+ }
+ }
+
+ iOutstandingDataReceivedNotificationMessage = aMessage;
+ iOutstandingDataReceivedNotification = ETrue;
+
+ iSubConnectionShim.DataTransferShim()->DataReceivedNotificationRequest(requestedDownlinkGranularity, iDownlinkDataNotificationVolume);
+
+ return EFalse;
+ }
+
+TBool CSubConnectionLinkShimClient::DataReceivedNotificationCancel(const RMessage2& /*aMessage*/)
+/**
+Complete outstanding data received notification RMessage
+
+@param aMessage The client message
+@return ETrue if the client message is to be completed immediately
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tDataReceivedNotificationCancel() id %d"),
+ this, iSubConnectionShim.Id()));
+
+ iSubConnectionShim.DataTransferShim()->DataReceivedNotificationCancel();
+
+ if(iOutstandingDataReceivedNotification)
+ {
+ iOutstandingDataReceivedNotificationMessage.Complete(KErrCancel);
+ iOutstandingDataReceivedNotification = EFalse;
+ }
+ return ETrue;
+ }
+
+TBool CSubConnectionLinkShimClient::IsSubConnectionActiveRequestL(const RMessage2& aMessage)
+/**
+Indicate whether the subconnection is active or not
+
+@note Checks at a period defined in the RMessage
+@note Only returns when the state varies from that provided by the client
+@param aMessage The client message
+@return ETrue if the client message is to be completed immediately
+*/
+ {
+ if(iOutstandingSubConnectionActivity)
+ User::Leave(KErrInUse);
+
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tIsSubConnectionActiveRequestL() id %d"),
+ this, iSubConnectionShim.Id()));
+
+ // Create the activity timer if it doesn't already exist (from a previous request)
+ if(!iActivityTimer)
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tIsSubConnectionActiveRequestL() id %d - creating timer"),
+ this, iSubConnectionShim.Id()));
+
+ iActivityTimer = CActivityTimer::NewL(this, KActivityTimerPriority);
+ }
+
+ TPckg<TBool> subConnectionActiveBuf(iClientBelievesSubConnectionActive);
+ aMessage.ReadL(2, subConnectionActiveBuf);
+
+ iSubConnectionShim.DataTransferShim()->DataTransferred(iPreviousUplinkDataVolume, iPreviousDownlinkDataVolume);
+
+ // get clients request timer period and check validity
+ TInt timeInSeconds = static_cast<TUint>(aMessage.Int1());
+ if(timeInSeconds > KMaxTimerPeriod) // secs; underlying CTimer limitation
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tIsSubConnectionActiveRequestL() id %d - rejecting timer request (%d secs)"),
+ this, iSubConnectionShim.Id(), timeInSeconds));
+
+ SetReturnCode(KErrArgument);
+ return ETrue;
+ }
+
+ // store in microsecs
+ iRequestedClientTimerPeriod = timeInSeconds * KMicrosecondsInASecond;
+
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tIsSubConnectionActiveRequestL() id %d, iClientBelievesSubConnectionActive %d, iRequestedClientTimerPeriod %d - Starting timer."),
+ this, iSubConnectionShim.Id(), iClientBelievesSubConnectionActive, iRequestedClientTimerPeriod));
+
+ iOutstandingSubConnectionActivity = ETrue;
+ iOutstandingSubConnectionActivityMessage = aMessage;
+
+ iActivityTimer->After(iRequestedClientTimerPeriod);
+ return EFalse;
+ }
+
+TBool CSubConnectionLinkShimClient::IsSubConnectionActiveCancel(const RMessage2& /*aMessage*/)
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tIsSubConnectionActiveCancel() id %d, connection %08x"),
+ this, iSubConnectionShim.Id(), &iConnection));
+
+ if(iOutstandingSubConnectionActivity)
+ {
+ iActivityTimer->Cancel();
+ ASSERT(iOutstandingSubConnectionActivity); // assert that the timer cancelled rather than completing
+ iOutstandingSubConnectionActivityMessage.Complete(KErrCancel);
+ iOutstandingSubConnectionActivity = EFalse;
+ }
+ return ETrue;
+ }
+
+TInt CSubConnectionLinkShimClient::GetSubConnectionInfo(const RMessage2& aMessage)
+ {
+ TUint index = static_cast<TUint>(aMessage.Int0());
+
+ TInt result = KErrNone;
+ TRAP(result,
+
+ // Find the size of the clients descriptor
+ TInt sizeOfSubConnInfo = aMessage.GetDesLengthL(1);
+
+ // Create an appropriately sized descriptor server-side
+ HBufC8* subConnectionInfo;
+ subConnectionInfo = HBufC8::NewL(sizeOfSubConnInfo);
+ CleanupStack::PushL (subConnectionInfo);
+
+ TPtr8 subConnInfoPtr(subConnectionInfo->Des());
+
+ // and read the client data across
+ aMessage.ReadL(1, subConnInfoPtr);
+
+ // Pass it down to the connection provider using the appropriate call
+ if(index==KUseEmbeddedUniqueId)
+ {
+ result = iSubConnectionShim.Provider().GetSubConnectionInfo(subConnInfoPtr);
+ }
+ else
+ {
+ result = iSubConnectionShim.Provider().GetSubConnectionInfo(index, subConnInfoPtr);
+ }
+
+ if (KErrNone == result)
+ {
+ // Write result back into client's address space
+ aMessage.WriteL(1, subConnInfoPtr);
+ }
+
+ CleanupStack::PopAndDestroy (subConnectionInfo);
+ ); // END TRAP
+
+ SetReturnCode(result);
+ return ETrue;
+ }
+
+void CSubConnectionLinkShimClient::ProgressNotification(TInt aStage, TInt aError, const TDesC8& /*aInfo*/)
+/**
+Notification of new progress stage from nif/agent via Nifman and CInterface
+
+@param aStage The progress stage that has been reached
+@param aError Any errors that have occured
+@param aInfo No idea what this is, it's inserted by CInterface and is currently null
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tProgressNotification(%d, %d) id %d"),
+ this, aStage, aError, iSubConnectionShim.Id()));
+
+ iCurrentProgress.iStage = aStage;
+ iCurrentProgress.iError = aError;
+
+ if(iOutstandingProgressNotification)
+ {
+ if(iLastProgressToClient!=iCurrentProgress.iStage && /* we could assume this since we've probably just received a new progress value */
+ (iCurrentProgress.iStage == iClientRequestedProgress || iClientRequestedProgress==0))
+ {
+ TPckg<TNifProgress> prog(iCurrentProgress);
+ TInt err= iOutstandingProgressNotificationMessage.Write(1, prog);
+ iOutstandingProgressNotificationMessage.Complete(err);
+ iOutstandingProgressNotification= EFalse;
+ }
+ }
+ }
+
+TInt CSubConnectionLinkShimClient::NotifyDataSent(TUint aUplinkVolume, TUint aCurrentGranularity)
+/**
+Upcall from connection provider, via MConnDataTransferNotify. Update the sent bytes count, and if necessary
+complete any outstanding RMessages
+
+@param aUplinkVolume The total number of bytes sent on this subconnection
+@note Upcall from CInterface via CConnection
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tNotifyDataSent(aUplinkVolume %d, aCurrentGranularity %d) id %d"),
+ this, aUplinkVolume, aCurrentGranularity, iSubConnectionShim.Id()));
+
+ iUplinkDataVolume = aUplinkVolume;
+
+ TBool completeMessage = EFalse;
+
+ if(iOutstandingDataSentNotification)
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - outstanding client request"),
+ this, iSubConnectionShim.Id()));
+ switch(iDataSentNotificationsInAbsoluteMode)
+ {
+ case ETrue:
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - %d bytes remaining to be sent before client completion (absolute mode)"),
+ this, iSubConnectionShim.Id(), (iUplinkDataNotificationVolume - iUplinkDataVolume)));
+
+ if (iUplinkDataVolume >= iUplinkDataNotificationVolume)
+ {
+ completeMessage = ETrue;
+ }
+ break;
+
+ case EFalse: // in relative mode
+ iRemainingUplinkGranularity -= aCurrentGranularity;
+
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - %d bytes remaining to be sent before client completion (relative mode)."),
+ this, iSubConnectionShim.Id(), iRemainingUplinkGranularity));
+
+ if(iRemainingUplinkGranularity <= 0)
+ {
+ completeMessage = ETrue;
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if(completeMessage)
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - completing client request."),
+ iSubConnectionShim.Id(), this));
+ TPckg<TUint> iUplinkDataVolumePckg(iUplinkDataVolume);
+ TInt ret= iOutstandingDataSentNotificationMessage.Write(2, iUplinkDataVolumePckg);
+ iOutstandingDataSentNotificationMessage.Complete(ret);
+ iOutstandingDataSentNotification= EFalse;
+ }
+ return KErrNone;
+ }
+
+TInt CSubConnectionLinkShimClient::NotifyDataReceived(TUint aDownlinkVolume, TUint aCurrentGranularity)
+/**
+Update the received bytes count, and if necessary complete any outstanding RMessages
+
+@param aDownlinkVolume The total number of bytes sent on this subconnection
+@param aCurrentGranularity The currently set granularity of notifications from the CInterface object
+@note Upcall from CInterface via CConnection
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tNotifyDataReceived(aDownlinkVolume %d, aCurrentGranularity %d)"),
+ this, iSubConnectionShim.Id(), aDownlinkVolume, aCurrentGranularity));
+
+ iDownlinkDataVolume = aDownlinkVolume;
+
+ TBool completeMessage = EFalse;
+
+ if(iOutstandingDataReceivedNotification)
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - outstanding client request"),
+ this, iSubConnectionShim.Id()));
+ switch(iDataReceivedNotificationsInAbsoluteMode)
+ {
+ case ETrue:
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - %d bytes remaining to be sent before client completion (absolute mode)."),
+ this, iSubConnectionShim.Id(), (iDownlinkDataNotificationVolume - iDownlinkDataVolume)));
+
+ if (iDownlinkDataVolume >= iDownlinkDataNotificationVolume)
+ {
+ completeMessage = ETrue;
+ }
+ break;
+
+ case EFalse: // in relative mode
+ iRemainingDownlinkGranularity -= aCurrentGranularity;
+
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - %d bytes remaining to be sent before client completion (relative mode)."),
+ this, iSubConnectionShim.Id(), iRemainingDownlinkGranularity));
+
+ if(iRemainingDownlinkGranularity <= 0)
+ {
+ completeMessage = ETrue;
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if(completeMessage)
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - completing client request."),
+ this, &iSubConnectionShim));
+ TPckg<TUint> iDownlinkDataVolumePckg(iDownlinkDataVolume);
+ TInt ret= iOutstandingDataReceivedNotificationMessage.Write(2, iDownlinkDataVolumePckg);
+ iOutstandingDataReceivedNotificationMessage.Complete(ret);
+ iOutstandingDataReceivedNotification= EFalse;
+ }
+ return KErrNone;
+ }
+
+TInt CSubConnectionLinkShimClient::NotifyDataTransferred(const TUint aUplinkVolume, const TUint aDownlinkVolume)
+/**
+Upcall from CConnection, indicating that it has performed a DataTransferred request and notifying us of the results
+
+@param aUplinkVolume The total amount of data sent so far on this subconnection
+@param aDownlinkVolume The total amount of data received so far on this subconnection
+*/
+ {
+ // Update internal data counters, complete any outstanding RMessages if appropriate
+ // No granularities because we don't know what they are, and because we're taking the
+ // opportunity of using the client's call to update our counters, ie. it's not an
+ // actual notification
+ NotifyDataSent(aUplinkVolume, 0);
+ NotifyDataReceived(aDownlinkVolume, 0);
+ return KErrNone;
+ }
+
+void CSubConnectionLinkShimClient::CheckSubConnectionActivity()
+/**
+Check for activity on the subconnection since the last call (to IsSubConnectionActiveRequest() )
+
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tCheckSubConnectionActivity() id %d"),
+ this, iSubConnectionShim.Id()));
+
+ ASSERT(iOutstandingSubConnectionActivity);
+
+ TUint newUplinkDataVolume;
+ TUint newDownlinkDataVolume;
+
+ iSubConnectionShim.DataTransferShim()->DataTransferred(newUplinkDataVolume, newDownlinkDataVolume);
+
+ TBool dataTransferred = (newUplinkDataVolume!=iPreviousUplinkDataVolume) ||
+ (newDownlinkDataVolume!=iPreviousDownlinkDataVolume);
+
+ // If the data transferred volumes haven't change but the client thinks the connection is active...
+ if(iClientBelievesSubConnectionActive)
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - client believes subconnection active"),
+ this, iSubConnectionShim.Id()));
+
+ if(dataTransferred) // ...and it is, so just start another timer cycle
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - ...and it is. Restart timer for another cycle."),
+ this, iSubConnectionShim.Id()));
+
+ iPreviousUplinkDataVolume = newUplinkDataVolume;
+ iPreviousDownlinkDataVolume = newDownlinkDataVolume;
+ iActivityTimer->After(iRequestedClientTimerPeriod);
+ }
+ else // ...tell them it's not
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - ...and it isn't. Notify client."),
+ this, iSubConnectionShim.Id()));
+
+ TPckg<TBool> subConnectionActiveBuf(dataTransferred);
+ TInt ret= iOutstandingSubConnectionActivityMessage.Write(2, subConnectionActiveBuf);
+ iOutstandingSubConnectionActivityMessage.Complete(ret);
+ iOutstandingSubConnectionActivity = EFalse;
+ }
+ }
+ else // client believes subconnection is idle...
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - client believes subconnection idle..."),
+ this, iSubConnectionShim.Id()));
+
+ if(dataTransferred)
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - ...and it isn't. Notify client."),
+ this, iSubConnectionShim.Id()));
+
+ TPckg<TBool> subConnectionActiveBuf(dataTransferred);
+ TInt ret= iOutstandingSubConnectionActivityMessage.Write(2, subConnectionActiveBuf);
+ iOutstandingSubConnectionActivityMessage.Complete(ret);
+ iOutstandingSubConnectionActivity = EFalse;
+ }
+ else // ...and it is, so just start another timer cycle
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprClientTag, _L8("CSubConnectionLinkShimClient %08x:\tid %d - ...and it is. Restart timer for another cycle."),
+ this, iSubConnectionShim.Id()));
+
+ iPreviousUplinkDataVolume = newUplinkDataVolume;
+ iPreviousDownlinkDataVolume = newDownlinkDataVolume;
+ iActivityTimer->After(iRequestedClientTimerPeriod);
+ }
+ }
+ }
+
+CSubConnectionLinkShimClient::CActivityTimer* CSubConnectionLinkShimClient::CActivityTimer::NewL(CSubConnectionLinkShimClient* aOwner, TInt aPriority)
+/**
+Construct a new CActivityTimer()
+
+@param aOwner The owning CSubConnectionLinkShimClient (on which we call methods upon timer completion)
+@param aPriority The priority of the active object underlying this timer object
+@return A pointer to the newly constructed CActivityTimer object
+*/
+ {
+ CSubConnectionLinkShimClient::CActivityTimer* newActivityTimer =
+ new(ELeave) CSubConnectionLinkShimClient::CActivityTimer(aOwner, aPriority);
+
+ CleanupStack::PushL(newActivityTimer);
+ newActivityTimer->ConstructL();
+ CleanupStack::Pop(newActivityTimer);
+ return newActivityTimer;
+ }
+
+void CSubConnectionLinkShimClient::CActivityTimer::RunL()
+/**
+Call the owning object's check activity method
+
+*/
+ {
+ iOwner->CheckSubConnectionActivity();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/src/shimconnsettings.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,46 @@
+// 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:
+//
+
+/**
+ @file SS_CONNSETTINGS.CPP
+*/
+
+#include "shimconnsettings.h"
+#include "es_prot.h"
+
+void CConnectionSettingsShim::DoGetBoolSettingL(const TDesC& aSettingName, TBool& aValue, const RMessagePtr2* aMessage )
+ {
+ iConnectionProvdBase.DoGetBoolSettingL( aSettingName, aValue, aMessage );
+ }
+
+void CConnectionSettingsShim::DoGetDes16SettingL(const TDesC& aSettingName, TDes16& aValue, const RMessagePtr2* aMessage )
+ {
+ iConnectionProvdBase.DoGetDes16SettingL( aSettingName, aValue, aMessage );
+ }
+
+void CConnectionSettingsShim::DoGetDes8SettingL(const TDesC& aSettingName, TDes8& aValue, const RMessagePtr2* aMessage )
+ {
+ iConnectionProvdBase.DoGetDes8SettingL( aSettingName, aValue, aMessage );
+ }
+
+void CConnectionSettingsShim::DoGetIntSettingL(const TDesC& aSettingName, TUint32& aValue, const RMessagePtr2* aMessage )
+ {
+ iConnectionProvdBase.DoGetIntSettingL( aSettingName, aValue, aMessage );
+ }
+
+HBufC* CConnectionSettingsShim::DoGetLongDesSettingLC(const TDesC& aSettingName, const RMessagePtr2* aMessage )
+ {
+ return iConnectionProvdBase.DoGetLongDesSettingLC( aSettingName, aMessage );
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/src/shimcpr.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,681 @@
+// 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:
+//
+
+#include <comms-infras/nifif.h>
+#include <esockmessages.h>
+#include <nifman.h>
+#include "shimcpr.h"
+#include "shimconnsettings.h"
+#include "es_prot.h"
+#include "shimnifmansconn.h"
+#include "ss_glob.h"
+#include "connectionSelectorShim.h"
+
+using namespace ESock;
+
+//PREQ399_REMOVE
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+#include <networking/umtsgprs_subconnprovfactory.h>
+#endif
+//SYMBIAN_NETWORKING_3GPPDEFAULTQOS //PREQ399_REMOVE
+
+
+CConnectionProviderShim* CConnectionProviderShim::NewL(CConnectionProviderFactoryBase& aFactory)
+ {
+ CConnectionProviderShim* self = new (ELeave) CConnectionProviderShim(aFactory);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+void CConnectionProviderShim::ConstructL()
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tConstructL"), this));
+ // Do nothing, atleast for now;
+ }
+
+CConnectionProviderShim::~CConnectionProviderShim()
+ {
+ delete iConnectionSettings;
+
+ // As soon as the provider has a valid iProvider pointer the ownership has passed to this provider
+ delete iProvider;
+
+ iSelectors.Close();
+ iConnections.Close();
+ iNifManSubConnections.Close();
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\t~CConnectionProviderShim"), this));
+ }
+
+void CConnectionProviderShim::AddRefL(CConnectionSelectorShim* aSelector)
+ {
+ TInt index = iSelectors.Find(aSelector);
+ if (-1 == index)
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tAddRef(aSelector %x) adding selector"), this, aSelector));
+ iSelectors.AppendL(aSelector);
+ }
+ else
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tAddRef(aSelector %x) selector already known"), this, aSelector));
+ }
+ }
+
+
+void CConnectionProviderShim::ReleaseRef(CConnectionSelectorShim* aSelector)
+ {
+ TInt index = iSelectors.Find(aSelector);
+ if (-1 != index)
+ {
+ iSelectors[index]->SetProviderNull();
+ iSelectors.Remove(index);
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tReleaseRef(aSelector %x) removng selector"), this, aSelector));
+ }
+ else
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tReleaseRef(aSelector %x) selector not known"), this, aSelector));
+ }
+
+ if (ShouldIDeleteNow())
+ {
+ DeleteMeNow();
+ }
+ }
+
+// CConnectionProviderBase virtuals
+TBool CConnectionProviderShim::ShouldIDeleteNow()
+ {
+ TInt selectors = iSelectors.Count();
+ if (0 == selectors && !iHasAnyControlClientJoined)
+ {
+ return ETrue;
+ }
+
+ return EFalse;
+ }
+
+void CConnectionProviderShim::DoStartL(Meta::SMetaData& aParams, const RMessagePtr2* aMessage)
+ {
+#ifdef _DEBUG
+ Meta::STypeId tid = aParams.GetTypeId();
+ ASSERT( tid.iUid == TUid::Uid( KESockMessagesImplementationUid ) && tid.iType == EESockMessageConnStart);
+#endif
+
+ CConnStart& p = static_cast<CConnStart&>(aParams);
+ if ( p.ConnPrefs() )
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tDoStartL() with prefs"), this));
+ iProvider->StartL(p.StartType(), *p.ConnPrefs(), aMessage);
+ }
+ else
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tDoStartL() without prefs"), this));
+ iProvider->StartL(p.StartType(), aMessage);
+ }
+ }
+
+void CConnectionProviderShim::DoDataClientJoiningL(MConnectionDataClient& aDataClient)
+ {
+ (void)aDataClient;
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tDoDataClientJoiningL(aDataClient %x) [iDataClients.Count()=%d]"), this, &aDataClient, iDataClients.Count()));
+ }
+
+void CConnectionProviderShim::DoDataClientLeaving(MConnectionDataClient& aDataClient)
+ {
+ (void)aDataClient;
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tDoDataClientLeaving(aDataClient %x) [iDataClients.Count()=%d]"), this, &aDataClient, iDataClients.Count()));
+ }
+
+void CConnectionProviderShim::DoControlClientJoiningL(MConnectionControlClient& aControlClient)
+ {
+ (void)aControlClient;
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tDoControlClientJoiningL(aControlClient %x) [iControlClients.Count()=%d]"), this, &aControlClient, iControlClients.Count()));
+ }
+
+void CConnectionProviderShim::DoControlClientLeaving(MConnectionControlClient& aControlClient)
+ {
+ (void)aControlClient;
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tDoControlClientLeaving(aControlClient %x) [iControlClients.Count()=%d]"), this, &aControlClient, iControlClients.Count()));
+ }
+
+TInt CConnectionProviderShim::DoStop(TInt aError, const RMessagePtr2* aMessage)
+ {
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ // when RConn::Stop() happens, that means one is releasing the connection, so the IAP associated with
+ // the Lock should go away. The code below will set the status of IAP locked to false, so that any further
+ // Start can lock it
+ iFactoryShim->SetIAPLockStatus(EFalse,-1);
+#endif // SYMBIAN_NETWORKING_UMTSR5
+ return iProvider->Stop( aError, aMessage );
+ }
+
+void CConnectionProviderShim::DoProgressL(Meta::SMetaData& aParams) const
+ {
+#ifdef _DEBUG
+ Meta::STypeId tid = aParams.GetTypeId();
+#endif
+ ASSERT( tid.iUid == TUid::Uid( KESockMessagesImplementationUid ) && tid.iType == EESockMessageCommsNifBuffer);
+ TMetaNifProgressBuf& p = static_cast<TMetaNifProgressBuf&>(aParams);
+ iProvider->ProgressL( p.iNifProgressBuf );
+ }
+
+void CConnectionProviderShim::DoLastProgressError(Meta::SMetaData& aBuffer)
+ {
+#ifdef _DEBUG
+ Meta::STypeId tid = aBuffer.GetTypeId();
+#endif
+ ASSERT( tid.iUid == TUid::Uid( KESockMessagesImplementationUid ) && tid.iType == EESockMessageCommsNifBuffer);
+ TMetaNifProgressBuf& p = static_cast<TMetaNifProgressBuf&>(aBuffer);
+ iProvider->LastProgressError( p.iNifProgressBuf );
+ }
+
+void CConnectionProviderShim::DoRequestServiceChangeNotificationL()
+ {
+ iProvider->RequestServiceChangeNotificationL();
+ }
+
+void CConnectionProviderShim::DoCancelServiceChangeNotification()
+ {
+ iProvider->CancelServiceChangeNotification();
+ }
+
+void CConnectionProviderShim::DoControlL(TUint aOptionLevel, TUint aOptionName, Meta::SMetaData& aOption, const RMessagePtr2* aMessage)
+ {
+#ifdef _DEBUG
+ Meta::STypeId tid = aOption.GetTypeId();
+#endif
+ ASSERT( tid.iUid == TUid::Uid( KESockMessagesImplementationUid ) && tid.iType == EESockMessageCommsDes8);
+ ::TMetaDes8& p = static_cast< ::TMetaDes8& >(aOption);
+ ASSERT(p.iDes);
+ iProvider->ControlL(aOptionLevel, aOptionName, *((TDes8*)(p.iDes)), aMessage);
+ }
+
+TInt CConnectionProviderShim::DoAllSubConnectionNotificationEnable()
+ {
+ return iProvider->AllSubConnectionNotificationEnable();
+ }
+
+TInt CConnectionProviderShim::DoCancelAllSubConnectionNotification()
+ {
+ return iProvider->CancelAllSubConnectionNotification();
+ }
+
+void CConnectionProviderShim::DoSendIoctlMessageL(const RMessage2& aMessage)
+ {
+ iProvider->SendIoctlMessageL(aMessage);
+ }
+
+void CConnectionProviderShim::DoSendCancelIoctl()
+ {
+ iProvider->SendCancelIoctl();
+ }
+
+TInt CConnectionProviderShim::DoEnumerateSubConnectionsL(TUint& aCount)
+ {
+ return iProvider->EnumerateSubConnections(aCount);
+ }
+
+TUint CConnectionProviderShim::DoEnumerateClientsL(HBufC8*& /*aClientInfoBuffer*/, TEnumClients /*aClientType*/)
+ {
+ return 0;
+ }
+
+CConnectionSettings& CConnectionProviderShim::DoSettingsAccessL()
+ {
+ ASSERT(iProvider);
+ if (iConnectionSettings == NULL)
+ {
+ iConnectionSettings = new (ELeave)CConnectionSettingsShim(*iProvider);
+ }
+ return *iConnectionSettings;
+ }
+
+void CConnectionProviderShim::ConnectionJoiningL( const CConnection& aConnection )
+ {
+ if (iConnections.Find(&aConnection) < 0)
+ {
+ iConnections.AppendL(&aConnection);
+ }
+ TInt count = iNifManSubConnections.Count();
+ for ( TInt n = 0; n < count; n++ )
+ {//here we exactly know what we are dealing with hence the cast
+ CNifManSubConnectionShim* c = static_cast<CNifManSubConnectionShim*>(iNifManSubConnections[n]);
+ MSubInterfaceShim* subint = static_cast<MSubInterfaceShim*>(c);
+ subint->ConnectionJoiningL(aConnection);
+ }
+ }
+
+void CConnectionProviderShim::ConnectionLeaving( const CConnection& aConnection )
+ {
+ TInt count = iNifManSubConnections.Count();
+ for ( TInt n = 0; n < count; n++ )
+ {//here we exactly know what we are dealing with hence the cast
+ CNifManSubConnectionShim* c = static_cast<CNifManSubConnectionShim*>(iNifManSubConnections[n]);
+ MSubInterfaceShim* subint = static_cast<MSubInterfaceShim*>(c);
+ subint->ConnectionLeaving(aConnection);
+ }
+ TInt n = iConnections.Find(&aConnection);
+ if (n >= 0)
+ {
+ iConnections.Remove(n);
+ }
+ }
+
+void CConnectionProviderShim::DoConnectionControlActivityL( TControlActivity aControlActivity, const Meta::SMetaData* aData, const RMessagePtr2* aMessage )
+ {
+ switch (aControlActivity)
+ {
+ case EAttachNormal:
+ case EAttachMonitor:
+ iProvider->AttachToConnectionL(iConnectionInfo.Right(KConnInfoPart), aControlActivity == EAttachMonitor, aMessage);
+ if ( aData == NULL )
+ {
+ break;
+ }
+ aControlActivity = EConnJoin; //and fall through
+ case EConnJoin:
+ if ( !aData || !aData->IsTypeOf( STypeId::CreateSTypeId(KShimCommsUid, Meta::KNetMetaTypeAny) ) )
+ {
+ User::Leave(KErrArgument);
+ }
+ ConnectionJoiningL(static_cast<const TShimConnectionInfo*>(aData)->iConnection);
+ break;
+ case EConnLeave:
+ if ( !aData || !aData->IsTypeOf( STypeId::CreateSTypeId(KShimCommsUid, Meta::KNetMetaTypeAny) ) )
+ {
+ User::Leave(KErrArgument);
+ }
+ ConnectionLeaving(static_cast<const TShimConnectionInfo*>(aData)->iConnection);
+ break;
+ case ESetUsageProfile:
+ {
+ ASSERT(aData);
+ #ifdef _DEBUG
+ Meta::STypeId tid = aData->GetTypeId();
+ #endif
+ ASSERT( tid.iUid == TUid::Uid( KESockMessagesImplementationUid ) && tid.iType == EESockMessageCommsDes8);
+ const ::TMetaDes8* p = static_cast<const ::TMetaDes8*>(aData);
+ ASSERT(p->iDes);
+ const TUint* profile = reinterpret_cast<const TUint*>(p->iDes->Ptr());
+ if (iUsageProfile != *profile)
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tSetting usage profile %x -> %x"),
+ this, iUsageProfile & 0xff, *profile & 0xff));
+ iUsageProfile = *profile;
+ iProvider->SetUsageProfile(*profile);
+ }
+ break;
+ }
+ };
+ }
+
+CNifManSubConnectionShim* CConnectionProviderShim::FindSubConnection( TSubConnectionUniqueId aId )
+ {
+ CNifManSubConnectionShim* client = NULL;
+ TInt count = iNifManSubConnections.Count();
+ for ( TInt n = 0; n < count; n++ )
+ {//here we exactly know what we are dealing with hence the cast
+ CNifManSubConnectionShim* c = static_cast<CNifManSubConnectionShim*>(iNifManSubConnections[n]);
+ MSubInterfaceShim* subint = static_cast<MSubInterfaceShim*>(c);
+ if (subint->Id() == aId )
+ {
+ client = c;
+ break;
+ }
+ }
+ return client;
+ }
+
+// Define methods from the interface specified by MConnectionNotify
+void CConnectionProviderShim::ProgressNotification(TInt aStage, TInt aError)
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tProgressNotification(%d, %d)"), this, aStage, aError));
+
+ TInt max = iControlClients.Count();
+ for (TInt n = max - 1 ; n >= 0 ; n--)
+ {
+ MConnectionControlClient* client = iControlClients[n];
+ client->ProgressNotification(aStage, aError);
+ //check whether the client dissapeared or not
+ if ( n < iControlClients.Count() && client == iControlClients[n] )
+ {
+ if (aStage == KLinkLayerOpen)
+ {
+ iControlClients[n]->LayerUp(aError);
+ }
+ else if (aError != KErrNone)
+ {
+ iControlClients[n]->ConnectionError(aStage, aError);
+ }
+ }
+ }
+ if (aStage == KConnectionUninitialised && !iIsAlreadyUninitialised /* Guard against receiving KConnectionUninitialised multiple times*/)
+ {
+ iIsAlreadyUninitialised = ETrue;
+ TInt selectors = iSelectors.Count();
+ for (TInt i = 0; i < selectors; ++i)
+ {
+ iSelectors[i]->SetProviderNull();
+ }
+ DeleteMeNow();
+ }
+ }
+
+void CConnectionProviderShim::LinkLayerOpen(TInt /*aError*/)
+/**
+Notification from the connection provider - ignored.
+
+*/
+ {
+ }
+
+void CConnectionProviderShim::LinkLayerClosed(TInt /*aError*/)
+/**
+Notification from the connection provider - not currently used.
+
+*/
+ {
+ User::Invariant();
+ }
+
+void CConnectionProviderShim::SelectionComplete(TInt aError, const TDesC8& /*aSelectionInfo*/)
+ {//obsolete call selection done by factories this could happen only on Attach
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tSelectionComplete(%d)"), this, aError));
+ ProgressNotification(KFinishedSelection, aError);
+ }
+
+void CConnectionProviderShim::ConnectionError(TInt /*aError*/)
+/**
+Notification from the connection provider - not currently used.
+
+*/
+ {
+ User::Invariant();
+ }
+
+void CConnectionProviderShim::ProgressNotification(TSubConnectionUniqueId aSubConnectionUniqueId, TInt aStage, TInt aError)
+ {
+ MSubInterfaceShim* subint = static_cast<MSubInterfaceShim*>(FindSubConnection(aSubConnectionUniqueId));
+ if (subint)
+ {//here we exactly know what we are dealing with hence the cast
+ subint->ProgressNotification(aStage, aError, KNullDesC8);
+ }
+ else
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tProgressNotification(subConnectionId %d, %d, %d) subconnection ID lookup error occured"),
+ this, aSubConnectionUniqueId, aStage, aError));
+ }
+ }
+
+void CConnectionProviderShim::ServiceChangeNotification(TUint32 aId, const TDesC& aType)
+ {
+ TInt max = iControlClients.Count();
+ for (TInt i = max - 1 ; i >= 0 ; i--)
+ {
+ iControlClients[i]->ServiceChangeNotification(aId, aType);
+ }
+ }
+
+void CConnectionProviderShim::InterfaceStateChangeNotification(TDesC8& /*aInfo*/)
+ {//served through factories
+ ASSERT( NULL );
+ }
+
+void CConnectionProviderShim::NotifyDataSent(TSubConnectionUniqueId aSubConnectionUniqueId, TUint aUplinkVolume)
+ {//here we exactly know what we are dealing with hence the cast
+ MSubInterfaceShim* subint = static_cast<MSubInterfaceShim*>(FindSubConnection(aSubConnectionUniqueId));
+ if (subint)
+ {
+ subint->NotifyDataSent(aUplinkVolume,0);
+ }
+ else
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tNotifyDataSent(subConnectionId %d, aUplinkVolume %d) subconnection ID lookup error %d occured"),
+ this, aSubConnectionUniqueId, aUplinkVolume, KErrNotFound));
+ }
+ }
+
+void CConnectionProviderShim::NotifyDataReceived(TSubConnectionUniqueId aSubConnectionUniqueId, TUint aDownlinkVolume)
+ {//here we exactly know what we are dealing with hence the cast
+ MSubInterfaceShim* subint = static_cast<MSubInterfaceShim*>(FindSubConnection(aSubConnectionUniqueId));
+ if (subint)
+ {
+ subint->NotifyDataReceived(aDownlinkVolume,0);
+ }
+ else
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tNotifyDataReceived(SubConnectionId %d, aDownLinkVolume %d); subconnection ID lookup error %d occured"),
+ this, aSubConnectionUniqueId, aDownlinkVolume, KErrNotFound));
+ }
+ }
+
+void CConnectionProviderShim::SubConnectionEvent(const TSubConnectionEvent& aSubConnectionEvent)
+/**
+Upcall from connection provider indicating that a subconnection event has occured
+
+@param aSubConnectionEvent The event that occured
+@note Even if the not client is listening for subconnection events, we still need them to manage the array of subconnections by listening for started and stopped events on each subconnection
+@note Events are not handled on a per-subconnection basis - all events are distributed to anyone who uses the AllSubConnectionNotification() method, so no subconnection/subinterface involvement is necessary
+*/
+ {
+ TSubConnectionEventType eventType(aSubConnectionEvent.iEventType);
+ TInt ret = KErrNone;
+
+ TSockManData* sockManData = SockManGlobals::Get();
+ ASSERT(sockManData != NULL);
+
+ CNifManSubConnectionShim* c = NULL;
+ switch(eventType)
+ {
+ case ESubConnectionOpened:
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tSubConnectionEvent() ESubConnectionOpened"), this));
+ c = FindSubConnection(aSubConnectionEvent.iSubConnectionUniqueId);
+ if (c == NULL)
+ {
+ // no instance yet for particular Id, create one
+ TRAP(ret,c = new (ELeave)CNifManSubConnectionShim(*this));
+ if(ret!=KErrNone) // nothing we can do here, no point in throwing error back to event source - nothing they can do about it
+ {
+ // Array integrity will be broken here - may cause errors later with events on this subconnection if we recover
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tERROR: Subconnection opened event; could not create CSubInterface - possible OOM condition - subconnection ID %d, error %d - subinterface array integrity failure"),
+ this, aSubConnectionEvent.iSubConnectionUniqueId, ret));
+ break;
+ }
+ ret = iNifManSubConnections.Append(c);
+ if (ret != KErrNone)
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tERROR: could not append CNifManSubConnectionShim to the list - subconnection ID %d, error %d - subinterface array integrity failure"),
+ this, aSubConnectionEvent.iSubConnectionUniqueId, ret));
+ c->DeleteAsync();
+ break;
+ }
+ }
+ MSubInterfaceShim* subint = static_cast<MSubInterfaceShim*>(c);
+ subint->SetSubConnectionUniqueId(aSubConnectionEvent.iSubConnectionUniqueId);
+
+ TInt count = iConnections.Count();
+ for (TInt i = count - 1; i >= 0; i--)
+ {
+ TRAP(ret,c->ConnectionJoiningL(*iConnections[i]));
+ if(ret!=KErrNone) // nothing we can do here, no point in throwing error back to event source - nothing they can do about it
+ {
+ // Array integrity will be broken here - may cause errors later with events on this subconnection if we recover
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tERROR: connection joining subconnection opened event; - possible OOM condition - subconnection ID %d, error %d - subinterface array integrity failure"),
+ this, aSubConnectionEvent.iSubConnectionUniqueId, ret));
+ break;
+ }
+ }
+ }
+ break;
+
+ case ESubConnectionClosed:
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tSubConnectionEvent() ESubConnectionClosed"), this));
+ c = FindSubConnection(aSubConnectionEvent.iSubConnectionUniqueId);
+ if(!c) // then there was an error (probably that we couldn't find the object in the array) - write error to log - not much else we can do
+ {
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tERROR: Subconnection closed event; could not find subconnection ID %d, lookup error %d occured"),
+ this, aSubConnectionEvent.iSubConnectionUniqueId, KErrNotFound));
+ }
+ else
+ {
+ iDeleteAsynchOnly = ETrue;
+ TInt n = iNifManSubConnections.Find(c);
+ if (n >= 0)
+ {
+ iNifManSubConnections.Remove(n);
+ }
+ c->DeleteAsync();
+ }
+ break;
+
+ default:
+ // do nothing; we only care about open and close events
+ break;
+ }
+
+ // Rebroadcast all events to all attached control clients
+ TInt max = iControlClients.Count();
+ for (TInt i = max - 1; i >= 0 ; i--)
+ {
+ iControlClients[i]->SubConnectionEvent(NULL, aSubConnectionEvent);
+ }
+
+ CheckDeleteThis();
+
+ }
+
+CConnectionProvdBase* CConnectionProviderShim::GetNifSession()
+ {
+ return iProvider;
+ }
+
+void CConnectionProviderShim::InitialiseL(CConnectionProvdBase* aStarterSession)
+ {
+ ASSERT(aStarterSession);
+ //
+ //can't set the provider twice
+ //
+ ASSERT(iProvider == NULL);
+ iProvider = Nif::NewConnectionL(this, 0);
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tInitialiseL(aStarterSession %x) iProvider %x"), this, aStarterSession, iProvider));
+ //
+ // After creating the new nif session (iProvider) we also need to transfer the connection attempt count
+ // from the old nif session (aStarterSession) to the new one, since it was the one that initially
+ // started the interface and connection attempt count was incremented in StartL of nif session
+ //
+ TPckg<TInt> connectionAttempt(-1);
+ aStarterSession->ControlL(KCOLProvider, KNifSessionGetConnectionAttempt, connectionAttempt, NULL);
+ ASSERT(connectionAttempt() != -1);
+ iProvider->ControlL(KCOLProvider, KNifSessionSetConnectionAttempt, connectionAttempt, NULL);
+ //
+ // Finally, call ConnectionControlActivityL to ensure that the provider is attached to the connection
+ // and progress notifications from the provider end up in the connection object too
+ //
+ DoConnectionControlActivityL(EAttachNormal, NULL, NULL);
+
+//PREQ399_REMOVE
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ _LIT(KIfNameField, "IfName");
+ TBuf<KCommsDbSvrMaxFieldLength> nifname;
+ iProvider->GetDes16SettingL(KIfNameField(), nifname);
+ if (nifname.CompareF (KSpudName) == 0)
+ {
+ iSubConnectionType = KUmtsGprsSubConnectionProviderFactoryId;
+ }
+#endif //SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ iHasAnyControlClientJoined = ETrue;
+ }
+
+void CConnectionProviderShim::SetBlockProgressesL(CConnectionProvdBase* aStarterSession)
+/**
+Ensure that the "blocked progress" status of aStarterSession is copied across to iProvider session.
+
+@param aStarterSession session from which to copy "blocked progress" status.
+*/
+ {
+ TPckg<TBool> blockProgresses(EFalse);
+ aStarterSession->ControlL(KCOLProvider, KNifSessionGetBlockProgresses, blockProgresses, NULL);
+ iProvider->ControlL(KCOLProvider, KNifSessionSetBlockProgresses, blockProgresses, NULL);
+ }
+
+void CConnectionProviderShim::DoJoinNextLayerL(CConnectionProviderBase* aNextLayer)
+ {
+ (void)aNextLayer;
+ if ( !iProvider )
+ {
+ ASSERT( !aNextLayer );
+// AddRef(); //The AddRef needs to be here since it follows the logic in the selector shim.
+ iProvider = Nif::NewConnectionL(this, 0);
+ __CFLOG_VAR((KShimCprTag, KShimCprSubTag, _L8("CConnectionProviderShim %08x:\tDoJoinNextLayerL(aNextLayer %x) iProvider %x"), this, aNextLayer, iProvider));
+ }
+ }
+
+CConnectionProviderBase* CConnectionProviderShim::DoNextLayer() const
+ {
+ //This is (by design) the last layer.
+ return NULL;
+ }
+
+
+TInt CConnectionProviderShim::DoCanDoSubConnection(RSubConnection::TSubConnType aSubConnType) const
+ {
+ (void)aSubConnType;
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ return iSubConnectionType;
+#else
+ return 0;
+#endif
+// SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ }
+
+/**
+Find particular CSubConnectionLinkShimClient object with the pointer to given aConnection
+
+@param aTypeId Id of CNifManSubConnectionShim
+@param aConnection aConnection pointer
+@return CSubConnectionLinkShimClient* or NULL
+*/
+CSubConnectionLinkShimClient* CConnectionProviderShim::QuerySubSessions(TInt32 aTypeId,const CConnection* aConnection)
+ {
+ TInt count = iNifManSubConnections.Count();
+ CNifManSubConnectionShim *nifManSubConnection;
+ CSubConnectionLinkShimClient *linkShimClient = NULL;
+ for (TInt i = count - 1; i >= 0; i--)
+ {
+ nifManSubConnection = iNifManSubConnections[i];
+ if (nifManSubConnection && nifManSubConnection->Id() == aTypeId)
+ {
+ TInt n = 0;
+ do
+ {
+ linkShimClient = nifManSubConnection->ShimClient(n++);
+ }
+ while (linkShimClient && !linkShimClient->Match(*aConnection));
+ }
+ }
+
+ return linkShimClient;
+ }
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+void CConnectionProviderShim::SetFactoryIfactory(CConnectionProviderFactoryShim *aFactoryShim)
+ {
+ iFactoryShim = aFactoryShim;
+ }
+#endif // SYMBIAN_NETWORKING_UMTSR5
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/src/shimcprfactory.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,256 @@
+// 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:
+// SHIMCPRFACTORY.H
+//
+//
+
+#include <ecom/ecom.h>
+#include <implementationproxy.h>
+#include "shimcprfactory.h" // for CConnectionProviderFactoryShim
+
+#include "connectionSelectorShim.h"
+#include "shimcpr.h"
+#include "shimnifmansconn.h"
+#include "idquerynetmsg.h"
+#include <nifman.h>
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+#include <esockmessages.h>
+#endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
+
+
+const TUint KShimConnectionProviderImplementationUid = 0x102070FF;
+/**
+Data required for instantiating ECOM Plugin
+*/
+const TImplementationProxy ImplementationTable[] =
+ {
+ IMPLEMENTATION_PROXY_ENTRY(KShimConnectionProviderImplementationUid, CConnectionProviderFactoryShim::NewL),
+ };
+
+
+/**
+ECOM Implementation Factory
+*/
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
+ {
+ aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+
+ return ImplementationTable;
+ }
+
+CConnectionProviderFactoryShim* CConnectionProviderFactoryShim::NewL(TAny* aConstructionParameters)
+ {
+ CConnectionProviderFactoryShim* ptr = new (ELeave) CConnectionProviderFactoryShim(KShimConnectionProviderFactoryId, *(reinterpret_cast<CConnectionFactoryContainer*>(aConstructionParameters)));
+ CleanupStack::PushL(ptr);
+ ptr->ConstructL();
+ CleanupStack::Pop(ptr);
+ return ptr;
+ }
+
+void CConnectionProviderFactoryShim::ConstructL()
+ {//create a provider session for global tasks (enumerate connections/all interface notification....)
+ iNifmanSession = Nif::NewConnectionL(this, 0);
+ iNifmanSession->AllInterfaceNotificationL();
+ }
+// Destructor
+CConnectionProviderFactoryShim::~CConnectionProviderFactoryShim()
+ {
+ delete iNifmanSession;
+ }
+
+// Constructor
+CConnectionProviderFactoryShim::CConnectionProviderFactoryShim(TUint aFactoryId, CConnectionFactoryContainer& aParentContainer) :
+ CConnectionProviderFactoryBase( aFactoryId, aParentContainer )
+ {
+ }
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+// Sets the IAP lock status
+void CConnectionProviderFactoryShim::SetIAPLockStatus(TBool aLockStatus, TInt aLockedIAP)
+ {
+ iIsIAPLocked = aLockStatus;
+ iLockedIAP = aLockedIAP;
+ }
+// Gets the IAP lock status
+void CConnectionProviderFactoryShim::GetIAPLockStatus(TBool &aLockStatus, TInt &aLockedIAP)
+ {
+ aLockStatus = iIsIAPLocked;
+ aLockedIAP = iLockedIAP;
+ }
+
+#endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
+
+CConnectionProviderBase* CConnectionProviderFactoryShim::DoCreateProviderL()
+ {
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ CConnectionProviderShim * shimProv = CConnectionProviderShim::NewL(*this);
+ shimProv->SetFactoryIfactory(this);
+ return shimProv;
+#else
+ return CConnectionProviderShim::NewL(*this);
+#endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
+ }
+
+MProviderSelector* CConnectionProviderFactoryShim::DoSelectProvider( Meta::SMetaData& aPreferences, ISelectionNotify& aSelectionNotify, const RMessagePtr2* aMessage )
+ {
+ //create self-destructing object
+ CConnectionSelectorShim* selector = new CConnectionSelectorShim(aSelectionNotify);
+ if (!selector)
+ {
+ aSelectionNotify.SelectComplete(NULL,KErrNoMemory);
+ aSelectionNotify.Detach();
+ }
+ else
+ {
+ #ifdef SYMBIAN_NETWORKING_UMTSR5
+ selector->SetFactoryIface(this);
+ #endif
+ if ( selector->Select(aPreferences, aMessage) != KErrNone )
+ {
+ selector = NULL;
+ }
+ }
+
+
+ return selector;
+ }
+
+MProviderSelector* CConnectionProviderFactoryShim::DoSelectNextLayerProvider( Meta::SMetaData& /*aPreferences*/, ISelectionNotify& /*aSelectionNotify*/, const RMessagePtr2* /*aMessage*/ )
+ {
+ return NULL;
+ }
+
+void CConnectionProviderFactoryShim::DoEnumerateConnectionsL(RPointerArray<TConnectionInfo>& aConnectionInfoPtrArray)
+ {
+ iNifmanSession->EnumerateConnectionsL(aConnectionInfoPtrArray);
+ }
+
+//MConnectionNotify interface to catch the global events
+void CConnectionProviderFactoryShim::SelectionComplete(TInt /*aError*/, const TDesC8& /*aSelectionInfo*/)
+ {
+
+ ASSERT(NULL);//it's never to happen
+ }
+
+void CConnectionProviderFactoryShim::ConnectionError(TInt /*aError*/)
+ {
+ ASSERT(NULL);//it's never to happen
+ }
+
+void CConnectionProviderFactoryShim::LinkLayerOpen(TInt /*aError*/)
+ {
+ ASSERT(NULL);//it's never to happen
+ }
+
+void CConnectionProviderFactoryShim::LinkLayerClosed(TInt /*aError*/)
+ {
+ ASSERT(NULL);//it's never to happen
+ }
+
+void CConnectionProviderFactoryShim::ProgressNotification(TInt /*aStage*/, TInt /*aError*/)
+ {
+ ASSERT(NULL);//it's never to happen
+ }
+
+void CConnectionProviderFactoryShim::ProgressNotification(TSubConnectionUniqueId /*aSubConnectionUniqueId*/, TInt /*aStage*/, TInt /*aError*/)
+ {
+ ASSERT(NULL);//it's never to happen
+ }
+
+void CConnectionProviderFactoryShim::ServiceChangeNotification(TUint32 /*aId*/, const TDesC& /*aType*/)
+ {
+ ASSERT(NULL);//it's never to happen
+ }
+
+void CConnectionProviderFactoryShim::InterfaceStateChangeNotification(TDesC8& aInfo)
+ {
+ TInt count = iConnectionFactoryNotify.Count();
+ for (TInt n = 0; n < count; n++)
+ {
+ iConnectionFactoryNotify[n].InterfaceStateChange(aInfo);
+ }
+ }
+
+void CConnectionProviderFactoryShim::NotifyDataSent(TSubConnectionUniqueId /*aSubConnectionUniqueId*/, TUint /*aUplinkVolume*/)
+ {
+ ASSERT(NULL);//it's never to happen
+ }
+
+void CConnectionProviderFactoryShim::NotifyDataReceived(TSubConnectionUniqueId /*aSubConnectionUniqueId*/, TUint /*aDownlinkVolume*/)
+ {
+ ASSERT(NULL);//it's never to happen
+ }
+
+void CConnectionProviderFactoryShim::SubConnectionEvent(const TSubConnectionEvent& /*aSubConnectionEvent*/)
+ {
+ ASSERT(NULL);//it's never to happen
+ }
+
+
+/**
+Define the factory query to find out particular CSubConnectionLinkShimClient object based on CConnection address
+*/
+
+class XShimFactoryQuery : public MCommsFactoryQuery
+ {
+ friend class CConnectionProviderFactoryShim;
+
+public:
+ explicit XShimFactoryQuery( NetMessages::CTypeIdQuery& aQuery ) :
+ iQuery(aQuery),
+ iClient(NULL)
+ {
+ }
+
+protected:
+ NetMessages::CTypeIdQuery& iQuery;
+ CSubConnectionLinkShimClient* iClient;
+
+public:
+ virtual TMatchResult Match( TFactoryObjectInfo& aInfo );
+ };
+
+//This method is called for each instance of particular class being managed by CommsFactory framework
+MCommsFactoryQuery::TMatchResult XShimFactoryQuery::Match( TFactoryObjectInfo& aInfo )
+ {
+ CConnectionProviderShim* connectionProvider = static_cast<CConnectionProviderShim*>(aInfo.iInfo.iFactoryObject);
+ ASSERT(connectionProvider);
+ //call the CNifManSubConnectionShim interface to do the job
+ iClient = connectionProvider->QuerySubSessions(iQuery.iTypeId, reinterpret_cast<CConnection*> (iQuery.iHandle));
+
+ return iClient ? MCommsFactoryQuery::EMatch : MCommsFactoryQuery::EContinue;
+ }
+
+/** Handles incoming messages
+
+@param aNetMessage Messsge reference
+@return KErrNone|KErrNotFound|KErrNotSupported
+@return if object found passes its pointer to the aNetMessasge object
+*/
+TInt CConnectionProviderFactoryShim::DoReceiveMessage( NetMessages::CMessage& aNetMessage )
+{
+STypeId tid = STypeId::CreateSTypeId(NetMessages::KInterfaceUid, NetMessages::ETypeIdQueryId);
+NetMessages::CTypeIdQuery& query = static_cast<NetMessages::CTypeIdQuery&>(aNetMessage);
+TInt ret = KErrNotSupported;
+if (aNetMessage.GetTypeId() == tid && query.iUid == KShimCommsUid)
+ {
+ XShimFactoryQuery q(query);
+ ret = FindObject(q) ? KErrNone : KErrNotFound;
+ //carry the result back
+ query.iHandle = (TInt)(static_cast<MShimControlClient*>(q.iClient));
+ }
+return ret;
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/src/shimdatatransfer.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,458 @@
+// 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:
+//
+
+/**
+ @file SHIMDATATRANSFER.CPP
+*/
+
+#include "shimnifmansconn.h"
+#include "shimdatatransfer.h"
+#include "es_prot.h" //CConnectionProvdBase alias NIFMAN
+
+
+
+
+CConnDataTransferShim::CConnDataTransferShim(CNifManSubConnectionShim& aSubConnectionProviderShim) :
+ iSubConnectionProviderShim(aSubConnectionProviderShim)
+ {
+ }
+
+CConnDataTransferShim::~CConnDataTransferShim()
+ {
+ iUplinkGranularities.Close();
+ iDownlinkGranularities.Close();
+ }
+
+
+TInt CConnDataTransferShim::DoDataTransferred(TUint& aUplinkVolume, TUint& aDownlinkVolume)
+ {
+ // Find out the amount of data transferred from the connection provider
+ TInt ret = iSubConnectionProviderShim.Provider().DataTransferred(iSubConnectionProviderShim.Id(), aUplinkVolume, aDownlinkVolume);
+
+ // Let the subinterface know in case any subconnections have outstanding data notification requests that might be completed by this
+ NotifyDataTransferred(aUplinkVolume, aDownlinkVolume);
+
+ // And return the results to the connection
+ return(ret);
+ }
+
+TInt CConnDataTransferShim::DoDataTransferredCancel()
+ {
+ // do nothing
+ return KErrNone;
+ }
+
+TInt CConnDataTransferShim::DoDataSentNotificationRequest(TUint aRequestedGranularity, TUint aRequestedNotificationVolume)
+ {
+ TInt requiredGranularity;
+
+ if(aRequestedGranularity == 0) // absolute mode
+ {
+ // Start by finding out how much data has been sent, then calculate granularity
+ TUint uplinkDataVolume;
+ TUint dummyDataVolume;
+
+ DoDataTransferred( uplinkDataVolume, dummyDataVolume);
+
+ requiredGranularity = aRequestedNotificationVolume - uplinkDataVolume;
+ if(requiredGranularity < 0) // we've already achieved this so notify immediately
+ {
+ // possible optimisation: pass reference to caller in here and
+ // only notify them if this condition is met
+ // essentially we don't know what the granularity was here
+ for(TInt i=0; i < iClients.Count(); i++)
+ {
+ iClients[i]->NotifyDataSent(uplinkDataVolume, 0);
+ }
+ }
+ }
+ else // relative mode
+ {
+ requiredGranularity = aRequestedGranularity;
+ }
+
+ return CalculateNewUplinkGranularity(requiredGranularity);
+ }
+
+TInt CConnDataTransferShim::DoDataSentNotificationCancel()
+ {
+ // Do nothing. Not worth trying to adjust granularity array.
+ return KErrNone;
+ }
+
+TInt CConnDataTransferShim::DoDataReceivedNotificationRequest(TUint aRequestedGranularity, TUint aRequestedNotificationVolume)
+ {
+ TInt requiredGranularity;
+
+ if(aRequestedGranularity == 0) // absolute mode
+ {
+ // Start by finding out how much data has been sent, then calculate granularity
+ TUint dummyDataVolume;
+ TUint downlinkDataVolume;
+
+ DoDataTransferred( dummyDataVolume, downlinkDataVolume);
+
+ requiredGranularity = aRequestedNotificationVolume - downlinkDataVolume;
+ if(requiredGranularity < 0) // we've already achieved this so notify immediately
+ {
+ // possible optimisation: pass reference to caller in here
+ // and only notify them if this condition is met
+ // essentially we don't know what the granularity was here
+ for(TInt i=0; i < iClients.Count(); i++)
+ {
+ iClients[i]->NotifyDataReceived(downlinkDataVolume, 0);
+ }
+ }
+ }
+ else // relative mode
+ {
+ requiredGranularity = aRequestedGranularity;
+ }
+
+ return CalculateNewDownlinkGranularity(requiredGranularity);
+ }
+
+TInt CConnDataTransferShim::DoDataReceivedNotificationCancel()
+ {
+ // Do nothing. Not worth trying to adjust granularity array.
+ return KErrNone;
+ }
+
+TInt CConnDataTransferShim::NotifyDataTransferred(TUint aUplinkVolume, TUint aDownlinkVolume)
+/**
+Called as a side-effect of someone calling DataTransferredRequest(), to allow any absolute volume notifications that may be outstanding to be completed if the required amount of data has been sent/received
+
+@param aUplinkVolume The total volume of data sent on this subconnection
+@param aDownlinkVolume The total volume of data received on this subconnection
+@return KErrNone, or one of the system-wide error codes
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprDataTag, _L8("CConnDataTransferShim[id: %d]: New data transferred notification (uplink: %d, downlink: %d)"),
+ iSubConnectionProviderShim.Id(), aUplinkVolume, aDownlinkVolume));
+
+ for(TInt i=0; i < iClients.Count(); i++)
+ {
+ iClients[i]->NotifyDataTransferred(aUplinkVolume, aDownlinkVolume);
+ }
+
+ return KErrNone;
+ }
+
+TInt CConnDataTransferShim::NotifyDataSent(TUint aUplinkVolume)
+/**
+Notification from connection provider via CInterface that the requested granularity for data sent has been met or exceeded
+
+@note The granularity system is not perfect, as it may be the case that we get notifications for more than "granularity" quantity of data.
+@param aUplinkVolume The total volume of data sent so far on this subconnection
+@return KErrNone, or one of the system-wide error codes
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprDataTag, _L8("CConnDataTransferShim[id: %d]: New data sent notification (uplink: %d)"),
+ iSubConnectionProviderShim.Id(), aUplinkVolume));
+
+ // Pass notification up to all subconnections, including the current granularity setting in case they are in relative notification mode
+ for(TInt i=0; i < iClients.Count(); i++)
+ {
+ iClients[i]->NotifyDataSent(aUplinkVolume, iCurrentUplinkGranularity);
+ }
+
+ // Set the new granularity required of the interface
+ return SetNextUplinkGranularity();
+ }
+
+TInt CConnDataTransferShim::NotifyDataReceived(TUint aDownlinkVolume)
+/**
+Notification from connection provider via CInterface that the requested granularity for data received has been met or exceeded
+
+@param aDownlinkVolume The total volume of data received so far on this subconnection
+@return KErrNone, or one of the system-wide error codes
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprDataTag, _L8("CConnDataTransferShim[id: %d]: New data received notification (downlink: %d)"), iSubConnectionProviderShim.Id(), aDownlinkVolume));
+
+ // Pass notification up to all subconnections, including the current granularity setting in case they are in relative notification mode
+ for(TInt i=0; i < iClients.Count(); i++)
+ {
+ iClients[i]->NotifyDataReceived(aDownlinkVolume, iCurrentDownlinkGranularity);
+ }
+
+ // Set the new granularity required of the interface
+ return SetNextDownlinkGranularity();
+ }
+
+TInt CConnDataTransferShim::CalculateNewUplinkGranularity(TUint aRequestedGranularity)
+/**
+Calculate the required granularity to satisfy client requests
+This function calculates the delta between client requests and stores it in an array.
+
+@param aRequestedGranularity The new requested granularity
+@return KErrNone if successful, otherwise one of the system-wide error codes
+@todo Quantise requests to granularity of 1K
+*/
+ {
+ TInt ret = KErrNone;
+ TInt requestedGranularity = static_cast<TInt>(aRequestedGranularity);
+
+ //@todo In the future, this method could be rewritten to expand the maximum
+ //granularity from 2GB to 4GB. Probably not necessary...
+ if(requestedGranularity < 0) // check that the cast didn't produce an invalid result
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprDataTag, _L8("CConnDataTransferShim[id: %d]: ERROR - calculating new uplink granularity - overflow when casting integer"),
+ iSubConnectionProviderShim.Id()));
+ return(KErrOverflow);
+ }
+
+ __CFLOG_VAR((KShimScprTag, KShimScprDataTag, _L8("CConnDataTransferShim[id: %d]: Calculating new uplink granularity..."),
+ iSubConnectionProviderShim.Id()));
+
+ TUint newGranularity = 0;
+
+ ret = CalculateNewGranularity(requestedGranularity, iCurrentUplinkGranularity, iUplinkGranularities, newGranularity);
+ if (ret == KErrNone && newGranularity)
+ {
+ ret = SetUplinkGranularity(newGranularity);
+ }
+ return(ret);
+ }
+
+TInt CConnDataTransferShim::CalculateNewDownlinkGranularity(TUint aRequestedGranularity)
+/**
+Calculate the required granularity to satisfy client requests
+This function calculates the delta between client requests and stores it in an array.
+
+@param aRequestedGranularity The new requested granularity
+@return KErrNone if successful, otherwise one of the system-wide error codes
+@todo Quantise requests to granularity of 1K
+*/
+ {
+ TInt ret;
+ TInt requestedGranularity = static_cast<TInt>(aRequestedGranularity);
+
+ //@todo In the future, this method could be rewritten to expand the maximum
+ // granularity from 2GB to 4GB. Probably not necessary...
+ if(requestedGranularity < 0) // check that the cast didn't produce an invalid result
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprDataTag, _L8("CConnDataTransferShim[id: %d]: ERROR - calculating new downlink granularity - overflow when casting integer"),
+ iSubConnectionProviderShim.Id()));
+ return(KErrOverflow);
+ }
+
+ __CFLOG_VAR((KShimScprTag, KShimScprDataTag, _L8("ESock: CConnDataTransferShim[id: %d]: Calculating new downlink granularity..."),
+ iSubConnectionProviderShim.Id()));
+
+ TUint newGranularity = 0;
+
+ ret = CalculateNewGranularity(requestedGranularity, iCurrentDownlinkGranularity, iDownlinkGranularities, newGranularity);
+ if (ret == KErrNone && newGranularity)
+ {
+ ret = SetDownlinkGranularity(newGranularity);
+ }
+ return(ret);
+ }
+
+TInt CConnDataTransferShim::CalculateNewGranularity(TInt aRequestedGranularity, TUint aCurrentGranularity, RArray<TUint>& aGranularities, TUint& aNewCurrentGranularity)
+/**
+Given a new granularity, calculate new values for the Current granularity and granularity array.
+
+Helper function used for processing new uplink and downlink granularities.
+
+@param aRequestedGranularity new granularity (in).
+@param aCurrentGranularity current granularity in the lower provider (in).
+@param aGranularities ordered array of delta granularities which will become the current granularity
+after the latter has expired (in/out).
+@param aNewCurrentGranularity new value of current granularity to be set in lower provider (out).
+@return KErrNone or a system wide error code.
+*/
+ {
+ TInt ret = KErrNone;
+ TInt i = 0;
+ TInt count = aGranularities.Count(); // granularities in the array
+
+ // The reason we have the three way if statement below is because we have to deal with
+ // the fact that there is a "current" granularity (set in the lower provider), and
+ // an array of delta granularities which will become the current granularity in turn:
+ //
+ // +---+ +---+---+---+
+ // | | | | | |...
+ // +---+ +---+---+---+
+ // 0 1 2
+ // Current Array
+ //
+ // The complexity comes when a new granularity needs to be notionally inserted either before the
+ // current granularity or between the current granularity and the first entry in the array.
+
+ if (count == 0 && aCurrentGranularity == 0)
+ {
+ // Empty granularity array and no current granularity.
+ //
+ // - set current granularity to the requested granularity (no entries needed in array)
+ aNewCurrentGranularity = aRequestedGranularity;
+ }
+ else
+ if (aRequestedGranularity < aCurrentGranularity)
+ {
+ // Requested granularity is less than current granularity. The requested granularity
+ // needs to be notionally inserted before the current granularity.
+
+ // add a new entry into the beginning of the array that contains the delta between the requested
+ // granularity and current granularity. This new entry represents the "old" current granularity.
+ ret = aGranularities.Insert(aCurrentGranularity - aRequestedGranularity, 0);
+ if (ret == KErrNone)
+ {
+ // the requested granularity becomes the new current granularity
+ aNewCurrentGranularity = aRequestedGranularity;
+ }
+ }
+ else
+ if (aRequestedGranularity > aCurrentGranularity)
+ {
+ // Requested granularity is greater than current granularity. The requested granularity
+ // needs to be inserted into the array at the appropriate place. The current granularity
+ // remains unchanged.
+
+ // Take into account the current granularity by subtracting it from requested granularity
+ aRequestedGranularity -= aCurrentGranularity;
+
+ // Find correct insertion position. Each entry visited in the array will subtract from the
+ // requested granularity, leaving the latter as being delta based.
+ for(i=0; i < count ; i++)
+ {
+ aRequestedGranularity -= aGranularities[i];
+ if (aRequestedGranularity <= 0)
+ {
+ break;
+ }
+ }
+
+ if (aRequestedGranularity < 0)
+ {
+ // Insertion position found within the array - held in "i".
+ aRequestedGranularity += aGranularities[i];
+ ret = aGranularities.Insert(aRequestedGranularity, i);
+ if (ret == KErrNone)
+ {
+ // Adjust the next granularity in the array by the Requested granularity
+ // that we've just inserted. "i+1" because of the Insert() above.
+ aGranularities[i+1] -= aRequestedGranularity;
+ }
+ }
+ else
+ if (aRequestedGranularity > 0)
+ {
+ // Reached end of the array while searching - insert requested granularity at the end.
+ ret = aGranularities.Append(aRequestedGranularity);
+ }
+ // aRequestedGranularity == 0 is a no-op case (setting zero granularity).
+ }
+ // (aRequestedGranularity == iCurrentUplinkGranularity) is a no-op case (setting the same
+ // granularity as current value).
+ return (ret);
+ }
+
+
+TInt CConnDataTransferShim::SetUplinkGranularity(TUint aRequestedGranularity)
+/**
+Set data sent notification granularity in lower provider.
+
+@param aRequestedGranularity granularity to set. If zero, cancel data sent notifications.
+@return KErrNone or a system wide error code.
+*/
+ {
+ iCurrentUplinkGranularity = aRequestedGranularity;
+ if (iCurrentUplinkGranularity)
+ {
+ return iSubConnectionProviderShim.Provider().SetDataSentNotificationGranularity(iSubConnectionProviderShim.Id(), iCurrentUplinkGranularity);
+ }
+ else
+ {
+ return iSubConnectionProviderShim.Provider().DataSentNotificationCancel(iSubConnectionProviderShim.Id());
+ }
+ }
+
+TInt CConnDataTransferShim::SetNextUplinkGranularity()
+/**
+Get the next uplink granularity from the array, and send it to the connection provider
+
+@return KErrNone if successful, otherwise one of the system-wide error codes
+*/
+ {
+ if(iUplinkGranularities.Count())
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprDataTag, _L8("CConnDataTransferShim[id: %d]: setting new uplink granularity (%d)"),
+ iSubConnectionProviderShim.Id(), iCurrentUplinkGranularity));
+
+ // Read the next granularity from the array
+ TUint granularity = iUplinkGranularities[0];
+
+ // Remove the value read
+ iUplinkGranularities.Remove(0);
+
+ return SetUplinkGranularity(granularity);
+ }
+ else
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprDataTag, _L8("CConnDataTransferShim[id: %d]: cancelling data sent notifications - no values remaining in granularity array"),
+ iSubConnectionProviderShim.Id()));
+
+ return SetUplinkGranularity(0); // cancel notifications
+ }
+ }
+
+TInt CConnDataTransferShim::SetDownlinkGranularity(TUint aRequestedGranularity)
+/**
+Set data received notification granularity in lower provider.
+
+@param aRequestedGranularity granularity to set. If zero, cancel data received notifications.
+@return KErrNone or a system wide error code.
+*/
+ {
+ iCurrentDownlinkGranularity = aRequestedGranularity;
+ if (iCurrentDownlinkGranularity)
+ {
+ return iSubConnectionProviderShim.Provider().SetDataReceivedNotificationGranularity(iSubConnectionProviderShim.Id(), iCurrentDownlinkGranularity);
+ }
+ else
+ {
+ return iSubConnectionProviderShim.Provider().DataReceivedNotificationCancel(iSubConnectionProviderShim.Id());
+ }
+ }
+
+TInt CConnDataTransferShim::SetNextDownlinkGranularity()
+/**
+Get the next downlink granularity from the array, and send it to the connection provider
+
+@return KErrNone if successful, otherwise one of the system-wide error codes
+*/
+ {
+ if(iDownlinkGranularities.Count())
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprDataTag, _L8("CConnDataTransferShim[id: %d]: setting new downlink granularity (%d)"),
+ iSubConnectionProviderShim.Id(), iCurrentDownlinkGranularity));
+ // Read the next granularity from the array
+ TUint granularity = iDownlinkGranularities[0];
+
+ // Remove the value read
+ iDownlinkGranularities.Remove(0);
+
+ return SetDownlinkGranularity(granularity);
+ }
+ else
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprDataTag, _L8("ESock: CConnDataTransferShim[id: %d]: cancelling data received notifications - no values remaining in granularity array"),
+ iSubConnectionProviderShim.Id()));
+
+ return SetDownlinkGranularity(0); // cancel notifications
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipcprshim/src/shimnifmansconn.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,244 @@
+// 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:
+// SHIMSCPR.CPP
+// This is part of an ECOM plug-in
+//
+//
+
+#include <ss_std.h>
+#include <comms-infras/ss_log.h>
+#include "shimnifmansconn.h"
+
+START_ATTRIBUTE_TABLE(TShimConnectionInfo, KShimCommsUid, Meta::KNetMetaTypeAny)
+END_ATTRIBUTE_TABLE()
+
+TInt CNifManSubConnectionShim::AsyncDestructorCb(TAny* aInstance)
+ {
+ CNifManSubConnectionShim* nifManSubConnection= reinterpret_cast<CNifManSubConnectionShim*>(aInstance);
+ delete nifManSubConnection;
+ return KErrNone;
+ }
+
+/**
+Create a new CNifManSubConnectionShim to act as a mux/demux for subconnections
+*/
+CNifManSubConnectionShim::CNifManSubConnectionShim (CConnectionProviderShim& aProviderShim)
+ :iSubConnectionsUniqueId(0), iConnectionProvider(&aProviderShim),
+ iAsyncDestructor(CActive::EPriorityStandard + 1)
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprSubTag, _L8("CNifManSubConnectionShim [this=%08x]:\tCNifManSubConnectionShim() [MConnectionDataClient=%08x]"),
+ this, (MConnectionDataClient*)this));
+ iAsyncDestructor.Set(TCallBack(AsyncDestructorCb, this));
+ }
+
+/**
+D'tor
+*/
+CNifManSubConnectionShim::~CNifManSubConnectionShim()
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprSubTag, _L8("CNifManSubConnectionShim::~CNifManSubConnectionShim() %08x"), this));
+ iShimClients.ResetAndDestroy();
+ delete iConnDataTransferShim;
+ }
+
+
+void CNifManSubConnectionShim::DeleteAsync()
+ {
+ if ( !iAsyncDestructor.IsActive() )
+ {
+ iAsyncDestructor.CallBack();
+ }
+ }
+
+TInt CNifManSubConnectionShim::FindClient(const CConnection& aConnection)
+ {
+ TInt max = iShimClients.Count();
+ for (TInt i = max - 1 ; i >= 0 ; i--)
+ {
+ CSubConnectionLinkShimClient* client = iShimClients[i];
+ if ( client->Match(aConnection) )
+ {
+ return i;
+ }
+ }
+ return KErrNotFound;
+ }
+
+void CNifManSubConnectionShim::ConnectionJoiningL(const CConnection& aConnection)
+ {//create a new CSubConnectionLinkShimClient for the joining conection
+ TInt i = FindClient(aConnection);
+ if ( i == KErrNotFound )
+ {
+ CSubConnectionLinkShimClient* client = new (ELeave)CSubConnectionLinkShimClient(aConnection,*this);
+ CleanupStack::PushL(client);
+ //create data transfer object if not created yet
+ CreateDataTransferL();
+ iConnDataTransferShim->RegisterClientL(*client);
+ TInt ret = iShimClients.Append(client);
+ if (ret != KErrNone)
+ {
+ iConnDataTransferShim->DeRegisterClient(*client);
+ User::Leave(ret);
+ }
+ CleanupStack::Pop(client);
+ }
+ }
+
+void CNifManSubConnectionShim::ConnectionLeaving(const CConnection& aConnection)
+ {//destroy a CSubConnectionLinkShimClient belonging to leaving conection
+ TInt i = FindClient(aConnection);
+ if ( i >= 0 )
+ {
+ CSubConnectionLinkShimClient* client = iShimClients[i];
+ iShimClients.Remove(i);
+ delete client;
+ }
+ }
+
+void CNifManSubConnectionShim::ConnectionGoingDown(CConnectionProviderBase& /*aConnProvider*/)
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprSubTag, _L8("CNifManSubConnectionShim %08x:\tConnectionGoingDown() Id %d"),
+ this, iSubConnectionsUniqueId));
+
+ // The ConnectionProvider has told us its going down so we delete ourselves, clearing
+ // the pointer to it so our d'tor doesn't make any calls on it.
+ iConnectionProvider = NULL;
+ delete this;
+ }
+
+void CNifManSubConnectionShim::ConnectionError(TInt /*aStage*/, TInt /*aError*/)
+ {
+ }
+
+void CNifManSubConnectionShim::Notify(TNotify /*aNotifyType*/, CConnectionProviderBase* /*aConnProvider*/, TInt /*aError*/, const CConNotificationEvent* /*aConNotificationEvent*/)
+ {
+ }
+
+void CNifManSubConnectionShim::AttachToNext(CSubConnectionProviderBase* /*aSubConnProvider*/)
+ {
+ }
+
+TInt CNifManSubConnectionShim::ProgressNotification(TInt aStage, TInt aError, const TDesC8& aInfo)
+/**
+Upcall from connection provider via CInterface with notification of new progress stage reached
+
+@param aStage The progress stage that the subconnection has reached
+@param aError Any errors that were encountered at this stage
+@param aInfo No idea what this is, it's inserted by CInterface and is currently null
+@return KErrNone, or one of the system-wide error codes
+*/
+ {
+ __CFLOG_VAR((KShimScprTag, KShimScprSubTag, _L8("CNifManSubConnectionShim %08x:\tProgressNotification(%d, %d) SubConnId: %d"),
+ this, aStage, aError, iSubConnectionsUniqueId));
+
+ TInt max = iShimClients.Count();
+ for (TInt i = max - 1 ; i >= 0 ; i--)
+ {
+ iShimClients[i]->ProgressNotification(aStage, aError, aInfo);
+ }
+
+ return KErrNone;
+ }
+
+
+TInt CNifManSubConnectionShim::NotifyDataTransferred(TUint aUplinkVolume, TUint aDownlinkVolume)
+ {
+ return iConnDataTransferShim ? iConnDataTransferShim->NotifyDataTransferred(aUplinkVolume, aDownlinkVolume) : KErrNone;
+
+ }
+
+TInt CNifManSubConnectionShim::NotifyDataSent(TUint aUplinkVolume, TUint /*aCurrentGranularity*/)
+ {
+ return iConnDataTransferShim ? iConnDataTransferShim->NotifyDataSent(aUplinkVolume) : KErrNone;
+
+ }
+
+TInt CNifManSubConnectionShim::NotifyDataReceived(TUint aDownlinkVolume, TUint /*aCurrentGranularity*/)
+ {
+ return iConnDataTransferShim ? iConnDataTransferShim->NotifyDataReceived(aDownlinkVolume) : KErrNone;
+
+ }
+
+TSubConnectionUniqueId CNifManSubConnectionShim::Id()
+ /**
+ Access this subconnections unique id for search purposes
+ */
+ {
+ return iSubConnectionsUniqueId;
+ }
+
+void CNifManSubConnectionShim::SetSubConnectionUniqueId( TSubConnectionUniqueId aSubConnectionUniqueId )
+ {
+ iSubConnectionsUniqueId = aSubConnectionUniqueId;
+ }
+
+//void CNifManSubConnectionShim::DataClientJoiningL(MSubConnectionDataClient& aDataClient)
+// {
+// aDataClient.JoinComplete(*this);
+// }
+
+//void CNifManSubConnectionShim::DataClientLeaving(MSubConnectionDataClient& aDataClient)
+// {
+// aDataClient.LeaveComplete(*this);
+// }
+
+//void CNifManSubConnectionShim::DoSourceAddressUpdate(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aSource*/)
+// {//do nothing
+// }
+
+//void CNifManSubConnectionShim::DoDestinationAddressUpdate(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aDestination*/)
+// {//do nothing
+// }
+
+//void CNifManSubConnectionShim::DoDataClientRouted(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aSource*/, const TSockAddr& /*aDestination*/, const TDesC8& /*aConnectionInfo*/)
+// {//do nothing
+// }
+
+//void CNifManSubConnectionShim::DoParametersAboutToBeSetL(CSubConParameterBundle& /*aParameterBundle*/)
+// {//do nothing
+// }
+
+//TInt CNifManSubConnectionShim::DoControl(TUint /*aOptionLevel*/, TUint /*aOptionName*/, TDes8& /*aOption*/)
+// {//do nothing
+// return KErrNotSupported;
+// }
+
+//void CNifManSubConnectionShim::DoStartL()
+// {
+// User::Leave(KErrNotSupported);
+// }
+
+//void CNifManSubConnectionShim::DoStop()
+// {
+// }
+
+//CSubConnectionProviderBase* CNifManSubConnectionShim::DoNextLayer()
+// {
+// return NULL;
+// }
+
+CConnDataTransfer& CNifManSubConnectionShim::CreateDataTransferL()
+ {
+ if (!iConnDataTransferShim)
+ {
+ iConnDataTransferShim = new (ELeave)CConnDataTransferShim(*this);
+ }
+ return *iConnDataTransferShim;
+ }
+
+//MConnectionDataClient* CNifManSubConnectionShim::DoSelfConnectionDataClient()
+// {
+// return this;
+// }
+
--- a/networkcontrol/ipnetworklayer/addressinfohook/src/hookaddrinfo.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/ipnetworklayer/addressinfohook/src/hookaddrinfo.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -38,7 +38,7 @@
EXPORT_C void CHookAddressInfo::AddL(CIPProtoBinder* aBinder, CSubConIPAddressInfoParamSet::TSubConIPAddressInfo& aAddrInfo)
{
TIpAddrBinder *addrBinder = new(ELeave) TIpAddrBinder(aBinder, aAddrInfo);
-
+
CleanupStack::PushL(addrBinder);
iAddrInfo.AppendL(addrBinder);
CleanupStack::Pop(addrBinder);
--- a/networkcontrol/ipnetworklayer/inc/IPProtoCPR.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/IPProtoCPR.h Tue Aug 31 16:45:15 2010 +0300
@@ -187,19 +187,17 @@
ESock::TDataMonitoringConnProvisioningInfo iDataMonitoringConnProvisioningInfo;
TInt iLastControlClientsCount;
TInt iRouteCount;
+ TBool iRouteCountStretchOne;
TBool iPeriodActivity;
TInt iTimerDisableCount;
TTime iStartTime;
- TBool iRouteCountStretchOne:1;
TBool iLinkUp:1;
TBool iConnectionControlActivity:1;
TBool iTimerExpired:1;
TBool iTimerStopped:1;
TBool iTimerRunning:1;
TBool iSubConnEventDataSent:1; // Hack to cope with multiple DataClientStatusChange notifications for 'stopped'
- TBool iNodeLocalExtensionsCreated:1;
- TBool iStopped:1; // Hack to cope with AllInterfaceNotification not indicating a down/up sequence
- // if the IpProtoCpr is restarted before it is destroyed.
+ TBool iNodeLocalExtensionsCreated;
ESock::RMetaExtensionContainer iNodeLocalExtensions;
};
--- a/networkcontrol/ipnetworklayer/inc/IPProtoMCpr.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/IPProtoMCpr.h Tue Aug 31 16:45:15 2010 +0300
@@ -57,7 +57,6 @@
public:
TBool iIapLocked;
- TUint32 iLockedIapsid;
};
namespace IPProtoMCprActivities
--- a/networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -386,7 +386,6 @@
iLinkUp = EFalse;
CancelTimer();
- iStopped = ETrue;
}
void CIPProtoConnectionProvider::OpenRoute()
@@ -1008,3 +1007,4 @@
{
CTimer::ConstructL();
}
+
--- a/networkcontrol/ipnetworklayer/src/IPProtoCprStates.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoCprStates.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -38,8 +38,6 @@
#include <commsdattypesv1_1_partner.h>
#include <es_prot_internal.h>
#include <elements/nm_messages_errorrecovery.h>
-#include <es_enum_internal.h>
-#include "ItfInfoConfigExt.h"
using namespace Messages;
using namespace MeshMachine;
@@ -155,10 +153,8 @@
if (iContext.Node().iTimerStopped)
{
TInt selfidx = iContext.iNodeActivity->FindOriginator(iContext.Node().SelfInterface());
- if(selfidx != KErrNotFound)
- {
- iContext.iNodeActivity->RemoveOriginator(selfidx);
- }
+ ASSERT(selfidx != KErrNotFound);
+ iContext.iNodeActivity->RemoveOriginator(selfidx);
}
TInt stopCode = KErrCancel;
@@ -287,19 +283,6 @@
if (state.Accept())
{
iContext.Node().DisableTimers();
- // Check if we have been re-started (i.e. a start request is processed immmediately after a stop request
- // has been processed). If so, we generate a special EInterfaceStarting notification towards ESock.
- // This is to solve the problem where there is a missing EInterfaceDown/EInterfaceUp event sequence
- // from AllInterfaceNotification in this scenario.
- if (iContext.Node().iStopped)
- {
- const TItfInfoConfigExt* ext = static_cast<const TItfInfoConfigExt*>(iContext.Node().AccessPointConfig().FindExtension(STypeId::CreateSTypeId(KIpProtoConfigExtUid, EItfInfoConfigExt)));
- if (ext)
- {
- TInterfaceNotification info = { ext->iConnectionInfo, TConnInterfaceState(EInterfaceRestarting) };
- iContext.Node().Factory().InterfaceStateChange(TPckgC<TInterfaceNotification>(info));
- }
- }
return ETrue;
}
return EFalse;
@@ -396,7 +379,6 @@
iContext.Node().SetTimerMode(CIPProtoConnectionProvider::ETimerMedium);
iContext.Node().iTimerStopped = EFalse;
- iContext.Node().iTimerExpired = EFalse;
CoreNetStates::TSendStarted transition(iContext);
transition.DoL();
}
@@ -427,21 +409,14 @@
TCFMessage::TSubConnDataTransferred wholeConnMsg(KNifEMCompatibilityLayerEntireSubConnectionUid, dmProvider->DataVolumesPtr()->iSentBytes, dmProvider->DataVolumesPtr()->iReceivedBytes);
TCFMessage::TSubConnDataTransferred defaultSubConnMsg(KNifEMCompatibilityLayerFakeSubConnectionId, dmProvider->DataVolumesPtr()->iSentBytes, dmProvider->DataVolumesPtr()->iReceivedBytes);
- // 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;
- }
+ 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;
+ }
}
}
--- a/networkcontrol/ipnetworklayer/src/IPProtoMCpr.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoMCpr.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -63,7 +63,7 @@
CIPProtoMetaConnectionProvider::CIPProtoMetaConnectionProvider(CMetaConnectionProviderFactoryBase& aFactory,
const TProviderInfo& aProviderInfo,
const MeshMachine::TNodeActivityMap& aActivityMap)
- : CCoreMetaConnectionProvider(aFactory,aProviderInfo,aActivityMap), iIapLocked(EFalse) , iLockedIapsid(0)
+ : CCoreMetaConnectionProvider(aFactory,aProviderInfo,aActivityMap), iIapLocked(EFalse)
{
LOG_NODE_CREATE(KIPProtoMCprTag, CIPProtoMetaConnectionProvider);
}
--- a/networkcontrol/ipnetworklayer/src/IPProtoSCPR.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoSCPR.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -160,7 +160,7 @@
CIPProtoSubConnectionProvider::~CIPProtoSubConnectionProvider()
{
if (iControl)
- iControl->AsyncDelete();
+ delete iControl;
if (iNotify)
delete iNotify;
--- a/networkcontrol/ipnetworklayer/src/IPProtoTierManagerSelector.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoTierManagerSelector.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -106,26 +106,21 @@
if (!(iSelectionPrefs.Scope()&TSelectionPrefs::ESelectFromExisting))
{
CIPProtoMetaConnectionProvider *ipprotomcpr = static_cast<CIPProtoMetaConnectionProvider *>(provider);
-
+ if (ipprotomcpr->iIapLocked)
+ User::Leave(KErrPermissionDenied);
TSecureId sid;
ASubSessionPlatsecApiExt platsecext(iSelectionPrefs.SubSessionUniqueId());
if (platsecext.SecureId(sid) == KErrNone)
{
- if (ipprotomcpr->iIapLocked && sid.iId!=ipprotomcpr->iLockedIapsid)
- User::Leave(KErrPermissionDenied);
+ CCommsDatIapView* iapView = CCommsDatIapView::NewLC(aIapToFind);
- CCommsDatIapView* iapView = CCommsDatIapView::NewLC(aIapToFind);
-
- TUint32 iapsid;
- iapView->GetIntL(KCDTIdIAPAppSid, iapsid);
-
- if (sid.iId == iapsid && iapsid != 0)
- {
- ipprotomcpr->iIapLocked = ETrue;
- ipprotomcpr->iLockedIapsid=iapsid;
- }
- CleanupStack::PopAndDestroy(iapView);
+ TUint32 iapsid;
+ iapView->GetIntL(KCDTIdIAPAppSid, iapsid);
+
+ if (sid.iId == iapsid && iapsid != 0)
+ ipprotomcpr->iIapLocked = ETrue;
+ CleanupStack::PopAndDestroy(iapView);
}
}
provider->IncrementBlockingDestroy();
--- a/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -202,8 +202,7 @@
}
}
if (iControl)
- iControl->AsyncDelete();
-
+ delete iControl;
//incase registration is successful and Network is configured.
if (iNotify)
{
--- a/networkcontrol/ipnetworklayer/src/ipprotodeftscprstates.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/ipprotodeftscprstates.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -174,9 +174,6 @@
{
iContext.Node().iNetworkConfigurationState = EFalse;
TInt tag = IPProtoDeftSCpr::TNetworkConfiguredOrErrorTagOrCancelTagOrNoTag::TransitionTag();
-
-
-
if (tag == KNoTag)
return tag | NetStateMachine::EBackward;
return tag;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/group/basicipscpr.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,34 @@
+// 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:
+// BasicIPSCPR.MMP IP Subconnection Provider ECOM plugin
+//
+//
+
+/**
+ @file
+*/
+
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+
+#define BASIC_IPSCPR_MMP
+MACRO BASIC_IPSCPR
+
+#include "ipscpr.mmh"
+
+#endif
+// SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+
+UNPAGED
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,32 @@
+// 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:
+//
+
+#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
+
+PRJ_EXPORTS
+../inc/ip_subconparams.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ip_subconparams.h)
+../inc/ip_subconparams.inl SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ip_subconparams.inl)
+
+../group/ipscpr.iby /epoc32/rom/include/ipscpr.iby
+
+PRJ_MMPFILES
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+basicipscpr.mmp
+#endif
+ipscpr.mmp
+
+PRJ_TESTMMPFILES
+
+#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/group/ipscpr.iby Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,43 @@
+/*
+* 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 __IPSCPR_IBY__
+#define __IPSCPR_IBY__
+
+REM IP Subconnection Provider
+
+
+#if defined(SYMBIAN_EXCLUDE_QOS_PROTPLUGINS) && defined(SYMBIAN_NETWORKING_3GPPDEFAULTQOS)
+REM Feature QoS is not included in this ROM
+
+#ifdef _DEBUG
+ECOM_PLUGIN_UDEB(basicipscpr.dll,102752C4.rss)
+#else
+ECOM_PLUGIN(basicipscpr.dll,102752C4.rss)
+#endif
+
+#else
+
+#ifdef _DEBUG
+ECOM_PLUGIN_UDEB(ipscpr.dll,10204307.rss)
+#else
+ECOM_PLUGIN(ipscpr.dll,10204307.rss)
+#endif
+
+#endif
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/group/ipscpr.mmh Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,86 @@
+// 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:
+// Ipscpr/Basic Ipscpr.MMH IP Subconnection Provider ECOM plugin
+//
+//
+
+/**
+ @file
+*/
+
+#ifdef BASIC_IPSCPR_MMP
+
+// Should be ARMV5 only really...
+
+TARGET basicipscpr.dll
+TARGETTYPE PLUGIN
+UID 0x10009D8D 0x102752C4
+#else
+TARGET ipscpr.dll
+TARGETTYPE PLUGIN
+UID 0x10009D8D 0x10204307
+#endif
+
+VENDORID 0x70000001
+
+SOURCEPATH ../src
+SOURCE ipscpr.cpp
+SOURCE ip_subconparams.cpp
+SOURCE deft_scpr.cpp
+SOURCE ipscprlog.cpp
+#ifndef BASIC_IPSCPR_MMP
+SOURCE asyncwriter.cpp
+SOURCE qos_msg.cpp
+#endif
+
+USERINCLUDE ../inc
+#ifndef BASIC_IPSCPR_MMP
+USERINCLUDE ../../pfqoslib/inc
+#endif
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+USERINCLUDE ../../ipcpr/inc
+#endif
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+#ifdef BASIC_IPSCPR_MMP
+START RESOURCE 102752C4.rss
+TARGET basicipscpr.rsc
+END
+#else
+START RESOURCE 10204307.rss
+TARGET ipscpr.rsc
+END
+#endif
+
+LIBRARY euser.lib esock.lib esocksvr.lib eintsock.lib insock.lib netmeta.lib
+#ifndef BASIC_IPSCPR_MMP
+
+LIBRARY pfqoslib.lib qoslib.lib
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+LIBRARY qosextnapi.lib
+#else
+LIBRARY umtsapi.lib sblpapi.lib
+#endif
+// SYMBIAN_NETWORKING_UMTSR5
+
+
+#endif
+
+#include "comms-infras/commsdebugutility.mmh"
+
+CAPABILITY ALL -Tcb
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/group/ipscpr.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,26 @@
+// 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:
+// Ipscpr.MMP IP Subconnection Provider ECOM plugin
+//
+//
+
+/**
+ @file
+*/
+
+#include "ipscpr.mmh"
+
+UNPAGED
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/group/networking_ipscpr.history.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<relnotes name="Connection Provider Plugin">
+ <purpose>
+ </purpose>
+</relnotes>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/group/networking_ipscpr.mrp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,25 @@
+#
+# 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:
+#
+
+component networking_ipscpr
+source \sf\os\networkingsrv\networkcontrol\ipscpr
+binary \sf\os\networkingsrv\networkcontrol\ipscpr\group all
+exports \sf\os\networkingsrv\networkcontrol\ipscpr\group
+notes_source \component_defs\release.src
+
+
+ipr E
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/inc/asyncwriter.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,41 @@
+// 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:
+//
+
+#ifndef ASYNCWRITER_H_
+#define ASYNCWRITER_H_
+
+#include <qoslib.h>
+#include <e32base.h>
+#include "pfqoslib.h"
+#include "pfqos_stream.h"
+#include "qos_msg.h"
+
+NONSHARABLE_CLASS(CAsyncWriter) : public CActive
+ {
+ public:
+ static CAsyncWriter* NewL(CQoSMsgWriter* aWriter);
+ void Send(CQoSMsg* aMessage);
+ protected:
+ CAsyncWriter(CQoSMsgWriter* aWriter);
+ void ConstructL();
+ void RunL();
+ void DoCancel();
+ private:
+ CQoSMsgWriter* iWriter;
+ CQoSMsg* iMessage;
+ TSglQue<CQoSMsg> iPendingMsg;
+ };
+
+#endif //ASYNCWRITER_H_
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/inc/deft_scpr.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,170 @@
+/**
+* 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:
+* Header file for the default SubConnection Provider
+*
+*
+*/
+
+
+
+/**
+ @file deft_scpr.h
+*/
+
+#ifndef __DEFT_CPR_H__
+#define __DEFT_CPR_H__
+
+#include <e32base.h>
+#include <e32std.h>
+#include <ss_subconnprov.h>
+#include <ss_connprov.h>
+#include "ipscprlog.h"
+
+
+class CConnDataTransfer;
+class CEmptySubConnectionProvider : public CSubConnectionProviderBase, public MConnectionEnumerateClients, public MConnectionDataClient
+/**
+Defines the IP Connection Provider. Class provides a mapping from ESock Subconnection
+function calls to QoS.PRT messages.
+
+@internalComponent
+
+@released Since v9.0
+*/
+ {
+protected:
+ // Construction
+ CEmptySubConnectionProvider(CSubConnectionProviderFactoryBase& aFactory, CConnectionProviderBase& aConnProvider) :
+ CSubConnectionProviderBase(aFactory, aConnProvider)
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CEmptySubConnectionProvider [this=%08x]:\tCEmptySubConnectionProvider() [MConnectionDataClient=%08x]"),
+ this, (MConnectionDataClient*)this));
+ }
+
+ ~CEmptySubConnectionProvider();
+
+ virtual MConnectionDataClient* DoSelfConnectionDataClient();
+
+ //MConnectionEnumerateClients
+ virtual void EnumerateClientsL(TUint& aCount, TDes8& aDes, CConnectionProviderBase::TEnumClients aClientType);
+
+ //MConnectionDataClient
+ virtual void ConnectionError(TInt aStage, TInt aError);
+
+ virtual void DoControlClientJoiningL(MSubConnectionControlClient& aControlClient);
+ virtual void DoControlClientLeaving(MSubConnectionControlClient& aControlClient);
+ };
+
+
+/**
+Defines the default IP Connection Provider.
+
+@internalComponent
+
+@released Since v9.0
+*/
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+class CDefaultSubConnectionProvider : public CEmptySubConnectionProvider, public MSubConnectionControlClient
+#else
+class CDefaultSubConnectionProvider : public CEmptySubConnectionProvider
+#endif
+//SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ {
+public:
+
+ // Construction
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ CDefaultSubConnectionProvider(CSubConnectionProviderFactoryBase& aFactory, CConnectionProviderBase& aConnProvider, RSubConnection::TSubConnType aType)
+ : CEmptySubConnectionProvider(aFactory, aConnProvider), iSubConnType(aType)
+#else
+ CDefaultSubConnectionProvider(CSubConnectionProviderFactoryBase& aFactory, CConnectionProviderBase& aConnProvider)
+ : CEmptySubConnectionProvider(aFactory, aConnProvider)
+#endif
+ {
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ __IPCPRLOG(IpCprLog::Printf(_L("CDefaultSubConnectionProvider [this=%08x]:\tCDefaultSubConnectionProvider() [MSubConnectionControlClient=%08x] [MConnectionDataClient=%08x]"),
+ this, (MSubConnectionControlClient*)this, (MConnectionDataClient*)this));
+#else
+ __IPCPRLOG(IpCprLog::Printf(_L("CDefaultSubConnectionProvider [this=%08x]:\tCDefaultSubConnectionProvider() [MConnectionDataClient=%08x]"),
+ this, (MConnectionDataClient*)this));
+#endif
+ }
+
+ ~CDefaultSubConnectionProvider();
+
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ //-=========================================================
+ // MSubConnectionControlClient methods
+ //-=========================================================
+ /** Override this to inform the sub-connection client (e.g. socket, host resolver etc.) that
+ the sub-connection is going down
+
+ @param aSubConnProvider the sub-connection provider going down */
+ virtual void SubConnectionGoingDown(CSubConnectionProviderBase& aSubConnProvider);
+
+ /** Override this to notify the control client of a sub-connection event, eg. layer up etc.
+
+ @param aSubConnProvider The provider which the event was generated on
+ @param aNotifyType The type of event
+ @param aError Error code, if any
+ @param aEvent The notification object containing specialized information */
+ virtual void SubConnectionEvent(CSubConnectionProviderBase& aSubConnProvider, MConnectionDataClient::TNotify aNotifyType, TInt aError, const CSubConNotificationEvent* aEvent);
+
+
+ virtual void LayerUp(CSubConnectionProviderBase& aSubConnProvider, TInt aError);
+ virtual void IncomingConnection(CSubConnectionProviderBase* aSubConnProvider, CSubConParameterBundle* aParameterBundle, TInt aError);
+#endif
+// SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+
+protected:
+ //-=========================================================
+ // CSubConnectionProviderBase methods
+ //-=========================================================
+ // Methods to be overriden be derived subconnection provider
+ virtual void DoControlClientJoiningL(MSubConnectionControlClient& aControlClient); //Fix for DEF096132
+ virtual void DoDataClientJoiningL(MSubConnectionDataClient& aDataClient);
+ virtual void DoDataClientLeaving(MSubConnectionDataClient& aDataClient);
+ virtual void DoSourceAddressUpdate(MSubConnectionDataClient& aDataClient, const TSockAddr& aSource);
+ virtual void DoDestinationAddressUpdate(MSubConnectionDataClient& aDataClient, const TSockAddr& aDestination);
+ virtual void DoDataClientRouted(MSubConnectionDataClient& aDataClient, const TSockAddr& aSource, const TSockAddr& aDestination, const TDesC8& aConnectionInfo);
+ virtual void DoParametersAboutToBeSetL(CSubConParameterBundle& aParameterBundle);
+ virtual TInt DoControl(TUint aOptionLevel, TUint aOptionName, TDes8& aOption);
+
+ virtual void DoStartL();
+ virtual void DoStop();
+ virtual CSubConnectionProviderBase* DoNextLayer();
+ virtual CConnDataTransfer& DoDataTransferL();
+
+ //MConnectionDataClient
+ virtual TAny* FetchInterfaceInstanceL(CConnectionProviderBase& aProvider, const STypeId& aTid);
+ virtual void ConnectionGoingDown(CConnectionProviderBase& aConnProvider);
+ virtual void Notify(TNotify aNotifyType, CConnectionProviderBase* aConnProvider, TInt aError, const CConNotificationEvent* aConNotificationEvent);
+ virtual void AttachToNext(CSubConnectionProviderBase* aSubConnProvider);
+
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ virtual void DoControlClientLeaving(MSubConnectionControlClient& aControlClient);
+private:
+ const RSubConnection::TSubConnType iSubConnType;
+#endif
+
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ TUint32 iAppId;
+ CSubConnectionProviderBase * iSubConNextLayer;
+#endif
+ };
+#endif
+// __DEFT_CPR_H__
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/inc/ip_subconparams.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,221 @@
+/**
+* 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:
+* Header file for the IP SubConnection Parameters
+*
+*
+*/
+
+
+
+/**
+ @file ip_subconparams.h
+*/
+
+#ifndef __IP_SUBCONPARAMS_H__
+#define __IP_SUBCONPARAMS_H__
+
+#include <es_sock.h>
+#include <comms-infras/metadata.h>
+#include <comms-infras/metatype.h>
+#include <etelqos.h>
+
+
+// NOTE: This Uid may be changed - See #ifdef at bottom of the file
+const TInt KSubConIPParamsUid = 0x10204309;
+const TInt KSubConQosIPLinkR99ParamsType = 1;
+
+
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+#include <networking/qos3gpp_subconparams.h>
+
+#else
+const TInt KSubConnSBLPR5ExtensionParamsType = 2;
+
+
+/** Constant definitions particular to the Generic Parameters. */
+const TInt KMAuthTokenLength = 255;
+/** Typedef for the AuthToken Holder. */
+typedef TBuf8<KMAuthTokenLength> TAuthToken;
+
+#if defined(SYMBIAN_NETWORKING_UMTSR5) && !defined(SYMBIAN_NETWORKING_3GPPDEFAULTQOS)
+#pragma message("SYMBIAN_NETWORKING_UMTSR5 cannot be defined without SYMBIAN_NETWORKING_3GPPDEFAULTQOS")
+#endif
+// SYMBIAN_NETWORKING_UMTSR5
+
+
+#endif
+
+
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+/** Provides Implementation of IP QoS Parameters
+
+@publishedAll
+@released since v9.1
+@deprecated from v9.2 onwards. Use CSubConQosR99ParamSet from Qos3GPP_Subconparams.h instead.
+*/
+#else
+/** Provides Implementation of IP QoS Parameters
+
+@publishedAll
+@released since v9.1
+*/#endif
+class CSubConQosIPLinkR99ParamSet : public CSubConExtensionParameterSet
+{
+public:
+ inline static CSubConQosIPLinkR99ParamSet* NewL(CSubConParameterFamily& aFamily, CSubConParameterFamily::TParameterSetType aType);
+ inline static CSubConQosIPLinkR99ParamSet* NewL();
+
+ inline CSubConQosIPLinkR99ParamSet();
+
+ inline RPacketQoS::TTrafficClass GetTrafficClass() const;
+ inline RPacketQoS::TDeliveryOrder GetDeliveryOrder() const;
+ inline RPacketQoS::TErroneousSDUDelivery GetErroneousSDUDelivery() const;
+ inline RPacketQoS::TBitErrorRatio GetResidualBitErrorRatio() const;
+ inline RPacketQoS::TSDUErrorRatio GetSDUErrorRatio() const;
+ inline RPacketQoS::TTrafficHandlingPriority GetTrafficHandlingPriority() const;
+ inline TInt GetTransferDelay() const;
+ inline TInt GetMaxSduSize() const;
+ inline TInt GetMaxBitrateUplink() const;
+ inline TInt GetMaxBitrateDownlink() const;
+ inline TInt GetGuaBitrateUplink() const;
+ inline TInt GetGuaBitrateDownlink() const;
+ inline void SetTrafficClass(RPacketQoS::TTrafficClass aTrafficClass);
+ inline void SetDeliveryOrder(RPacketQoS::TDeliveryOrder aDeliveryOrder);
+ inline void SetErroneousSDUDelivery(RPacketQoS::TErroneousSDUDelivery aDeliveryOfErroneusSdu);
+ inline void SetResidualBitErrorRatio(RPacketQoS::TBitErrorRatio aResidualBer);
+ inline void SetSDUErrorRatio(RPacketQoS::TSDUErrorRatio aErrorRatio);
+ inline void SetTrafficHandlingPriority(RPacketQoS::TTrafficHandlingPriority aPriority);
+ inline void SetTransferDelay(TInt aTransferDelay);
+ inline void SetMaxSduSize(TInt aMaxSduSize);
+ inline void SetMaxBitrateUplink(TInt aMaxBitrateUplink);
+ inline void SetMaxBitrateDownlink(TInt aMaxBitrateDownlink);
+ inline void SetGuaBitrateUplink(TInt aGuaBitrateUplink);
+ inline void SetGuaBitrateDownlink(TInt aGuaBitrateDownlink);
+
+protected:
+
+ DATA_VTABLE
+
+protected:
+ RPacketQoS::TTrafficClass iTrafficClass; // Traffic class
+ RPacketQoS::TDeliveryOrder iDeliveryOrder; // Delivery order
+ RPacketQoS::TErroneousSDUDelivery iDeliveryOfErroneusSdu; // Delivery of erroneous SDUs
+ RPacketQoS::TBitErrorRatio iResidualBer; // Residual BER
+ RPacketQoS::TSDUErrorRatio iErrorRatio; // SDU error ratio
+ RPacketQoS::TTrafficHandlingPriority iPriority; // Traffic handling priority
+ TInt iTransferDelay; // Transfer delay
+ TInt iMaxSduSize; // Maximum SDU size
+ TInt iMaxBitrateUplink; // Maximum bit rate for uplink
+ TInt iMaxBitrateDownlink; // Maximum bit rate for downlink
+ TInt iGuaBitrateUplink; // Guaranteed bit rate for uplink
+ TInt iGuaBitrateDownlink; // Guaranteed bit rate for downlink
+ };
+
+#ifndef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+
+
+/** Flow Identifires
+ECOM Implementation Id for SBLP Extension parameters.
+
+@publishedAll
+@released since v9.1 */
+struct TFlowId
+ {
+ /** Getter Function for the Components of Flow ids. */
+ inline TUint16 GetMediaComponentNumber() const;
+ inline TUint16 GetIPFlowNumber() const;
+ /** Setter Function For Flow Id Components. */
+ inline void SetMediaComponentNumber(TUint16 aMediaComponentNumber);
+ inline void SetIPFlowNumber(TUint16 aIPFlowNumber);
+
+private:
+ TUint16 iMediaComponentNumber;
+ TUint16 iIPFlowNumber;
+ };
+
+typedef RArray<TFlowId> RFlowIdentifiers;
+
+/** Extension Parameter Sets, Consise of MAT and FI(s).
+Provides Implementation of Extension parameters of the SBLP Family.
+
+@publishedAll
+@released since v9.1 */
+class CSubConSBLPR5ExtensionParamSet : public CSubConExtensionParameterSet
+ {
+public:
+ inline static CSubConSBLPR5ExtensionParamSet* NewL(CSubConParameterFamily& aFamily, CSubConParameterFamily::TParameterSetType aType);
+ inline static CSubConSBLPR5ExtensionParamSet* NewL();
+
+ /** Media Authorization Token setter and getter functions. */
+ inline const TAuthToken& GetMAT() const;
+ inline void SetMAT(const TAuthToken& aAuthToken);
+
+ /** Flow identifires setter and getter functions. */
+ inline TInt GetNumberOfFlowIds() const;
+ inline const TFlowId& GetFlowIdAt(TInt aIndex) const;
+
+ /** Adding of Flow Identifires into an array. */
+ inline void AddFlowIdL(const TFlowId& aFlowId);
+
+ /** public constructors so that it can be accessed by factory. */
+ inline CSubConSBLPR5ExtensionParamSet();
+ inline ~CSubConSBLPR5ExtensionParamSet();
+
+protected:
+ DATA_VTABLE
+
+ /** Single Media Authorization Token (MAT). */
+ TAuthToken iAuthToken;
+
+ /** Multiple Flow Identifiers. */
+ RFlowIdentifiers iFlowIds;
+ };
+#endif
+
+
+
+
+
+/**
+Factory used to create instances of IP SubConnection Parameters.
+
+@internalComponent
+@released since v9.1
+*/
+class CSubConIPExtensionParamsFactory : public CBase
+ {
+public:
+ static CSubConExtensionParameterSet* NewL(TAny* aConstructionParameters);
+ };
+
+#include <ip_subconparams.inl>
+
+
+
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+/*
+ Umts QoS extension classes have been relocated to the UmtsGprsSCPR component.
+ So now we need to make sure that the correct class factory TUid, class name,
+ and class Id are used
+*/
+#define KSubConIPParamsUid KSubCon3GPPExtParamsFactoryUid
+#define KSubConQosIPLinkR99ParamsType KSubConQosR99ParamsType
+#define CSubConQosIPLinkR99ParamSet CSubConQosR99ParamSet
+#endif
+// SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+
+
+#endif
+// __IP_SUBCONPARAMS_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/inc/ip_subconparams.inl Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,261 @@
+/**
+* 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:
+* Inline Functions file for the IP SubConnection Parameters
+*
+*
+*/
+
+
+
+/**
+ @file ip_subconparams.inl
+*/
+
+
+#ifndef __IP_SUBCONPARAMS_INL__
+#define __IP_SUBCONPARAMS_INL__
+
+#ifndef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+
+CSubConQosIPLinkR99ParamSet* CSubConQosIPLinkR99ParamSet::NewL(CSubConParameterFamily& aFamily, CSubConParameterFamily::TParameterSetType aType)
+ {
+ CSubConQosIPLinkR99ParamSet* obj = NewL();
+ CleanupStack::PushL(obj);
+ aFamily.AddExtensionSetL(*obj, aType);
+ CleanupStack::Pop(obj);
+ return obj;
+ }
+
+CSubConQosIPLinkR99ParamSet* CSubConQosIPLinkR99ParamSet::NewL()
+ {
+ STypeId typeId = STypeId::CreateSTypeId(KSubConIPParamsUid, KSubConQosIPLinkR99ParamsType);
+ return static_cast<CSubConQosIPLinkR99ParamSet*>(CSubConParameterSet::NewL(typeId));
+ }
+
+CSubConQosIPLinkR99ParamSet::CSubConQosIPLinkR99ParamSet()
+ : CSubConExtensionParameterSet(),
+ iTrafficClass(RPacketQoS::ETrafficClassUnspecified),
+ iDeliveryOrder(RPacketQoS::EDeliveryOrderUnspecified),
+ iDeliveryOfErroneusSdu(RPacketQoS::EErroneousSDUDeliveryUnspecified),
+ iResidualBer(RPacketQoS::EBERUnspecified),
+ iErrorRatio(RPacketQoS::ESDUErrorRatioUnspecified),
+ iPriority(RPacketQoS::ETrafficPriorityUnspecified),
+ iTransferDelay(0),
+ iMaxSduSize(0),
+ iMaxBitrateUplink(0),
+ iMaxBitrateDownlink(0),
+ iGuaBitrateUplink(0),
+ iGuaBitrateDownlink(0)
+ {
+ }
+
+RPacketQoS::TTrafficClass CSubConQosIPLinkR99ParamSet::GetTrafficClass() const
+ {
+ return iTrafficClass;
+ }
+
+RPacketQoS::TDeliveryOrder CSubConQosIPLinkR99ParamSet::GetDeliveryOrder() const
+ {
+ return iDeliveryOrder;
+ }
+
+RPacketQoS::TErroneousSDUDelivery CSubConQosIPLinkR99ParamSet::GetErroneousSDUDelivery() const
+ {
+ return iDeliveryOfErroneusSdu;
+ }
+
+RPacketQoS::TBitErrorRatio CSubConQosIPLinkR99ParamSet::GetResidualBitErrorRatio() const
+ {
+ return iResidualBer;
+ }
+
+RPacketQoS::TSDUErrorRatio CSubConQosIPLinkR99ParamSet::GetSDUErrorRatio() const
+ {
+ return iErrorRatio;
+ }
+
+RPacketQoS::TTrafficHandlingPriority CSubConQosIPLinkR99ParamSet::GetTrafficHandlingPriority() const
+ {
+ return iPriority;
+ }
+
+TInt CSubConQosIPLinkR99ParamSet::GetTransferDelay() const
+ {
+ return iTransferDelay;
+ }
+
+TInt CSubConQosIPLinkR99ParamSet::GetMaxSduSize() const
+ {
+ return iMaxSduSize;
+ }
+
+TInt CSubConQosIPLinkR99ParamSet::GetMaxBitrateUplink() const
+ {
+ return iMaxBitrateUplink;
+ }
+
+TInt CSubConQosIPLinkR99ParamSet::GetMaxBitrateDownlink() const
+ {
+ return iMaxBitrateDownlink;
+ }
+
+TInt CSubConQosIPLinkR99ParamSet::GetGuaBitrateUplink() const
+ {
+ return iGuaBitrateUplink;
+ }
+
+TInt CSubConQosIPLinkR99ParamSet::GetGuaBitrateDownlink() const
+ {
+ return iGuaBitrateDownlink;
+ }
+
+void CSubConQosIPLinkR99ParamSet::SetTrafficClass(RPacketQoS::TTrafficClass aTrafficClass)
+ {
+ iTrafficClass = aTrafficClass;
+ }
+
+void CSubConQosIPLinkR99ParamSet::SetDeliveryOrder(RPacketQoS::TDeliveryOrder aDeliveryOrder)
+ {
+ iDeliveryOrder = aDeliveryOrder;
+ }
+
+void CSubConQosIPLinkR99ParamSet::SetErroneousSDUDelivery(RPacketQoS::TErroneousSDUDelivery aDeliveryOfErroneusSdu)
+ {
+ iDeliveryOfErroneusSdu = aDeliveryOfErroneusSdu;
+ }
+
+void CSubConQosIPLinkR99ParamSet::SetResidualBitErrorRatio(RPacketQoS::TBitErrorRatio aResidualBer)
+ {
+ iResidualBer = aResidualBer;
+ }
+
+void CSubConQosIPLinkR99ParamSet::SetSDUErrorRatio(RPacketQoS::TSDUErrorRatio aErrorRatio)
+ {
+ iErrorRatio = aErrorRatio;
+ }
+
+void CSubConQosIPLinkR99ParamSet::SetTrafficHandlingPriority(RPacketQoS::TTrafficHandlingPriority aPriority)
+ {
+ iPriority = aPriority;
+ }
+
+void CSubConQosIPLinkR99ParamSet::SetTransferDelay(TInt aTransferDelay)
+ {
+ iTransferDelay = aTransferDelay;
+ }
+
+void CSubConQosIPLinkR99ParamSet::SetMaxSduSize(TInt aMaxSduSize)
+ {
+ iMaxSduSize = aMaxSduSize;
+ }
+
+void CSubConQosIPLinkR99ParamSet::SetMaxBitrateUplink(TInt aMaxBitrateUplink)
+ {
+ iMaxBitrateUplink = aMaxBitrateUplink;
+ }
+
+void CSubConQosIPLinkR99ParamSet::SetMaxBitrateDownlink(TInt aMaxBitrateDownlink)
+ {
+ iMaxBitrateDownlink = aMaxBitrateDownlink;
+ }
+
+void CSubConQosIPLinkR99ParamSet::SetGuaBitrateUplink(TInt aGuaBitrateUplink)
+ {
+ iGuaBitrateUplink = aGuaBitrateUplink;
+ }
+
+void CSubConQosIPLinkR99ParamSet::SetGuaBitrateDownlink(TInt aGuaBitrateDownlink)
+ {
+ iGuaBitrateDownlink = aGuaBitrateDownlink;
+ }
+
+
+TUint16 TFlowId::GetMediaComponentNumber() const
+ {
+ return iMediaComponentNumber;
+ }
+
+TUint16 TFlowId::GetIPFlowNumber() const
+ {
+ return iIPFlowNumber;
+ }
+
+void TFlowId::SetMediaComponentNumber(TUint16 aMediaComponentNumber)
+ {
+ iMediaComponentNumber = aMediaComponentNumber;
+ }
+
+void TFlowId::SetIPFlowNumber(TUint16 aIPFlowNumber)
+ {
+ iIPFlowNumber = aIPFlowNumber;
+ }
+
+
+//===========================
+// Implementation Extension class
+CSubConSBLPR5ExtensionParamSet::CSubConSBLPR5ExtensionParamSet()
+ : CSubConExtensionParameterSet()
+ {
+ }
+
+CSubConSBLPR5ExtensionParamSet::~CSubConSBLPR5ExtensionParamSet()
+ {
+ iFlowIds.Close();
+ }
+
+CSubConSBLPR5ExtensionParamSet* CSubConSBLPR5ExtensionParamSet::NewL(CSubConParameterFamily& aFamily, CSubConParameterFamily::TParameterSetType aType)
+ {
+ CSubConSBLPR5ExtensionParamSet* sblpExtn = NewL();
+ CleanupStack::PushL(sblpExtn);
+ aFamily.AddExtensionSetL(*sblpExtn, aType);
+ CleanupStack::Pop(sblpExtn);
+ return sblpExtn;
+ }
+CSubConSBLPR5ExtensionParamSet* CSubConSBLPR5ExtensionParamSet::NewL()
+ {
+ STypeId typeId = STypeId::CreateSTypeId(KSubConIPParamsUid, KSubConnSBLPR5ExtensionParamsType);
+ return static_cast<CSubConSBLPR5ExtensionParamSet*>(CSubConParameterSet::NewL(typeId));
+ }
+
+const TAuthToken& CSubConSBLPR5ExtensionParamSet::GetMAT() const
+ {
+ return iAuthToken;
+ }
+
+void CSubConSBLPR5ExtensionParamSet::SetMAT(const TAuthToken& aAuthToken)
+ {
+ iAuthToken = aAuthToken;
+ }
+
+TInt CSubConSBLPR5ExtensionParamSet::GetNumberOfFlowIds() const
+ {
+ return iFlowIds.Count();
+ }
+
+const TFlowId& CSubConSBLPR5ExtensionParamSet::GetFlowIdAt(TInt aIndex) const
+ {
+ return iFlowIds[aIndex];
+ }
+
+void CSubConSBLPR5ExtensionParamSet::AddFlowIdL(const TFlowId & aFlowId)
+ {
+ iFlowIds.AppendL(aFlowId);
+ }
+#endif
+// SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+
+#endif
+// __IP_SUBCONPARAMS_INL__
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/inc/ipscpr.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,249 @@
+/**
+* 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:
+* Header file for the IP SubConnection Provider and its basic version
+*
+*
+*/
+
+
+
+/**
+ @file ipscpr.h
+*/
+
+#ifndef __IPSCPR_H__
+#define __IPSCPR_H__
+
+#include <e32base.h>
+#include <e32std.h>
+#include <ss_subconnprov.h>
+#include "deft_scpr.h"
+#include <eintsock.h>
+#include <in_sock.h>
+#include <es_sock.h>
+
+
+#ifndef BASIC_IPSCPR
+#include "asyncwriter.h"
+#include <qoslib.h>
+#include <ip_subconparams.h>
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+#include <umtsextn.h>
+#include <imsextn.h>
+#endif
+#endif
+
+
+/**
+Connection Provider Id - Protocol Family
+
+@internalComponent
+
+@released Since v9.0
+*/
+const TUint KIPConnectionProviderFactoryId = KAfInet;
+
+/**
+ECOM Implementation Id for Connection Provider
+
+@internalComponent
+
+@released Since v9.0
+*/
+#ifdef BASIC_IPSCPR
+const TInt KSubConnectionProviderImplementationUid = { 0x102752C5 };
+#else
+const TInt KSubConnectionProviderImplementationUid = { 0x10204308 };
+#endif
+
+
+class CConnectionProviderBase;
+class CIpSubConnectionProviderFactory : public CSubConnectionProviderFactoryBase
+/**
+Factory that is used to create instances of IP Connection Providers
+
+@internalComponent
+
+@released Since v9.0
+*/
+ {
+public:
+ static CIpSubConnectionProviderFactory* NewL(TAny* aConstructionParameters);
+ virtual ~CIpSubConnectionProviderFactory();
+
+ CIpSubConnectionProviderFactory(TUint aFactoryId, CSubConnectionFactoryContainer& aParentContainer);
+
+ // methods to be overriden for CSubConnectionProviderFactory
+ virtual CSubConnectionProviderBase* DoCreateProviderL(CConnectionProviderBase& aConnProvider, RSubConnection::TSubConnType aType);
+ };
+
+
+#ifndef BASIC_IPSCPR
+
+class CQoSMsgWriter;
+class CQoSMsgReader;
+class TPfqosMessage;
+class CSubConGenEventParamsGranted;
+class CSubConQosGenericParamSet;
+class CSubConQosIPLinkR99ParamSet;
+class CSubConSBLPR5ExtensionParamSet;
+class CSblpParameters;
+class TQoSParameters;
+class TUmtsQoSParameters;
+
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+class TUmtsR5QoSParameters;
+class TImsParameter;
+class CSubConQosR5ParamSet;
+class CSubConIMSExtParamSet;
+#endif
+// SYMBIAN_NETWORKING_UMTSR5
+
+
+class CIpSubConnectionProvider : public CEmptySubConnectionProvider
+/**
+Defines the IP Connection Provider. Class provides a mapping from ESock Subconnection
+function calls to QoS.PRT messages.
+
+@internalComponent
+
+@released Since v9.0
+*/
+ {
+private:
+ enum
+ {
+ KParameterRelInvalid = 0,
+ KParameterRelGeneric = 1,
+ KParameterRel4Rel99 = 4,
+ KParameterRel5 = 5,
+ };
+
+public:
+ // Construction
+ static CIpSubConnectionProvider* NewL(CIpSubConnectionProviderFactory& aFactory, CConnectionProviderBase& aConnProvider);
+
+protected:
+ // Construction
+ CIpSubConnectionProvider(CIpSubConnectionProviderFactory& aFactory, CConnectionProviderBase& aConnProvider);
+
+ // Methods to be overriden be derived subconnection provider
+ virtual void DoDataClientJoiningL(MSubConnectionDataClient& aDataClient);
+ virtual void DoDataClientLeaving(MSubConnectionDataClient& aDataClient);
+ virtual void DoSourceAddressUpdate(MSubConnectionDataClient& aDataClient, const TSockAddr& aSource);
+ virtual void DoDestinationAddressUpdate(MSubConnectionDataClient& aDataClient, const TSockAddr& aDestination);
+ virtual void DoDataClientRouted(MSubConnectionDataClient& aDataClient, const TSockAddr& aSource, const TSockAddr& aDestination, const TDesC8& aConnectionInfo);
+ virtual void DoParametersAboutToBeSetL(CSubConParameterBundle& aParameterBundle);
+ virtual TInt DoControl(TUint aOptionLevel, TUint aOptionName, TDes8& aOption);
+
+ virtual void DoStartL();
+ virtual void DoStop();
+ virtual CSubConnectionProviderBase* DoNextLayer();
+ virtual CConnDataTransfer& DoDataTransferL();
+
+ //MConnectionDataClient
+ virtual TAny* FetchInterfaceInstanceL(CSubConnectionProviderBase& aProvider, const STypeId& aTid);
+ virtual void ConnectionGoingDown(CConnectionProviderBase& aConnProvider);
+ virtual void Notify(TNotify aNotifyType, CConnectionProviderBase* aConnProvider, TInt aError, const CConNotificationEvent* aConNotificationEvent);
+ virtual void AttachToNext(CSubConnectionProviderBase* aSubConnProvider);
+
+ // Don't allow clients to invoke the destructor.
+ // (Only the CCommsFactoryBase should do this)
+ virtual ~CIpSubConnectionProvider();
+
+ void ConstructL();
+
+public:
+ // Messages from PRT
+ void ProcessPRTMsg(TPfqosMessage& aMsg);
+ void ProcessPRTError(TPfqosMessage& aMsg, TInt aError);
+#ifdef _DEBUG
+ void ProcessPRTError(TInt aMsgType, TInt aError);
+#endif
+
+private:
+ // Messages to PRT
+ void SendOpenExistingL(const TInetAddr &aSrcAddr, const TInetAddr &aDstAddr, TUint32 aIapId, TUint32 aProtocol);
+ void SendCreateL(const TInetAddr &aSrcAddr, const TInetAddr &aDstAddr, TUint32 aIapId, TUint32 aProtocol);
+ void SendCloseL();
+ void SendJoinL(const TInetAddr &aSrcAddr, const TInetAddr &aDstAddr, TUint32 aIapId, TUint32 aProtocol);
+ void SendLeaveL(const TInetAddr &aSrcAddr, const TInetAddr &aDstAddr, TUint32 aIapId, TUint32 aProtocol);
+ void SendSetQoSL();
+
+ // Internal Processing
+ void ProcessPRTEventL(TPfqosMessage& aMsg);
+ void ProcessPRTReplyL(TPfqosMessage& aMsg);
+
+ void ConvertParametersFromESockL(CSubConParameterBundle& aParameterBundle);
+ void ConvertParametersFromQOSL(TPfqosMessage& aMsg, CSubConGenEventParamsGranted* aEvent);
+
+ TInt DetermineClient(const TPfqosMessage& aMsg, MSubConnectionDataClient*& aDataClient);
+ void MapGenericParamsFromESockToPRTL(const CSubConQosGenericParamSet& generic) const;
+ void MapGenericParamsFromPRTToESockL(CSubConQosGenericParamSet& generic) const;
+ void MapExtensionParamsFromESockToPRTL(const CSubConQosIPLinkR99ParamSet& extension, TUmtsQoSParameters& params);
+
+ void ResetPrtExtensions();
+
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ void MapExtensionParamsFromESockToPRTL(const CSubConQosR5ParamSet& aExtension, TUmtsR5QoSParameters& aParams);
+ void MapExtensionParamsFromESockToPRTL(const CSubConImsExtParamSet& aExtension, TImsParameter& aParams);
+
+ CSubConExtensionParameterSet* MapFromUmtsR5ExtensionL (const CUmtsR5QoSPolicy* aPolicy);
+ CSubConExtensionParameterSet* MapFromImsExtensionL (const CImsPolicy* aPolicy);
+#endif
+// SYMBIAN_NETWORKING_UMTSR5
+
+
+ void MapExtensionParamsFromESockToPRTL(const CSubConSBLPR5ExtensionParamSet& extension, CSblpParameters& params) const;
+
+ void ConvertTQoSIntoCQoSParamsL(const TQoSParameters& aParameter);
+ void ConvertCQoSIntoTQoSParamsL(TQoSParameters& aParameters) const;
+
+private:
+ /** Internal Socket */
+ RInternalSocket iSocket;
+
+ /** PRT message writer */
+ CQoSMsgWriter* iWriter;
+
+ /** PRT message reader */
+ CQoSMsgReader* iReader;
+
+ /** QoS channel Id */
+ TInt iChannelId;
+
+ /** Process UID */
+ TUidType iUid;
+
+ /** QoS Parameters */
+ CQoSParameters* iPrtParameters;
+
+ /** QoS Extensions */
+ TQoSExtensionQueue iPrtExtensions;
+
+ /** QoS Parameters Set */
+ TBool iParametersSet;
+ TInt iParameterRelease;
+
+ /**Class for doing async writes */
+ CAsyncWriter* iAsyncWriter;
+ };
+
+#endif // BASIC_IPSCPR
+#endif // __IPSCPR_H__
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/src/10204307.rss Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,60 @@
+// 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:
+// Registry info for IP Sub-Connection Provider plug-in
+//
+//
+
+/**
+ @file 10204307.RSS
+*/
+
+#include <ecom/registryinfo.rh>
+
+RESOURCE REGISTRY_INFO theInfo
+{
+dll_uid = 0x10204307;
+interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = 0x10204301;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10204308;
+ version_no = 1;
+ display_name = "IP Sub-Connection Provider Factory";
+ default_data = "IpSubConnectionProviderFactory";
+ opaque_data = "";
+ }
+ };
+ },
+ INTERFACE_INFO
+ {
+ interface_uid = 0x10204303;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10204309;
+ version_no = 1;
+ display_name = "CSubConnection Qos IP Link R5 Extension Parameter Set";
+ default_data = "text/wml";
+ opaque_data = "";
+ }
+ };
+ }
+ };
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/src/102752C4.rss Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,60 @@
+// 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:
+// Registry info for Basic IP Sub-Connection Provider plug-in
+//
+//
+
+/**
+ @file
+*/
+
+#include <ecom/registryinfo.rh>
+
+RESOURCE REGISTRY_INFO theInfo
+{
+dll_uid = 0x102752C4;
+interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = 0x10204301;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x102752C5;
+ version_no = 1;
+ display_name = "Basic IP Sub-Connection Provider Factory";
+ default_data = "BasicIpSubConnectionProvdFactory";
+ opaque_data = "";
+ }
+ };
+ },
+ INTERFACE_INFO
+ {
+ interface_uid = 0x10204303;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x102754C7;
+ version_no = 1;
+ display_name = "CSubConnection Qos IP Link R5 Extension Parameter Set";
+ default_data = "text/wml";
+ opaque_data = "";
+ }
+ };
+ }
+ };
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/src/asyncwriter.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,70 @@
+// 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:
+//
+
+#include "asyncwriter.h"
+
+
+CAsyncWriter* CAsyncWriter::NewL(CQoSMsgWriter* aWriter)
+ {
+ CAsyncWriter* self = new (ELeave) CAsyncWriter(aWriter);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+CAsyncWriter::CAsyncWriter(CQoSMsgWriter* aWriter) :
+ CActive(EPriorityNormal),
+ iWriter(aWriter)
+ {
+ iPendingMsg.SetOffset(_FOFF(CQoSMsg, iLink));
+ }
+
+void CAsyncWriter::ConstructL()
+ {
+ CActiveScheduler::Add(this);
+ }
+
+void CAsyncWriter::Send(CQoSMsg* aMessage)
+ {
+ if (IsActive())
+ {
+ iPendingMsg.AddLast(*aMessage);
+ }
+ else
+ {
+ iWriter->Send(aMessage);
+ SetActive();
+ TRequestStatus* stat = &iStatus;
+ User::RequestComplete(stat,KErrNone);
+ }
+ }
+
+void CAsyncWriter::RunL()
+ {
+ ASSERT(iWriter);
+ if (!iPendingMsg.IsEmpty())
+ {
+ CQoSMsg* msg = iPendingMsg.First();
+ iPendingMsg.Remove(*msg);
+ iWriter->Send(msg);
+ SetActive();
+ }
+ }
+
+void CAsyncWriter::DoCancel()
+ {
+ //No code needed here becuase the request is completed immediately on activation
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/src/deft_scpr.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,460 @@
+// 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:
+// Implementation file for the IP SubConnection Provider
+//
+//
+
+/**
+ @file
+*/
+
+#include <e32std.h>
+#include <e32test.h>
+#include <ss_glob.h>
+#include "deft_scpr.h"
+#include "ipscprlog.h"
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+#include "MAppIdInfo.h"
+#include <networking/qos3gpp_subconparams.h>
+#include <ip_subconparams.h>
+#endif //SYMBIAN_NETWORKING_UMTSR5
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ const TUint32 KSIPSecureId = 270490934;
+ const TUint32 KDHCPSecureId = 270522821;
+ const TUint32 KDNSSecureId = 268437634;
+#endif //SYMBIAN_NETWORKING_UMTSR5
+
+CEmptySubConnectionProvider::~CEmptySubConnectionProvider()
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("~CEmptySubConnectionProvider [this=%08x]"), this));
+ if (iConnectionProvider)
+ {
+ iConnectionProvider->Leave(*this);
+ }
+ }
+
+void CEmptySubConnectionProvider::DoControlClientJoiningL(MSubConnectionControlClient& aControlClient)
+ {
+ (void)aControlClient;
+ __IPCPRLOG(IpCprLog::Printf(_L("CEmptySubConnectionProvider [this=%08x]:\tDoControlClientJoiningL() [iControlClients.Count=%d] [aControlClient=%08x]"), this, iControlClients.Count(), &aControlClient));
+ }
+
+void CEmptySubConnectionProvider::DoControlClientLeaving(MSubConnectionControlClient& aControlClient)
+ {
+ (void)aControlClient;
+ __IPCPRLOG(IpCprLog::Printf(_L("CEmptySubConnectionProvider [this=%08x]:\tDoControlClientLeaving() [iControlClients.Count=%d] [aControlClient=%08x]"), this, iControlClients.Count(), &aControlClient));
+ }
+
+void CEmptySubConnectionProvider::EnumerateClientsL(TUint& aCount, TDes8& aDes, CConnectionProviderBase::TEnumClients aClientType)
+ {
+ STypeId tid = STypeId::CreateSTypeId(KConnectionClientExtUid,EConnectionClientDesc);
+ TInt max = iControlClients.Count();
+ for ( TInt n = 0; n < max; n++ )
+ {
+ MConnectionClientDesc* intf = reinterpret_cast<MConnectionClientDesc*>(iControlClients[n]->FetchInterfaceInstanceL(*this,tid));
+ if ( intf )
+ {
+ TConnectionProcessInfo cinfo;
+ cinfo.GetInfoL(aClientType,aCount, *intf, aDes);
+ }
+ }
+ STypeId tid2 = STypeId::CreateSTypeId(KConnectionClientExtUid,EConnectionEnumerateClients);
+ max = iDataClients.Count();
+ for ( TInt n = 0; n < max; n++ )
+ {
+ MConnectionEnumerateClients* intf = reinterpret_cast<MConnectionEnumerateClients*>(iDataClients[n]->FetchInterfaceInstanceL(*this,tid2));
+ if ( intf )
+ {
+ intf->EnumerateClientsL(aCount,aDes,aClientType);
+ }
+ }
+ }
+
+void CEmptySubConnectionProvider::ConnectionError(TInt /*aStage*/, TInt aError)
+ {//it's comming from connection at the same level so forward it sideways
+ //with an origin EConnection
+ TInt max = iDataClients.Count();
+ for ( TInt n = max - 1; n >= 0; n-- )
+ {
+ iDataClients[n]->SubConnectionError(*this, MSubConnectionDataClient::EConnection, aError);
+ }
+ }
+
+MConnectionDataClient* CEmptySubConnectionProvider::DoSelfConnectionDataClient()
+ {
+ return this;
+ }
+
+
+// Methods to be overriden be derived subconnection provider
+void CDefaultSubConnectionProvider::DoControlClientJoiningL(MSubConnectionControlClient& aControlClient)
+ {
+ (void)aControlClient;
+ __IPCPRLOG(IpCprLog::Printf(_L("CDefaultSubConnectionProvider::DoControlClientJoiningL [this=%08x]"), this));
+ if (NULL != NextLayer())
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Lower subconnection provider for IP exists - joined with provider")));
+ }
+ else
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Lower subconnection provider for IP doesn't exists - not joined")));
+ }
+
+ }
+
+void CDefaultSubConnectionProvider::DoDataClientJoiningL(MSubConnectionDataClient& aDataClient)
+ {
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ // This piece of code is being added as per the requirements of PREQ 635 of dedicated PDP signalling
+ // context. When Primary PDP Context is created Network will return back the code saying whether it
+ // accepts the request to be dedicated signalling context or not. If Network decided to allow for dedicated
+ // signalling context then UmtsGprs SCPR add the information into the iParameterBundle of the UmtsGprsScpr
+
+ // However, if the User doesnt do RSubConnection::SetParamter(EAttachDefault), which actually the user shouldn't do
+ // then we have to Get the parameter from the Next Layer, which again might or might not be UmtsGprs SubConnection Provider.
+ // Nevertheless if we call SetParameter() on iNextLayer then SetParameters across all the Layers below will get called, and
+ // since I knew that if any of the layer below is UmtsGprsSCpr, it will update the IMCN Signalling flag in the
+ // parameter Bundle which I will pass with the SetParameter()
+
+ // We Initialize this variable everytime so that it can it can point to proper next layer
+ // everytime. Just a safety measure because it will anyway be initialised by the code written
+ // below
+ iSubConNextLayer = NULL;
+ if (NULL == iNextLayer)
+ {
+ // Find the Next Layer , otherwise iSubConNextLayer will be NULL by default.
+ CConnectionProviderBase* lowerConnectionProvider = iConnectionProvider->NextLayer();
+ if (lowerConnectionProvider)
+ {
+ TUint nextLayerFactoryId = lowerConnectionProvider->CanDoSubConnection(RSubConnection::EAttachToDefault);
+ if (nextLayerFactoryId != 0)
+ {
+ TSockManData* sockManData = SockManGlobals::Get();
+ CSubConnectionFactoryContainer* subConnectionFactories = sockManData->iSubConnectionFactories;
+ XSubConnectionFactoryQuery query(lowerConnectionProvider, RSubConnection::EAttachToDefault);
+ iSubConNextLayer = subConnectionFactories->FindOrCreateProviderL(nextLayerFactoryId, query);
+ }
+
+ }
+ }
+ else
+ {
+ // We have a NextLayer, Point iSubConNextLayer to the same
+ iSubConNextLayer = iNextLayer;
+ }
+
+ // Get The parameter Bundle for this SubConnectionProvider Instance. if Not available create one
+ // and Get the parameters from the Next Lyer
+ CSubConParameterBundle *tempBundle = NULL;
+ if (iSubConNextLayer != NULL)
+ {
+ tempBundle = iParameterBundle != NULL? iParameterBundle :CSubConParameterBundle::NewL();
+ TRAP_IGNORE(iSubConNextLayer->SetParametersL(*tempBundle));
+ }
+
+ // Get the family if Available
+ CSubConParameterFamily *imcnFamily = tempBundle != NULL ? tempBundle->FindFamily(KSubConnContextDescrParamsFamily) : NULL;
+ if (imcnFamily)
+ {
+ // Find the family, Look for the IMCN value, using CSubConImsExtParamSet defined in Qos3gpp
+ CSubConImsExtParamSet *imcnSigParams = static_cast<CSubConImsExtParamSet*>
+ (imcnFamily->FindExtensionSet(STypeId::CreateSTypeId(KSubConIPParamsUid,KSubConImsExtParamsType),
+ CSubConParameterFamily::EGranted));
+ // If Family contains IMCN Signalling Parameters
+ if (imcnSigParams&& imcnSigParams->GetImsSignallingIndicator())
+ {
+ // Check and Delete
+ if (tempBundle != iParameterBundle)
+ {
+ tempBundle->Close();
+ tempBundle=NULL;
+ }
+ // Fetch the interface from the connection provider
+ STypeId typeID = STypeId::CreateSTypeId(KConnectionAppInfoInterfaceId,0); // IP Conenction provider factory Uid
+ TAny* intf = iConnectionProvider->FetchInterfaceInstanceL(typeID);
+ if (!intf)
+ {
+ // We are not able to get the AppSId so leaving
+ User::Leave(KErrNotSupported);
+ }
+ MConnectionAppIdInfo *appIdIP = static_cast<MConnectionAppIdInfo*>(intf);
+ TUint32 appSecureId = appIdIP->GetAppSecureId();
+
+ // if socket is being opened by any application other than SIP, DHCP, and DNS we need to
+ // restrict the socket from being Created.
+
+
+ if ( ( appSecureId==KSIPSecureId || iAppId == KSIPSecureId) ||
+ (appSecureId==KDHCPSecureId || iAppId == KDHCPSecureId) ||
+ (appSecureId==KDNSSecureId || iAppId == KDNSSecureId) )
+ {
+ aDataClient.JoinComplete(*this);
+ }
+ else
+ {
+ User::Leave(KErrPermissionDenied);
+ }
+ } // if (imcnSigParams&& imcnSigParams->GetImsSignallingIndicator())
+ else
+ {
+ if (iConnectionProvider->IsLayerUp())
+ {
+ aDataClient.JoinComplete(*this);
+ }
+
+ }
+ } // if (imcnFamily)
+ // Check and Delete
+ if (tempBundle != iParameterBundle && tempBundle!=NULL)
+ {
+ tempBundle->Close();
+ }
+#else
+
+ if (iConnectionProvider->IsLayerUp())
+ {
+ aDataClient.JoinComplete(*this);
+ }
+#endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
+
+ }
+
+void CDefaultSubConnectionProvider::DoDataClientLeaving(MSubConnectionDataClient& aDataClient)
+ {
+ aDataClient.LeaveComplete(*this);
+ }
+
+void CDefaultSubConnectionProvider::DoSourceAddressUpdate(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aSource*/)
+ {
+ }
+
+void CDefaultSubConnectionProvider::DoDestinationAddressUpdate(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aDestination*/)
+ {
+ }
+
+void CDefaultSubConnectionProvider::DoDataClientRouted(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aSource*/, const TSockAddr& /*aDestination*/, const TDesC8& /*aConnectionInfo*/)
+ {
+ }
+
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+void CDefaultSubConnectionProvider::DoParametersAboutToBeSetL(CSubConParameterBundle& aParameterBundle)
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CDefaultSubConnectionProvider::DoParametersAboutToBeSetL [this=%08x]"), this));
+ if (NULL != NextLayer())
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Lower subconnection provider for IP exists - forwarding the request")));
+ iNextLayer->SetParametersL(aParameterBundle);
+ }
+ else
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Lower subconnection provider for IP doesn't exists - the request not supported")));
+ User::Leave(KErrNotSupported);
+ }
+ }
+
+#else
+void CDefaultSubConnectionProvider::DoParametersAboutToBeSetL(CSubConParameterBundle& /*)aParameterBundle*/)
+ {//this could potentially fetch a current parameters from GuQoS and return them back as granted ones
+ User::Leave(KErrNotSupported);
+ }
+#endif
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+TInt CDefaultSubConnectionProvider::DoControl(TUint aOptionLevel, TUint /*aOptionName*/, TDes8& /*aOption*/)
+#else
+TInt CDefaultSubConnectionProvider::DoControl(TUint /*aOptionLevel*/, TUint /*aOptionName*/, TDes8& /*aOption*/)
+#endif //#ifdef SYMBIAN_NETWORKING_UMTSR5
+ {
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+//This control is used to send application secure ID of Active Connection. This Id
+//will be used to for adding socket as data client to the subconnection.
+ iAppId=aOptionLevel;
+ return KErrNone;
+#else
+ return KErrNotSupported;
+#endif //#ifdef SYMBIAN_NETWORKING_UMTSR5
+ }
+
+void CDefaultSubConnectionProvider::DoStartL()
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CDefaultSubConnectionProvider::DoStartL [this=%08x]"), this));
+ }
+
+void CDefaultSubConnectionProvider::DoStop()
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CDefaultSubConnectionProvider::DoStop [this=%08x]"), this));
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ if (iNextLayer)
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Leaving Lower subconnection provider")));
+ iNextLayer->Leave(*this);
+ iNextLayer = NULL;
+ }
+#endif
+ }
+
+CSubConnectionProviderBase* CDefaultSubConnectionProvider::DoNextLayer()
+ {
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ __IPCPRLOG(IpCprLog::Printf(_L("CDefaultSubConnectionProvider [this=%08x]:\tDoNextLayer()"), this));
+ if (NULL == iNextLayer)
+ {
+ CConnectionProviderBase* lowerConnectionProvider = iConnectionProvider->NextLayer();
+ if (!lowerConnectionProvider)
+ {
+ //This could denote the connection isn't started and perhaps should be from here,
+ // but since the selection isn't separated from startup, we don't have enough
+ // information to do it here.
+ __IPCPRLOG(IpCprLog::Printf(_L("CDefaultSubConnectionProvider [this=%08x]:\tDoNextLayer() Connection Provider is missing its NextLayer"), this));
+ return NULL; // No Lower layer,so leaving rhostresolver without connection.
+ }
+
+ TUint nextLayerFactoryId = lowerConnectionProvider->CanDoSubConnection(RSubConnection::EAttachToDefault);
+ TRAP_IGNORE(
+
+ if (nextLayerFactoryId != 0)
+ {
+ //'This' not started yet. The lower layer unknown
+ //This is as much as we can delay with resolving the subconnection stack
+ TSockManData* sockManData = SockManGlobals::Get();
+ CSubConnectionFactoryContainer* subConnectionFactories = sockManData->iSubConnectionFactories;
+
+ XSubConnectionFactoryQuery query(lowerConnectionProvider, RSubConnection::EAttachToDefault);
+ iNextLayer = subConnectionFactories->FindOrCreateProviderL(nextLayerFactoryId, query);
+ }
+
+ if (iNextLayer)
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Lower subconnection provider for IP found.. Joining")));
+ iNextLayer->JoinL(*this);
+ }
+ else
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Lower subconnection provider for IP not found.. Continuing")));
+ }
+ );
+
+ }
+
+ return iNextLayer;
+
+#else
+ __IPCPRLOG(IpCprLog::Printf(_L("Lower subconnection provider for IP not supported")));
+ return NULL;
+#endif
+//SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ }
+
+CConnDataTransfer& CDefaultSubConnectionProvider::DoDataTransferL()
+ {
+ User::Leave(KErrNotSupported);
+ //unreachable code
+ return iNextLayer->DataTransferL();
+ }
+
+//MConnectionDataClient
+TAny* CDefaultSubConnectionProvider::FetchInterfaceInstanceL(CConnectionProviderBase& /*aProvider*/, const STypeId& aTid)
+ {
+ return (aTid == STypeId::CreateSTypeId(KConnectionClientExtUid,EConnectionEnumerateClients)) ? static_cast<MConnectionEnumerateClients*>(this) : NULL;
+ }
+
+void CDefaultSubConnectionProvider::ConnectionGoingDown(CConnectionProviderBase& /*aConnProvider*/)
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CDefaultSubConnectionProvider [this=%08x]:\tConnectionGoingDown()"), this));
+ iConnectionProvider = NULL;
+ DeleteMeNow();
+ }
+
+void CDefaultSubConnectionProvider::Notify(MConnectionDataClient::TNotify aNotifyType, CConnectionProviderBase* /*aConnProvider*/, TInt aError, const CConNotificationEvent* /*aConNotificationEvent*/)
+ {
+ int count = iControlClients.Count();
+ for (int i = count - 1; i >= 0; --i)
+ {
+ iControlClients[i]->SubConnectionEvent(*this, aNotifyType, aError, NULL);
+ }
+ if (aNotifyType == ENotifyLayerUp)
+ {//complete outstanding data client joins
+ TInt max = iDataClients.Count();
+ for ( TInt n = max - 1; n >= 0; n-- )
+ {
+ if (aError == KErrNone)
+ {
+ iDataClients[n]->JoinComplete(*this);
+ }
+ else
+ {
+ iDataClients[n]->JoinFailed(*this,aError);
+ }
+ }
+ }
+ }
+
+void CDefaultSubConnectionProvider::AttachToNext(CSubConnectionProviderBase* /*aSubConnProvider*/)
+ {
+ }
+
+CDefaultSubConnectionProvider::~CDefaultSubConnectionProvider ()
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("~CDefaultSubConnectionProvider [this=%08x]"), this));
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ if (iNextLayer)
+ {
+ iNextLayer->Leave (*this);
+ }
+#endif
+ }
+
+
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+void CDefaultSubConnectionProvider::DoControlClientLeaving(MSubConnectionControlClient& aControlClient)
+ {
+ (void)aControlClient;
+ __IPCPRLOG(IpCprLog::Printf(_L("CDefaultSubConnectionProvider [this=%08x]:\tDoControlClientLeaving() [iControlClients.Count=%d] [aControlClient=%08x]"), this, iControlClients.Count(), &aControlClient));
+
+ // Note: control client count == 1 because the the client has not been removed yet
+ if (iNextLayer && iControlClients.Count() == 1 && iDataClients.Count() == 0)
+ {
+ iNextLayer->Leave (*this);
+ iNextLayer = NULL;
+ }
+ }
+
+void CDefaultSubConnectionProvider::SubConnectionEvent(CSubConnectionProviderBase& /*aSubConnProvider*/, MConnectionDataClient::TNotify /*aNotifyType*/, TInt /*aError*/, const CSubConNotificationEvent* aEvent)
+ {
+ NotifyClientEvent(*aEvent);
+ }
+
+
+void CDefaultSubConnectionProvider::SubConnectionGoingDown(CSubConnectionProviderBase& /*aSubConnProvider*/)
+ {
+ TInt max = iControlClients.Count();
+ for ( TInt n = max - 1; n >= 0; n-- )
+ {
+ iControlClients[n]->SubConnectionGoingDown(*this);
+ }
+ }
+
+
+void CDefaultSubConnectionProvider::LayerUp(CSubConnectionProviderBase& /*aSubConnProvider*/, TInt /*aError*/)
+ {
+ }
+
+void CDefaultSubConnectionProvider::IncomingConnection(CSubConnectionProviderBase* /*aSubConnProvider*/, CSubConParameterBundle* /*aParameterBundle*/, TInt /*aError*/)
+ {
+ }
+
+#endif
+// SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/src/ip_subconparams.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,74 @@
+// 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:
+// Implementation file for the IP SubConnection Parameters
+//
+//
+
+/**
+ @file ip_subconparams.h
+*/
+
+
+#include <e32std.h>
+#include <e32test.h>
+#include <ecom/ecom.h>
+#include <implementationproxy.h>
+#include <ip_subconparams.h>
+#include <comms-infras/metatypearray.h>
+
+#ifndef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+// need to ensure the original class name and TUid of the factory class
+// is used for implementions in this component
+#undef KSubConIPParamsUid
+#undef KSubConQosIPLinkR99ParamsType
+#undef CSubConQosIPLinkR99ParamSet
+#endif
+
+START_ATTRIBUTE_TABLE( CSubConQosIPLinkR99ParamSet, KSubConIPParamsUid, KSubConQosIPLinkR99ParamsType )
+ REGISTER_ATTRIBUTE( CSubConQosIPLinkR99ParamSet, iTrafficClass, TMetaNumber )
+ REGISTER_ATTRIBUTE( CSubConQosIPLinkR99ParamSet, iDeliveryOrder, TMetaNumber )
+ REGISTER_ATTRIBUTE( CSubConQosIPLinkR99ParamSet, iDeliveryOfErroneusSdu, TMetaNumber )
+ REGISTER_ATTRIBUTE( CSubConQosIPLinkR99ParamSet, iResidualBer, TMetaNumber )
+ REGISTER_ATTRIBUTE( CSubConQosIPLinkR99ParamSet, iErrorRatio, TMetaNumber )
+ REGISTER_ATTRIBUTE( CSubConQosIPLinkR99ParamSet, iPriority, TMetaNumber )
+ REGISTER_ATTRIBUTE( CSubConQosIPLinkR99ParamSet, iTransferDelay, TMetaNumber )
+ REGISTER_ATTRIBUTE( CSubConQosIPLinkR99ParamSet, iMaxSduSize, TMetaNumber )
+ REGISTER_ATTRIBUTE( CSubConQosIPLinkR99ParamSet, iMaxBitrateUplink, TMetaNumber )
+ REGISTER_ATTRIBUTE( CSubConQosIPLinkR99ParamSet, iMaxBitrateDownlink, TMetaNumber )
+ REGISTER_ATTRIBUTE( CSubConQosIPLinkR99ParamSet, iGuaBitrateUplink, TMetaNumber )
+ REGISTER_ATTRIBUTE( CSubConQosIPLinkR99ParamSet, iGuaBitrateDownlink, TMetaNumber )
+END_ATTRIBUTE_TABLE()
+
+START_ATTRIBUTE_TABLE( CSubConSBLPR5ExtensionParamSet, KSubConIPParamsUid, KSubConnSBLPR5ExtensionParamsType )
+ REGISTER_ATTRIBUTE( CSubConSBLPR5ExtensionParamSet, iAuthToken, TMeta<TAuthToken>)
+ REGISTER_ATTRIBUTE( CSubConSBLPR5ExtensionParamSet, iFlowIds, TMetaArray<RFlowIdentifiers>)
+END_ATTRIBUTE_TABLE()
+
+CSubConExtensionParameterSet* CSubConIPExtensionParamsFactory::NewL(TAny* aConstructionParameters)
+ {
+ TInt32 type = reinterpret_cast<TInt32>(aConstructionParameters);
+ switch (type)
+ {
+ case (KSubConQosIPLinkR99ParamsType):
+ return new (ELeave) CSubConQosIPLinkR99ParamSet;
+ // break;
+ case (KSubConnSBLPR5ExtensionParamsType):
+ return new (ELeave) CSubConSBLPR5ExtensionParamSet;
+ // break;
+ default:
+ User::Leave(KErrNotFound);
+ }
+ return NULL;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/src/ipscpr.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,2006 @@
+// 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:
+// Implementation file for the IP SubConnection Provider and its basic version.
+//
+//
+
+/**
+ @file ipscpr.cpp
+*/
+
+#include <e32std.h>
+#include <e32test.h>
+#include <ecom/ecom.h>
+#include <implementationproxy.h>
+#include <es_prot.h>
+#include <cs_subconevents.h>
+#include <cs_subconparams.h>
+#include "ipscpr.h"
+#include "ipscprlog.h"
+#include "sblpextn.h"
+#include <ip_subconparams.h>
+
+#ifndef BASIC_IPSCPR
+#include "pfqos_stream.h"
+#include "ipscprlog.h"
+#include <ip_subconparams.h>
+#include "qos_msg.h"
+#include "pfqoslib.h"
+#include <networking/qoserr.h>
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+#include <networking/imsextn.h>
+#include <networking/sblpextn.h>
+#include <networking/umtsextn.h>
+#else
+#include <networking/umtsapi.h>
+#include <networking/sblpapi.h>
+#endif
+// SYMBIAN_NETWORKING_UMTSR5
+
+#endif
+
+#ifndef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+// need to ensure the original TUid of the factory class is used for implementions in this component
+#undef KSubConIPParamsUid
+#endif
+
+
+/**
+Data required for instantiating ECOM Plugin
+*/
+const TImplementationProxy ImplementationTable[] =
+ {
+ IMPLEMENTATION_PROXY_ENTRY(KSubConnectionProviderImplementationUid, CIpSubConnectionProviderFactory::NewL),
+ IMPLEMENTATION_PROXY_ENTRY(KSubConIPParamsUid, CSubConIPExtensionParamsFactory::NewL)
+ };
+
+
+/**
+ECOM Implementation Factory
+*/
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
+ {
+ aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+
+ return ImplementationTable;
+ }
+
+
+/**
+Plugin Implementation
+*/
+
+
+CIpSubConnectionProviderFactory* CIpSubConnectionProviderFactory::NewL(TAny* aConstructionParameters)
+/**
+Constructs a IP Connection Provider Factory
+
+@param aConstructionParameters construction data passed by ECOM
+
+@return pointer to a constructed factory
+*/
+ {
+ CIpSubConnectionProviderFactory* ptr = new (ELeave) CIpSubConnectionProviderFactory(KIPConnectionProviderFactoryId, *(reinterpret_cast<CSubConnectionFactoryContainer*>(aConstructionParameters)));
+ return ptr;
+ }
+
+
+CIpSubConnectionProviderFactory::CIpSubConnectionProviderFactory(TUint aFactoryId, CSubConnectionFactoryContainer& aParentContainer)
+ : CSubConnectionProviderFactoryBase(aFactoryId, aParentContainer)
+/**
+IP SubConnection Provider Factory Constructor
+
+@param aFactoryId ECOM Implementation Id
+@param aParentContainer Object Owner
+*/
+ {
+ }
+
+
+CIpSubConnectionProviderFactory::~CIpSubConnectionProviderFactory()
+/**
+IP SubConnection Provider Factory Destructor
+*/
+ {
+ }
+
+
+CSubConnectionProviderBase* CIpSubConnectionProviderFactory::DoCreateProviderL(CConnectionProviderBase& aConnProvider, RSubConnection::TSubConnType aType)
+/**
+Factory Function that either creates a new SubConnection Provider or attaches
+to the default Provider. The type of creation can be either RSubConnection::ECreateNew
+or RSubConnection::EAttachToDefault.
+
+Use of other types will cause the factory to leave with KErrNotSupported.
+
+@param aConnProvider Associated Connection Provider
+@param aType Type of SubConnection Provider Creation.
+*/
+ {
+ CSubConnectionProviderBase* p = NULL;
+ switch (aType)
+ {
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ case RSubConnection::EAttachToDefault:
+ p = new(ELeave)CDefaultSubConnectionProvider(*this, aConnProvider, aType);
+ break;
+#ifdef BASIC_IPSCPR
+ case RSubConnection::ECreateNew:
+ // The Basic IPSCPR, itself, by definition, doesn't support secondary contexts.
+ // Ideally it should defer to the transport layer provider as for primary contexts...
+ //
+ User::Leave(KErrNotSupported);
+ break;
+#else
+ case RSubConnection::ECreateNew:
+ p = CIpSubConnectionProvider::NewL(*this, aConnProvider);
+ break;
+#endif // BASIC_IPSCPR
+#else
+ case RSubConnection::ECreateNew:
+ p = CIpSubConnectionProvider::NewL(*this, aConnProvider);
+ break;
+ case RSubConnection::EAttachToDefault:
+ p = new(ELeave)CDefaultSubConnectionProvider(*this, aConnProvider);
+ break;
+#endif // SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ default:
+ {
+ User::Leave(KErrNotSupported);
+ }
+ };
+ return p;
+ }
+
+
+#ifndef BASIC_IPSCPR
+
+/**
+Provider Implementation
+*/
+
+
+CIpSubConnectionProvider* CIpSubConnectionProvider::NewL(CIpSubConnectionProviderFactory& aFactory, CConnectionProviderBase& aConnProvider)
+/**
+Construct a new IP SubConnection Provider Object
+
+@param aFactory factory that create this object
+@param aConnProvider Connection Provider associated with this object
+*/
+ {
+ CIpSubConnectionProvider* ptr = new (ELeave) CIpSubConnectionProvider(aFactory, aConnProvider);
+
+ CleanupStack::PushL(ptr);
+ ptr->ConstructL();
+ CleanupStack::Pop();
+
+ return ptr;
+ }
+
+
+CIpSubConnectionProvider::CIpSubConnectionProvider(CIpSubConnectionProviderFactory& aFactory, CConnectionProviderBase& aConnProvider)
+ : CEmptySubConnectionProvider(aFactory, aConnProvider)
+ , iChannelId(-1)
+ , iPrtExtensions(_FOFF(CExtensionBase,iLink))
+ , iParametersSet(EFalse)
+/**
+IP SubConnection Provider Constructor
+
+@param aFactory factory that create this object
+@param aConnProvider Connection Provider associated with this object
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider [this=%08x]:\tCIpSubConnectionProvider() [MConnectionDataClient=%08x]"),
+ this, (MConnectionDataClient*)this));
+ }
+
+
+CIpSubConnectionProvider::~CIpSubConnectionProvider()
+/**
+IP SubConnection Provider Destructor
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::Destruct [%08x]"), this));
+
+ if( iChannelId >= 0 ) // Only send a Close if have opened a channel
+ {
+ TRAPD(ret,SendCloseL());
+ if( ret != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("SendCloseL left with error: %d"), ret));
+ }
+ }
+
+ if( iWriter )
+ {
+ iWriter->Cancel();
+ delete iWriter;
+ iWriter = NULL;
+ }
+
+ if( iReader )
+ {
+ iReader->Cancel();
+ delete iReader;
+ iReader = NULL;
+ }
+
+ delete iPrtParameters;
+ delete iAsyncWriter;
+ ResetPrtExtensions();
+
+ iSocket.Close();
+ }
+
+
+void CIpSubConnectionProvider::ConstructL()
+/**
+IP SubConnection Provider Second Phase Constructor
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::Construct [%08x]"), this));
+
+ // Open a connection to the QoS PRT
+ _LIT(KDescPfqos, "pfqos");
+
+#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+ // If we couldn't open pipe to QoS framework then it is not supported
+ TInt ret = iSocket.Open(KDescPfqos);
+ if(ret == KErrNotFound)
+ {
+ User::Leave(KErrNotSupported);
+ }
+ else if (ret != KErrNone)
+ {
+ User::Leave(ret);
+ }
+#else
+ User::LeaveIfError(iSocket.Open(KDescPfqos));
+#endif
+ iUid = RProcess().Type();
+
+ iReader = CQoSMsgReader::NewL(this, iSocket);
+ iWriter = CQoSMsgWriter::NewL(this, iSocket);
+ iAsyncWriter = CAsyncWriter::NewL(iWriter);
+
+ /** Create the CQoSParameters to hold the Qos
+ * and Extension Parameters. The values will initially
+ be set to default
+ */
+ iPrtParameters = new (ELeave) CQoSParameters;
+ // Set Default Uplink Parameters
+ iPrtParameters->SetUpLinkMaximumBurstSize(3000); // for TokenBucketSizeUplink
+ iPrtParameters->SetUpLinkMaximumPacketSize(1500); // for MaxPacketSizeUplink
+ iPrtParameters->SetUplinkBandwidth(1500); // for TokenRateUplink
+ iPrtParameters->SetUpLinkAveragePacketSize(1500); // for MinimumPolicedUnitUplink
+ iPrtParameters->SetUpLinkPriority(KQoSLowestPriority); // for PriorityUplink
+ iPrtParameters->SetUpLinkDelay(0); // for DelayUplink
+ // Set Default Downlink parameters
+ iPrtParameters->SetDownLinkMaximumBurstSize(3000); // for TokenBucketSizeDownlink
+ iPrtParameters->SetDownLinkMaximumPacketSize(1500); // for MaxPacketSizeDownlink
+ iPrtParameters->SetDownlinkBandwidth(1500); // for TokenRateDownlink
+ iPrtParameters->SetDownLinkAveragePacketSize(1500); // for MinimumPolicedUnitDownlink
+ iPrtParameters->SetDownLinkPriority(KQoSLowestPriority); // for PriorityDownlonk
+ iPrtParameters->SetDownLinkDelay(0); // for DelayDownlink
+
+ iPrtParameters->SetAdaptMode(EFalse);
+// iPrtParameters->SetHeaderMode(???);
+// User::LeaveIfError(iPrtParameters->SetName(name));
+ }
+
+
+TAny* CIpSubConnectionProvider::FetchInterfaceInstanceL(CSubConnectionProviderBase& /*aProvider*/, const STypeId& aTid)
+ {
+ return (aTid == STypeId::CreateSTypeId(KConnectionClientExtUid,EConnectionEnumerateClients)) ? static_cast<MConnectionEnumerateClients*>(this) : NULL;
+ }
+
+void CIpSubConnectionProvider::DoDataClientJoiningL(MSubConnectionDataClient& aDataClient)
+/**
+Function called by Connection Provider when a socket is to be added to a QoS Flow
+
+@param aDataClient Data Client to add to the QoS Channel
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider [this=%08x]:\tDoDataClientJoiningL() [iDataClients.Count=%d] [aDataClient=%08x]"), this, iDataClients.Count(), &aDataClient));
+
+ // Can only join to a channel once it has been successfully routed
+ // Can only open/create/join the channel once the connection has been established
+ const TSockAddr* srcAddr = NULL;
+ const TSockAddr* dstAddr = NULL;
+ const TDesC8* connInfo;
+ if(aDataClient.ReadAddressInformation(srcAddr, dstAddr, connInfo) == KErrNone)
+ {
+ if( srcAddr == NULL || srcAddr->Family() == KAFUnspec )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Source Address not defined")));
+ User::Leave( KErrNotReady );
+ }
+
+ if( dstAddr == NULL || dstAddr->Family() == KAFUnspec )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Destination Address not defined")));
+ User::Leave( KErrNotReady );
+ }
+
+ if( connInfo == NULL )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Connection Information not defined")));
+ User::Leave( KErrNotReady );
+ }
+
+ TConnectionInfoBuf* connInfoBuf = (TConnectionInfoBuf*)connInfo->Ptr();
+ TUint32 iapId = (*connInfoBuf)().iIapId;
+
+ if( iChannelId >= 0 )
+ {
+ SendJoinL((TInetAddr)*srcAddr, (TInetAddr)*dstAddr, iapId, aDataClient.ProtocolId());
+ }
+ else
+ {
+ SendCreateL((TInetAddr)*srcAddr, (TInetAddr)*dstAddr, iapId, aDataClient.ProtocolId());
+ }
+ }
+ }
+
+
+void CIpSubConnectionProvider::DoDataClientLeaving(MSubConnectionDataClient& aDataClient)
+/**
+Function called by Connection Provider when a socket is to be removed from a QoS Flow
+
+@param aDataClient Data Client to remove from the QoS Channel
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider [this=%08x]:\tDoDataClientLeaving() [iDataClients.Count=%d] [aDataClient=%08x]"), this, iDataClients.Count(), &aDataClient));
+
+ // Can only leave on a routed conection that has been successfully
+ // attached to a QoS Channel. Otherwise we cannot leave
+ const TSockAddr* srcAddr = NULL;
+ const TSockAddr* dstAddr = NULL;
+ const TDesC8* connInfo;
+ TInt err = aDataClient.ReadAddressInformation(srcAddr, dstAddr, connInfo);
+ if( err != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Unable to read Address Information")));
+ return;
+ }
+
+ if( srcAddr == NULL || srcAddr->Family() == KAFUnspec )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Source Address not defined")));
+ return;
+ }
+
+ if( dstAddr == NULL || dstAddr->Family() == KAFUnspec )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Destination Address not defined")));
+ return;
+ }
+
+ if( connInfo == NULL )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Connection Information not defined")));
+ return;
+ }
+
+ TConnectionInfoBuf* connInfoBuf = (TConnectionInfoBuf*)connInfo->Ptr();
+ TUint32 iapId = (*connInfoBuf)().iIapId;
+
+ if( iChannelId >= 0 )
+ {
+ TRAPD(ret, SendLeaveL((TInetAddr)*srcAddr, (TInetAddr)*dstAddr, iapId, aDataClient.ProtocolId()));
+ if (ret != KErrNone)
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("SendLeaveL left with err=%d"), ret));
+ }
+ }
+ else
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Attempted to leave on an unconnected channel")));
+ }
+ }
+
+
+void CIpSubConnectionProvider::DoSourceAddressUpdate(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aSource*/)
+/**
+Function called by Connection Provider when the source address on a data client is set
+
+@param aDataClient Data Client affected
+@param aSource Source Address
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::DoSourceAddressUpdate [%08x]"), this));
+ // Not Interested in either souce or destination updates; wait until connected
+ }
+
+
+void CIpSubConnectionProvider::DoDestinationAddressUpdate(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aDestination*/)
+/**
+Function called by Connection Provider when the destination address on a data client is set
+
+@param aDataClient Data Client affected
+@param aDestination Destination Address
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::DoDestinationAddressUpdate [%08x]"), this));
+ // Not Interested in either souce or destination updates; wait until connected
+ }
+
+
+void CIpSubConnectionProvider::DoDataClientRouted(MSubConnectionDataClient& aDataClient, const TSockAddr& aSource, const TSockAddr& aDestination, const TDesC8& aConnectionInfo)
+/**
+Function called by Connection Provider when the connection has been established
+
+@param aDataClient Data Client affected
+@param aSource Source Address
+@param aDestination Destination Address
+@param aConnectionInfo Connection Data
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::DoDestinationAddressUpdate [%08x]"), this));
+
+ TConnectionInfoBuf* connInfo = (TConnectionInfoBuf*)aConnectionInfo.Ptr();
+ TUint32 iapId = (*connInfo)().iIapId;
+
+ if( aSource.Family() != KAFUnspec && aDestination.Family() != KAFUnspec)
+ {
+ // If already have a open channel add this socket. o/w create a new channel
+ if( iChannelId >= 0 )
+ {
+ TRAPD(ret,SendJoinL((TInetAddr)aSource, (TInetAddr)aDestination, iapId, aDataClient.ProtocolId()));
+ if( ret != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("SendJoinL left with error: %d"), ret));
+ }
+ }
+ else
+ {
+ TRAPD(ret,SendCreateL((TInetAddr)aSource, (TInetAddr)aDestination, iapId, aDataClient.ProtocolId()));
+ if( ret != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("SendCreateL left with error: %d"), ret));
+ }
+ }
+ }
+ else
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Data Client Routed contains invalid source or dest address")));
+ }
+ }
+
+
+void CIpSubConnectionProvider::DoParametersAboutToBeSetL(CSubConParameterBundle& aParameterBundle)
+/**
+Function called by the Connection Provider before the QoS Parameters are set by the client
+
+@param aParameterBundle Container holding pending QoS Parameters
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::DoParametersAboutToBeSetL [%08x]"), this));
+
+ iParameterRelease = KParameterRelInvalid;
+ ConvertParametersFromESockL( aParameterBundle );
+ iParametersSet = ETrue;
+
+ if(iChannelId >= 0)
+ {
+ SendSetQoSL();
+ }
+ }
+
+
+TInt CIpSubConnectionProvider::DoControl(TUint /*aOptionLevel*/, TUint /*aOptionName*/, TDes8& /*aOption*/)
+/**
+@param aOptionLevel
+@param aOptionName
+@param aOption
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::DoControl [%08x]"), this));
+
+ return KErrNotSupported;
+ }
+
+
+void CIpSubConnectionProvider::DoStartL()
+ {
+ }
+
+void CIpSubConnectionProvider::DoStop()
+ {
+ }
+
+CSubConnectionProviderBase* CIpSubConnectionProvider::DoNextLayer()
+ {
+ return NULL;
+ }
+
+CConnDataTransfer& CIpSubConnectionProvider::DoDataTransferL()
+ {
+ User::Leave(KErrNotSupported);
+ //unreachable code
+ return iNextLayer->DataTransferL();
+// return *((CConnDataTransfer*)this);
+ }
+
+//MConnectionDataClient
+void CIpSubConnectionProvider::ConnectionGoingDown(CConnectionProviderBase& /*aConnProvider*/)
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::ConnectionGoingDown [%08x]"), this));
+ iConnectionProvider = NULL;
+ DeleteMeNow();
+ }
+
+void CIpSubConnectionProvider::Notify(TNotify /*aNotifyType*/, CConnectionProviderBase* /*aConnProvider*/, TInt /*aError*/, const CConNotificationEvent* /*aConNotificationEvent*/)
+ {
+ }
+
+void CIpSubConnectionProvider::AttachToNext(CSubConnectionProviderBase* /*aSubConnProvider*/)
+ {
+ }
+
+
+
+void CIpSubConnectionProvider::SendOpenExistingL(const TInetAddr &aSrcAddr, const TInetAddr &aDstAddr, TUint32 aIapId, TUint32 aProtocolId)
+/**
+Sends a Message to QoS PRT to open a QoS Channel
+
+@param aSrcAddr Source Address
+@param aDstAddr Destination Address
+@param aIapId IAP Id
+@param aProtocolId Protocol Id
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Sending PRT Msg: EPfqosOpenExistingChannel")));
+
+ CQoSMsg* msg = CQoSMsg::NewL(EPfqosOpenExistingChannel);
+ msg->AddConnInfo(aProtocolId, iUid, aIapId);
+ msg->AddSrcAddr(aSrcAddr);
+ msg->AddDstAddr(aDstAddr);
+ msg->AddChannel(0);
+
+ iWriter->Send(msg);
+ }
+
+
+void CIpSubConnectionProvider::SendCreateL(const TInetAddr &aSrcAddr, const TInetAddr &aDstAddr, TUint32 aIapId, TUint32 aProtocolId)
+/**
+Sends a Message to QoS PRT to create a QoS Channel
+
+@param aSrcAddr Source Address
+@param aDstAddr Destination Address
+@param aIapId IAP Id
+@param aProtocolId Protocol Id
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Sending PRT Msg: EPfqosCreateChannel")));
+
+ CQoSMsg* msg = CQoSMsg::NewL(EPfqosCreateChannel);
+ msg->AddConnInfo(aProtocolId, iUid, aIapId);
+ msg->AddSrcAddr(aSrcAddr);
+ msg->AddDstAddr(aDstAddr);
+ msg->AddChannel(0);
+
+ TQoSParameters qosParams;
+ ConvertCQoSIntoTQoSParamsL(qosParams);
+ msg->AddQoSParameters(qosParams);
+ msg->AddExtensionPolicy(iPrtExtensions);
+ //Now we need to write to the qos.prt asynchronously. This becuase the TCP/IP stack in CIp6Flow::Connect() calls Bearer() before RefreshFlow()
+ iAsyncWriter->Send(msg);
+ }
+
+
+void CIpSubConnectionProvider::SendCloseL()
+/**
+Sends a Message to QoS PRT to close a QoS Channel
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Sending PRT Msg: EPfqosDeleteChannel")));
+
+ CQoSMsg* msg = CQoSMsg::NewL(EPfqosDeleteChannel);
+ msg->AddChannel(iChannelId);
+
+ iWriter->Send(msg);
+ }
+
+
+void CIpSubConnectionProvider::SendJoinL(const TInetAddr &aSrcAddr, const TInetAddr &aDstAddr, TUint32 aIapId, TUint32 aProtocolId)
+/**
+Sends a Message to QoS PRT to add a socket to a QoS Channel
+
+@param aSrcAddr Source Address
+@param aDstAddr Destination Address
+@param aIapId IAP Id
+@param aProtocolId Protocol Id
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Sending PRT Msg: EPfqosJoin")));
+
+ CQoSMsg* msg = CQoSMsg::NewL(EPfqosJoin);
+ msg->AddConnInfo(aProtocolId, iUid, aIapId);
+ msg->AddSrcAddr(aSrcAddr);
+ msg->AddDstAddr(aDstAddr);
+ msg->AddChannel(iChannelId);
+
+ iWriter->Send(msg);
+ }
+
+
+void CIpSubConnectionProvider::SendLeaveL(const TInetAddr &aSrcAddr, const TInetAddr &aDstAddr, TUint32 aIapId, TUint32 aProtocolId)
+/**
+Sends a Message to QoS PRT to remove a socket from a QoS Channel
+
+@param aSrcAddr Source Address
+@param aDstAddr Destination Address
+@param aIapId IAP Id
+@param aProtocolId Protocol Id
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Sending PRT Msg: EPfqosLeave")));
+
+ CQoSMsg* msg = CQoSMsg::NewL(EPfqosLeave);
+ msg->AddConnInfo(aProtocolId, iUid, aIapId);
+ msg->AddSrcAddr(aSrcAddr);
+ msg->AddDstAddr(aDstAddr);
+ msg->AddChannel(iChannelId);
+
+ iWriter->Send(msg);
+ }
+
+
+
+void CIpSubConnectionProvider::SendSetQoSL()
+/**
+Sends Message to QoS PRT to update the parameters for a QoS Channel
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Sending PRT Msg: EPfqosConfigChannel")));
+
+ CQoSMsg* msg = CQoSMsg::NewL(EPfqosConfigChannel);
+ msg->AddChannel(iChannelId);
+
+ TQoSParameters qosParams;
+ ConvertCQoSIntoTQoSParamsL(qosParams);
+ msg->AddQoSParameters(qosParams);
+ msg->AddExtensionPolicy(iPrtExtensions);
+
+ iWriter->Send(msg);
+ }
+
+
+void CIpSubConnectionProvider::ProcessPRTMsg(TPfqosMessage& aMsg)
+/**
+Process Messages sent from the PRT to the SubConnection Provider
+Messages are either replies or events
+
+@param aMsg the message from the PRT
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::ProcessPRTMsg [%08x]"), this));
+
+ if( aMsg.iBase.iMsg == NULL )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Received malformed message from PRT")));
+ }
+ else
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Msg: %d"), aMsg.iBase.iMsg->pfqos_msg_type));
+ switch(aMsg.iBase.iMsg->pfqos_msg_type)
+ {
+ case EPfqosEvent:
+ {
+ TRAPD(ret, ProcessPRTEventL(aMsg) );
+ if( ret != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("ProcessPRTEventL left with error: %d"), ret));
+ }
+ }
+ break;
+
+ case EPfqosUpdate:
+ case EPfqosDelete:
+ case EPfqosAdd:
+ case EPfqosGet:
+ case EPfqosReject:
+ case EPfqosDump:
+ case EPfqosConfigure:
+ case EPfqosJoin:
+ case EPfqosLeave:
+ case EPfqosCreateChannel:
+ case EPfqosOpenExistingChannel:
+ case EPfqosDeleteChannel:
+ case EPfqosConfigChannel:
+ case EPfqosLoadFile:
+ case EPfqosUnloadFile:
+ {
+ TRAPD(ret, ProcessPRTReplyL(aMsg) );
+ if( ret != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("ProcessPRTReplyL left with error: %d"), ret));
+ }
+ }
+ break;
+
+ default:
+ __IPCPRLOG(IpCprLog::Printf(_L("Received Unknown PRT Msg: %d"), aMsg.iBase.iMsg->pfqos_msg_type));
+ break;
+ }
+ }
+ }
+
+
+void CIpSubConnectionProvider::ProcessPRTEventL(TPfqosMessage& aMsg)
+/**
+Process Events sent from the PRT to the SubConnection Provider
+
+@param aMsg the message from the PRT
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::ProcessPRTEventL [%08x]"), this));
+
+ // Only interested in Channel Events
+ if (aMsg.iEvent.iExt == NULL || aMsg.iFlowSpec.iExt == NULL || aMsg.iChannel.iExt == NULL)
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Received malformed event message from PRT")));
+ return;
+ }
+
+ MSubConnectionDataClient* client = NULL;
+ TInt ret = DetermineClient(aMsg, client);
+ if( ret != KErrNone || client == NULL )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Could not determine DataClient from message. Error=%d"), ret));
+ }
+
+ switch (aMsg.iEvent.iExt->event_type)
+ {
+ case KPfqosEventFailure:
+ {
+/*
+ EQoSOk,
+ EQoSPolicyExists = -5119, //< -5119 Policy exists in database
+ EQoSNoModules, //< -5118 No QoS modules available
+ EQoSInterface, //< -5117 Flows are using different interfaces
+ EQoSModules, //< -5116 Flows use different QoS modules
+ EQoSModuleLoadFailed, //< -5115 Loading of QoS module failed
+ EQoSMessageCorrupt, //< -5114 Pfqos message corrupted
+ EQoSJoinFailure, //< -5113 Join to QoS channel failed
+ EQoSLeaveFailure, //< -5112 Leave from QoS channel failed
+ EQoSNoInterface, //< -5111 Network interface deleted
+ EQoSChannelDeleted, //< -5110 QoS channel deleted
+ EQoSDowngradeForced //< -5109 QoS parameters downgraded by administrative policy
+*/
+ CSubConNotificationEvent* event = NULL;
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Event: KPfqosEventFailure. Error=%d"),aMsg.iBase.iMsg->pfqos_msg_errno));
+
+#if defined(QOS_ERROR_REPORTING) //Awaiting code delivery for qos and guqos to support this functionality
+ switch(aMsg.iBase.iMsg->pfqos_msg_errno)
+ {
+ case EQoSJoinFailure:
+
+ if( client )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Join failed Event")));
+ client->JoinFailed(*this,aMsg.iBase.iMsg->pfqos_msg_errno);
+ }
+ break;
+
+ case EQoSLeaveFailure:
+ if( client )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Leave failed Event")));
+ //We don't particularly care that it failed - just pretend that it was successful
+ client->LeaveComplete(*this);
+ }
+ break;
+ case EQoSNoInterface:
+ case EQoSChannelDeleted:
+ {
+ CSubConGenEventSubConDown* scde = CSubConGenEventSubConDown::NewL();
+ scde->SetError(aMsg.iBase.iMsg->pfqos_msg_errno);
+ event = scde;
+ iChannelId = -1;
+ break;
+ }
+ case EQoSDowngradeForced:
+ {
+ event = CSubConGenEventParamsChanged::NewL();
+ break;
+ }
+
+ case EQoSChannelFailed:
+ if( client )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Join failed Event")));
+ client->JoinFailed(*this,aMsg.iBase.iMsg->pfqos_msg_errno);
+ }
+ // no break here we want to continue into the next case statement;
+ case EQoSParamsRejected:
+ {
+ CSubConGenEventParamsRejected* scde = CSubConGenEventParamsRejected::NewL();
+ scde->SetError(aMsg.iBase.iMsg->pfqos_msg_errno);
+ scde->SetFamilyId(KSubConQoSFamily);
+ event = scde;
+ break;
+ }
+
+ default:
+ __IPCPRLOG(IpCprLog::Printf(_L("Unknown event sent ")));
+ };
+#else
+ if( client )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Join failed Event")));
+ client->JoinFailed(*this,aMsg.iBase.iMsg->pfqos_msg_errno);
+ CSubConGenEventParamsRejected* scde = CSubConGenEventParamsRejected::NewL();
+ /**
+ There can be two set of parameters that are sent to QOS either as KSubConQoSFamily
+ or as KSubConAuthorisationFamily. Here we should differentiate, the QOS is rejected
+ because of which parameter family.
+ At present there is no indication comes from the lower layer why the QOS has failed, and in
+ all the case the member *aMsg.iBase.iMsg->pfqos_msg_type* will return *EPfQoSReject*.
+
+ At the time of writing this code any differentiation method was not available to differentiate
+ between events. i.e whether the event is SBLP or UMTS events. So this has not been done.
+ This needs to be done when the TPfqosMessage will have the differentiation
+ */
+ scde->SetError(aMsg.iBase.iMsg->pfqos_msg_errno);
+ scde->SetFamilyId(KSubConQoSFamily);
+ event = scde;
+ }
+#endif
+
+ // Setting QoS Parameters Failed
+ /**
+ There can be two set of parameters that are sent to QOS either as KSubConQoSFamily
+ or as KSubConAuthorisationFamily. Here we should differentiate, the QOS is rejected
+ because of which parameter family.
+ At present there is no indication comes from the lower layer why the QOS has failed, and in
+ all the case the member *aMsg.iBase.iMsg->pfqos_msg_type* will return *EPfQoSReject*.
+
+ At the time of writing this code any differentiation method was not available to differentiate
+ between events. i.e whether the event is SBLP or UMTS events. So this has not been done.
+ This needs to be done when the TPfqosMessage will have the differentiation
+ */
+ if (event)
+ {
+
+ NotifyClientEvent(*event);
+ delete event;
+ }
+ }
+ break;
+
+ case KPfqosEventConfirm:
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Event: KPfqosEventConfirm")));
+
+ // Setting QoS Parameters OK
+ CSubConGenEventParamsGranted* event = CSubConGenEventParamsGranted::NewL();
+ ConvertParametersFromQOSL(aMsg, event);
+
+ NotifyClientEvent(*event);
+ delete event;
+
+ if( client != NULL )
+ {
+ client->JoinComplete(*this);
+ }
+ }
+ break;
+
+ case KPfqosEventAdapt:
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Event: KPfqosEventAdapt")));
+
+ // Available QoS Changed
+ CSubConGenEventParamsChanged* event = CSubConGenEventParamsChanged::NewL();
+ event->SetError(aMsg.iBase.iMsg->pfqos_msg_errno);
+ ConvertParametersFromQOSL(aMsg, event);
+
+ NotifyClientEvent(*event);
+ delete event;
+ }
+ break;
+
+ case KPfqosEventJoin:
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Event: KPfqosEventJoin")));
+ if (aMsg.iBase.iMsg->pfqos_msg_errno)
+ {
+ ProcessPRTError( aMsg, aMsg.iBase.iMsg->pfqos_msg_errno );
+ return;
+ }
+
+
+ CSubConGenEventDataClientJoined* event = CSubConGenEventDataClientJoined::NewL();
+
+ if( client )
+ {
+ const TSockAddr* SrcAddr = NULL;
+ const TSockAddr* DstAddr = NULL;
+ const TDesC8* connInfo;
+ client->ReadAddressInformation(SrcAddr, DstAddr, connInfo); // return can be would have errored above
+
+ TConnectionInfoBuf* connInfoBuf = (TConnectionInfoBuf*)connInfo->Ptr();
+ TUint32 iapId = (*connInfoBuf)().iIapId;
+
+ event->SetSourceAddress( *SrcAddr );
+ event->SetDestAddress( *DstAddr );
+ event->SetIap( iapId );
+
+ client->JoinComplete(*this);
+ }
+
+ NotifyClientEvent(*event);
+ delete event;
+ }
+ break;
+
+ case KPfqosEventLeave:
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Event: KPfqosEventLeave")));
+
+ CSubConGenEventDataClientLeft* event = CSubConGenEventDataClientLeft::NewL();
+
+ if( client )
+ {
+ const TSockAddr* SrcAddr = NULL;
+ const TSockAddr* DstAddr = NULL;
+ const TDesC8* connInfo;
+ client->ReadAddressInformation(SrcAddr, DstAddr, connInfo); // return can be would have errored above
+
+ TConnectionInfoBuf* connInfoBuf = (TConnectionInfoBuf*)connInfo->Ptr();
+ TUint32 iapId = (*connInfoBuf)().iIapId;
+
+ event->SetSourceAddress( *SrcAddr );
+ event->SetDestAddress( *DstAddr );
+ event->SetIap( iapId );
+ }
+
+ NotifyClientEvent(*event);
+ delete event;
+
+ if( client != NULL )
+ {
+ client->LeaveComplete(*this);
+ }
+ }
+ break;
+
+ default:
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Event: Unknown - %d"), aMsg.iEvent.iExt->event_type));
+ break;
+ }
+ }
+
+void CIpSubConnectionProvider::ProcessPRTReplyL(TPfqosMessage& aMsg)
+/**
+Process Replies sent from the PRT to the SubConnection Provider
+
+@param aMsg the message from the PRT
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::ProcessPRTReplyL [%08x]"), this));
+
+ if( aMsg.iChannel.iExt == NULL )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Received malformed reply message from PRT")));
+ }
+ else if( aMsg.iBase.iMsg->pfqos_msg_errno != KErrNone )
+ {
+ ProcessPRTError( aMsg, aMsg.iBase.iMsg->pfqos_msg_errno );
+ }
+ else
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Reply: %d"), aMsg.iBase.iMsg->pfqos_msg_type));
+
+ MSubConnectionDataClient* client = NULL;
+ TInt ret = DetermineClient(aMsg, client);
+ if( ret != KErrNone || client == NULL )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Could not determine DataClient from message. Error=%d"),ret));
+ }
+
+ switch (aMsg.iBase.iMsg->pfqos_msg_type)
+ {
+ case EPfqosOpenExistingChannel:
+ iChannelId = aMsg.iChannel.iExt->channel_id;
+ __IPCPRLOG(IpCprLog::Printf(_L("Processing Reply for message: EPfqosOpenExistingChannel")));
+ break;
+
+ case EPfqosCreateChannel:
+ iChannelId = aMsg.iChannel.iExt->channel_id;
+ __IPCPRLOG(IpCprLog::Printf(_L("Processing Reply for message: EPfqosCreateChannel")));
+ //Now you will expect to complete the join here. This will not work becuase
+ //qos.prt send a reply before finishing the join down to the nif level
+ //we will have to delay the response until the event is received
+ break;
+
+ case EPfqosJoin:
+ __IPCPRLOG(IpCprLog::Printf(_L("Processing Reply for message: EPfqosJoin")));
+ //Now you will expect to complete the join here. This will not work becuase
+ //qos.prt send a reply before finishing the join down to the nif level
+ //we will have to delay the response until the event is received
+ break;
+
+ case EPfqosLeave:
+ __IPCPRLOG(IpCprLog::Printf(_L("Processing Reply for message: EPfqosLeave")));
+ break;
+
+ case EPfqosConfigChannel:
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Processing Reply for message: EPfqosConfigChannel")));
+ }
+ break;
+
+ case EPfqosDeleteChannel:
+ iChannelId = -1;
+ __IPCPRLOG(IpCprLog::Printf(_L("Processing Reply for message: EPfqosDeleteChannel")));
+ break;
+
+ default:
+ __IPCPRLOG(IpCprLog::Printf(_L("Ignoring Reply for unknown message: %d"), aMsg.iBase.iMsg->pfqos_msg_type));
+ break;
+ }
+ }
+
+ __IPCPRLOG(IpCprLog::Printf(_L("Provider=0x%x Channel=%d"), this, iChannelId));
+ }
+
+
+#ifdef _DEBUG
+void CIpSubConnectionProvider::ProcessPRTError(TInt aMsgType, TInt __IPCPRLOG(aError))
+/**
+Process Errors that occur in communicating between the PRT and the
+SubConnection Provider
+
+@param aMsgType the type of message that encountered the error
+@param aError the error ththas occurred
+*/
+ {
+ switch (aMsgType)
+ {
+ case EPfqosOpenExistingChannel:
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Error %d on EPfqosOpenExistingChannel"), aError));
+ break;
+
+ case EPfqosCreateChannel:
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Error %d on EPfqosCreateChannel"), aError));
+ break;
+
+ case EPfqosDeleteChannel:
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Error %d on EPfqosDeleteChannel"), aError));
+ break;
+
+ case EPfqosJoin:
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Error %d on EPfqosJoin"), aError));
+ break;
+
+ case EPfqosLeave:
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Error %d on EPfqosLeave"), aError));
+ break;
+
+ case EPfqosConfigChannel:
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Error %d on EPfqosConfigChannel"), aError));
+ break;
+
+ case EPfqosEvent:
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Error %d on EPfqosEvent"), aError));
+ break;
+
+ default:
+ __IPCPRLOG(IpCprLog::Printf(_L("Received PRT Error %d on Unknown Message"), aError));
+ break;
+ }
+ }
+#endif
+
+
+void CIpSubConnectionProvider::ProcessPRTError(TPfqosMessage& aMsg, TInt aError)
+/**
+Process Errors that occur in communicating between the PRT and the
+SubConnection Provider
+
+@param aMsg the message from the PRT
+@param aError the error ththas occurred
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::ProcessPRTError [%08x]"), this));
+
+ if( aError != KErrNone)
+ {
+ TInt msgType = aMsg.iBase.iMsg->pfqos_msg_type;
+
+#ifdef _DEBUG
+ ProcessPRTError(msgType, aError);
+#endif
+
+ MSubConnectionDataClient* client = NULL;
+ TInt ret = DetermineClient(aMsg, client);
+ if( ret != KErrNone || client == NULL )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Could not determine DataClient from message. Error=%d"),ret));
+ }
+
+ if( msgType == EPfqosJoin ||
+ msgType == EPfqosOpenExistingChannel ||
+ msgType == EPfqosCreateChannel ||
+ (msgType == EPfqosEvent && aMsg.iBase.iMsg->pfqos_msg_errno == EQoSJoinFailure))
+ {
+ if( client )
+ {
+ client->JoinFailed(*this,aError);
+ }
+ }
+ else if( msgType == EPfqosConfigChannel )
+ {
+ //This will send an error only if ECom successfuly constructs the event object
+ CSubConGenEventParamsRejected* event = NULL;
+ TRAP_IGNORE(event = CSubConGenEventParamsRejected::NewL());
+ if (event)
+ {
+ /**
+ comments give in case of *KPfqosEventFailure* in function *ProcessPRTEventL*
+ will also applicable here
+ */
+ if (aMsg.iBase.iMsg->pfqos_msg_errno == RPacketContext::EEtelPcktPolicyControlRejectionCode)
+ {
+ event->SetFamilyId(KSubConAuthorisationFamily);
+ }
+ else
+ {
+ event->SetFamilyId(KSubConQoSFamily);
+ }
+
+ event->SetError(aError);
+
+ NotifyClientEvent(*event);
+ delete event;
+ }
+ }
+ else if( msgType == EPfqosLeave ||
+ (msgType == EPfqosEvent && aMsg.iBase.iMsg->pfqos_msg_errno == EQoSLeaveFailure))
+ {
+ // Not Interested in whether the leave was successful. Inform client regardless
+ if( client != NULL )
+ {
+ client->LeaveComplete(*this);
+ }
+ }
+ else
+ {
+ if( client )
+ {
+ client->SubConnectionError(*this, MSubConnectionDataClient::ESubConnection, aError);
+ }
+ }
+ }
+ }
+
+
+TInt CIpSubConnectionProvider::DetermineClient(const TPfqosMessage& aMsg, MSubConnectionDataClient*& aDataClient)
+/**
+Determines which Data Client a message from the QoS PRT is for based upon source and destination
+address; and Protocol Id.
+
+@param aMsg QoS PRT Response Message
+@param aDataClient Output Variable as Data Client that matches reponse.
+
+@return KErrNone on finding the required client. Client passed back as argument.
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::DetermineClient [%08x]"), this));
+
+ aDataClient = NULL;
+
+ const TInetAddr* msgSrcAddr = aMsg.iSrcAddr.iAddr;
+ const TInetAddr* msgDstAddr = aMsg.iDstAddr.iAddr;
+
+ if( msgSrcAddr == NULL || msgDstAddr == NULL || aMsg.iSelector.iExt == NULL )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Received malformed message from PRT")););
+ }
+ else
+ {
+ TUint32 msgProtocol = aMsg.iSelector.iExt->protocol;
+
+ __IPCPRLOG(
+ THostName srcName;
+ msgSrcAddr->OutputWithScope(srcName);
+ THostName dstName;
+ msgDstAddr->OutputWithScope(dstName);
+ IpCprLog::Printf(_L("Msg SAddr[%S][%d] DAddr[%S][%d] Prot[%d]"), &srcName, msgSrcAddr->Port(), &dstName, msgDstAddr->Port(), msgProtocol);
+ );
+
+ // Compare message parameters with those from each client finding the one required
+ TInt numClients = iDataClients.Count();
+ for( TInt index=0; index<numClients; index++ )
+ {
+ MSubConnectionDataClient* client = iDataClients[index];
+ if( client != NULL )
+ {
+ const TSockAddr* cliSrcAddr = NULL;
+ const TSockAddr* cliDstAddr = NULL;
+ const TDesC8* connInfo;
+ TInt err = client->ReadAddressInformation(cliSrcAddr, cliDstAddr, connInfo);
+ if( err != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Unable to read Address Information")));
+ continue;
+ }
+
+ if( cliSrcAddr != NULL && cliDstAddr != NULL && connInfo != NULL )
+ {
+ TUint32 cliProtocol = client->ProtocolId();
+
+ TInetAddr srcInetAddr(*cliSrcAddr);
+ TInetAddr dstInetAddr(*cliDstAddr);
+
+ if (dstInetAddr.Family() == KAfInet)
+ {
+ dstInetAddr.ConvertToV4Mapped();
+ }
+
+ __IPCPRLOG(
+ srcInetAddr.OutputWithScope(srcName);
+ dstInetAddr.OutputWithScope(dstName);
+ IpCprLog::Printf(_L("Cli SAddr[%S][%d] DAddr[%S][%d] Prot[%d]"), &srcName, srcInetAddr.Port(), &dstName, dstInetAddr.Port(), cliProtocol);
+ );
+
+ if( (msgSrcAddr->Port() == srcInetAddr.Port() &&
+ (msgDstAddr->CmpAddr(dstInetAddr) && msgDstAddr->Port() == dstInetAddr.Port())) &&
+ msgProtocol == cliProtocol )
+ {
+ // Have our required client
+ __IPCPRLOG(IpCprLog::Printf(_L("Client Matched [%08x]"), client));
+ aDataClient = client;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if( aDataClient != NULL )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Client Found")));
+ }
+ else
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Client Not Found!")));
+ }
+
+ return aDataClient != NULL ? KErrNone : KErrNotFound;
+ }
+
+
+void CIpSubConnectionProvider::MapGenericParamsFromESockToPRTL(const CSubConQosGenericParamSet& generic) const
+/**
+Mapping function to map the generic parameters from the ESock to QoS PRT equivalent
+@param Generic Input structure contains the generic parameters
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::MapGenericParamsFromESockToPRTL")));
+ /**
+ Get and Set Uplink Parameters
+ */
+ iPrtParameters->SetUpLinkMaximumBurstSize(generic.GetUpLinkMaximumBurstSize());
+ iPrtParameters->SetUpLinkMaximumPacketSize(generic.GetUpLinkMaximumPacketSize());
+ iPrtParameters->SetUplinkBandwidth(generic.GetUplinkBandwidth());
+ iPrtParameters->SetUpLinkAveragePacketSize(generic.GetUpLinkAveragePacketSize());
+ iPrtParameters->SetUpLinkPriority(generic.GetUpLinkPriority());
+ iPrtParameters->SetUpLinkDelay(generic.GetUpLinkDelay());
+ /**
+ Get and Set Downlink Parameters
+ */
+ iPrtParameters->SetDownLinkMaximumBurstSize(generic.GetDownLinkMaximumBurstSize());
+ iPrtParameters->SetDownLinkMaximumPacketSize(generic.GetDownLinkMaximumPacketSize());
+ iPrtParameters->SetDownlinkBandwidth(generic.GetDownlinkBandwidth());
+ iPrtParameters->SetDownLinkAveragePacketSize(generic.GetDownLinkAveragePacketSize());
+ iPrtParameters->SetDownLinkPriority(generic.GetDownLinkPriority());
+ iPrtParameters->SetDownLinkDelay(generic.GetDownLinkDelay());
+ /**
+ Get and Set rest of the Parameters
+ */
+ iPrtParameters->SetHeaderMode(generic.GetHeaderMode());
+ TName name = generic.GetName();
+ iPrtParameters->SetName(name);
+ }
+
+void CIpSubConnectionProvider::MapGenericParamsFromPRTToESockL(CSubConQosGenericParamSet& generic) const
+/**
+Map generic parameters from QoS PRT to the ESock Equivalents
+
+@param params input structure that contains the QoS PRT generic parameters
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::MapGenericParamsFromPRTToESockL")));
+ /**
+ Get and Set Uplink Parameters
+ */
+ generic.SetUpLinkMaximumBurstSize(iPrtParameters->GetUpLinkMaximumBurstSize());
+ generic.SetUpLinkMaximumPacketSize(iPrtParameters->GetUpLinkMaximumPacketSize());
+ generic.SetUplinkBandwidth(iPrtParameters->GetUplinkBandwidth());
+ generic.SetUpLinkAveragePacketSize(iPrtParameters->GetUpLinkAveragePacketSize());
+ generic.SetUpLinkPriority(iPrtParameters->GetUpLinkPriority());
+ generic.SetUpLinkDelay(iPrtParameters->GetUpLinkDelay());
+ /**
+ Get and Set Downlink Parameters
+ */
+ generic.SetDownLinkMaximumBurstSize(iPrtParameters->GetDownLinkMaximumBurstSize());
+ generic.SetDownLinkMaximumPacketSize(iPrtParameters->GetDownLinkMaximumPacketSize());
+ generic.SetDownlinkBandwidth(iPrtParameters->GetDownlinkBandwidth());
+ generic.SetDownLinkAveragePacketSize(iPrtParameters->GetDownLinkAveragePacketSize());
+ generic.SetDownLinkPriority(iPrtParameters->GetDownLinkPriority());
+ generic.SetDownLinkDelay(iPrtParameters->GetDownLinkDelay());
+ /**
+ Get and Set rest of the Parameters
+ */
+ generic.SetHeaderMode(iPrtParameters->GetHeaderMode());
+ TName name = iPrtParameters->GetName();
+ generic.SetName(name);
+ }
+
+void CIpSubConnectionProvider::ConvertTQoSIntoCQoSParamsL(const TQoSParameters& aParameters)
+/**
+This function will copy the aParameters into the class CQoSParameters
+using member access functions
+@param aParameters input parameters that needs to be copied
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::ConvertTQoSIntoCQoSParamsL")));
+ /**
+ Get and Set Uplink Parameters
+ */
+ iPrtParameters->SetUplinkBandwidth(aParameters.GetUplinkBandwidth());
+ iPrtParameters->SetUpLinkMaximumBurstSize(aParameters.GetUpLinkMaximumBurstSize());
+ iPrtParameters->SetUpLinkMaximumPacketSize(aParameters.GetUpLinkMaximumPacketSize());
+ iPrtParameters->SetUpLinkAveragePacketSize(aParameters.GetUpLinkAveragePacketSize());
+ iPrtParameters->SetUpLinkDelay(aParameters.GetUpLinkDelay());
+ iPrtParameters->SetUpLinkPriority(aParameters.GetUpLinkPriority());
+ /**
+ Get and Set Downlink Parameters
+ */
+ iPrtParameters->SetDownlinkBandwidth(aParameters.GetDownlinkBandwidth());
+ iPrtParameters->SetDownLinkMaximumBurstSize(aParameters.GetDownLinkMaximumBurstSize());
+ iPrtParameters->SetDownLinkMaximumPacketSize(aParameters.GetDownLinkMaximumPacketSize());
+ iPrtParameters->SetDownLinkAveragePacketSize(aParameters.GetDownLinkAveragePacketSize());
+ iPrtParameters->SetDownLinkDelay(aParameters.GetDownLinkDelay());
+ iPrtParameters->SetDownLinkPriority(aParameters.GetDownLinkPriority());
+
+ iPrtParameters->SetAdaptMode(aParameters.AdaptMode());
+ iPrtParameters->SetHeaderMode(aParameters.GetHeaderMode());
+ const TName name = aParameters.GetName();
+ iPrtParameters->SetName(name);
+ }
+
+void CIpSubConnectionProvider::ConvertCQoSIntoTQoSParamsL(TQoSParameters& aParameters) const
+/**
+This function will copy the iParameters (CQoSParameters) into aParameters
+using member access functions
+@param aParameters output parameters that iParameters will be copied into
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::ConvertCQoSIntoTQoSParamsL")));
+ /**
+ Get and Set Uplink Parameters
+ */
+ aParameters.SetUplinkBandwidth(iPrtParameters->GetUplinkBandwidth());
+ aParameters.SetUpLinkMaximumBurstSize(iPrtParameters->GetUpLinkMaximumBurstSize());
+ aParameters.SetUpLinkMaximumPacketSize(iPrtParameters->GetUpLinkMaximumPacketSize());
+ aParameters.SetUpLinkAveragePacketSize(iPrtParameters->GetUpLinkAveragePacketSize());
+ aParameters.SetUpLinkDelay(iPrtParameters->GetUpLinkDelay());
+ aParameters.SetUpLinkPriority(iPrtParameters->GetUpLinkPriority());
+
+ /**
+ Get and Set Downlink Parameters
+ */
+ aParameters.SetDownlinkBandwidth(iPrtParameters->GetDownlinkBandwidth());
+ aParameters.SetDownLinkMaximumBurstSize(iPrtParameters->GetDownLinkMaximumBurstSize());
+ aParameters.SetDownLinkMaximumPacketSize(iPrtParameters->GetDownLinkMaximumPacketSize());
+ aParameters.SetDownLinkAveragePacketSize(iPrtParameters->GetDownLinkAveragePacketSize());
+ aParameters.SetDownLinkDelay(iPrtParameters->GetDownLinkDelay());
+ aParameters.SetDownLinkPriority(iPrtParameters->GetDownLinkPriority());
+
+ aParameters.SetAdaptMode(iPrtParameters->AdaptMode());
+ aParameters.SetHeaderMode(iPrtParameters->GetHeaderMode());
+ const TName name = iPrtParameters->GetName();
+ aParameters.SetName(name);
+ }
+
+
+void CIpSubConnectionProvider::MapExtensionParamsFromESockToPRTL(const CSubConQosIPLinkR99ParamSet& extension, TUmtsQoSParameters& params)
+/**
+Map extension parameters from QoS PRT to the ESock Equivalents
+
+@param extension input structure that contains the ESock extension parameters
+@param params structure updated to contains the equivalent QoS PRT extension parameters
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("MapExtensionParamsFromESockToPRTL")));
+
+ RPacketQoS::TTrafficClass trafficClass = extension.GetTrafficClass();
+ User::LeaveIfError(params.SetTrafficClass((TUmtsTrafficClass)trafficClass));
+
+ RPacketQoS::TDeliveryOrder deliveryOrder = extension.GetDeliveryOrder();
+ User::LeaveIfError(params.SetDeliveryOrder((TUmtsDeliveryOrder)deliveryOrder));
+
+ RPacketQoS::TErroneousSDUDelivery sduDelivery = extension.GetErroneousSDUDelivery();
+ User::LeaveIfError(params.SetDeliveryOfErroneusSdu((TUmtsErroneousSDUDelivery)sduDelivery));
+
+ RPacketQoS::TBitErrorRatio bitErrorRate = extension.GetResidualBitErrorRatio();
+ User::LeaveIfError(params.SetResidualBer((TUmtsBitErrorRatio)bitErrorRate));
+
+ RPacketQoS::TSDUErrorRatio sduErrorRatio = extension.GetSDUErrorRatio();
+ User::LeaveIfError(params.SetErrorRatio((TUmtsSDUErrorRatio)sduErrorRatio));
+
+ RPacketQoS::TTrafficHandlingPriority trafficHandlingPriority = extension.GetTrafficHandlingPriority();
+ User::LeaveIfError(params.SetPriority((TUmtsTrafficHandlingPriority)trafficHandlingPriority));
+
+ TInt transferDelay = extension.GetTransferDelay();
+ User::LeaveIfError(params.SetTransferDelay(transferDelay));
+
+ TInt maxSduSize = extension.GetMaxSduSize();
+ User::LeaveIfError(params.SetMaxSduSize(maxSduSize));
+
+ TInt maxBitRateUp = extension.GetMaxBitrateUplink();
+ User::LeaveIfError(params.SetMaxBitrateUplink(maxBitRateUp));
+
+ TInt maxBitRateDown = extension.GetMaxBitrateDownlink();
+ User::LeaveIfError(params.SetMaxBitrateDownlink(maxBitRateDown));
+
+ TInt guaBitRateUp = extension.GetGuaBitrateUplink();
+ User::LeaveIfError(params.SetGuaranteedBitrateUplink(guaBitRateUp));
+
+ TInt guaBitRateDown = extension.GetGuaBitrateDownlink();
+ User::LeaveIfError(params.SetGuaranteedBitrateDownlink(guaBitRateDown));
+
+ iParameterRelease = KParameterRel4Rel99;
+ }
+
+void CIpSubConnectionProvider::MapExtensionParamsFromESockToPRTL(const CSubConSBLPR5ExtensionParamSet& extension, CSblpParameters& params) const
+ {
+ TAuthToken authToken = extension.GetMAT();
+ params.SetMAT(authToken);
+
+ /**
+ Get Flow Identifires And store that into the RArray of Flow Ids
+ of SBLP Paramters
+ */
+ RArray<CSblpParameters::TFlowIdentifier> arrFlowIds;
+ CleanupClosePushL(arrFlowIds);
+
+ TInt nrOfFlows = extension.GetNumberOfFlowIds();
+ for ( TInt i = 0; i < nrOfFlows; i ++ )
+ {
+ const TFlowId & Fid = extension.GetFlowIdAt(i);
+ CSblpParameters::TFlowIdentifier FlowId;
+ FlowId.iMediaComponentNumber = Fid.GetMediaComponentNumber();
+ FlowId.iIPFlowNumber = Fid.GetIPFlowNumber();
+ arrFlowIds.AppendL(FlowId);
+ }
+ params.SetFlowIds(arrFlowIds);
+ CleanupStack::Pop(&arrFlowIds);
+ arrFlowIds.Close();
+ }
+
+void MapExtensionParamsFromPRTToESockL(TUmtsQoSParameters& params, CSubConQosIPLinkR99ParamSet& extension)
+/**
+Map extension parameters from ESock to the QoS PRT Equivalents
+
+@param params input structure that contains the QoS PRT extension parameters
+@param extension structure updated to contain the ESock equivalent extension parameters
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("MapExtensionParamsFromPRTToESockL")));
+
+ TUmtsTrafficClass trafficClass = params.TrafficClass();
+ extension.SetTrafficClass((RPacketQoS::TTrafficClass) trafficClass);
+
+ TUmtsDeliveryOrder deliveryOrder = params.DeliveryOrder();
+ extension.SetDeliveryOrder((RPacketQoS::TDeliveryOrder) deliveryOrder);
+
+ TUmtsErroneousSDUDelivery deliveryOfErroneusSdu = params.DeliveryOfErroneusSdu();
+ extension.SetErroneousSDUDelivery((RPacketQoS::TErroneousSDUDelivery) deliveryOfErroneusSdu);
+
+ TUmtsBitErrorRatio residualBer = params.ResidualBer();
+ extension.SetResidualBitErrorRatio((RPacketQoS::TBitErrorRatio) residualBer);
+
+ TUmtsSDUErrorRatio errorRatio = params.ErrorRatio();
+ extension.SetSDUErrorRatio((RPacketQoS::TSDUErrorRatio) errorRatio);
+
+ TUmtsTrafficHandlingPriority priority = params.Priority();
+ extension.SetTrafficHandlingPriority((RPacketQoS::TTrafficHandlingPriority) priority);
+
+ TInt transferDelay = params.TransferDelay();
+ extension.SetTransferDelay(transferDelay);
+
+ TInt maxSduSize = params.MaxSduSize();
+ extension.SetMaxSduSize(maxSduSize);
+
+ TInt maxBitrateUplink = params.MaxBitrateUplink();
+ extension.SetMaxBitrateUplink(maxBitrateUplink);
+
+ TInt maxBitrateDownlink = params.MaxBitrateDownlink();
+ extension.SetMaxBitrateDownlink(maxBitrateDownlink);
+
+ TInt guaBitrateUplink = params.GuaranteedBitrateUplink();
+ extension.SetGuaBitrateUplink(guaBitrateUplink);
+
+ TInt guaBitrateDownlink = params.GuaranteedBitrateDownlink();
+ extension.SetGuaBitrateDownlink(guaBitrateDownlink);
+ }
+
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+void CIpSubConnectionProvider::MapExtensionParamsFromESockToPRTL(const CSubConQosR5ParamSet& aExtension, TUmtsR5QoSParameters& aParams)
+/**
+Map extension parameters from QoS PRT to the ESock Equivalents
+
+@param extension input structure that contains the ESock extension parameters
+@param params structure updated to contains the equivalent QoS PRT extension parameters
+*/
+ {
+
+ __IPCPRLOG(IpCprLog::Printf(_L("MapExtensionParamsFromESockToPRTL")));
+
+ MapExtensionParamsFromESockToPRTL(static_cast<const CSubConQosIPLinkR99ParamSet&>(aExtension), static_cast<TUmtsQoSParameters&>(aParams));
+
+ TBool signallingIndicator = aExtension.GetSignallingIndicator();
+ User::LeaveIfError(aParams.SetSignallingIndicator(signallingIndicator));
+
+ RPacketQoS::TSourceStatisticsDescriptor sourceStatisticsDescriptor = aExtension.GetSourceStatisticsDescriptor();
+ User::LeaveIfError(aParams.SetSourceStatisticsDescriptor(reinterpret_cast<TUmtsSourceStatisticsDescriptor&>(sourceStatisticsDescriptor)));
+
+ iParameterRelease = KParameterRel5;
+ }
+
+void MapExtensionParamsFromPRTToESockL(TUmtsR5QoSParameters& aParams, CSubConQosR5ParamSet& aExtension)
+/**
+Map extension parameters from ESock to the QoS PRT Equivalents
+
+@param params input structure that contains the QoS PRT extension parameters
+@param extension structure updated to contain the ESock equivalent extension parameters
+*/
+ {
+
+ __IPCPRLOG(IpCprLog::Printf(_L("MapExtensionParamsFromPRTToESockL")));
+
+ MapExtensionParamsFromPRTToESockL(static_cast<TUmtsQoSParameters&>(aParams),static_cast<CSubConQosIPLinkR99ParamSet&>(aExtension));
+
+ TBool signallingprtIndicator = aParams.SignallingIndicator();
+ aExtension.SetSignallingIndicator(signallingprtIndicator);
+
+ TUmtsSourceStatisticsDescriptor sourceStatisticsprtDescriptor = aParams.SourceStatisticsDescriptor();
+ aExtension.SetSourceStatisticsDescriptor(reinterpret_cast<RPacketQoS::TSourceStatisticsDescriptor&>(sourceStatisticsprtDescriptor));
+
+ }
+
+void CIpSubConnectionProvider::MapExtensionParamsFromESockToPRTL(const CSubConImsExtParamSet& aExtension, TImsParameter& aParams)
+/**
+Map extension parameters from QoS PRT to the ESock Equivalents
+
+@param extension input structure that contains the ESock extension parameters
+@param params structure updated to contains the equivalent QoS PRT extension parameters
+*/
+ {
+
+
+ __IPCPRLOG(IpCprLog::Printf(_L("MapExtensionParamsFromESockToPRTL")));
+
+ TBool IMSSignallingIndicator = aExtension.GetImsSignallingIndicator();
+ aParams.SetIMSSigallingIndicator(IMSSignallingIndicator);
+
+ }
+
+void MapExtensionParamsFromPRTToESockL(TImsParameter& aParams, CSubConImsExtParamSet& aExtension)
+/**
+Map extension parameters from ESock to the QoS PRT Equivalents
+
+@param params input structure that contains the QoS PRT extension parameters
+@param extension structure updated to contain the ESock equivalent extension parameters
+*/
+ {
+
+ __IPCPRLOG(IpCprLog::Printf(_L("MapExtensionParamsFromPRTToESockL")));
+
+ TBool IMSSignallingIndicator = aParams.GetIMSSigallingIndicator();
+ aExtension.SetImsSignallingIndicator(IMSSignallingIndicator);
+
+ }
+
+#endif
+// SYMBIAN_NETWORKING_UMTSR5
+
+void CIpSubConnectionProvider::ResetPrtExtensions()
+ {
+ TQoSExtensionQueueIter iter(iPrtExtensions);
+ CExtensionBase *ext;
+ ext = iter++;
+ while (ext)
+ {
+ delete ext;
+ ext = iter++;
+ }
+ iPrtExtensions.Reset();
+ }
+
+void CIpSubConnectionProvider::ConvertParametersFromESockL(CSubConParameterBundle& aParameterBundle)
+/**
+Covert QoS Parameters sent from ESock to QoS PRT values and cache the values
+
+@param aParameterBundle the bundle that contains all of ESock's QoS Variables
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::ConvertParametersFromESockL [%08x]"), this));
+
+ ResetPrtExtensions();
+
+ CSubConParameterFamily* family = aParameterBundle.FindFamily(KSubConQoSFamily);
+ if(family)
+ {
+ CUmtsQoSPolicy* policy = CUmtsQoSPolicy::NewL();
+ CleanupStack::PushL(policy);
+ TBool policySet = EFalse;
+
+ // Map Requested Generic Parameters from ESock to PRT Values
+ CSubConQosGenericParamSet* generic = (CSubConQosGenericParamSet*)family->GetGenericSet(CSubConParameterFamily::ERequested);
+ if(generic)
+ {
+ TRAPD(err, MapGenericParamsFromESockToPRTL(*generic));
+ if( err != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Failed to convert from ESock to PRT Generic Parameters (Requested) with Error: %d"),err));
+ }
+ }
+
+ // Map Requested UMTS Parameters from ESock to PRT values
+ CSubConQosIPLinkR99ParamSet* extension = (CSubConQosIPLinkR99ParamSet*)family->FindExtensionSet(
+ STypeId::CreateSTypeId(KSubConIPParamsUid,KSubConQosIPLinkR99ParamsType), CSubConParameterFamily::ERequested);
+ if(extension)
+ {
+ TUmtsQoSParameters params;
+
+ TRAPD(err, MapExtensionParamsFromESockToPRTL(*extension, params));
+ if( err != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Failed to convert from ESock to PRT Extension Parameters (Requested) with Error: %d"),err));
+ }
+
+ policy->SetQoSRequested(params);
+ policySet = ETrue;
+ }
+
+ // Map Minimum UMTS Parameters from ESock to PRT values
+ extension = (CSubConQosIPLinkR99ParamSet*)family->FindExtensionSet(
+ STypeId::CreateSTypeId(KSubConIPParamsUid,KSubConQosIPLinkR99ParamsType), CSubConParameterFamily::EAcceptable);
+ if(extension)
+ {
+ TUmtsQoSParameters params;
+ TRAPD(err, MapExtensionParamsFromESockToPRTL(*extension,params));
+ if( err != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Failed to convert from ESock to PRT Extension Parameters (Minimum) with Error: %d"),err));
+ }
+
+ policy->SetQoSMinimum(params);
+ policySet = ETrue;
+ }
+
+ if(policySet)
+ {
+ iPrtExtensions.AddFirst(*policy);
+ CleanupStack::Pop();
+ }
+ else
+ {
+ CleanupStack::PopAndDestroy(policy);
+ }
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+
+ CUmtsR5QoSPolicy* policyR5 = CUmtsR5QoSPolicy::NewL();
+ CleanupStack::PushL(policyR5);
+ TBool policySetR5 = EFalse;
+ // Map Requested UMTS Parameters from ESock to PRT values
+ CSubConQosR5ParamSet* extensionR5 = static_cast<CSubConQosR5ParamSet*>(family->FindExtensionSet(STypeId::CreateSTypeId(KSubConIPParamsUid,KSubConQosR5ParamsType), CSubConParameterFamily::ERequested));
+ if(extensionR5)
+ {
+ TUmtsR5QoSParameters paramsR5;
+ TRAPD(err, MapExtensionParamsFromESockToPRTL(*extensionR5, paramsR5));
+ if( err != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Failed to convert from ESock to PRT Extension Parameters (Requested) with Error: %d"),err));
+ }
+
+ policyR5->SetQoSRequested(paramsR5);
+ policySetR5 = ETrue;
+ }
+ // Map Minimum UMTS Parameters from ESock to PRT values
+ extensionR5 = static_cast<CSubConQosR5ParamSet*>(family->FindExtensionSet(STypeId::CreateSTypeId(KSubConIPParamsUid,KSubConQosR5ParamsType), CSubConParameterFamily::EAcceptable));
+ if(extensionR5)
+ {
+ TUmtsR5QoSParameters paramsR5;
+ TRAPD(err, MapExtensionParamsFromESockToPRTL(*extensionR5,paramsR5));
+ if( err != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Failed to convert from ESock to PRT Extension Parameters (Minimum) with Error: %d"),err));
+ }
+
+ policyR5->SetQoSMinimum(paramsR5);
+ policySetR5 = ETrue;
+ }
+
+ if(policySetR5)
+ {
+ iPrtExtensions.AddFirst(*policyR5);
+ CleanupStack::Pop();
+ }
+ else
+ {
+ CleanupStack::PopAndDestroy(policyR5);
+ }
+
+
+ CImsPolicy* policyIms = CImsPolicy ::NewL();
+ CleanupStack::PushL(policyIms);
+ TBool policySetIms = EFalse;
+ // Map Requested UMTS IMS Parameters from ESock to PRT values
+ CSubConImsExtParamSet* extensionIms = static_cast<CSubConImsExtParamSet*>(family->FindExtensionSet(STypeId::CreateSTypeId(KSubConIPParamsUid,KSubConImsExtParamsType), CSubConParameterFamily::ERequested));
+ if(extensionIms)
+ {
+ TImsParameter paramsIms;
+
+ TRAPD(err, MapExtensionParamsFromESockToPRTL(*extensionIms, paramsIms));
+ if( err != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Failed to convert from ESock to PRT Extension Parameters (Requested) with Error: %d"),err));
+ }
+
+ policyIms->SetImsParameter(paramsIms);
+ policySetIms = ETrue;
+ }
+
+ if(policySetIms)
+ {
+ iPrtExtensions.AddFirst(*policyIms);
+ CleanupStack::Pop();
+ }
+ else
+ {
+ CleanupStack::PopAndDestroy(policyIms);
+ }
+
+#endif
+// SYMBIAN_NETWORKING_UMTSR5
+
+ }
+
+ // Convert SBLP set if present
+ // Check for the presence of the family in the bundle
+ CSubConParameterFamily* sblpFamily = aParameterBundle.FindFamily(KSubConAuthorisationFamily);
+ if (sblpFamily)
+ {
+ CSblpPolicy* policy = CSblpPolicy::NewL();
+ CleanupStack::PushL(policy);
+ TBool policySet = EFalse;
+
+ /**
+ Extract the generic and extension Parmaters of the Family. At present the generic
+ parameters will just contains a dummy , and will not be used. The code is commented
+ and can be enabled sometimes when any parameter varification at the code is required
+ */
+ // CSubConAuthorisationGenericParamSet* generic = (CSubConAuthorisationGenericParamSet*)SblpFamily->GetGenericSet(CSubConParameterFamily::ERequested);
+ /**
+ There can be more than one extension set containing multiple MATs, as a requirement for the R6.
+ currently the APIs in CSubConParameterFamily is not able to extract multiple parameters. once this
+ is done, the code below must be changed to run on a loop on number of extensions
+ */
+
+ // Map Requested UMTS Parameters from ESock to PRT values
+ CSubConSBLPR5ExtensionParamSet* extension = (CSubConSBLPR5ExtensionParamSet*)sblpFamily->FindExtensionSet(
+ STypeId::CreateSTypeId(KSubConIPParamsUid,KSubConnSBLPR5ExtensionParamsType), CSubConParameterFamily::ERequested);
+ if(extension)
+ {
+ CSblpParameters* params = new (ELeave)CSblpParameters;
+ CleanupStack::PushL(params);
+ TRAPD(err, MapExtensionParamsFromESockToPRTL(*extension,*params));
+ if( err != KErrNone )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("Failed to convert from ESock to PRT Extension Parameters (Requested) with Error: %d"),err));
+ }
+
+ policy->SetSblpParameters(*params); //does a bitwise copy therefore we must still delete params afterwards
+ policySet = ETrue;
+ CleanupStack::Pop(params);
+ delete params;
+ }
+
+ if( policySet )
+ {
+ iPrtExtensions.AddFirst(*policy);
+ CleanupStack::Pop();
+ }
+ else
+ {
+ CleanupStack::PopAndDestroy(policy);
+ }
+ }
+ }
+
+
+void CIpSubConnectionProvider::ConvertParametersFromQOSL(TPfqosMessage& aMsg, CSubConGenEventParamsGranted* aEvent)
+/**
+Convert parameters from a PRT response to ESock equivalents. PRT parameters are cached
+
+@param aMsg QoS PRT Response Message
+@param aEvent ESock event to contain changed QoS Parameters
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CIpSubConnectionProvider::ConvertParametersFromQOSL [%08x]"), this));
+
+ /** Changed as per usase of CQosParamaters instead of
+ TQoSParameter
+ */
+
+ TQoSParameters qosParams;
+ aMsg.SetQoSParameters(qosParams);
+
+ // Copy qosParams into the iPrtParameters
+ ConvertTQoSIntoCQoSParamsL(qosParams);
+ aEvent->SetFamily(KSubConQoSFamily);
+
+ CSubConQosGenericParamSet* generic = CSubConQosGenericParamSet::NewL();
+ MapGenericParamsFromPRTToESockL(*generic);
+ aEvent->SetGenericSet(generic);
+
+
+
+ TSglQueIter<CPfqosPolicyData> iter(aMsg.iExtensions);
+ CPfqosPolicyData* data = NULL;
+
+ // for each pfqos extension that exists in aMsg
+ while ((data = iter++) != NULL)
+ {
+ const TUint8 *p = data->Data().Ptr();
+ TInt length = data->Data().Length();
+ const struct pfqos_configure* pfqosExtConfig = reinterpret_cast<const struct pfqos_configure*>(p);
+
+ if (length > (TInt)sizeof(pfqos_configure) &&
+ pfqosExtConfig->pfqos_configure_len * 8 == length &&
+ pfqosExtConfig->pfqos_ext_type == EPfqosExtExtension)
+ {
+
+ // pfqos_extension struct is located straight after pfqos_configure struct
+ p += sizeof(struct pfqos_configure);
+ const struct pfqos_extension* pfqosExtension = reinterpret_cast<const struct pfqos_extension*>(p);
+ TInt extType = pfqosExtension->pfqos_extension_type;
+
+ CExtensionBase* scPfqosExtension = NULL;
+ TQoSExtensionQueueIter iter2(iPrtExtensions);
+
+ // for each pfqos extension that has been configured in this subconnection
+ while ((scPfqosExtension = iter2++) != NULL)
+ {
+ if (scPfqosExtension->Type() == extType)
+ {
+ // the extension in the message matches an extension that is configured on the
+ // subconnection, now we can parse it
+ scPfqosExtension->ParseMessage(data->Data());
+
+ CSubConExtensionParameterSet* extension = NULL;
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ switch (extType)
+ {
+ case KPfqosExtensionUmts:
+#endif
+ {
+ CUmtsQoSPolicy *policy = static_cast<CUmtsQoSPolicy*>(scPfqosExtension);
+ TNegotiatedUmtsQoSParameters grantedQoS;
+ policy->GetQoSNegotiated(grantedQoS);
+ extension = CSubConQosIPLinkR99ParamSet::NewL();
+ CleanupStack::PushL(extension);
+ MapExtensionParamsFromPRTToESockL(grantedQoS,*static_cast<CSubConQosIPLinkR99ParamSet*>(extension));
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ break;
+ }
+ case KPfqosR5ExtensionUmts:
+ extension = MapFromUmtsR5ExtensionL(static_cast<CUmtsR5QoSPolicy*>(scPfqosExtension));
+ CleanupStack::PushL(extension);
+ break;
+
+ case KPfqosExtensionIMS:
+ extension = MapFromImsExtensionL(static_cast<CImsPolicy*>(scPfqosExtension));
+ CleanupStack::PushL(extension);
+ break;
+#endif
+ }
+
+ if (extension)
+ {
+ // Need to add it to the cleanup stack so we don't lose the ptr
+ // in the event that AddExtensionSetL leaves
+ aEvent->AddExtensionSetL(extension);
+ CleanupStack::Pop(extension);
+ }
+
+ // Next extension from aMsg
+ break;
+ }
+ }
+ }
+ }
+ }
+
+
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+CSubConExtensionParameterSet* CIpSubConnectionProvider::MapFromUmtsR5ExtensionL (const CUmtsR5QoSPolicy* aPolicy)
+ {
+ ASSERT(aPolicy);
+
+ TNegotiatedUmtsR5QoSParameters grantedR5QoS;
+ aPolicy->GetQoSNegotiated(grantedR5QoS);
+
+ CSubConExtensionParameterSet* paramSet;
+
+ switch (iParameterRelease)
+ {
+ case KParameterRel5:
+ paramSet = CSubConQosR5ParamSet::NewL();
+ CleanupStack::PushL(paramSet);
+ MapExtensionParamsFromPRTToESockL(static_cast<TUmtsR5QoSParameters&>(grantedR5QoS),
+ *static_cast<CSubConQosR5ParamSet*>(paramSet));
+ CleanupStack::Pop(paramSet);
+ break;
+
+ case KParameterRel4Rel99:
+ paramSet = CSubConQosR99ParamSet::NewL();
+ CleanupStack::PushL(paramSet);
+ MapExtensionParamsFromPRTToESockL(static_cast<TUmtsQoSParameters&>(grantedR5QoS),
+ *static_cast<CSubConQosR99ParamSet*>(paramSet));
+ CleanupStack::Pop(paramSet);
+ break;
+
+ default:
+ // Break in debug builds
+ ASSERT(EFalse);
+ return NULL;
+ }
+
+ return paramSet;
+ }
+
+
+CSubConExtensionParameterSet* CIpSubConnectionProvider::MapFromImsExtensionL (const CImsPolicy* aPolicy)
+ {
+ ASSERT(aPolicy);
+
+ TImsParameter grantedImsQoS;
+ aPolicy->GetImsParameter(grantedImsQoS);
+
+ CSubConImsExtParamSet* extensionIms = CSubConImsExtParamSet::NewL();
+ CleanupStack::PushL(extensionIms);
+ MapExtensionParamsFromPRTToESockL(grantedImsQoS, *extensionIms);
+ CleanupStack::Pop(extensionIms);
+
+ return extensionIms;
+ }
+#endif
+// SYMBIAN_NETWORKING_UMTSR5
+
+#endif
+// BASIC_IPSCPR
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/src/ipscprlog.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,73 @@
+// 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:
+// Implementation file for the IP CPR Logger
+//
+//
+
+/**
+ @file ipcprlog.cpp
+*/
+
+#ifdef _DEBUG
+
+#include <e32std.h>
+#include "ipscprlog.h"
+#include "comms-infras/commsdebugutility.h"
+
+/**
+Comms Debug Utility Folder Name
+@internalComponent
+*/
+_LIT(KQFrameLogFolder, "SubConn");
+
+/**
+Comms Debug Utilitiy File Name
+@internalComponent
+*/
+_LIT(KQFrameLogFile, "ipscpr");
+
+void IpCprLog::Printf(TRefByValue<const TDesC> aFmt,...)
+/**
+Write arguments in supplied format to log file
+*/
+ {
+#if defined __FLOG_ACTIVE
+ VA_LIST list;
+ VA_START(list,aFmt);
+ RFileLogger::WriteFormat(KQFrameLogFolder(), KQFrameLogFile(), EFileLoggingModeAppend, aFmt, list);
+#else // stop variable not used message
+ (void)aFmt;
+ (void)KQFrameLogFolder();
+ (void)KQFrameLogFile();
+#endif
+ }
+
+void IpCprLog::Printf(TRefByValue<const TDesC8> aFmt,...)
+/**
+Write arguments in supplied format to log file
+*/
+ {
+#if defined __FLOG_ACTIVE
+ VA_LIST list;
+ VA_START(list,aFmt);
+ RFileLogger::WriteFormat(KQFrameLogFolder(), KQFrameLogFile(), EFileLoggingModeAppend, aFmt, list);
+#else
+ (void)aFmt;
+ (void)KQFrameLogFolder();
+ (void)KQFrameLogFile();
+#endif
+ }
+
+#endif // _DEBUG
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/src/ipscprlog.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,62 @@
+/**
+* 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:
+* Header file for the IP CPR Logger
+*
+*
+*/
+
+
+
+/**
+ @file ipcprlog.h
+*/
+
+#ifndef __IPCPRLOG_H__
+#define __IPCPRLOG_H__
+
+#include <e32std.h>
+
+#ifdef _DEBUG
+
+/**
+@internalComponent
+*/
+#define __IPCPRLOG(x) x
+
+
+class IpCprLog
+/**
+Provides a wrapper around use of Comms Debug Utility for the the
+IP Connection Provider. Calls are usuallly enclosed with the use
+of the LOG macro. This will thus remove calls to logging in
+release builds.
+
+@internalComponent
+
+@released Since v9.0
+*/
+ {
+public:
+ static void Printf(TRefByValue<const TDesC8> aFmt, ...);
+ static void Printf(TRefByValue<const TDesC> aFmt, ...);
+ };
+
+#else
+
+#define __IPCPRLOG(x)
+
+#endif
+
+#endif // __IPCPRLOG_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/src/qos_msg.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,393 @@
+// 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:
+// Implementation file for the QoS Mapping Messages
+//
+//
+
+/**
+ @file qos_msg.cpp
+*/
+
+#include "pfqos_stream.h"
+#include "pfqoslib.h"
+#include "ipscpr.h"
+#include "qos_msg.h"
+#include "ipscprlog.h"
+
+
+const TIp6Addr KInet6AddrMask = {{{0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}}};
+
+const TInt KQoSDefaultBufSize = 8000;
+
+
+CQoSMsg* CQoSMsg::NewL( TPfqosMessages aMsgType )
+/**
+Create a new QoS PRT Message
+
+@param aMsgType Message Type
+*/
+ {
+ CQoSMsg* msg = new (ELeave) CQoSMsg();
+
+ CleanupStack::PushL( msg );
+ msg->ConstructL( aMsgType );
+ CleanupStack::Pop();
+
+ return msg;
+ }
+
+
+CQoSMsg::~CQoSMsg()
+/**
+Destructor
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsg::Destroy [%08x] Type=%d"), this, iType));
+
+ delete iMsg;
+ iMsg = NULL;
+ }
+
+
+CQoSMsg::CQoSMsg()
+/**
+Constructor
+*/
+ {
+ }
+
+
+void CQoSMsg::ConstructL( TPfqosMessages aMsgType )
+/**
+QoS PRT Message second phase construction
+
+@param aMsgType Message Type
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsg::Construct [%08x] Type=%d"), this, aMsgType));
+
+ iMsg = CPfqosStream::NewL(KQoSDefaultBufSize);
+ iMsg->Init((TUint8)aMsgType);
+ iType = aMsgType;
+ }
+
+
+void CQoSMsg::AddSrcAddr(const TInetAddr &aAddr)
+/**
+Adds Source Address Information to the QoS PRT Message
+
+@param aAddr Source Address
+*/
+ {
+ TInetAddr srcInetAddr(aAddr);
+ srcInetAddr.SetFamily(KAFUnspec);
+ srcInetAddr.SetAddress(KInet6AddrNone);
+
+ TInetAddr mask;
+ mask.SetAddress(KInet6AddrMask);
+ iMsg->AddSrcAddress(srcInetAddr, mask, (TUint16)srcInetAddr.Port());
+ }
+
+
+void CQoSMsg::AddDstAddr(const TInetAddr &aAddr)
+/**
+Adds Destination Address Information to the QoS PRT Message
+
+@param aAddr Destination Address
+*/
+ {
+ TInetAddr dstInetAddr(aAddr);
+ if (dstInetAddr.Family() == KAfInet)
+ {
+ dstInetAddr.ConvertToV4Mapped();
+ }
+
+ TInetAddr mask;
+ mask.SetAddress(KInet6AddrMask);
+ iMsg->AddDstAddress(dstInetAddr, mask, (TUint16)dstInetAddr.Port());
+ }
+
+
+void CQoSMsg::AddExtensionPolicy(TQoSExtensionQueue& aExtensions)
+/**
+Add QoS Extension Parameters to the QoS Message
+
+@param aExtensions Collection of Extensions Parameters
+*/
+ {
+ TQoSExtensionQueueIter iter(aExtensions);
+ CExtensionBase* extension;
+ while ((extension=iter++) != NULL)
+ {
+ TDesC8& extData = extension->Data();
+ iMsg->AddExtensionPolicy(extData);
+ }
+ }
+
+
+void CQoSMsg::Send(RInternalSocket &aSocket, TRequestStatus& aStatus)
+/**
+Sends the current message to the QoS PRT
+
+@param aSocket Internal Socket over which to send a message
+@param aStatus Request Status
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsg::Send [%08x] Type=%d"), this, iType));
+
+ iMsg->Send(aSocket, aStatus);
+ }
+
+
+// ###########################################################
+
+
+CQoSMsgWriter* CQoSMsgWriter::NewL(CIpSubConnectionProvider* aOwner, RInternalSocket& aSocket)
+/**
+Create QoS PRT Message Writer
+
+@param aOwner The IP SubConnection Provider that creates this object
+@param aSocket reference to an Internal Socket owned by the IP SubConnection Provider
+*/
+ {
+ return new (ELeave) CQoSMsgWriter(aOwner, aSocket);
+ }
+
+
+CQoSMsgWriter::CQoSMsgWriter(CIpSubConnectionProvider* aOwner, RInternalSocket& aSocket)
+/**
+Constructor
+
+@param aOwner The IP SubConnection Provider that creates this object
+@param aSocket reference to an Internal Socket owned by the IP SubConnection Provider
+*/
+ : CActive(EPriorityStandard)
+ , iOwner(aOwner)
+ , iSocket(aSocket)
+ , iClosing(EFalse)
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgWriter::Construct [%08x]"), this));
+
+ CActiveScheduler::Add(this);
+ iPendingMsg.SetOffset(_FOFF(CQoSMsg, iLink));
+ }
+
+
+CQoSMsgWriter::~CQoSMsgWriter()
+/**
+Destructor
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgWriter::Destroy [%08x]"), this));
+
+ if (IsActive())
+ {
+ Cancel();
+ }
+
+ iClosing = ETrue;
+
+ if (iCurrentMsg)
+ {
+ delete iCurrentMsg;
+ iCurrentMsg = NULL;
+ }
+
+ while (!iPendingMsg.IsEmpty())
+ {
+ CQoSMsg* msg = iPendingMsg.First();
+ iPendingMsg.Remove(*msg);
+ delete msg;
+ }
+
+ iPendingMsg.Reset();
+ }
+
+
+void CQoSMsgWriter::Send(CQoSMsg* aMsg)
+/**
+Sends a Message to the QoS PRT
+
+@param aMsg The message to send
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgWriter::Send [%08x]"), this));
+
+ // Can only process one message at a time.
+ if (IsActive())
+ {
+ iPendingMsg.AddLast(*aMsg);
+ }
+ else
+ {
+ iCurrentMsg = aMsg;
+ iCurrentMsg->Send(iSocket, iStatus);
+ SetActive();
+ }
+ }
+
+
+void CQoSMsgWriter::RunL()
+/**
+Active Object main processing function
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgWriter::RunL [%08x] - Enter"), this));
+
+ TInt err = iStatus.Int();
+ if (err != KErrNone && iOwner)
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgWriter::RunL [%08x] - Process Error"), this));
+#ifdef _DEBUG
+ TInt msgType = EPfqosReserved;
+ if( iCurrentMsg )
+ {
+ msgType = iCurrentMsg->iType;
+ }
+ iOwner->ProcessPRTError(msgType, err);
+#endif
+ }
+
+ delete iCurrentMsg;
+ iCurrentMsg = NULL;
+
+ if (!iClosing && !iPendingMsg.IsEmpty())
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgWriter::RunL [%08x] - Send next message"), this));
+ CQoSMsg* msg = iPendingMsg.First();
+ iPendingMsg.Remove(*msg);
+ iCurrentMsg = msg;
+ iCurrentMsg->Send(iSocket, iStatus);
+ SetActive();
+ }
+
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgWriter::RunL [%08x] - Exit"), this));
+ }
+
+
+// ###########################################################
+
+
+CQoSMsgReader* CQoSMsgReader::NewL( CIpSubConnectionProvider *aOwner, RInternalSocket& aSocket)
+/**
+Create QoS PRT Message Reader
+
+@param aOwner The IP SubConnection Provider that creates this object
+@param aSocket reference to an Internal Socket owned by the IP SubConnection Provider
+*/
+ {
+ CQoSMsgReader* reader = new (ELeave) CQoSMsgReader(aOwner, aSocket);
+
+ CleanupStack::PushL( reader );
+ reader->ConstructL();
+ CleanupStack::Pop();
+
+ return reader;
+ }
+
+
+CQoSMsgReader::CQoSMsgReader(CIpSubConnectionProvider *aOwner, RInternalSocket& aSocket)
+/**
+Constructor
+
+@param aOwner The IP SubConnection Provider that creates this object
+@param aSocket reference to an Internal Socket owned by the IP SubConnection Provider
+*/
+ : CActive(EPriorityStandard)
+ , iOwner(aOwner)
+ , iSocket(aSocket)
+ , iRecvPtr(0,0)
+ , iClosing(EFalse)
+ {
+ CActiveScheduler::Add(this);
+ }
+
+
+CQoSMsgReader::~CQoSMsgReader()
+/**
+Destructor
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgReader::Destruct [%08x]"), this));
+
+ if (IsActive())
+ {
+ Cancel();
+ }
+
+ iClosing = ETrue;
+
+ if (iRecvBuf)
+ {
+ delete iRecvBuf;
+ iRecvBuf = NULL;
+ }
+ }
+
+
+void CQoSMsgReader::ConstructL()
+/**
+QoS PRT Message Reader second phase construction
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgReader::Construct [%08x]"), this));
+
+ iRecvBuf = HBufC8::NewL(KQoSDefaultBufSize);
+ TPtr8 tmp(iRecvBuf->Des());
+ iRecvPtr.Set(tmp);
+
+ iRecvPtr.Zero();
+ iRecvPtr.SetLength(KQoSDefaultBufSize);
+ iSocket.Recv(iRecvPtr, 0, iStatus);
+ SetActive();
+ }
+
+
+void CQoSMsgReader::RunL()
+/**
+Active Object main processing function
+*/
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgReader::RunL [%08x] - Enter"), this));
+
+ if (iStatus.Int() == KErrNone && iRecvPtr.Length() > 0 )
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgReader::RunL [%08x] - Process Response"), this));
+ TPfqosMessage msg(iRecvPtr);
+ if (msg.iError == KErrNone)
+ {
+ iOwner->ProcessPRTMsg(msg);
+ }
+#ifdef _DEBUG
+ else
+ {
+ TInt msgType = EPfqosReserved;
+ iOwner->ProcessPRTError(msgType, msg.iError);
+ }
+#endif
+ }
+
+ if (!iClosing)
+ {
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgReader::RunL [%08x] - Wait for next message"), this));
+ iRecvPtr.Zero();
+ iRecvPtr.SetLength(KQoSDefaultBufSize);
+ iSocket.Recv(iRecvPtr, 0, iStatus);
+ SetActive();
+ }
+
+ __IPCPRLOG(IpCprLog::Printf(_L("CQoSMsgReader::RunL [%08x] - Exit"), this));
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/src/qos_msg.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,168 @@
+/**
+* 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:
+* Header file for the QoS Mapping Messages
+*
+*
+*/
+
+
+
+/**
+ @file qos_msg.h
+*/
+
+#ifndef __QOS_MSG_H__
+#define __QOS_MSG_H__
+
+#include <e32base.h>
+#include <e32std.h>
+#include <comms-infras/eintsock.h>
+
+class CPfqosStream;
+
+
+NONSHARABLE_CLASS(CQoSMsg) : public CBase
+/**
+Encapsulation of a QoS PRT Message that can be stored in a
+link list of messages.
+
+@internalComponent
+
+@released Since v9.0
+*/
+ {
+public:
+ // Construction
+ static CQoSMsg* NewL( TPfqosMessages aMsgType );
+ ~CQoSMsg();
+
+ // Message Content
+ inline void AddConnInfo(TUint32 aProtocol, const TUidType& aUid, TUint32 aIapId );
+ void AddSrcAddr(const TInetAddr &aAddr);
+ void AddDstAddr(const TInetAddr &aAddr);
+ inline void AddChannel(TInt aChannelId);
+ inline void AddQoSParameters(const TQoSParameters& aParameters);
+ void AddExtensionPolicy(TQoSExtensionQueue& aExtensions);
+
+ // Send Message to PRT
+ void Send(RInternalSocket &aSocket, TRequestStatus& aStatus);
+
+protected:
+ // Construction
+ CQoSMsg();
+ void ConstructL( TPfqosMessages aMsgType );
+
+public:
+ /** QoS PRT formatted Message */
+ CPfqosStream* iMsg;
+
+ /** Message Type */
+ TPfqosMessages iType;
+
+ /** Link to next item */
+ TSglQueLink iLink;
+ };
+
+
+class CIpSubConnectionProvider;
+
+
+NONSHARABLE_CLASS(CQoSMsgWriter) : public CActive
+/**
+Active Object that sends messages from IP Connection Provider to the QoS PRT
+
+@internalComponent
+
+@released Since v9.0
+*/
+ {
+public:
+ // Construction
+ static CQoSMsgWriter* NewL(CIpSubConnectionProvider* aOwner, RInternalSocket& aSocket);
+ ~CQoSMsgWriter();
+
+ // Send Message over Internal Socket
+ void Send(CQoSMsg* aMsg);
+
+protected:
+ // Construction
+ CQoSMsgWriter(CIpSubConnectionProvider* aOwner, RInternalSocket& aSocket);
+
+ // Active Object Implementation
+ void RunL();
+ inline void DoCancel();
+
+private:
+ /** Message Owner */
+ CIpSubConnectionProvider* iOwner;
+
+ /** Reference to an Internal Socket */
+ RInternalSocket& iSocket;
+
+ /** Current Message */
+ CQoSMsg* iCurrentMsg;
+
+ /** List of Pending Messages */
+ TSglQue<CQoSMsg> iPendingMsg;
+
+ /** Flag Set when Active Object is shuttin down */
+ TBool iClosing;
+ };
+
+
+NONSHARABLE_CLASS(CQoSMsgReader) : public CActive
+/**
+Active Object that receives messages from the QoS PRT and forwards them to the
+IP Connection Provider
+
+@internalComponent
+
+@released Since v9.0
+*/
+ {
+public:
+ // Construction
+ static CQoSMsgReader* NewL(CIpSubConnectionProvider *aOwner, RInternalSocket& aSocket);
+ ~CQoSMsgReader();
+
+protected:
+ // Construction
+ CQoSMsgReader(CIpSubConnectionProvider* aOwner, RInternalSocket& aSocket);
+ void ConstructL();
+
+ // Active Object Implmentation
+ void RunL();
+ inline void DoCancel();
+
+private:
+ /** Message Owner */
+ CIpSubConnectionProvider* iOwner;
+
+ /** Reference of Internal Socket */
+ RInternalSocket& iSocket;
+
+ /** Pointer to Buffer to receive data from QoS PRT */
+ TPtr8 iRecvPtr;
+
+ /** Buffer to receive data from QoS PRT */
+ HBufC8* iRecvBuf;
+
+ /** Flag Set when Active Object is shuttin down */
+ TBool iClosing;
+ };
+
+#include "qos_msg.inl"
+
+#endif // __QOS_MSG_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipscpr/src/qos_msg.inl Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,86 @@
+/**
+* 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:
+* Inline functions file for the QoS Mapping Messages
+*
+*
+*/
+
+
+
+/**
+ @file qos_msg.inl
+*/
+
+#ifndef __QOS_MSG_INL__
+#define __QOS_MSG_INL__
+
+inline void CQoSMsg::AddConnInfo(TUint32 aProtocol, const TUidType& aUid, TUint32 aIapId )
+/**
+Add Connection Information to the QoS PRT Message
+
+@param aProtocol Protocol Id
+@param aUid Process UID Type
+@param aIapId Internet Access Point Id
+*/
+ {
+ iMsg->AddSelector((TUint8)aProtocol, aUid, EPfqosFlowspecPolicy, aIapId, EPfqosApplicationPriority, TPtr(0,0));
+ }
+
+
+inline void CQoSMsg::AddChannel(TInt aChannelId)
+ {
+/**
+Adds QoS Channel Id to the QoS PRT Message
+
+@param aChannelId QoS Channel Id
+*/
+ iMsg->AddChannel(aChannelId);
+ }
+
+inline void CQoSMsg::AddQoSParameters(const TQoSParameters& aParameters)
+/**
+Adds Standard QoS Parameters to the QoS PRT Message
+
+@param aParameters QoS Parameters
+*/
+ {
+ iMsg->AddQoSParameters(aParameters);
+ }
+
+
+// ###########################################################
+
+
+inline void CQoSMsgWriter::DoCancel()
+/**
+Cancel Writing to internal socket
+*/
+ {
+ iSocket.CancelWrite();
+ }
+
+
+// ###########################################################
+
+
+inline void CQoSMsgReader::DoCancel()
+/**
+Cancel Reading from internal socket
+*/
+ {
+ iSocket.CancelRecv();
+ }
+
+#endif // __QOS_MSG_INL__
--- a/networkcontrol/iptransportlayer/inc/ipcpr_states.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/iptransportlayer/inc/ipcpr_states.h Tue Aug 31 16:45:15 2010 +0300
@@ -108,6 +108,9 @@
virtual void DoL();
DECLARE_SMELEMENT_FOOTER( TProcessSubConnDataTransferred)
+
+
+
DECLARE_SMELEMENT_HEADER( TSendInitialSubConnectionOpenedEvent, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, TContext)
virtual void DoL();
DECLARE_SMELEMENT_FOOTER( TSendInitialSubConnectionOpenedEvent)
@@ -176,10 +179,6 @@
TSendParamsToSelf
)
#endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
-
-DECLARE_SMELEMENT_HEADER( TAwaitingSpecialGoneDown, MeshMachine::TState<TContext>, NetStateMachine::MState, TContext)
- virtual TBool Accept();
-DECLARE_SMELEMENT_FOOTER( TAwaitingSpecialGoneDown)
} // IpCprStates
--- a/networkcontrol/iptransportlayer/src/ipcpr_activities.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/ipcpr_activities.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -48,8 +48,6 @@
using namespace IpCprStates;
using namespace MeshMachine;
-
-
namespace IpCprActivities
{
@@ -158,20 +156,6 @@
NODEACTIVITY_END()
#endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
-namespace IPCPRGoneDownActivity
- {
-DECLARE_DEFINE_CUSTOM_NODEACTIVITY(ECFActivityGoneDown, IPCPRSpecialContentionManagementGoneDown, TCFControlClient::TGoneDown, PRActivities::CGoneDownActivity::New)
- // Our Service Provider has gone down unexpectedly (we haven't issued a TStop)
- FIRST_NODEACTIVITY_ENTRY(IpCprStates::TAwaitingSpecialGoneDown, MeshMachine::TNoTag)
- THROUGH_NODEACTIVITY_ENTRY(KNoTag, CoreNetStates::TCancelAndCloseZone0ClientExtIfaces, MeshMachine::TNoTag)
- NODEACTIVITY_ENTRY(KNoTag, PRActivities::CGoneDownActivity::TSendErrorRecoveryReq, MeshMachine::TAwaitingErrorRecoveryResponseOrError, CoreStates::TRetryOrIgnoreOrPropagate)
- THROUGH_NODEACTIVITY_ENTRY(CoreStates::KRetry, MeshMachine::TDoNothing, PRActivities::CGoneDownActivity::TIgnoreOrPropagate)
- LAST_NODEACTIVITY_ENTRY(CoreStates::KIgnore, MeshMachine::TDoNothing)
- NODEACTIVITY_ENTRY(CoreStates::KPropagate, CoreNetStates::TCancelStartAndStopSelf, CoreNetStates::TAwaitingDataClientStopped, MeshMachine::TNoTag)
- LAST_NODEACTIVITY_ENTRY(KNoTag, PRStates::TSendGoneDown)
-NODEACTIVITY_END()
- }
-
DEFINE_ACTIVITY_MAP(ipCprActivities)
ACTIVITY_MAP_ENTRY(IpCprActivities, IpCprStart)
ACTIVITY_MAP_ENTRY(IpCprActivities, IpCprStop)
@@ -183,8 +167,6 @@
ACTIVITY_MAP_ENTRY(IpCprActivities, IPCprEventNotification)
#endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
- ACTIVITY_MAP_ENTRY(IpCprActivities::IPCPRGoneDownActivity, IPCPRSpecialContentionManagementGoneDown)
-
#ifdef SYMBIAN_NETWORKING_UPS
ACTIVITY_MAP_ENTRY(IpCprActivities, IpCprControlClientJoin)
ACTIVITY_MAP_ENTRY(IpCprActivities, IpCprPolicyCheckRequest)
--- a/networkcontrol/iptransportlayer/src/ipcpr_states.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/ipcpr_states.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -25,7 +25,6 @@
#include "IPCpr.h"
#include "ipcpr_states.h"
#include "IPMessages.h"
-#include <gsmerror.h>
#include <comms-infras/ss_nodemessages.h>
#include <comms-infras/ss_nodemessages_internal_esock.h>
#include <comms-infras/ss_datamonitoringprovider.h>
@@ -190,26 +189,6 @@
#endif //SYMBIAN_NETWORKING_UPS
-
-DEFINE_SMELEMENT( TAwaitingSpecialGoneDown, NetStateMachine::MState, IpCprStates::TContext)
-TBool IpCprStates::TAwaitingSpecialGoneDown::Accept()
- {
- TCFControlClient::TGoneDown* pGoneDown = message_cast<TCFControlClient::TGoneDown>(&iContext.iMessage);
- if(pGoneDown && //If this is a TCFControlClient::TGoneDown message AND
- iContext.Node().CountClients<TDefaultClientMatchPolicy>(
- TClientType(TCFClientType::ECtrl, TCFClientType::EAttach)) && //the local node is an attached ipcpr AND
- ((pGoneDown->iValue1 == KErrGprsInsufficientResources) || //the error value suggests the contention management
- (pGoneDown->iValue1 == KErrPacketDataTsyMaxPdpContextsReached) ||
- (pGoneDown->iValue1 == KErrUmtsMaxNumOfContextExceededByNetwork) ||
- (pGoneDown->iValue1 == KErrUmtsMaxNumOfContextExceededByPhone))
- )
- {
- return ETrue;
- }
- return EFalse;
- }
-
-
#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
/*
Constructor for the new parameter set to be sent in parameter bundle while requesting for bearer type.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/dialogcreator/bwins/ipupsdialogu.def Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,5 @@
+EXPORTS
+ ?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &)
+ ?KTestNotifierImplementationId@@3KB @ 2 NONAME ; unsigned long const KTestNotifierImplementationId
+ ?KNotifierImplementationId@@3KB @ 3 NONAME ; unsigned long const KNotifierImplementationId
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/dialogcreator/eabi/ipupsdialogu.def Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,5 @@
+EXPORTS
+ _Z24ImplementationGroupProxyRi @ 1 NONAME
+ KNotifierImplementationId @ 2 NONAME DATA 4
+ KTestNotifierImplementationId @ 3 NONAME DATA 4
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/dialogcreator/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,25 @@
+// Copyright (c) 2008-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:
+// Component description file
+//
+//
+
+PRJ_EXPORTS
+../group/ipupsdialog.iby /epoc32/rom/include/ipupsdialog.iby
+
+PRJ_MMPFILES
+ipupsdialog.mmp
+
+PRJ_PLATFORMS
+DEFAULT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/dialogcreator/group/ipupsdialog.iby Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,51 @@
+/*
+* 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 SYMBIAN_IPUPSDIALOG_IBY
+#define SYMBIAN_IPUPSDIALOG_IBY
+
+REM IP UPS Dialog Creator
+
+#ifdef TEXT_ONLY_ROM
+#include <security_ups_utils.iby>
+#endif
+
+define ZDRIVE \epoc32\data\Z
+
+data=ZDRIVE\system\data\ups_101F7989_10281DD8.rsc system\data\ups_101F7989_10281DD8.rsc
+
+
+
+#ifdef _DEBUG
+ECOM_PLUGIN_UDEB(ipupsdialog.dll,10285A7B.rss)
+#else
+ECOM_PLUGIN(ipupsdialog.dll,10285A7B.rss)
+#endif
+
+// If NETWORKING_UPS_NOTIFIERUID is defined, then patch the Dialog Creator to use that Notifier UID.
+// Otherwise if _STARTUPMODE1 is defined then use Networking UPS Test Notifier UID, otherwise don't patch.
+
+#ifndef NETWORKING_UPS_NOTIFIERUID
+#ifdef _STARTUPMODE1
+#define NETWORKING_UPS_NOTIFIERUID 0x1028369b
+#endif
+#endif
+
+#ifdef NETWORKING_UPS_NOTIFIERUID
+patchdata ipupsdialog.dll@KNotifierImplementationId NETWORKING_UPS_NOTIFIERUID
+#endif
+
+#endif //SYMBIAN_IPUPSDIALOG_IBY
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/dialogcreator/group/ipupsdialog.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,59 @@
+// Copyright (c) 2008-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:
+// IP implementation of User Prompt Service dialog creator ECOM plug-in
+//
+//
+
+/**
+ @file
+*/
+
+target ipupsdialog.dll
+capability protserv trustedui
+targettype plugin
+deffile ipupsdialog.def
+
+uid 0x10009D8D 0x10285A7B
+vendorid 0x70000001
+
+userinclude ../source
+userinclude ../inc
+
+// OS_LAYER_SYSTEMINCLUDE_SYMBIAN illegal dependency on apaid.h
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+sourcepath ../source
+source ipupsdialog.cpp
+source ipupsconst.cpp
+
+sourcepath ../resource
+start resource 10285A7B.rss
+target ipupsdialog.rsc
+end
+
+//
+// Default reference policy file for IP UPS
+//
+// This policy file is not installed by default in the proper UPS policy file directory
+// (/private/10283558/policies/), as it is intended to be copied there as required.
+
+sourcepath ../../policyfile
+start resource ups_101F7989_10281DD8.rss
+targetpath /system/data
+end
+
+library apgrfx.lib apparc.lib ecom.lib euser.lib upspolicies.lib
+library upsclient.lib ipcstream.lib estor.lib sisregistryclient.lib upsnotifierutil.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/dialogcreator/inc/ipupsconst.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2008-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:
+// This file specifies the constants which are used to configure
+// the NetUps during testing. The associated enumerations are to
+// to be found in netupstls.h.
+// @internalComponent
+// @prototype
+//
+//
+
+#ifndef IPUPSCONST_H
+#define IPUPSCONST_H
+
+#include <e32def.h>
+
+/** @SYMPatchable Disable UPS IP functionality
+*/
+IMPORT_C extern const TUint32 KNotifierImplementationId;
+IMPORT_C extern const TUint32 KTestNotifierImplementationId;
+
+
+#endif // IPUPSCONST_H
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/dialogcreator/inc/ipupsdialog.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,98 @@
+// Copyright (c) 2008-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:
+// Class declaration for Reference dialog creator plug-in for IP.
+//
+//
+
+/**
+ @file
+ @internalTechnology
+ @prototype
+*/
+
+#ifndef IPUPSDIALOG_H
+#define IPUPSDIALOG_H
+
+#include <e32base.h>
+#include <e32cmn.h>
+#include <ups/dialogcreator.h>
+#include <ups/fingerprint.h>
+#include <ups/upsnotifierutil.h>
+
+using namespace UserPromptService;
+
+/**
+ Reference implementation of a User Prompt Service dialog creator ECOM plug-in for IP.
+ */
+NONSHARABLE_CLASS(CIpUpsDialog) : public CDialogCreator
+ {
+ public:
+ typedef enum
+ {
+ EIdle,
+ EPrepareDialog,
+ EDisplayDialog,
+ EProcessResult
+ } TState;
+ static CIpUpsDialog* CreateDialogCreatorL();
+ ~CIpUpsDialog();
+
+protected:
+ // From CActive
+ void DoCancel();
+ void RunL();
+ TInt RunError(TInt aError);
+
+ // From CDialogCreator
+ void PrepareDialog(
+ const CPromptRequest& aRequest, const CPolicy& aPolicy,
+ const RPointerArray<CFingerprint>& aFingerprints, const CClientEntity* aClientEntity,
+ const TAny* aDialogCreatorParams, TRequestStatus& aStatus);
+ void DisplayDialog(CPolicy::TOptions& aOptionSelcted, const CFingerprint*& aFingerprint,
+ TUint& aEvaluatorInfo, TRequestStatus& aStatus);
+
+private:
+ CIpUpsDialog();
+ void ConstructL();
+ void ResolveClientNameL(const TSecureId& aSid);
+ TBool ResolveClientNameFromAppArcL(const TSecureId& aSid);
+ TBool ResolveClientNameFromSisRegistryL(const TSecureId& aSid);
+ void ResolveVendorNameL(const TVendorId& aVid);
+ void DoPrepareDialogL();
+ void DoDisplayDialogL();
+ void DoProcessResultL();
+
+ // Const data from UPS & policy evaluator
+ const CPromptRequest* iRequest; //< Request data from system server
+ const CPolicy* iPolicy; //< The policy that matches iRequest
+ const RPointerArray<CFingerprint>* iFingerprints; //< Fingerprints generated by policy evaluator from iRequest
+ const TAny* iEvalPrivateData; //< Extra data generated by policy evaluator
+
+ TRequestStatus* iClientStatus; //< UPS's request object
+
+ // Return data for DisplayDialog
+ CPolicy::TOptions* iOptionSelected; //< The option selected by the user
+ const CFingerprint** iFingerprint; //< The fingerprint for the new decision if Always or Never selected
+ TUint* iEvaluatorInfo; //< Plug-in specific field in decision record
+
+ CPromptData* iPromptData; //< Data used by notifier to render dialog
+ RBuf8 iPromptDataDes; //< Externalized prompt data
+ TPromptResult iPromptResult; //< Response buffer for notifier
+ TPckg<TPromptResult> iPromptResultPckg; //< Packages iPromptResult
+ RNotifier iNotifier; //< Connection to notifier framework
+ TState iState; //< Current state
+ TUint iNotifierId; //< User prompting user Id
+ };
+#endif // SMSUPSDIALOG_H
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/dialogcreator/resource/10285A7B.rss Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,46 @@
+// Copyright (c) 2008-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:
+// UIDs quick-ref
+// ECOM DLL UID: 0x10285A7B
+// ECOM interface UID: KUidUpsDialogCreatorInterface
+// ECOM Implementation: 0x10285A7C
+//
+//
+
+
+#include <ups/ups.hrh>
+#include <ecom/registryinfo.rh>
+
+RESOURCE REGISTRY_INFO r_registry
+ {
+ dll_uid = 0x10285A7B;
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = KUidUpsDialogCreatorInterface;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10285A7C;
+ version_no = 1;
+ display_name = "IP Reference dialog creator";
+ default_data = "";
+ opaque_data = "";
+ }
+ };
+ }
+ };
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/dialogcreator/source/ipupsconst.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,28 @@
+// Copyright (c) 2008-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:
+// This file provides the definition of the patchable constants
+// used in debugging.
+// @internalAll
+// @prototype
+//
+//
+
+#include <e32def.h>
+
+/** @SYMPatchable Disable UPS IP functionality
+*/
+EXPORT_C extern const TUint32 KNotifierImplementationId = 0x1028369b;
+EXPORT_C extern const TUint32 KTestNotifierImplementationId = 0x10285887;
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/dialogcreator/source/ipupsdialog.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,440 @@
+// Copyright (c) 2008-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:
+//
+#include <e32svr.h> // Included here, since removal of Platform headers from public headers[f32file.h] for TB92SDK
+#include "ipupsdialog.h"
+#include <ecom/implementationproxy.h>
+#include <apgcli.h>
+#include <ups/promptrequest.h>
+#include <swi/sisregistrypackage.h>
+#include <swi/sisregistrysession.h>
+#include <scs/nullstream.h>
+#include <s32mem.h>
+#include <u32hal.h>
+
+#include "ipupsconst.h"
+
+static const TUint KIpDialogCreatorImplementationId = 0x10285A7C;
+
+CIpUpsDialog* CIpUpsDialog::CreateDialogCreatorL()
+/**
+Factory method that instantiates a new dialog creator ECOM plug-in.
+
+@return A pointer to the new reference dialog creator object.
+*/
+ {
+ CIpUpsDialog* self = new (ELeave)CIpUpsDialog();
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+const TImplementationProxy ImplementationTable[] =
+ {
+ IMPLEMENTATION_PROXY_ENTRY(KIpDialogCreatorImplementationId, CIpUpsDialog::CreateDialogCreatorL)
+ };
+
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
+/**
+Standard ECOM factory
+*/
+ {
+ aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+ return ImplementationTable;
+ }
+
+
+CIpUpsDialog::CIpUpsDialog()
+/**
+Constructor
+*/
+ : CDialogCreator(), iPromptResult(),iPromptResultPckg(iPromptResult), iState(EIdle)
+ {
+ CActiveScheduler::Add(this);
+ }
+
+CIpUpsDialog::~CIpUpsDialog()
+/**
+Destructor
+*/
+ {
+ Deque();
+ iPromptDataDes.Close();
+ delete iPromptData;
+ iNotifier.Close();
+ }
+
+void CIpUpsDialog::ConstructL()
+/**
+Second phase constructor
+*/
+ {
+ User::LeaveIfError(iNotifier.Connect());
+
+ // setup the value for the notifier. Test or reference
+#if (defined (__EABI__) || defined (__GCCXML__))
+ // this value is patched via the patchable constant mechanism
+ iNotifierId = KNotifierImplementationId;
+#else
+ TUint notifierUidVal = 0;
+ TInt retCode = UserSvr::HalFunction(EHalGroupEmulator, EEmulatorHalIntProperty,
+ (TAny*)"NETWORKING_UPS_NOTIFIERUID", ¬ifierUidVal);
+
+ if (retCode == KErrNone)
+ {
+ iNotifierId = notifierUidVal;
+ }
+ else
+ {
+ TUint startupModeVal = 0;
+ retCode = UserSvr::HalFunction(EHalGroupEmulator, EEmulatorHalIntProperty,
+ (TAny*)"startupmode", &startupModeVal);
+
+ if(retCode == KErrNone && startupModeVal == 1)
+ iNotifierId = KTestNotifierImplementationId;
+ else
+ iNotifierId = KNotifierImplementationId;
+ }
+#endif
+ }
+
+void CIpUpsDialog::DoCancel()
+ {
+ if (iState == EProcessResult)
+ {
+ iNotifier.CancelNotifier(TUid::Uid(iNotifierId));
+ }
+
+ if (iClientStatus)
+ {
+ User::RequestComplete(iClientStatus, KErrCancel);
+ }
+ }
+
+TInt CIpUpsDialog::RunError(TInt aError)
+ {
+ if (iClientStatus)
+ {
+ User::RequestComplete(iClientStatus, aError);
+ }
+ return KErrNone;
+ }
+
+void CIpUpsDialog::RunL()
+ {
+ User::LeaveIfError(iStatus.Int());
+ switch (iState)
+ {
+ case EPrepareDialog:
+ DoPrepareDialogL();
+ break;
+ case EDisplayDialog:
+ DoDisplayDialogL();
+ break;
+ case EProcessResult:
+ DoProcessResultL();
+ break;
+ default:
+ ASSERT(EFalse);
+ }
+ }
+
+void CIpUpsDialog::DoPrepareDialogL()
+ {
+ iPromptData = CPromptData::NewL();
+
+ // Only one state at the moment but more should be
+ // added for long running operators e.g. querying the SIS registry
+ // or resolving the client entity.
+ ResolveClientNameL(iRequest->ClientSid());
+
+ // Get the vendor name for the client process
+ ResolveVendorNameL(iRequest->ClientVid());
+
+ // pass the destination information through.
+ iPromptData->iDestination.Create(iRequest->Destination());
+
+ // Pass any opaque data from the user to the notifier
+ iPromptData->iOpaqueData.Create(iRequest->OpaqueData());
+
+ // Server / Service localized names generated in notifier plug-in.
+ iPromptData->iServerSid = iRequest->ServerSid();
+ iPromptData->iServiceId = iRequest->ServiceId();
+
+ // Different dialog text is displayed depending on whether the client application
+ // is signed.
+ // N.B. Protected SID is assumed to be signed or included at ROM build.
+ if (iRequest->IsClientSidProtected()) iPromptData->iFlags |= ETrustedClient;
+
+ // Use the options specified by the policy
+ iPromptData->iOptions = iPolicy->Options();
+
+ // Add the descriptions of the fingerprints. This could be used
+ // to allow the user to grant access to all destinations
+ // or a single destination.
+ TInt count = iFingerprints->Count();
+ for (TInt i = 0; i < count; ++i)
+ {
+ HBufC* description = (*iFingerprints)[i]->Description().AllocLC();
+ iPromptData->iDescriptions.AppendL(description);
+ CleanupStack::Pop(description);
+ }
+
+ User::RequestComplete(iClientStatus, KErrNone);
+ // DisplayDialog is invoked by the UPS, this just verifies
+ // that PrepareDialog was called first.
+ iState = EDisplayDialog;
+ }
+
+void CIpUpsDialog::DoDisplayDialogL()
+/**
+Uses the notifier framework to display the dialog.
+*/
+ {
+ // Externalize the prompt data to a descriptor
+ RNullWriteStream ns;
+ ns << *iPromptData;
+ ns.CommitL();
+ iPromptDataDes.CreateL(ns.BytesWritten());
+ RDesWriteStream ws;
+ ws.Open(iPromptDataDes);
+ ws << *iPromptData;
+ ws.CommitL();
+ iNotifier.StartNotifierAndGetResponse(iStatus, TUid::Uid(iNotifierId),
+ iPromptDataDes, iPromptResultPckg);
+ SetActive();
+ iState = EProcessResult;
+ }
+
+void CIpUpsDialog::DoProcessResultL()
+/**
+Processes the result returned by the notifier.
+*/
+ {
+ if(iPromptResult.iSelected == CPolicy::EAlways || iPromptResult.iSelected == CPolicy::ENever)
+ {
+ // The Always or Never option was selected so return the fingerprint
+ // for the new decision record.
+ //
+ // In this implementation a copy of the original fingerprint is returned. However,
+ // it is permitted to return a different fingerprint e.g. a modifier description.
+ if(iPromptResult.iDestination >= 0 && iPromptResult.iDestination < iFingerprints->Count())
+ {
+ *iFingerprint = (*iFingerprints)[iPromptResult.iDestination];
+ }
+ else
+ {
+ ASSERT(EFalse); // should never happen, unless notifier is buggy.
+ }
+ }
+
+ // ensure the notifier has returned a valid option specified in policy file
+ if(iPromptResult.iSelected & iPromptData->iOptions)
+ {
+ *iOptionSelected = iPromptResult.iSelected;
+ }
+ else
+ {
+ ASSERT(EFalse);
+ }
+
+ iState = EIdle;
+ User::RequestComplete(iClientStatus, KErrNone);
+ }
+
+void CIpUpsDialog::ResolveVendorNameL(const TVendorId& aVid)
+/**
+Looks up the localized vendor name for the client process and writes
+this to iPromptData.iVendorName.
+
+Typically, this would be resolved from the SIS registry or a lookup table.
+
+@param aVid The vendor id of the client process.
+*/
+ {
+ if (iPromptData->iVendorName.Length() != 0)
+ {
+ // already obtained vendor name from SIS registry
+ return;
+ }
+
+ if (aVid.iId == 0x70000001)
+ {
+ _LIT(KSymbian, "Symbian Software Ltd");
+ iPromptData->iVendorName.Create(KSymbian);
+ }
+ else
+ {
+ _LIT(KUnknown, "Unknown vendor");
+ iPromptData->iVendorName.Create(KUnknown);
+ }
+ }
+
+void CIpUpsDialog::ResolveClientNameL(const TSecureId& aSid)
+/**
+Generates a human readable name for the client process. In order of
+preference the following data is returned
+
+- The AppArc caption name.
+- The localized package name that owns this SID.
+- A value from a lookup table.
+- The filename for the client process executable.
+
+@param aSid The secure id of the client process.
+*/
+ {
+ TBool found = EFalse;
+
+ // Although the client name from AppArc takes precedance the SIS
+ // registry is always invoked in order to retrieve the vendor name
+ found |= ResolveClientNameFromSisRegistryL(aSid);
+ found |= ResolveClientNameFromAppArcL(aSid);
+
+ // A lookup that maps secure-ids to application names could
+ // be used here.
+
+ // Fall back to the filename of the client process
+ // The original thread may have exited so the process handle is used instead.
+ // because the client-side object e.g. RSocket may be shared between threads.
+
+ // If the process has exited then it's o.k. to leave.
+ if (! found)
+ {
+ RProcess clientProcess;
+ User::LeaveIfError(clientProcess.Open(iRequest->ClientProcessId()));
+ CleanupClosePushL(clientProcess);
+ iPromptData->iClientName.Create(clientProcess.FileName());
+ CleanupStack::PopAndDestroy(&clientProcess);
+ }
+ }
+
+TBool CIpUpsDialog::ResolveClientNameFromAppArcL(const TSecureId& aSid)
+/**
+Gets the caption name for the application from AppArc (if available).
+
+@param aSid The secure id of the client process.
+@return ETrue if a match was found in apparc; otherwise, EFalse is returned.
+*/
+ {
+ TBool found(EFalse);
+
+ RApaLsSession apa;
+ CleanupClosePushL(apa);
+ TInt err = apa.Connect();
+ if (err == KErrNone)
+ {
+ TApaAppInfo* info = new(ELeave) TApaAppInfo();
+ CleanupStack::PushL(info);
+
+ err = apa.GetAppInfo(*info, TUid::Uid(aSid));
+
+ if (err == KErrNone)
+ {
+ iPromptData->iClientName.Close();
+ iPromptData->iClientName.Create(info->iCaption);
+ found = ETrue;
+ }
+ else if (err != KErrNotFound)
+ {
+ User::Leave(err);
+ }
+
+ CleanupStack::PopAndDestroy(info);
+ }
+ else if (err != KErrNotFound)
+ {
+ // If the connection to apparc failed with KErrNotFound
+ // then the error is ignored becase we assume the dialog
+ // creator was invoked from text-shell
+ User::Leave(err);
+ }
+
+ CleanupStack::PopAndDestroy(&apa);
+ return found;
+ }
+
+TBool CIpUpsDialog::ResolveClientNameFromSisRegistryL(const TSecureId& aSid)
+/**
+Retrieves the client and vendor information from the SIS registry.
+@param aSid The secure-id of the client application to lookup in the registry.
+@return ETrue, if the lookup was successful; otherwise, EFalse is returned.
+*/
+ {
+ TBool found(EFalse);
+ Swi::RSisRegistrySession r;
+ User::LeaveIfError(r.Connect());
+ CleanupClosePushL(r);
+
+ Swi::CSisRegistryPackage* p(0);
+ TRAPD(err, p = r.SidToPackageL(aSid));
+ if (err == KErrNone)
+ {
+ iPromptData->iClientName.Create(p->Name());
+ iPromptData->iVendorName.Create(p->Vendor());
+ found = ETrue;
+ delete p;
+ }
+
+ CleanupStack::PopAndDestroy(&r);
+ return found;
+ }
+
+// From CDialogCreator
+void CIpUpsDialog::PrepareDialog(const UserPromptService::CPromptRequest& aRequest,
+ const CPolicy& aPolicy,
+ const RPointerArray<CFingerprint>& aFingerprints,
+ const CClientEntity* aClientEntity,
+ const TAny* aEvalPrivateData,
+ TRequestStatus& aStatus)
+ {
+ aStatus = KRequestPending;
+ iClientStatus = &aStatus;
+
+ iRequest = &aRequest;
+ iPolicy = &aPolicy;
+ iFingerprints = &aFingerprints;
+ iEvalPrivateData = aEvalPrivateData;
+ (void) aClientEntity;
+
+ // Kick off dialog creator state machine
+ iState = EPrepareDialog;
+ iStatus = KRequestPending;
+ TRequestStatus* status = &iStatus;
+ SetActive();
+ User::RequestComplete(status, KErrNone);
+ }
+
+void CIpUpsDialog::DisplayDialog(CPolicy::TOptions& aOptions,
+ const CFingerprint*& aFingerprint,
+ TUint& aEvaluatorInfo,
+ TRequestStatus& aStatus)
+ {
+ aStatus = KRequestPending;
+ iClientStatus = &aStatus;
+
+ iOptionSelected = &aOptions;
+ iFingerprint = &aFingerprint;
+ aFingerprint = 0;
+ iEvaluatorInfo = &aEvaluatorInfo;
+ iClientStatus = &aStatus;
+
+ // Start state machine
+ ASSERT(iState == EDisplayDialog); // PrepareDialog should have been called first
+ iStatus = KRequestPending;
+ TRequestStatus* status = &iStatus;
+ SetActive();
+ User::RequestComplete(status, KErrNone);
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,40 @@
+// Copyright (c) 2008-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:
+// UPS Plugins and Utilities for IP Networking
+//
+//
+
+/**
+ @file
+*/
+
+#define SYMBIAN_NETWORKING_UPS
+
+#ifdef SYMBIAN_NETWORKING_UPS
+
+#include "../dialogcreator/group/bld.inf"
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTEXPORTS
+../test/te_ipups/scripts/te_ipups.script z:/testdata/scripts/te_ipups/te_ipups.script
+../test/te_ipups/data/te_ipups.ini z:/testdata/configs/te_ipups/te_ipups.ini
+
+../test/te_ipups/group/te_ipups.iby /epoc32/rom/include/te_ipups.iby
+
+PRJ_TESTMMPFILES
+../test/te_ipups/group/te_ipups.mmp
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/group/networking_ipups.mrp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,25 @@
+#
+# 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:
+#
+
+component networking_ipups
+source \sf\os\networkingsrv\networkcontrol\ipupsplugins
+binary \sf\os\networkingsrv\networkcontrol\ipupsplugins\group all
+exports \sf\os\networkingsrv\networkcontrol\ipupsplugins\group
+notes_source \component_defs\release.src
+
+
+ipr E
+ipr T \sf\os\networkingsrv\networkcontrol\ipupsplugins\test
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/policyfile/ups_101F7989_10281DD8.rss Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,44 @@
+// Copyright (c) 2008-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:
+//
+
+#include <ups/policies.rh>
+
+UID2 KUidUpsPolicyResourceFile
+
+//New Unique identifier for this policy file
+UID3 0x10282FBE
+
+
+// UPS policy file for IP
+RESOURCE POLICIES IP_Default_policies
+ {
+ header = POLICY_HEADER
+ {
+ authorisationpolicy = ECheckUnprotectedSids;
+ dialogcreator = 0x10285A7C;
+ // Use default policy evaluator
+ policyevaluator = 0x00000000;
+ };
+ policies =
+ {
+ POLICY
+ {
+ sid_classes = KAllSids;
+ destination = "*";
+ options = KSessionYes | KSessionNo | KAlways | KNever;
+ }
+
+ };
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/data/te_ipups.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,274 @@
+// Copyright (c) 2003-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:
+
+//DialogOptionSelection (multiple options could be specified using delimeter ',') = Always/Never/SessionYes/SessionNo
+//ExpectedDialogOptions (Optional) = Always/Never/SessionYes/SessionNo
+//PlatSecPass = True/False
+//ExpectedUpsDecision (Optional, multiple options could be specified using delimeter ',') = Yes/No/SessionYes/SessionNo
+//PromptTriggerCount (Optional) = Expected number of times prompt would be triggered by test
+//NoOfAuthoriseCalls = 1..N (N - Maximum number of iterations , 10 is the limit)
+//AlwaysOpenNewSession (Each iteration open the session in the beiginning of the iteration and close at the end if set to True) = True/False
+//UseSameSubSession (Optional, Each iteration uses same SubSession if set to True) = True/False
+//UseSameSubSessionAfterClose (Optional, Each iteration uses same SubSession after closing it at the end of iteration) = True/False
+//AlwaysOpenNewSubSession (Optional, Always open new SubSession for each iteration) = True/False
+
+
+[ProtSidPlatSecFail]
+ServiceId = 10281DD8
+Destination = 0776655443
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+PromptTriggerCount = 1
+
+[UnProtSidPlatSecPass]
+ServiceId = 10281DD8
+Destination = 0776655443
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes
+PlatSecPass = True
+ExpectedUpsDecision = SessionYes
+PromptTriggerCount = 1
+
+[UnProtSidPlatSecFail]
+ServiceId = 10281DD8
+Destination = 0776655443
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+PromptTriggerCount = 1
+
+[ProtSidPlatSecPass]
+ServiceId = 10281DD8
+Destination = 0776655443
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes
+PlatSecPass = True
+ExpectedUpsDecision = Yes
+PromptTriggerCount = 0
+
+[ValidPromptResponse]
+ServiceId = 10281DD8
+Destination = 0776655443
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+PromptTriggerCount = 1
+ExpectedDialogOptions = Always/Never/SessionYes/SessionNo
+
+[ValidDestinationIPPrompted]
+ServiceId = 10281DD8
+Destination = 10.0.0.10
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+PromptTriggerCount = 1
+
+[UserResponseSessionYes]
+ServiceId = 10281DD8
+Destination = 10.0.0.10
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+PromptTriggerCount = 1
+
+[PromptAgainAfterSessionYes]
+ServiceId = 10281DD8
+Destination = 0789012345
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+PromptTriggerCount = 2
+NoOfAuthoriseCalls = 2
+
+[PromptAfterSessionYesWithNewSubSession]
+ServiceId = 10281DD8
+Destination = 0789012345
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+PromptTriggerCount = 2
+NoOfAuthoriseCalls = 2
+UseSameSubSessionAfterClose = True
+
+[PromptAgainAfterSessionNo]
+ServiceId = 10281DD8
+Destination = 0789012345
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionNo
+PlatSecPass = False
+ExpectedUpsDecision = SessionNo
+PromptTriggerCount = 2
+NoOfAuthoriseCalls = 2
+
+[PromptAfterSessionNoWithNewSubSession]
+ServiceId = 10281DD8
+Destination = 0789012345
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionNo
+PlatSecPass = False
+ExpectedUpsDecision = SessionNo
+PromptTriggerCount = 2
+NoOfAuthoriseCalls = 2
+UseSameSubSessionAfterClose = True
+
+[NoPromptAfterAlwaysResponse]
+ServiceId = 10281DD8
+Destination = 0789012345
+OpaqueData = NoOpaqueData
+DialogOptionSelection = Always
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+PromptTriggerCount = 1
+NoOfAuthoriseCalls = 2
+
+[NoPromptInNewSessionAfterAlways]
+ServiceId = 10281DD8
+Destination = 0789012345
+OpaqueData = NoOpaqueData
+DialogOptionSelection = Always
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+PromptTriggerCount = 1
+NoOfAuthoriseCalls = 2
+AlwaysOpenNewSession = True
+UseSameSubSessionAfterClose = True
+
+[NoPromptInSameSessionAfterNever]
+ServiceId = 10281DD8
+Destination = 0789012345
+OpaqueData = NoOpaqueData
+DialogOptionSelection = Never
+PlatSecPass = False
+ExpectedUpsDecision = SessionNo
+PromptTriggerCount = 1
+NoOfAuthoriseCalls = 2
+
+[NoPromptInNewSessionAfterNever]
+ServiceId = 10281DD8
+Destination = 0789012345
+OpaqueData = NoOpaqueData
+DialogOptionSelection = Never
+PlatSecPass = False
+ExpectedUpsDecision = SessionNo
+PromptTriggerCount = 1
+NoOfAuthoriseCalls = 2
+AlwaysOpenNewSession = True
+UseSameSubSessionAfterClose = True
+
+[UserResponseYes]
+ServiceId = 10281DD8
+Destination = 0789012345
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+PromptTriggerCount = 1
+
+[UserResponseNo]
+ServiceId = 10281DD8
+Destination = 10.0.0.1
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionNo
+PlatSecPass = False
+ExpectedUpsDecision = SessionNo
+PromptTriggerCount = 1
+
+[Client1UserResponseSessionYes]
+ServiceId = 10281DD8
+Destination = 20.0.0.1
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+
+[Client2UserResponseSessionNo]
+ServiceId = 10281DD8
+Destination = 20.0.0.2
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionNo
+PlatSecPass = False
+ExpectedUpsDecision = SessionNo
+
+[Client1UserResponseAlways]
+ServiceId = 10281DD8
+Destination = 20.0.0.1
+OpaqueData = NoOpaqueData
+DialogOptionSelection = Always
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+
+[Client2UserResponseNever]
+ServiceId = 10281DD8
+Destination = 20.0.0.2
+OpaqueData = NoOpaqueData
+DialogOptionSelection = Never
+PlatSecPass = False
+ExpectedUpsDecision = SessionNo
+
+[Client2UserResponseSessionNo]
+ServiceId = 10281DD8
+Destination = 20.0.0.2
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionNo
+PlatSecPass = False
+ExpectedUpsDecision = SessionNo
+
+[MultipleSubSessionsWithAlways]
+ServiceId = 10281DD8
+Destination = 20.0.0.1
+OpaqueData = NoOpaqueData
+DialogOptionSelection = Always
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes
+PromptTriggerCount = 1
+NoOfAuthoriseCalls = 2
+AlwaysOpenNewSubSession = True
+
+[MultipleSubSessionsWithSessionYes]
+ServiceId = 10281DD8
+Destination = 20.0.0.1
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes,Always
+PlatSecPass = False
+ExpectedUpsDecision = SessionYes,SessionYes
+PromptTriggerCount = 2
+NoOfAuthoriseCalls = 2
+AlwaysOpenNewSubSession = True
+
+[CancelPromptCall]
+ServiceId = 10281DD8
+Destination = 20.0.0.1
+OpaqueData = NoOpaqueData
+DialogOptionSelection = SessionYes
+PlatSecPass = False
+CancelPromptCall = True
+PromptTriggerCount = 0
+
+[StorePromptTriggerCount]
+StorePromptTriggerCount = True
+
+[PromptCount_2]
+PromptTriggerCount = 2
+
+[PromptCount_3]
+PromptTriggerCount = 3
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/group/te_ipups.iby Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,42 @@
+// Copyright (c) 2008-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:
+// tups_ipups.iby
+//
+//
+
+#ifndef __TE_IPUPS_IBY__
+#define __TE_IPUPS_IBY__
+
+#include <upstestnotifier.iby>
+#include <ipupsdialog.iby>
+#include <ups.iby>
+
+#ifdef NETWORKING_UPS_TESTS
+data=ABI_DIR\BUILD_DIR\te_ipups.exe \sys\bin\te_ipups.exe
+#endif
+
+REM Test policy files export
+data=ZDRIVE\private\10283558\policies\ups_10285B91_10281DD8.rsc \private\10283558\policies\ups_10285B91_10281DD8.rsc
+data=ZDRIVE\private\10283558\policies\ups_A0000001_10281DD8.rsc \private\10283558\policies\ups_A0000001_10281DD8.rsc
+data=ZDRIVE\private\10283558\policies\ups_10000001_10281DD8.rsc \private\10283558\policies\ups_10000001_10281DD8.rsc
+data=ZDRIVE\private\10283558\policies\ups_10000002_10281DD8.rsc \private\10283558\policies\ups_10000002_10281DD8.rsc
+data=ZDRIVE\system\data\ups_test_always_101F7989_10281DD8.rsc \system\data\ups_test_always_101F7989_10281DD8.rsc
+
+#ifdef NETWORKING_UPS_TESTS
+REM Test script and data files export
+data = ZDRIVE\testdata\scripts\te_ipups\te_ipups.script \testdata\scripts\te_ipups\te_ipups.script
+data = ZDRIVE\testdata\configs\te_ipups\te_ipups.ini \testdata\configs\te_ipups\te_ipups.ini
+#endif
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/group/te_ipups.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,86 @@
+// Copyright (c) 2008-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:
+//
+
+/**
+ @file
+ @test
+*/
+
+
+
+
+TARGET te_ipups.exe
+TARGETTYPE exe
+UID 0x1000007A 0x10285B91
+VENDORID 0x70000001
+
+CAPABILITY ALL -TCB
+
+SOURCEPATH ../src
+SOURCE te_ipups_stepbase.cpp
+SOURCE te_ipups_server.cpp
+SOURCE te_ipups_ups_step.cpp
+SOURCE te_ipups_notify_count.cpp
+SOURCE te_ipups_delete_decision_db.cpp
+
+USERINCLUDE ../inc
+
+SOURCEPATH ../policyfile
+
+START RESOURCE ups_10285B91_10281DD8.rss
+TARGETPATH /private/10283558/policies
+END
+
+START RESOURCE ups_10285B91_10281DD8.rss
+TARGETPATH /private/10283558/policies
+TARGET ups_a0000001_10281dd8.rsc
+END
+
+START RESOURCE ups_10285B91_10281DD8.rss
+TARGETPATH /private/10283558/policies
+TARGET ups_10000001_10281dd8.rsc
+END
+
+START RESOURCE ups_10285B91_10281DD8.rss
+TARGETPATH /private/10283558/policies
+TARGET ups_10000002_10281dd8.rsc
+END
+
+START RESOURCE ups_test_always_101F7989_10281DD8.rss
+TARGETPATH /system/data
+TARGET ups_test_always_101f7989_10281dd8.rss
+END
+
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/ups
+SYSTEMINCLUDE /epoc32/include/test
+#else
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+SYSTEMINCLUDE /epoc32/include/platform/test
+#endif
+
+LIBRARY euser.lib
+LIBRARY testexecuteutils.lib
+LIBRARY testexecutelogclient.lib
+LIBRARY bafl.lib
+LIBRARY efsrv.lib
+LIBRARY numberconversion.lib
+LIBRARY upsclient.lib
+LIBRARY upsmanagement.lib
+LIBRARY upsnotifierutil.lib
+LIBRARY estor.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/inc/te_ipups_delete_decision_db.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,42 @@
+// Copyright (c) 2008-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:
+// te_ipups_notify_count.h
+//
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+
+#if (!defined DELETE_DECISION_DB_STEP_H)
+#define DELETE_DECISION_DB_STEP_H
+#include <test/testexecutestepbase.h>
+
+class CIpUpsDeleteDecisionDB : public CTeIpUpsStepBase
+ {
+public:
+ CIpUpsDeleteDecisionDB();
+ virtual ~CIpUpsDeleteDecisionDB();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepL();
+ virtual TVerdict doTestStepPostambleL();
+ };
+
+_LIT(KIpUpsDeleteDecisionDB,"IpUpsDeleteDecisionDB");
+
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/inc/te_ipups_notify_count.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,41 @@
+// Copyright (c) 2008-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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+
+#if (!defined NOTIFY_COUNT_STEP_H)
+#define NOTIFY_COUNT_STEP_H
+#include <test/testexecutestepbase.h>
+
+class CIpUpsNotifyCount : public CTeIpUpsStepBase
+ {
+public:
+ CIpUpsNotifyCount();
+ virtual ~CIpUpsNotifyCount();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepL();
+ virtual TVerdict doTestStepPostambleL();
+ };
+
+_LIT(KIpUpsNotifyCount,"IpUpsNotifyCount");
+
+_LIT(KIpUpsStorePromptTriggerCount, "StorePromptTriggerCount");
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/inc/te_ipups_server.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,36 @@
+// Copyright (c) 2008-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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+#if (!defined TE_IPUPS_SERVER_H)
+#define TE_IPUPS_SERVER_H
+#include <test/testexecuteserverbase.h>
+
+
+class CTeIpUpsSuite : public CTestServer
+ {
+public:
+ static CTeIpUpsSuite* NewL(const TDesC& aName);
+
+ virtual CTestStep* CreateTestStep(const TDesC& aStepName);
+
+ };
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/inc/te_ipups_stepbase.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,36 @@
+// Copyright (c) 2008-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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+#if (!defined TE_IPUPS_STEP_BASE)
+#define TE_IPUPS_STEP_BASE
+#include <test/testexecutestepbase.h>
+#include <ups/upsclient.h>
+
+class CTeIpUpsStepBase : public CTestStep
+ {
+public:
+ virtual ~CTeIpUpsStepBase();
+ CTeIpUpsStepBase();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
+ };
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/inc/te_ipups_ups_step.h Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,93 @@
+// Copyright (c) 2008-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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+
+#if (!defined TE_IPUPS_UPS_STEP_H)
+#define TE_IPUPS_UPS_STEP_H
+#include <test/testexecutestepbase.h>
+#include "te_ipups_stepbase.h"
+#include <ups/upsnotifierutil.h>
+
+class CIpUpsStep : public CTeIpUpsStepBase
+ {
+public:
+ CIpUpsStep();
+ ~CIpUpsStep();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepL();
+ virtual TVerdict doTestStepPostambleL();
+private:
+ UserPromptService::CPolicy::TOptions ButtonToOption(const TPtrC& aButton);
+ TPtrC TUpsDecisionToString(TUpsDecision aDecision);
+ TUpsDecision TUpsDecisionFromString(const TPtrC& aDecision);
+ TBool OptionsFlagToString(TUint aOptions, TDes& aOptionString, TBool aCheckAgainstExpectedOpt=ETrue);
+ TBool VerifyAndPrintPromptDataL();
+ void GetValueAt(const TInt aPos, const TPtrC& aArrayString, const TChar aDelimeter, TDes& aValue);
+
+ void GetSessionAndSubSession(UserPromptService::RUpsSession& aUpsSession, UserPromptService::RUpsSubsession& aUpsSubsession);
+
+ TInt iNotifyCount;
+ UserPromptService::CPromptData* iPromptData;
+
+ TInt iServiceUID;
+ TPtrC iServerName;
+ TPtrC iDestination;
+ TPtrC iOpaqueData;
+ TBuf8<64> iOpaqueDataStored;
+ TPtrC iDialogOption;
+ TPtrC iExpectedDialogOptions;
+ TBool iPlatSecPass;
+ TPtrC iExpectedUpsDecision;
+ TInt iPromptTriggerCount;
+ TInt iNoOfAuthoriseCalls;
+ TBool iCancelPromptCall;
+
+ TBool iAlwaysOpenNewSession;
+
+ TBool iUseSameSubSession;
+ TBool iUseSameSubSessionAfterClose;
+ TBool iAlwaysOpenNewSubSession;
+ TInt iTestNotifierMode;
+ };
+
+_LIT(KIpUpsClientStep,"IpUpsStep");
+
+_LIT(KIpUpsServiceId, "ServiceId");
+_LIT(KIpUpsDestination, "Destination");
+_LIT(KIpUpsOpaqueData, "OpaqueData");
+_LIT(KIpUpsDialogOptionSelection, "DialogOptionSelection");
+_LIT(KExpectedDialogOptions, "ExpectedDialogOptions");
+_LIT(KIpUpsPlatSecPass, "PlatSecPass");
+_LIT(KIpUpsExpectedDecision, "ExpectedUpsDecision");
+_LIT(KIpUpsPromptTriggerCount, "PromptTriggerCount");
+_LIT(KIpUpsNoOfAuthoriseCalls, "NoOfAuthoriseCalls");
+_LIT(KIpUpsCancelPromptCall, "CancelPromptCall");
+
+_LIT(KIpUpsAlwaysOpenNewSession, "AlwaysOpenNewSession");
+
+_LIT(KIpUpsUseSameSubSession, "UseSameSubSession");
+_LIT(KIpUpsUseSameSubSessionAfterClose, "UseSameSubSessionAfterClose");
+_LIT(KIpUpsAlwaysOpenNewSubSession, "AlwaysOpenNewSubSession");
+
+const TInt KMaxNoOfAuthoriseCalls = 10;
+const TChar KIniFileDelimeter = ',';
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/policyfile/ups_10285B91_10281DD8.rss Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,43 @@
+// Copyright (c) 2008-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:
+//
+
+#include <ups/policies.rh>
+
+UID2 KUidUpsPolicyResourceFile
+
+//New Unique identifier for this policy file
+UID3 0x10285B92
+
+
+// UPS policy file for IP
+RESOURCE POLICIES IP_Default_policies
+ {
+ header = POLICY_HEADER
+ {
+ authorisationpolicy = ECheckUnprotectedSids;
+ dialogcreator = 0x10285A7C;
+ policyevaluator = 0x00000000;
+ };
+ policies =
+ {
+ POLICY
+ {
+ sid_classes = KAllSids;
+ destination = "*";
+ options = KSessionYes | KSessionNo | KAlways | KNever;
+ }
+
+ };
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/policyfile/ups_test_always_101F7989_10281DD8.rss Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,44 @@
+// Copyright (c) 2008-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:
+//
+
+#include <ups/policies.rh>
+
+UID2 KUidUpsPolicyResourceFile
+
+//New Unique identifier for this policy file
+UID3 0x10282FBE
+
+
+// UPS policy file for IP
+RESOURCE POLICIES IP_Default_policies
+ {
+ header = POLICY_HEADER
+ {
+ authorisationpolicy = EAlwaysCheck;
+ dialogcreator = 0x10285A7C;
+ // Use default policy evaluator
+ policyevaluator = 0x00000000;
+ };
+ policies =
+ {
+ POLICY
+ {
+ sid_classes = KAllSids;
+ destination = "*";
+ options = KSessionYes | KSessionNo | KAlways | KNever;
+ }
+
+ };
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/scripts/te_ipups.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,372 @@
+// Copyright (c) 2008-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 integration tests for UPS server.
+//
+//
+
+PRINT Run Basic integration test cases for PREQ1116 ( IP Networking User Prompting )
+
+RUN_PROGRAM -1 SETCAP te_ipups.exe 0003FFFE -SID A0000001 te_ipups_un_prot_sid.exe
+RUN_PROGRAM -1 SETCAP te_ipups.exe 0003FFFE -SID 10000001 te_ipups_1.exe
+RUN_PROGRAM -1 SETCAP te_ipups.exe 0003FFFE -SID 10000002 te_ipups_2.exe
+
+LOAD_SUITE te_ipups
+LOAD_SUITE te_ipups_1
+LOAD_SUITE te_ipups_2
+LOAD_SUITE te_ipups_un_prot_sid
+
+
+START_TESTCASE ProtSidPlatSecFail
+//!@SYMTestCaseID NET-IP-UPS-1001
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Prompt when protected SID, platsec fails.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini ProtSidPlatSecFail
+END_TESTCASE ProtSidPlatSecFail
+
+START_TESTCASE UnProtSidPlatSecPass
+//!@SYMTestCaseID NET-IP-UPS-1002
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Prompt when unprotected SID, platsec passes.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups_un_prot_sid IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini UnProtSidPlatSecPass
+END_TESTCASE UnProtSidPlatSecPass
+
+START_TESTCASE UnProtSidPlatSecFail
+//!@SYMTestCaseID NET-IP-UPS-1003
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Prompt when unprotected SID, platsec fails.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups_un_prot_sid IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini UnProtSidPlatSecFail
+END_TESTCASE UnProtSidPlatSecFail
+
+START_TESTCASE ProtSidPlatSecPass
+//!@SYMTestCaseID NET-IP-UPS-1004
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc No Prompt when protected SID, platsec passes.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini ProtSidPlatSecPass
+END_TESTCASE ProtSidPlatSecPass
+
+START_TESTCASE ValidPromptResponse
+//!@SYMTestCaseID NET-IP-UPS-1005
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Prompt only offers SessionYes, SessionNo, Always & Never.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini ValidPromptResponse
+END_TESTCASE ValidPromptResponse
+
+START_TESTCASE ValidDestinationIPPrompted
+//!@SYMTestCaseID NET-IP-UPS-1006
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Prompt contains details of client.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini ValidDestinationIPPrompted
+END_TESTCASE ValidDestinationIPPrompted
+
+START_TESTCASE UserResponseSessionYes
+//!@SYMTestCaseID NET-IP-UPS-1007
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Client receives correct SessionYes response.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini UserResponseSessionYes
+END_TESTCASE UserResponseSessionYes
+
+START_TESTCASE PromptAgainAfterSessionYes
+//!@SYMTestCaseID NET-IP-UPS-1008
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Prompt again after response first SessionYes response.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini PromptAgainAfterSessionYes
+END_TESTCASE PromptAgainAfterSessionYes
+
+START_TESTCASE PromptAfterSessionYesWithNewSubSession
+//!@SYMTestCaseID NET-IP-UPS-1009
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Prompt when starting subsequent sub session after initial SessionYes.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini PromptAfterSessionYesWithNewSubSession
+END_TESTCASE PromptAfterSessionYesWithNewSubSession
+
+START_TESTCASE PromptAgainAfterSessionNo
+//!@SYMTestCaseID NET-IP-UPS-1010
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Prompt again after response SessionNo.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini PromptAgainAfterSessionNo
+END_TESTCASE PromptAgainAfterSessionNo
+
+START_TESTCASE PromptAfterSessionNoWithNewSubSession
+//!@SYMTestCaseID NET-IP-UPS-1011
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Prompt when starting subsequent sub session after initial SessionNo.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini PromptAfterSessionNoWithNewSubSession
+END_TESTCASE PromptAfterSessionNoWithNewSubSession
+
+START_TESTCASE NoPromptAfterAlwaysResponse
+//!@SYMTestCaseID NET-IP-UPS-1012
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc User response Always - No further Prompting in same session.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini NoPromptAfterAlwaysResponse
+END_TESTCASE NoPromptAfterAlwaysResponse
+
+START_TESTCASE NoPromptInNewSessionAfterAlways
+//!@SYMTestCaseID NET-IP-UPS-1013
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc User response Always - No further Prompting in subsequent session.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini NoPromptInNewSessionAfterAlways
+END_TESTCASE NoPromptInNewSessionAfterAlways
+
+START_TESTCASE NoPromptInSameSessionAfterNever
+//!@SYMTestCaseID NET-IP-UPS-1014
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc User response Never - No further Prompting in same session.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini NoPromptInSameSessionAfterNever
+END_TESTCASE NoPromptInSameSessionAfterNever
+
+START_TESTCASE NoPromptInNewSessionAfterNever
+//!@SYMTestCaseID NET-IP-UPS-1015
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc User response Never - No further Prompting in subsequent session.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini NoPromptInNewSessionAfterNever
+END_TESTCASE NoPromptInNewSessionAfterNever
+
+START_TESTCASE UserResponseYes
+//!@SYMTestCaseID NET-IP-UPS-1016
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc User returned response SessionYes and receives same.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini UserResponseYes
+END_TESTCASE UserResponseYes
+
+START_TESTCASE UserResponseNo
+//!@SYMTestCaseID NET-IP-UPS-1017
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc User returned response SessionNo and receives same.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini UserResponseNo
+END_TESTCASE UserResponseNo
+
+START_TESTCASE MultipleClientWithSessionYesAndSessionNo
+//!@SYMTestCaseID NET-IP-UPS-1018
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Multiple UPS SubSessions and clients - SessionYes + SessionNo User response.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsNotifyCount z:\testdata\configs\te_ipups\te_ipups.ini StorePromptTriggerCount
+CONCURRENT
+RUN_TEST_STEP 100 te_ipups_1 IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini Client1UserResponseSessionYes
+DELAY 1
+RUN_TEST_STEP 100 te_ipups_2 IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini Client2UserResponseSessionNo
+DELAY 1
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini Client2UserResponseSessionNo
+CONSECUTIVE
+RUN_TEST_STEP 100 te_ipups IpUpsNotifyCount z:\testdata\configs\te_ipups\te_ipups.ini PromptCount_3
+END_TESTCASE MultipleClientWithSessionYesAndSessionNo
+
+START_TESTCASE MultipleClientWithAlwaysAndNever
+//!@SYMTestCaseID NET-IP-UPS-1019
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Multiple UPS SubSessions and Clients - Always + Never User responses.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsNotifyCount z:\testdata\configs\te_ipups\te_ipups.ini StorePromptTriggerCount
+CONCURRENT
+RUN_TEST_STEP 100 te_ipups_1 IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini Client1UserResponseAlways
+DELAY 1
+RUN_TEST_STEP 100 te_ipups_2 IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini Client2UserResponseNever
+DELAY 1
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini Client2UserResponseNever
+CONSECUTIVE
+RUN_TEST_STEP 100 te_ipups IpUpsNotifyCount z:\testdata\configs\te_ipups\te_ipups.ini PromptCount_3
+END_TESTCASE MultipleClientWithAlwaysAndNever
+
+START_TESTCASE MultipleClientWithAlwaysAndSessionNo
+//!@SYMTestCaseID NET-IP-UPS-1020
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Multiple UPS SubSessions and clients - Always + SessionNo User Responses.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsNotifyCount z:\testdata\configs\te_ipups\te_ipups.ini StorePromptTriggerCount
+CONCURRENT
+RUN_TEST_STEP 100 te_ipups_1 IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini Client1UserResponseAlways
+DELAY 1
+RUN_TEST_STEP 100 te_ipups_2 IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini Client2UserResponseSessionNo
+DELAY 1
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini Client2UserResponseSessionNo
+CONSECUTIVE
+RUN_TEST_STEP 100 te_ipups IpUpsNotifyCount z:\testdata\configs\te_ipups\te_ipups.ini PromptCount_3
+END_TESTCASE MultipleClientWithAlwaysAndSessionNo
+
+START_TESTCASE MultipleClientWithSessionYesAndNever
+//!@SYMTestCaseID NET-IP-UPS-1021
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Multiple UPS SubSessions and clients - SessionYes + Never User Responses.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsNotifyCount z:\testdata\configs\te_ipups\te_ipups.ini StorePromptTriggerCount
+CONCURRENT
+RUN_TEST_STEP 100 te_ipups_1 IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini Client1UserResponseSessionYes
+DELAY 1
+RUN_TEST_STEP 100 te_ipups_2 IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini Client2UserResponseNever
+DELAY 1
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini Client2UserResponseNever
+CONSECUTIVE
+RUN_TEST_STEP 100 te_ipups IpUpsNotifyCount z:\testdata\configs\te_ipups\te_ipups.ini PromptCount_3
+END_TESTCASE MultipleClientWithSessionYesAndNever
+
+START_TESTCASE MultipleSubSessionsWithAlways
+//!@SYMTestCaseID NET-IP-UPS-1022
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Multiple UPS SubSessions, single client - Always + No prompt.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini MultipleSubSessionsWithAlways
+END_TESTCASE MultipleSubSessionsWithAlways
+
+START_TESTCASE MultipleSubSessionsWithSessionYes
+//!@SYMTestCaseID NET-IP-UPS-1023
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Multiple UPS SubSessions, single client - SessionYes + Prompt.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini MultipleSubSessionsWithSessionYes
+END_TESTCASE MultipleSubSessionsWithSessionYes
+
+START_TESTCASE CancelPromptCall
+//!@SYMTestCaseID NET-IP-UPS-1024
+//!@SYMPREQ PREQ1116
+//!@SYMTestCaseDesc Cancel authorisation request mid-prompting.
+//!@SYMTestPriority Critical
+//!@SYMTestActions Start UPS Session, SubSession and call Authorise.
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CIT
+
+RUN_TEST_STEP 100 te_ipups IpUpsDeleteDecisionDB
+RUN_TEST_STEP_RESULT -3 100 te_ipups IpUpsStep z:\testdata\configs\te_ipups\te_ipups.ini CancelPromptCall
+END_TESTCASE CancelPromptCall
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/src/te_ipups_delete_decision_db.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,82 @@
+// Copyright (c) 2008-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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+#include "te_ipups_stepbase.h"
+#include "te_ipups_delete_decision_db.h"
+
+CIpUpsDeleteDecisionDB::CIpUpsDeleteDecisionDB()
+/**
+ * Constructor
+ */
+ {
+ SetTestStepName(KIpUpsDeleteDecisionDB);
+ }
+
+CIpUpsDeleteDecisionDB::~CIpUpsDeleteDecisionDB()
+/**
+ * Destructor
+ */
+ {
+ }
+
+TVerdict CIpUpsDeleteDecisionDB::doTestStepPreambleL()
+/**
+ * @return - TVerdict code
+ */
+ {
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CIpUpsDeleteDecisionDB::doTestStepL()
+/**
+ * @return - TVerdict code
+ */
+ {
+ UserPromptService::RUpsManagement upsManagement;
+
+ //Connect to the UPS Manager
+ User::LeaveIfError(upsManagement.Connect());
+
+ //Delete the contents of the Decision Database
+ TRAPD(err, upsManagement.DeleteDatabaseL());
+
+ if (err != KErrNone)
+ {
+ ERR_PRINTF2(_L("UPS Database Deletion attempt failed ( %d )"), err);
+ }
+ else
+ {
+ INFO_PRINTF1(_L("UPS Database Deleted."));
+ }
+
+ SetTestStepError(err);
+
+ return TestStepResult();
+ }
+
+TVerdict CIpUpsDeleteDecisionDB::doTestStepPostambleL()
+/**
+ * @return - TVerdict code
+ */
+ {
+ return TestStepResult();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/src/te_ipups_notify_count.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,113 @@
+// Copyright (c) 2008-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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+#include "te_ipups_ups_step.h"
+#include "te_ipups_notify_count.h"
+#include "upstestnotifierproperties.h"
+
+CIpUpsNotifyCount::CIpUpsNotifyCount()
+/**
+ * Constructor
+ */
+ {
+ SetTestStepName(KIpUpsNotifyCount);
+ }
+
+CIpUpsNotifyCount::~CIpUpsNotifyCount()
+/**
+ * Destructor
+ */
+ {
+ }
+
+TVerdict CIpUpsNotifyCount::doTestStepPreambleL()
+/**
+ * @return - TVerdict code
+ */
+ {
+ TSecurityPolicy nullPolicy(ECapability_None);
+ TInt err;
+
+ //Properties modified to be returned to test harness from test notifier
+ err = RProperty::Define(KUidPSUPSTestNotifCategory, KUnStart, KUnCountKeyType, nullPolicy, nullPolicy);
+ if (err != KErrAlreadyExists && err != KErrNone)
+ {
+ User::LeaveIfError(err);
+ }
+
+ //Define a new Property which would be used to store the count to retreive later for comparison
+ err = RProperty::Define(KUidPSUPSTestNotifCategory, KUnStoredNotifyCount, KUnStoredCountKeyType, nullPolicy, nullPolicy);
+ if (err != KErrAlreadyExists && err != KErrNone)
+ {
+ User::LeaveIfError(err);
+ }
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CIpUpsNotifyCount::doTestStepL()
+/**
+ * NotifyCount test step either stores the count retireved and store it in separate property defined or
+ * it compares the retireved notify count with the stored value + count increment expected relative to stored.
+ * @return - TVerdict code
+ */
+ {
+ TBool storePromptTriggerCount = EFalse;
+
+ GetBoolFromConfig(ConfigSection(),KIpUpsStorePromptTriggerCount, storePromptTriggerCount);
+
+ if (storePromptTriggerCount)
+ {
+ TInt notifyCountReturned = 0;
+ User::LeaveIfError(RProperty::Get(KUidPSUPSTestNotifCategory, KUnNotifyCount, notifyCountReturned));
+
+ User::LeaveIfError(RProperty::Set(KUidPSUPSTestNotifCategory, KUnStoredNotifyCount, notifyCountReturned));
+
+ INFO_PRINTF2(_L("NotifyCount Stored ( %d )"), notifyCountReturned);
+ }
+ else
+ {
+ TInt promptTriggerCount = 0;
+
+ GetIntFromConfig(ConfigSection(),KIpUpsPromptTriggerCount, promptTriggerCount);
+
+ TInt notifyCountReturned = 0;
+ User::LeaveIfError(RProperty::Get(KUidPSUPSTestNotifCategory, KUnNotifyCount, notifyCountReturned));
+
+ TInt sotredPromptTriggerCount = 0;
+ User::LeaveIfError(RProperty::Get(KUidPSUPSTestNotifCategory, KUnStart+2, sotredPromptTriggerCount));
+
+ INFO_PRINTF3(_L("NotifyCount Expected ( %d ) <> NotifyCount Returned ( %d )"), promptTriggerCount+sotredPromptTriggerCount, notifyCountReturned);
+
+ TEST ( (promptTriggerCount + sotredPromptTriggerCount) == notifyCountReturned);
+ }
+
+ return TestStepResult();
+ }
+
+TVerdict CIpUpsNotifyCount::doTestStepPostambleL()
+/**
+ * @return - TVerdict code
+ */
+ {
+ return TestStepResult();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/src/te_ipups_server.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,111 @@
+// Copyright (c) 2008-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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+#include "te_ipups_server.h"
+#include "te_ipups_ups_step.h"
+#include "te_ipups_notify_count.h"
+#include "te_ipups_delete_decision_db.h"
+#include <bacline.h>
+
+CTeIpUpsSuite* CTeIpUpsSuite::NewL(const TDesC& aName)
+/**
+ * @return - Instance of the test server
+ */
+ {
+ CTeIpUpsSuite * server = new (ELeave) CTeIpUpsSuite();
+ CleanupStack::PushL(server);
+ server->ConstructL(aName);
+ CleanupStack::Pop(server);
+ return server;
+ }
+
+
+LOCAL_C void MainL()
+/**
+ * Main implementation
+ */
+ {
+ CActiveScheduler* sched=NULL;
+ sched=new(ELeave) CActiveScheduler;
+ CActiveScheduler::Install(sched);
+ CTeIpUpsSuite* server = NULL;
+
+ CCommandLineArguments* args = CCommandLineArguments::NewLC();
+ TPtrC exeName = args->Arg(0);
+ TParse fullName;
+ fullName.Set(exeName, NULL, NULL);
+ CleanupStack::PopAndDestroy(args);
+
+ // Create the CTestServer derived server
+ TRAPD(err,server = CTeIpUpsSuite::NewL(fullName.Name()));
+ if(!err)
+ {
+ // Sync with the client and enter the active scheduler
+ RProcess::Rendezvous(KErrNone);
+ sched->Start();
+ }
+ delete server;
+ delete sched;
+ }
+
+
+
+GLDEF_C TInt E32Main()
+/**
+ * @return - Standard Epoc error code on process exit
+ * Process entry point. Called by client using RProcess API
+ */
+ {
+ __UHEAP_MARK;
+ CTrapCleanup* cleanup = CTrapCleanup::New();
+ if(cleanup == NULL)
+ {
+ return KErrNoMemory;
+ }
+ TRAPD(err,MainL());
+ delete cleanup;
+ __UHEAP_MARKEND;
+ return err;
+ }
+
+
+CTestStep* CTeIpUpsSuite::CreateTestStep(const TDesC& aStepName)
+/**
+ * @return - A CTestStep derived instance
+ */
+ {
+ CTestStep* testStep = NULL;
+
+ if(aStepName == KIpUpsClientStep)
+ {
+ testStep = new CIpUpsStep();
+ }
+ else if(aStepName == KIpUpsNotifyCount)
+ {
+ testStep = new CIpUpsNotifyCount();
+ }
+ else if(aStepName == KIpUpsDeleteDecisionDB)
+ {
+ testStep = new CIpUpsDeleteDecisionDB();
+ }
+
+ return testStep;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/src/te_ipups_stepbase.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,47 @@
+// Copyright (c) 2008-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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+#include "te_ipups_stepbase.h"
+
+TVerdict CTeIpUpsStepBase::doTestStepPreambleL()
+/**
+ * @return - TVerdict
+ */
+ {
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CTeIpUpsStepBase::doTestStepPostambleL()
+/**
+ * @return - TVerdict
+ */
+ {
+ return TestStepResult();
+ }
+
+CTeIpUpsStepBase::~CTeIpUpsStepBase()
+ {
+ }
+
+CTeIpUpsStepBase::CTeIpUpsStepBase()
+ {
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/ipupsplugins/test/te_ipups/src/te_ipups_ups_step.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,613 @@
+// Copyright (c) 2008-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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+#include "te_ipups_ups_step.h"
+#include "upstestnotifierproperties.h"
+#include <s32mem.h>
+
+static TInt ThreadFunction(TAny *)
+ {
+ return KErrNone;
+ }
+
+CIpUpsStep::~CIpUpsStep()
+/**
+ * Destructor
+ */
+ {
+ } // End of function
+
+
+CIpUpsStep::CIpUpsStep()
+/**
+ * Constructor
+ */
+ {
+ SetTestStepName(KIpUpsClientStep);
+ } // End of function
+
+
+TVerdict CIpUpsStep::doTestStepPreambleL()
+/**
+ * @return - TVerdict code
+ * Override of base class virtual
+ */
+ {
+ TSecurityPolicy nullPolicy(ECapability_None);
+ TInt err;
+
+ //Properties modified to be returned to test harness from test notifier
+ err = RProperty::Define(KUidPSUPSTestNotifCategory, KUnNotifyCount, KUnCountKeyType, nullPolicy, nullPolicy);
+ if (err != KErrAlreadyExists && err != KErrNone)
+ {
+ User::LeaveIfError(err);
+ }
+
+ err = RProperty::Define(KUidPSUPSTestNotifCategory, KUnNotifyValues, KUnNotifyValuesKeyType, nullPolicy, nullPolicy);
+ if (err != KErrAlreadyExists && err != KErrNone)
+ {
+ User::LeaveIfError(err);
+ }
+
+ //Properties test notifier requires from test harness about the button press and delay
+ err = RProperty::Define(KUidPSUPSTestNotifCategory, KUtButtonPress, KUtButtonPressKeyType, nullPolicy, nullPolicy);
+ if (err != KErrAlreadyExists && err != KErrNone)
+ {
+ User::LeaveIfError(err);
+ }
+
+ err = RProperty::Define(KUidPSUPSTestNotifCategory, KUtButtonPressDelay, KUtButtonPressDelayKeyType, nullPolicy, nullPolicy);
+ if (err != KErrAlreadyExists && err != KErrNone)
+ {
+ User::LeaveIfError(err);
+ }
+
+ //Get the testNotifier working mode, filemode or P&S mode
+ User::LeaveIfError(RProperty::Get(KUidPSUPSTestNotifCategory, KUtFileOverride, iTestNotifierMode));
+
+ //Set the property to override working of testNotifier in P&S mode instead of filemode
+ User::LeaveIfError(RProperty::Set(KUidPSUPSTestNotifCategory, KUtFileOverride, KFileOverride));
+
+ //Initialise optional data iNoOfAuthoriseCalls (should be '1' minimum).
+ iNoOfAuthoriseCalls = 1;
+
+ //Initialise optional data iPromptTriggerCount (Initialising with '-1' means no check if user not specfied in INI file).
+ iPromptTriggerCount = -1;
+
+ //Read data from INI file
+ GetHexFromConfig(ConfigSection(), KIpUpsServiceId, iServiceUID);
+ GetStringFromConfig(ConfigSection(),KIpUpsDestination, iDestination);
+ GetStringFromConfig(ConfigSection(),KIpUpsOpaqueData, iOpaqueData);
+ GetStringFromConfig(ConfigSection(),KIpUpsDialogOptionSelection, iDialogOption);
+ GetBoolFromConfig(ConfigSection(),KIpUpsPlatSecPass, iPlatSecPass);
+ GetStringFromConfig(ConfigSection(),KIpUpsExpectedDecision, iExpectedUpsDecision);
+ GetIntFromConfig(ConfigSection(),KIpUpsPromptTriggerCount, iPromptTriggerCount);
+ GetIntFromConfig(ConfigSection(),KIpUpsNoOfAuthoriseCalls, iNoOfAuthoriseCalls);
+ GetBoolFromConfig(ConfigSection(),KIpUpsCancelPromptCall, iCancelPromptCall);
+
+ GetBoolFromConfig(ConfigSection(),KIpUpsAlwaysOpenNewSession, iAlwaysOpenNewSession);
+
+ GetBoolFromConfig(ConfigSection(),KIpUpsUseSameSubSession, iUseSameSubSession);
+ GetBoolFromConfig(ConfigSection(),KIpUpsUseSameSubSessionAfterClose, iUseSameSubSessionAfterClose);
+ GetBoolFromConfig(ConfigSection(),KIpUpsAlwaysOpenNewSubSession, iAlwaysOpenNewSubSession);
+
+ //Keep the initial count of the notifier recorded, should be '0'
+ User::LeaveIfError(RProperty::Get(KUidPSUPSTestNotifCategory, KUnNotifyCount, iNotifyCount));
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ } // End of function.
+
+
+TVerdict CIpUpsStep::doTestStepL()
+/**
+ * @return - TVerdict code
+ * Override of base class virtual
+ */
+ {
+ UserPromptService::RUpsSession upsSession;
+ UserPromptService::RUpsSubsession upsSubSession[KMaxNoOfAuthoriseCalls];
+
+ RThread dummyThread[KMaxNoOfAuthoriseCalls];
+ TRequestStatus threadStatus;
+
+ TInt notifyCountBeforeTest = iNotifyCount;
+ TInt notifyCountAfterTest = 0;
+
+ TServiceId serviceId = TUid::Uid(iServiceUID);
+
+ TInt subSessionCntr = 0;
+
+ //Repeat call to Authorise as specified in INI file (through NoOfAuthoriseCalls data)
+ for (TInt cntr=0; cntr<iNoOfAuthoriseCalls && cntr<KMaxNoOfAuthoriseCalls; cntr++)
+ {
+ if (upsSession.Handle() == KNullHandle)
+ {
+ User::LeaveIfError(upsSession.Connect());
+ INFO_PRINTF1(_L("UPS Session Started."));
+ }
+
+ if (upsSubSession[subSessionCntr].SubSessionHandle() == KNullHandle)
+ {
+ //Create dummy thread with different names
+ TBuf<32> dummyThreadName;
+ dummyThreadName.Copy(_L("DummyThread_0123456789"));
+
+ User::LeaveIfError(dummyThread[subSessionCntr].Create(dummyThreadName.Right(dummyThreadName.Length()-subSessionCntr), ThreadFunction, 4096, 4096, 4096, 0, EOwnerThread));
+
+ dummyThread[subSessionCntr].Rendezvous(threadStatus);
+ dummyThread[subSessionCntr].Resume();
+ User::WaitForRequest(threadStatus);
+
+ upsSubSession[subSessionCntr] = UserPromptService::RUpsSubsession();
+ User::LeaveIfError(upsSubSession[subSessionCntr].Initialise(upsSession, dummyThread[subSessionCntr]));
+ INFO_PRINTF1(_L("UPS SubSession Initialised."));
+ }
+
+ //Get the dialog option for this iteration (specified in the INI file through
+ //DialogOptionSelection data, separated using KIniFileDelimeter).
+ TBuf<32> dialogOption;
+ GetValueAt(cntr, iDialogOption, KIniFileDelimeter, dialogOption);
+
+ UserPromptService::TPromptResult promptResult;
+ promptResult.iSelected = ButtonToOption(dialogOption);
+
+ TPckg<UserPromptService::TPromptResult> resultPckg(promptResult);
+
+ //Set the Dialog Option selection by user (specifies through DialogOptionSelection data value in INI file).
+ User::LeaveIfError(RProperty::Set(KUidPSUPSTestNotifCategory, KUtButtonPress, resultPckg));
+ User::LeaveIfError(RProperty::Set(KUidPSUPSTestNotifCategory, KUtButtonPressDelay, iCancelPromptCall?1:0));
+
+ INFO_PRINTF2(_L("Dialog Option Selection ( %S )."), &dialogOption);
+
+ //Get the Notify Count BEFORE call to Authorise
+ User::LeaveIfError(RProperty::Get(KUidPSUPSTestNotifCategory, KUnNotifyCount, notifyCountBeforeTest));
+
+ TUpsDecision upsDecision;
+ TRequestStatus status;
+
+ if ( iOpaqueData.Length() > 0 )
+ {
+ HBufC8* converter = HBufC8::NewLC(iOpaqueData.Length());
+ converter->Des().Copy(iOpaqueData);
+ iOpaqueDataStored = converter->Ptr();
+ CleanupStack::PopAndDestroy(); //converter
+
+ INFO_PRINTF1(_L("Opaque data present."));
+ upsSubSession[subSessionCntr].Authorise(iPlatSecPass, serviceId, iDestination, iOpaqueDataStored, upsDecision, status);
+ }
+ else
+ {
+ INFO_PRINTF1(_L("Opaque data NOT present."));
+ upsSubSession[subSessionCntr].Authorise(iPlatSecPass, serviceId, iDestination, upsDecision, status);
+ }
+
+
+ if (iCancelPromptCall)
+ {
+ upsSubSession[subSessionCntr].CancelPrompt();
+ INFO_PRINTF1(_L("CancelPrompt called on UPS SubSession."));
+ }
+
+ User::WaitForRequest(status);
+
+ SetTestStepError(status.Int());
+ User::LeaveIfError(status.Int());
+
+ //Get the Notify Count AFTER call to Authorise
+ User::LeaveIfError(RProperty::Get(KUidPSUPSTestNotifCategory, KUnNotifyCount, notifyCountAfterTest));
+
+ INFO_PRINTF3(_L("NotifyCount Before Authorise ( %d ) <> NotifyCount After Authorise ( %d )"), notifyCountBeforeTest, notifyCountAfterTest);
+
+ if ( iExpectedUpsDecision.Length() > 0 )
+ {
+ //Get the expected UPS decision for this iteration (specified in the INI file through
+ //ExpectedUpsDecision data, separated using KIniFileDelimeter).
+ TBuf<32> expectedUpsDecision;
+ GetValueAt(cntr, iExpectedUpsDecision, KIniFileDelimeter, expectedUpsDecision);
+
+ TPtrC upsDecisionString = TUpsDecisionToString(upsDecision);
+
+ INFO_PRINTF3(_L("UPS Decision Expected ( %S ) <> UPS Decision Returned ( %S )"), &expectedUpsDecision, &upsDecisionString);
+
+ //Compare the expected and returned UPS decision
+ TEST( expectedUpsDecision.Compare(TUpsDecisionToString(upsDecision)) == 0);
+ }
+
+ VerifyAndPrintPromptDataL();
+
+ //Check what user requested to do with SubSession for further iterations (if any).
+ if ( iUseSameSubSession )
+ {
+ INFO_PRINTF2(_L("Using UPS SubSession ( %d )."), subSessionCntr);
+ }
+ if ( iUseSameSubSessionAfterClose || iAlwaysOpenNewSession )
+ {
+ upsSubSession[subSessionCntr].Close();
+ INFO_PRINTF2(_L("UPS SubSession Closed ( %d )."), subSessionCntr);
+ dummyThread[subSessionCntr].Close();
+ }
+ else if ( iAlwaysOpenNewSubSession )
+ {
+ ++subSessionCntr;
+ }
+
+ if ( iAlwaysOpenNewSession )
+ {
+ upsSession.Close();
+ INFO_PRINTF1(_L("UPS Session Closed."));
+ }
+ } //End - for loop
+
+
+ //As with multiple clients , its better not to try to synchronize the calls which change the notify count.
+ //When all the concurrent calls are done , check the count finally through test step notifycount.
+ if (iPromptTriggerCount >= 0)
+ {
+ TEST( notifyCountAfterTest == (iNotifyCount+iPromptTriggerCount) );
+ }
+
+ //Ensure all sub sessions are closed
+ for (TInt cntr=0; cntr<subSessionCntr; cntr++)
+ {
+ if ( upsSubSession[cntr].SubSessionHandle() != KNullHandle )
+ {
+ INFO_PRINTF2(_L("UPS SubSession Closed ( %d )."), cntr);
+ upsSubSession[cntr].Close();
+ dummyThread[cntr].Close();
+ }
+ }
+
+ //Ensure session is closed
+ if ( upsSession.Handle() != KNullHandle )
+ {
+ upsSession.Close();
+ INFO_PRINTF1(_L("UPS Session Closed."));
+ }
+
+ return TestStepResult();
+ } // End of function
+
+
+TVerdict CIpUpsStep::doTestStepPostambleL()
+/**
+ * @return - TVerdict code
+ * Override of base class virtual
+ */
+ {
+ //ReSet the property to specify working of testNotifier in P&S or filemode
+ User::LeaveIfError(RProperty::Set(KUidPSUPSTestNotifCategory, KUtFileOverride, iTestNotifierMode));
+
+ return TestStepResult();
+ } // End of function.
+
+TBool CIpUpsStep::VerifyAndPrintPromptDataL()
+/**
+ * @return - TBool - ETrue of prompt data returned matched the data expected as specified in INI file, else EFalse.
+ *
+ */
+ {
+ //Get the Prompt Information
+ const TInt KMaxPromptDataLenght = 512;
+ HBufC8* buf=HBufC8::NewLC(KMaxPromptDataLenght);
+ TPtr8 bufPtr(buf->Des());
+
+ User::LeaveIfError(RProperty::Get(KUidPSUPSTestNotifCategory, KUnNotifyValues, bufPtr));
+
+ RDesReadStream promptDataStream(bufPtr);
+
+ iPromptData = UserPromptService::CPromptData::NewL();
+ CleanupStack::PushL(iPromptData);
+ iPromptData->InternalizeL(promptDataStream);
+
+ INFO_PRINTF2(_L("Client Name ( %S )"), &iPromptData->iClientName);
+ INFO_PRINTF2(_L("Vendor Name ( %S )"), &iPromptData->iVendorName);
+ INFO_PRINTF2(_L("Destination ( %S )"), &iPromptData->iDestination);
+ INFO_PRINTF2(_L("ClientSid ( %08x )"), iPromptData->iClientSid.iId);
+ INFO_PRINTF2(_L("ServerSid ( %08x )"), iPromptData->iServerSid.iId);
+ INFO_PRINTF2(_L("ServiceId ( %08x )"), iPromptData->iServiceId);
+
+ TInt count = iPromptData->iDescriptions.Count();
+ for (TInt cntr = 0; cntr < count; ++cntr)
+ {
+ INFO_PRINTF3(_L("Descriptions(%d) : %S "), cntr, iPromptData->iDescriptions[cntr]);
+ }
+
+ //Print Dialog Flags
+ TBuf<64> dialogFlags;
+
+ if ( iPromptData->iFlags & UserPromptService::ETrustedClient )
+ {
+ dialogFlags.Append(_L(" TrustedClient "));
+ }
+ if ( iPromptData->iFlags & UserPromptService::EBuiltInApp )
+ {
+ dialogFlags.Append(_L(" BuiltInApp "));
+ }
+ INFO_PRINTF2(_L("DialogFlags Set to ( %S )"), &dialogFlags);
+
+ TPtrC expectedDialogOptions;
+ TBuf<64> bufOptions;
+
+ GetStringFromConfig(ConfigSection(),KExpectedDialogOptions, iExpectedDialogOptions);
+
+ if (iExpectedDialogOptions.Length() > 0)
+ {
+ INFO_PRINTF2(_L("Options Expected ( %S )"), &iExpectedDialogOptions);
+
+ //Check if options presented are as expected
+ TBool result = OptionsFlagToString(iPromptData->iOptions, bufOptions);
+ TEST(result != EFalse);
+ }
+ else
+ {
+ OptionsFlagToString(iPromptData->iOptions, bufOptions, EFalse);
+ }
+
+ INFO_PRINTF2(_L("Options Presented ( %S )"), &bufOptions);
+
+ TEST(iPromptData->iServiceId.iUid == iServiceUID);
+ TEST(iPromptData->iDestination == iDestination);
+
+ CleanupStack::PopAndDestroy(2); //buf, iPromptData
+
+ return EFalse;
+ } // End of function.
+
+TBool CIpUpsStep::OptionsFlagToString(TUint aOptions, TDes& aOptionString, TBool aCheckAgainstExpectedOpt)
+/** OptionsFlagToString converts the dialog option(s) presented to string and check if the presented option
+ * is amongst the one which is expected(from INI file) or not if aCheckAgainstExpectedOpt is set to ETrue.
+ *
+ * @return - TBool - ETrue if presented options are the ones which are expected as specified in the INI file.
+ *
+ */
+ {
+ _LIT(KOptionYes, "Yes");
+ _LIT(KOptionNo, "No");
+ _LIT(KOptionSessionYes, "SessionYes");
+ _LIT(KOptionAlways, "Always");
+ _LIT(KOptionNever, "Never");
+ _LIT(KOptionSessionNo, "SessionNo");
+
+ const TPtrC policyOptions[] = {KOptionYes(), KOptionNo(), KOptionSessionYes(), KOptionAlways(),
+ KOptionNever(), KOptionSessionNo()};
+
+ TInt optionsCntr = 0;
+ TBool isOptionExpected = ETrue;
+
+ aOptionString.Append(_L("-"));
+
+ if (aOptions & UserPromptService::CPolicy::EYes)
+ {
+ aOptionString.Copy(policyOptions[optionsCntr]);
+ aOptionString.Append(_L("-"));
+
+ if (aCheckAgainstExpectedOpt)
+ {
+ if (iExpectedDialogOptions.FindF(policyOptions[optionsCntr]) == KErrNotFound)
+ {
+ isOptionExpected = EFalse;
+ }
+ }
+ }
+ ++optionsCntr;
+
+ if (aOptions & UserPromptService::CPolicy::ENo)
+ {
+ aOptionString.Append(policyOptions[optionsCntr]);
+ aOptionString.Append(_L("-"));
+
+ if (aCheckAgainstExpectedOpt)
+ {
+ if (iExpectedDialogOptions.FindF(policyOptions[optionsCntr]) == KErrNotFound)
+ {
+ isOptionExpected = EFalse;
+ }
+ }
+ }
+ ++optionsCntr;
+
+ if (aOptions & UserPromptService::CPolicy::ESessionYes)
+ {
+ aOptionString.Append(policyOptions[optionsCntr]);
+ aOptionString.Append(_L("-"));
+
+ if (aCheckAgainstExpectedOpt)
+ {
+ if (iExpectedDialogOptions.FindF(policyOptions[optionsCntr]) == KErrNotFound)
+ {
+ isOptionExpected = EFalse;
+ }
+ }
+ }
+ ++optionsCntr;
+
+ if (aOptions & UserPromptService::CPolicy::EAlways)
+ {
+ aOptionString.Append(policyOptions[optionsCntr]);
+ aOptionString.Append(_L("-"));
+
+ if (aCheckAgainstExpectedOpt)
+ {
+ if (iExpectedDialogOptions.FindF(policyOptions[optionsCntr]) == KErrNotFound)
+ {
+ isOptionExpected = EFalse;
+ }
+ }
+ }
+ ++optionsCntr;
+
+ if (aOptions & UserPromptService::CPolicy::ENever)
+ {
+ aOptionString.Append(policyOptions[optionsCntr]);
+ aOptionString.Append(_L("-"));
+
+ if (aCheckAgainstExpectedOpt)
+ {
+ if (iExpectedDialogOptions.FindF(policyOptions[optionsCntr]) == KErrNotFound)
+ {
+ isOptionExpected = EFalse;
+ }
+ }
+ }
+ ++optionsCntr;
+
+ if (aOptions & UserPromptService::CPolicy::ESessionNo)
+ {
+ aOptionString.Append(policyOptions[optionsCntr]);
+ aOptionString.Append(_L("-"));
+
+ if (aCheckAgainstExpectedOpt)
+ {
+ if (iExpectedDialogOptions.FindF(policyOptions[optionsCntr]) == KErrNotFound)
+ {
+ isOptionExpected = EFalse;
+ }
+ }
+ }
+
+ return isOptionExpected;
+ } // End of function.
+
+/** GetValueAt provides the value of data at a specific index (specified by aPos)
+* String containing the values is specified thorugh aArrayString and multiple values
+* are separated by delimeter aDelimeter.
+* aValue is returned.
+*/
+void CIpUpsStep::GetValueAt(const TInt aPos, const TPtrC& aArrayString, const TChar aDelimeter, TDes& aValue)
+ {
+ TInt posCntr=0;
+ TInt itemCntr = -1;
+
+ //Initialise it with blank string to avoid any previous copies
+ aValue.Copy(_L(""));
+
+ while (posCntr < aArrayString.Length() && itemCntr != aPos)
+ {
+ if (aArrayString[posCntr] != aDelimeter)
+ {
+ aValue.Append(aArrayString[posCntr]);
+ }
+ else
+ {
+ ++itemCntr;
+ //Is this the item we are looking for, if not, make space to next one
+ if (itemCntr != aPos)
+ {
+ aValue.Copy(_L(""));
+ }
+ }
+ ++posCntr;
+ }
+ }
+
+/* TUpsDecisionToString converts TUpsDecision to string.
+*/
+TPtrC CIpUpsStep::TUpsDecisionToString(TUpsDecision aDecision)
+ {
+ if(aDecision == EUpsDecYes)
+ {
+ return _L("Yes");
+ }
+ else if(aDecision == EUpsDecNo)
+ {
+ return _L("No");
+ }
+ else if(aDecision == EUpsDecSessionYes)
+ {
+ return _L("SessionYes");
+ }
+ else if(aDecision == EUpsDecSessionNo)
+ {
+ return _L("SessionNo");
+ }
+ else
+ {
+ ERR_PRINTF1(_L("Invalid UPS Descision, returning No by default."));
+ return _L("No");
+ }
+ } // End of function.
+
+/* TUpsDecisionFromString converts string value to TUpsDecision.
+*/
+TUpsDecision CIpUpsStep::TUpsDecisionFromString(const TPtrC& aDecision)
+ {
+ if(aDecision.CompareF(_L("Yes"))==0)
+ {
+ return EUpsDecYes;
+ }
+ else if(aDecision.CompareF(_L("No"))==0)
+ {
+ return EUpsDecNo;
+ }
+ else if(aDecision.CompareF(_L("SessionYes"))==0)
+ {
+ return EUpsDecSessionYes;
+ }
+ else if(aDecision.CompareF(_L("SessionNo"))==0)
+ {
+ return EUpsDecSessionNo;
+ }
+ else
+ {
+ ERR_PRINTF1(_L("Invalid UPS Descision, returning No by default."));
+ return EUpsDecNo;
+ }
+ } // End of function.
+
+/* ButtonToOption converts string value of button presented to CPolicy::TOptions.
+*/
+UserPromptService::CPolicy::TOptions CIpUpsStep::ButtonToOption(const TPtrC& aButton)
+ {
+ if(aButton.CompareF(_L("Yes"))==0)
+ {
+ return UserPromptService::CPolicy::EYes;
+ }
+ else if(aButton.CompareF(_L("No"))==0)
+ {
+ return UserPromptService::CPolicy::ENo;
+ }
+ else if(aButton.CompareF(_L("Session"))==0)
+ {
+ return UserPromptService::CPolicy::ESession;
+ }
+ else if(aButton.CompareF(_L("SessionYes"))==0)
+ {
+ return UserPromptService::CPolicy::ESessionYes;
+ }
+ else if(aButton.CompareF(_L("Always"))==0)
+ {
+ return UserPromptService::CPolicy::EAlways;
+ }
+ else if(aButton.CompareF(_L("Never"))==0)
+ {
+ return UserPromptService::CPolicy::ENever;
+ }
+ else if(aButton.CompareF(_L("SessionNo"))==0)
+ {
+ return UserPromptService::CPolicy::ESessionNo;
+ }
+ else
+ {
+ ERR_PRINTF1(_L("Invalid Button Option, returning Policy Option No by default."));
+ return UserPromptService::CPolicy::ENo;
+ }
+ } // End of function.
--- a/networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -22,8 +22,8 @@
#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
+../configs/te_QoSSuite_simtsy.txt z:/testdata/configs/te_qossuite_simtsy.txt
+../configs/te_QoSSuite_LoopbackCsy.ini z:/testdata/configs/te_qossuite_loopbackcsy.ini
#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
../configs/CIT_P192_Qos_SimTsy.xml z:/testdata/configs/cit_p192_qos_simtsy.xml
--- a/networkcontrol/qosipscpr/inc/ip_subconparams.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networkcontrol/qosipscpr/inc/ip_subconparams.h Tue Aug 31 16:45:15 2010 +0300
@@ -27,6 +27,8 @@
#define __IP_SUBCONPARAMS_H__
#include <es_sock.h>
+#include <networking/qos3gpp_subconparams.h>
+
// NOTE: This Uid may be changed - See #ifdef at bottom of the file
const TInt KSubConIPParamsUid = 0x10204309;
--- a/networkingsrv_info/networkingrom/group/NetworkTest.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingsrv_info/networkingrom/group/NetworkTest.iby Tue Aug 31 16:45:15 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"
@@ -70,6 +70,7 @@
// Initialisation before any tests are run
data=EPOCROOT##epoc32\data\z\testdata\scripts\te_initialiseboard.script TestData\scripts\te_initialiseboard.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\delay.script TestData\scripts\delay.script
REM ---------- Comms-Infras ----------
@@ -131,7 +132,7 @@
#endif //NW_TEST_ROM_2
// FTP Tests
-#include <tftp_e.iby>
+//#include <tftp_e.iby>
// IntegrationTest framework
#ifdef NW_TEST_ROM_1
@@ -141,9 +142,6 @@
// 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
@@ -262,13 +260,14 @@
// Needed by several tests
#include <simtsy.iby>
-#include <te_AnvlClient.iby>
+// Commenting anvl as no one is using it. can uncomment when needed . need to update networktest.iby also
+// #include <te_AnvlClient.iby>
REM ---------- WAP-Stack ----------
// SWS test
#ifdef NW_TEST_ROM_3
-#include <wapstacksuite.iby>
+//#include <wapstacksuite.iby>
#endif
REM --- NEEDED FOR THE SECURITY TESTS ---
--- a/networkingsrv_info/networkingrom/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingsrv_info/networkingrom/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -26,6 +26,8 @@
PRJ_TESTEXPORTS
// File run before every hardware test that can be added to pre-ROM build
../group/te_initialiseboard.script z:/testdata/scripts/te_initialiseboard.script
+// Calling this delay.script in the ATS test drop before calling any connection based test cases
+../group/delay.script z:/testdata/scripts/delay.script
// #include "../../../../unref/orphan/comgen/networking/test/te_Anvl/group/bld.inf"
// #include "../../../../unref/orphan/comgen/networking/test/te_TahiClient/group/bld.inf"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingsrv_info/networkingrom/group/delay.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,17 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+DELAY 10000
\ No newline at end of file
--- a/networkingtestandutils/ipprobe/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/ipprobe/group/bld.inf Tue Aug 31 16:45:15 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 <platform_paths.hrh>
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
-../group/probe.iby /epoc32/rom/include/probe.iby
PRJ_MMPFILES
--- a/networkingtestandutils/ipprobe/group/networking_probe.mrp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/ipprobe/group/networking_probe.mrp Tue Aug 31 16:45:15 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"
--- a/networkingtestandutils/ipprobe/group/probe.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/ipprobe/group/probe.iby Tue Aug 31 16:45:15 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"
--- a/networkingtestandutils/ipprobe/group/probe.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/ipprobe/group/probe.mmp Tue Aug 31 16:45:15 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
--- a/networkingtestandutils/ipprobe/inc/family.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/ipprobe/inc/family.h Tue Aug 31 16:45:15 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
--- a/networkingtestandutils/ipprobe/inc/prt.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/ipprobe/inc/prt.h Tue Aug 31 16:45:15 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 <e32std.h>
+#include <f32file.h>
#include <es_sock.h>
#include <nifman.h>
+
#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
--- a/networkingtestandutils/ipprobe/inc/sap.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/ipprobe/inc/sap.h Tue Aug 31 16:45:15 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
--- a/networkingtestandutils/ipprobe/src/family.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/ipprobe/src/family.cpp Tue Aug 31 16:45:15 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;
--- a/networkingtestandutils/ipprobe/src/prt.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/ipprobe/src/prt.cpp Tue Aug 31 16:45:15 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 <e32std.h>
#include <e32base.h>
+#include <f32file.h>
+#include <e32svr.h>
#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
#include <es_prot_internal.h>
#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<TInt>(secs);
+ info->iFlags = static_cast<TUint>(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<TUint32>(info->iProtocol);
+ TUint32 micros = static_cast<TUint32>(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<sizeof(TUint32)*5+sizeof(TUint16)*2> 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<sizeof(TUint32)*4> 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<CProtocolProbe*>(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);
+ }
+ }
--- a/networkingtestandutils/ipprobe/src/sap.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/ipprobe/src/sap.cpp Tue Aug 31 16:45:15 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"));
--- a/networkingtestandutils/networkingintegrationtest/Group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -49,6 +49,46 @@
PRJ_TESTEXPORTS
+#ifdef SIROCCO_CODE_MIGRATION
+../it_script_files/itest_s1/cccccc00_itest1.cre /epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest1.cre
+../it_script_files/itest_s2/cccccc00_itest2.cre /epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest2.cre
+../it_script_files/itest_s3/cccccc00_itest3.cre /epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest3.cre
+../it_script_files/itest_s4/cccccc00_itest4.cre /epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest4.cre
+../it_script_files/itest_s5/cccccc00_itest5.cre /epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest5.cre
+#endif
+
+
+#ifdef SIROCCO_CODE_MIGRATION
+// s1 scripts
+../it_script_files/itest_s1.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1.script
+../it_script_files/itest_s1_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1_manual_tcs.script
+../it_script_files/LogOn.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/logon.script
+../it_script_files/itest_s1/itest_RConnection.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest_rconnection.script
+../it_script_files/itest_s1/itest1_01_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_01_wlan.script
+../it_script_files/itest_s1/itest1_02_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_02_wlan.script
+../it_script_files/itest_s1/itest1_03_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_03_wlan.script
+../it_script_files/itest_s1/itest1_04.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_04.script
+../it_script_files/itest_s1/itest1_09.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_09.script
+../it_script_files/itest_s1/itest1_10_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_10_wlan.script
+../it_script_files/itest_s1/itest1_11.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_11.script
+../it_script_files/itest_s1/itest1_12.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_12.script
+../it_script_files/itest_s1/itest1_13_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_13_wlan.script
+../it_script_files/itest_s1/itest1_14.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_14.script
+../it_script_files/itest_s1/itest1_15.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_15.script
+../it_script_files/itest_s1/itest1_16.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_16.script
+../it_script_files/itest_s1/itest1_17_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_17_wlan.script
+../it_script_files/itest_s1/ipv4_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/ipv4_wlan.ini
+../it_script_files/itest_s1/ipv6_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/ipv6_wlan.ini
+../it_script_files/itest_s1/client_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/client_timeout.ini
+../it_script_files/itest_s1/genconn.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/genconn.ini
+../it_script_files/itest_s1/itest.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/itest.ini
+../it_script_files/itest_s1/rnif_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/rnif_timeout.ini
+../it_script_files/itest_s1/load_csd_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/load_csd_wlan.script
+../it_script_files/itest_s1/n6210.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/n6210.script
+../it_script_files/itest_s1/itest_load.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest_load.script
+../it_script_files/itest_s1/big_ipv4.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/big_ipv4.ini
+../it_script_files/itest_s1/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/te_teststeps.ini
+#else
// s1 scripts
../it_script_files/itest_s1.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1.script
../it_script_files/itest_s1_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1_manual_tcs.script
@@ -81,8 +121,7 @@
../it_script_files/itest_s1/big_ipv4.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/big_ipv4.ini
../it_script_files/itest_s1/ipsec_csd.xml /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/ipsec_csd.xml
../it_script_files/itest_s1/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/te_teststeps.ini
-
-
+#endif
../it_script_files/itest_s1.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s1.script
../it_script_files/LogOn.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/logon.script
@@ -117,15 +156,24 @@
-
+#ifdef SIROCCO_CODE_MIGRATION
// s2 scripts
../it_script_files/itest_s2.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2.script
+../it_script_files/itest_s2/itest2_01_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2/itest2_01_wlan.script
+../it_script_files/itest_s2/ipv4_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/ipv4_wlan.ini
+../it_script_files/itest_s2/client_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/client_timeout.ini
+../it_script_files/itest_s2/itest.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/itest.ini
+../it_script_files/itest_s2/load_hscsd_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2/load_hscsd_wlan.script
+#else
+../it_script_files/itest_s2.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2.script
../it_script_files/itest_s2/itest2_01.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2/itest2_01.script
../it_script_files/itest_s2/ipv4.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/ipv4.ini
../it_script_files/itest_s2/client_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/client_timeout.ini
../it_script_files/itest_s2/itest.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/itest.ini
../it_script_files/itest_s2/load_hscsd.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2/load_hscsd.script
../it_script_files/itest_s2/hscsd.xml /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/hscsd.xml
+#endif
+
../it_script_files/itest_s2.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s2.script
../it_script_files/itest_s2/itest2_01.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s2/itest2_01.script
@@ -135,9 +183,38 @@
../it_script_files/itest_s2/load_hscsd.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s2/load_hscsd.script
../it_script_files/itest_s2/hscsd.xml /epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s2/hscsd.xml
+#ifdef SIROCCO_CODE_MIGRATION
// s3 scripts
../it_script_files/itest_s3.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3.script
../it_script_files/itest_s3_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3_manual_tcs.script
+../it_script_files/itest_s3/itest3_01_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_01_wlan.script
+../it_script_files/itest_s3/itest3_02_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_02_wlan.script
+../it_script_files/itest_s3/itest3_03.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_03.script
+../it_script_files/itest_s3/itest3_04_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_04_wlan.script
+../it_script_files/itest_s3/itest3_05_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_05_wlan.script
+../it_script_files/itest_s3/itest3_05b.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_05b.script
+../it_script_files/itest_s3/itest3_05c_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_05c_wlan.script
+../it_script_files/itest_s3/itest3_09_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_09_wlan.script
+../it_script_files/itest_s3/itest3_10_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_10_wlan.script
+../it_script_files/itest_s3/itest3_11.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_11.script
+../it_script_files/itest_s3/itest3_12_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_12_wlan.script
+../it_script_files/itest_s3/itest3_13_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_13_wlan.script
+../it_script_files/itest_s3/itest3_14_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_14_wlan.script
+../it_script_files/itest_s3/itest3_15.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_15.script
+../it_script_files/itest_s3/itest3_16_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_16_wlan.script
+../it_script_files/itest_s3/itest3_17_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_17_wlan.script
+../it_script_files/itest_s3/ipv4_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/ipv4_wlan.ini
+../it_script_files/itest_s3/ipv6_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/ipv6_wlan.ini
+../it_script_files/itest_s3/client_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/client_timeout.ini
+../it_script_files/itest_s3/route_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/route_timeout.ini
+../it_script_files/itest_s3/genconn.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/genconn.ini
+../it_script_files/itest_s3/itest.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/itest.ini
+../it_script_files/itest_s3/rnif_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/rnif_timeout.ini
+../it_script_files/itest_s3/load_gprs_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/load_gprs_wlan.script
+../it_script_files/itest_s3/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/te_teststeps.ini
+#else
+../it_script_files/itest_s3.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3.script
+../it_script_files/itest_s3_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3_manual_tcs.script
../it_script_files/itest_s3/itest3_01.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_01.script
../it_script_files/itest_s3/itest3_02.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_02.script
../it_script_files/itest_s3/itest3_03.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_03.script
@@ -164,7 +241,7 @@
../it_script_files/itest_s3/load_gprs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/load_gprs.script
../it_script_files/itest_s3/gprs.xml /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/gprs.xml
../it_script_files/itest_s3/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/te_teststeps.ini
-
+#endif
../it_script_files/itest_s3.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s3.script
../it_script_files/itest_s3/itest3_01.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s3/itest3_01.script
@@ -195,8 +272,37 @@
../it_script_files/itest_s3/gprs.xml /epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s3/gprs.xml
../it_script_files/itest_s3/te_teststeps.ini /epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s3/te_teststeps.ini
+#ifdef SIROCCO_CODE_MIGRATION
+// s4 scripts
+../it_script_files/itest_s4.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4.script
+../it_script_files/itest_s4_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4_manual_tcs.script
+../it_script_files/itest_s4/itest4_01_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_01_wlan.script
+../it_script_files/itest_s4/itest4_02.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_02.script
+../it_script_files/itest_s4/itest4_03.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_03.script
+../it_script_files/itest_s4/itest4_04.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_04.script
+../it_script_files/itest_s4/itest4_06_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_06_wlan.script
+../it_script_files/itest_s4/itest4_07.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_07.script
+../it_script_files/itest_s4/itest4_08.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_08.script
-// s4 scripts
+../it_script_files/itest_s4/itest4_09.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_09.script
+../it_script_files/itest_s4/itest4_10.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_10.script
+../it_script_files/itest_s4/itest4_11_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_11_wlan.script
+../it_script_files/itest_s4/itest4_12.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_12.script
+../it_script_files/itest_s4/itest4_13.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_13.script
+../it_script_files/itest_s4/itest4_14.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_14.script
+../it_script_files/itest_s4/itest4_15.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_15.script
+../it_script_files/itest_s4/itest4_16.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_16.script
+../it_script_files/itest_s4/itest4_17_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_17_wlan.script
+../it_script_files/itest_s4/ipv4_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/ipv4_wlan.ini
+../it_script_files/itest_s4/ipv6_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/ipv6_wlan.ini
+../it_script_files/itest_s4/client_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/client_timeout.ini
+../it_script_files/itest_s4/genconn.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/genconn.ini
+../it_script_files/itest_s4/genconn-psd.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/genconn-psd.ini
+../it_script_files/itest_s4/itest.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/itest.ini
+../it_script_files/itest_s4/rnif_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/rnif_timeout.ini
+../it_script_files/itest_s4/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/te_teststeps.ini
+../it_script_files/itest_s4/route_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/route_timeout.ini
+#else
../it_script_files/itest_s4.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4.script
../it_script_files/itest_s4_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4_manual_tcs.script
../it_script_files/itest_s4/itest4_01.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_01.script
@@ -225,8 +331,7 @@
../it_script_files/itest_s4/rnif_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/rnif_timeout.ini
../it_script_files/itest_s4/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/te_teststeps.ini
../it_script_files/itest_s4/route_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/route_timeout.ini
-
-
+#endif
../it_script_files/itest_s4.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s4.script
../it_script_files/itest_s4/itest4_01.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s4/itest4_01.script
@@ -257,8 +362,44 @@
../it_script_files/itest_s4/te_teststeps.ini /epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s4/te_teststeps.ini
../it_script_files/itest_s4/route_timeout.ini /epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s4/route_timeout.ini
+#ifdef SIROCCO_CODE_MIGRATION
+// s5 scripts
+../it_script_files/itest_s5.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5.script
+../it_script_files/itest_s5_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5_manual_tcs.script
+../it_script_files/itest_s5/itest5_01_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_01_wlan.script
+../it_script_files/itest_s5/itest5_02.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_02.script
+../it_script_files/itest_s5/itest5_03_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_03_wlan.script
+../it_script_files/itest_s5/itest5_04.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_04.script
+../it_script_files/itest_s5/itest5_05.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_05.script
+../it_script_files/itest_s5/itest5_05b.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_05b.script
+../it_script_files/itest_s5/itest5_05c.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_05c.script
+../it_script_files/itest_s5/itest5_06.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_06.script
+../it_script_files/itest_s5/itest5_07.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_07.script
+../it_script_files/itest_s5/itest5_08.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_08.script
+../it_script_files/itest_s5/itest5_09.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_09.script
+../it_script_files/itest_s5/itest5_10_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_10_wlan.script
+../it_script_files/itest_s5/itest5_11.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_11.script
+../it_script_files/itest_s5/itest5_12_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_12_wlan.script
+../it_script_files/itest_s5/itest5_13_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_13_wlan.script
+../it_script_files/itest_s5/itest5_14.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_14.script
+../it_script_files/itest_s5/itest5_15.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_15.script
+../it_script_files/itest_s5/itest5_16.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_16.script
+../it_script_files/itest_s5/itest5_17_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_17_wlan.script
-// s5 scripts
+../it_script_files/itest_s5/itest5_18.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_18.script
+../it_script_files/itest_s5/itest5_19.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_19.script
+
+
+../it_script_files/itest_s5/ipv4_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/ipv4_wlan.ini
+../it_script_files/itest_s5/ipv6_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/ipv6_wlan.ini
+../it_script_files/itest_s5/client_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/client_timeout.ini
+../it_script_files/itest_s5/genconn.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/genconn.ini
+../it_script_files/itest_s5/itest.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/itest.ini
+../it_script_files/itest_s5/rnif_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/rnif_timeout.ini
+../it_script_files/itest_s5/route_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/route_timeout.ini
+../it_script_files/itest_s5/load_ircsd_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/load_ircsd_wlan.script
+../it_script_files/itest_s5/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/te_teststeps.ini
+#else
../it_script_files/itest_s5.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5.script
../it_script_files/itest_s5_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5_manual_tcs.script
../it_script_files/itest_s5/itest5_01.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_01.script
@@ -295,7 +436,7 @@
../it_script_files/itest_s5/load_ircsd.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/load_ircsd.script
../it_script_files/itest_s5/csd-ir.xml /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/csd-ir.xml
../it_script_files/itest_s5/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/te_teststeps.ini
-
+#endif
../it_script_files/itest_s5.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s5.script
--- a/networkingtestandutils/networkingintegrationtest/Group/integrationtest.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Group/integrationtest.iby Tue Aug 31 16:45:15 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -41,7 +41,44 @@
#include "te_DedicatedSignalling1ryCtx.iby"
#endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\cccccc00_itest1.cre testdata\configs\cccccc00_itest1.cre
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\cccccc00_itest2.cre testdata\configs\cccccc00_itest2.cre
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\cccccc00_itest3.cre testdata\configs\cccccc00_itest3.cre
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\cccccc00_itest4.cre testdata\configs\cccccc00_itest4.cre
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\cccccc00_itest5.cre testdata\configs\cccccc00_itest5.cre
+#endif
+
// S1 script files
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1.script testdata\scripts\integration\itest_s1.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\LogOn.script testdata\scripts\integration\LogOn.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest_RConnection.script testdata\scripts\integration\itest_s1\itest_RConnection.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_01_wlan.script testdata\scripts\integration\itest_s1\itest1_01.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_02_wlan.script testdata\scripts\integration\itest_s1\itest1_02.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_03_wlan.script testdata\scripts\integration\itest_s1\itest1_03.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_04.script testdata\scripts\integration\itest_s1\itest1_04.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_09.script testdata\scripts\integration\itest_s1\itest1_09.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_10_wlan.script testdata\scripts\integration\itest_s1\itest1_10.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_11.script testdata\scripts\integration\itest_s1\itest1_11.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_12.script testdata\scripts\integration\itest_s1\itest1_12.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_13_wlan.script testdata\scripts\integration\itest_s1\itest1_13.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_14.script testdata\scripts\integration\itest_s1\itest1_14.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_15.script testdata\scripts\integration\itest_s1\itest1_15.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_16.script testdata\scripts\integration\itest_s1\itest1_16.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_17_wlan.script testdata\scripts\integration\itest_s1\itest1_17.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\ipv4_wlan.ini testdata\configs\integration\itest_s1\ipv4.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\ipv6_wlan.ini testdata\configs\integration\itest_s1\ipv6.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\client_timeout.ini testdata\configs\integration\itest_s1\client_timeout.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\genconn.ini testdata\configs\integration\itest_s1\genconn.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\itest.ini testdata\configs\integration\itest_s1\itest.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\rnif_timeout.ini testdata\configs\integration\itest_s1\rnif_timeout.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\load_csd_wlan.script testdata\scripts\integration\itest_s1\load_csd.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\n6210.script testdata\scripts\integration\itest_s1\n6210.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest_load.script testdata\scripts\integration\itest_s1\itest_load.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\big_ipv4.ini testdata\configs\integration\itest_s1\big_ipv4.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\te_teststeps.ini testdata\configs\integration\itest_s1\te_teststeps.ini
+#else
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1.script testdata\scripts\integration\itest_s1.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\LogOn.script testdata\scripts\integration\LogOn.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest_RConnection.script testdata\scripts\integration\itest_s1\itest_RConnection.script
@@ -71,30 +108,61 @@
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest_load.script testdata\scripts\integration\itest_s1\itest_load.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\big_ipv4.ini testdata\configs\integration\itest_s1\big_ipv4.ini
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\ipsec_csd.xml testdata\configs\integration\itest_s1\ipsec_csd.xml
-
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\te_teststeps.ini testdata\configs\integration\itest_s1\te_teststeps.ini
-
-
-
+#endif
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
// S2 script files
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s2.script testdata\scripts\integration\itest_s2.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s2\itest2_01_wlan.script testdata\scripts\integration\itest_s2\itest2_01.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\ipv4_wlan.ini testdata\configs\integration\itest_s2\ipv4.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\client_timeout.ini testdata\configs\integration\itest_s2\client_timeout.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\itest.ini testdata\configs\integration\itest_s2\itest.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s2\load_hscsd_wlan.script testdata\scripts\integration\itest_s2\load_hscsd.script
+#else
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s2.script testdata\scripts\integration\itest_s2.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s2\itest2_01.script testdata\scripts\integration\itest_s2\itest2_01.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\ipv4.ini testdata\configs\integration\itest_s2\ipv4.ini
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\client_timeout.ini testdata\configs\integration\itest_s2\client_timeout.ini
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\itest.ini testdata\configs\integration\itest_s2\itest.ini
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s2\load_hscsd.script testdata\scripts\integration\itest_s2\load_hscsd.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\hscsd.xml testdata\configs\integration\itest_s2\hscsd.xml
-
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\hscsd.xml testdata\configs\integration\itest_s2\hscsd.xml
+#endif
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
// S3 script files
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3.script testdata\scripts\integration\itest_s3.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_01_wlan.script testdata\scripts\integration\itest_s3\itest3_01.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_02_wlan.script testdata\scripts\integration\itest_s3\itest3_02.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_03.script testdata\scripts\integration\itest_s3\itest3_03.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_04_wlan.script testdata\scripts\integration\itest_s3\itest3_04.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_05_wlan.script testdata\scripts\integration\itest_s3\itest3_05.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_05b.script testdata\scripts\integration\itest_s3\itest3_05b.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_05c_wlan.script testdata\scripts\integration\itest_s3\itest3_05c.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_09_wlan.script testdata\scripts\integration\itest_s3\itest3_09.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_10_wlan.script testdata\scripts\integration\itest_s3\itest3_10.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_11.script testdata\scripts\integration\itest_s3\itest3_11.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_12_wlan.script testdata\scripts\integration\itest_s3\itest3_12.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_13_wlan.script testdata\scripts\integration\itest_s3\itest3_13.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_14_wlan.script testdata\scripts\integration\itest_s3\itest3_14.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_15.script testdata\scripts\integration\itest_s3\itest3_15.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_16_wlan.script testdata\scripts\integration\itest_s3\itest3_16.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_17_wlan.script testdata\scripts\integration\itest_s3\itest3_17.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\ipv4_wlan.ini testdata\configs\integration\itest_s3\ipv4.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\ipv6_wlan.ini testdata\configs\integration\itest_s3\ipv6.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\client_timeout.ini testdata\configs\integration\itest_s3\client_timeout.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\route_timeout.ini testdata\configs\integration\itest_s3\route_timeout.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\genconn.ini testdata\configs\integration\itest_s3\genconn.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\itest.ini testdata\configs\integration\itest_s3\itest.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\rnif_timeout.ini testdata\configs\integration\itest_s3\rnif_timeout.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\load_gprs_wlan.script testdata\scripts\integration\itest_s3\load_gprs.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\te_teststeps.ini testdata\configs\integration\itest_s3\te_teststeps.ini
+#else
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3.script testdata\scripts\integration\itest_s3.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_01.script testdata\scripts\integration\itest_s3\itest3_01.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_02.script testdata\scripts\integration\itest_s3\itest3_02.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_03.script testdata\scripts\integration\itest_s3\itest3_03.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_04.script testdata\scripts\integration\itest_s3\itest3_04.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_05.script testdata\scripts\integration\itest_s3\itest3_05.script
-
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_05b.script testdata\scripts\integration\itest_s3\itest3_05b.script
-
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_05c.script testdata\scripts\integration\itest_s3\itest3_05c.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_09.script testdata\scripts\integration\itest_s3\itest3_09.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_10.script testdata\scripts\integration\itest_s3\itest3_10.script
@@ -112,24 +180,47 @@
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\genconn.ini testdata\configs\integration\itest_s3\genconn.ini
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\itest.ini testdata\configs\integration\itest_s3\itest.ini
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\rnif_timeout.ini testdata\configs\integration\itest_s3\rnif_timeout.ini
-data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\load_gprs.script testdata\scripts\integration\itest_s3\load_gprs.script
-data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\gprs.xml testdata\configs\integration\itest_s3\gprs.xml
-
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\load_gprs_wlan.script testdata\scripts\integration\itest_s3\load_gprs.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\gprs_wlan.xml testdata\configs\integration\itest_s3\gprs.xml
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\te_teststeps.ini testdata\configs\integration\itest_s3\te_teststeps.ini
-
-
+#endif
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
// S4 script files
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4.script testdata\scripts\integration\itest_s4.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_01_wlan.script testdata\scripts\integration\itest_s4\itest4_01.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_02.script testdata\scripts\integration\itest_s4\itest4_02.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_03.script testdata\scripts\integration\itest_s4\itest4_03.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_04.script testdata\scripts\integration\itest_s4\itest4_04.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_06_wlan.script testdata\scripts\integration\itest_s4\itest4_06.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_07.script testdata\scripts\integration\itest_s4\itest4_07.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_08.script testdata\scripts\integration\itest_s4\itest4_08.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_09.script testdata\scripts\integration\itest_s4\itest4_09.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_10.script testdata\scripts\integration\itest_s4\itest4_10.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_11_wlan.script testdata\scripts\integration\itest_s4\itest4_11.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_12.script testdata\scripts\integration\itest_s4\itest4_12.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_13.script testdata\scripts\integration\itest_s4\itest4_13.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_14.script testdata\scripts\integration\itest_s4\itest4_14.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_15.script testdata\scripts\integration\itest_s4\itest4_15.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_16.script testdata\scripts\integration\itest_s4\itest4_16.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_17_wlan.script testdata\scripts\integration\itest_s4\itest4_17.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\ipv4_wlan.ini testdata\configs\integration\itest_s4\ipv4.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\ipv6_wlan.ini testdata\configs\integration\itest_s4\ipv6.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\client_timeout.ini testdata\configs\integration\itest_s4\client_timeout.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\genconn.ini testdata\configs\integration\itest_s4\genconn.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\genconn-psd.ini testdata\configs\integration\itest_s4\genconn-psd.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\itest.ini testdata\configs\integration\itest_s4\itest.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\rnif_timeout.ini testdata\configs\integration\itest_s4\rnif_timeout.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\te_teststeps.ini testdata\configs\integration\itest_s4\te_teststeps.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\route_timeout.ini testdata\configs\integration\itest_s4\route_timeout.ini
+#else
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4.script testdata\scripts\integration\itest_s4.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_01.script testdata\scripts\integration\itest_s4\itest4_01.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_02.script testdata\scripts\integration\itest_s4\itest4_02.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_03.script testdata\scripts\integration\itest_s4\itest4_03.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_04.script testdata\scripts\integration\itest_s4\itest4_04.script
-
-
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_06.script testdata\scripts\integration\itest_s4\itest4_06.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_07.script testdata\scripts\integration\itest_s4\itest4_07.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_08.script testdata\scripts\integration\itest_s4\itest4_08.script
-
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_09.script testdata\scripts\integration\itest_s4\itest4_09.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_10.script testdata\scripts\integration\itest_s4\itest4_10.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_11.script testdata\scripts\integration\itest_s4\itest4_11.script
@@ -148,10 +239,42 @@
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\rnif_timeout.ini testdata\configs\integration\itest_s4\rnif_timeout.ini
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\te_teststeps.ini testdata\configs\integration\itest_s4\te_teststeps.ini
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\route_timeout.ini testdata\configs\integration\itest_s4\route_timeout.ini
-
-
+#endif
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
// S5 script files
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5.script testdata\scripts\integration\itest_s5.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_01_wlan.script testdata\scripts\integration\itest_s5\itest5_01.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_02.script testdata\scripts\integration\itest_s5\itest5_02.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_03_wlan.script testdata\scripts\integration\itest_s5\itest5_03.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_04.script testdata\scripts\integration\itest_s5\itest5_04.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_05.script testdata\scripts\integration\itest_s5\itest5_05.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_05b.script testdata\scripts\integration\itest_s5\itest5_05b.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_05c.script testdata\scripts\integration\itest_s5\itest5_05c.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_06.script testdata\scripts\integration\itest_s5\itest5_06.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_07.script testdata\scripts\integration\itest_s5\itest5_07.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_08.script testdata\scripts\integration\itest_s5\itest5_08.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_09.script testdata\scripts\integration\itest_s5\itest5_09.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_10_wlan.script testdata\scripts\integration\itest_s5\itest5_10.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_11.script testdata\scripts\integration\itest_s5\itest5_11.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_12_wlan.script testdata\scripts\integration\itest_s5\itest5_12.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_13_wlan.script testdata\scripts\integration\itest_s5\itest5_13.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_14.script testdata\scripts\integration\itest_s5\itest5_14.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_15.script testdata\scripts\integration\itest_s5\itest5_15.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_16.script testdata\scripts\integration\itest_s5\itest5_16.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_17_wlan.script testdata\scripts\integration\itest_s5\itest5_17.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_18.script testdata\scripts\integration\itest_s5\itest5_18.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_19.script testdata\scripts\integration\itest_s5\itest5_19.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\ipv4_wlan.ini testdata\configs\integration\itest_s5\ipv4.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\ipv6_wlan.ini testdata\configs\integration\itest_s5\ipv6.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\client_timeout.ini testdata\configs\integration\itest_s5\client_timeout.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\genconn.ini testdata\configs\integration\itest_s5\genconn.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\itest.ini testdata\configs\integration\itest_s5\itest.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\rnif_timeout.ini testdata\configs\integration\itest_s5\rnif_timeout.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\route_timeout.ini testdata\configs\integration\itest_s5\route_timeout.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\load_ircsd_wlan.script testdata\scripts\integration\itest_s5\load_ircsd.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\te_teststeps.ini testdata\configs\integration\itest_s5\te_teststeps.ini
+#else
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5.script testdata\scripts\integration\itest_s5.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_01.script testdata\scripts\integration\itest_s5\itest5_01.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_02.script testdata\scripts\integration\itest_s5\itest5_02.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_03.script testdata\scripts\integration\itest_s5\itest5_03.script
@@ -171,11 +294,8 @@
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_15.script testdata\scripts\integration\itest_s5\itest5_15.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_16.script testdata\scripts\integration\itest_s5\itest5_16.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_17.script testdata\scripts\integration\itest_s5\itest5_17.script
-
-
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_18.script testdata\scripts\integration\itest_s5\itest5_18.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_19.script testdata\scripts\integration\itest_s5\itest5_19.script
-
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\ipv4.ini testdata\configs\integration\itest_s5\ipv4.ini
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\ipv6.ini testdata\configs\integration\itest_s5\ipv6.ini
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\client_timeout.ini testdata\configs\integration\itest_s5\client_timeout.ini
@@ -185,10 +305,8 @@
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\route_timeout.ini testdata\configs\integration\itest_s5\route_timeout.ini
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\load_ircsd.script testdata\scripts\integration\itest_s5\load_ircsd.script
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\csd-ir.xml testdata\configs\integration\itest_s5\csd-ir.xml
-
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\te_teststeps.ini testdata\configs\integration\itest_s5\te_teststeps.ini
-
-
+#endif
// Self test files.
data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\example.ini testdata\configs\integration\example.ini
--- a/networkingtestandutils/networkingintegrationtest/Te_Http/src/TeInit.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Te_Http/src/TeInit.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -47,7 +47,7 @@
{
TInt err;
-
+#ifndef SIROCCO_CODE_MIGRATION
INFO_PRINTF1(_L("Load PDD"));
err = User::LoadPhysicalDevice(PDD_NAME);
if (err != KErrNone && err != KErrAlreadyExists)
@@ -56,7 +56,7 @@
SetTestStepResult(EFail);
User::Leave(err);
}
-
+#endif
INFO_PRINTF1(_L("Load LDD"));
err = User::LoadLogicalDevice(LDD_NAME);
if (err != KErrNone && err != KErrAlreadyExists)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/Scripts/te_msg_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,41 @@
+//
+// 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:
+//
+//
+PRINT Run all Te_msg Tests
+//
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+//
+//ced -i z:\testdata\configs\te_msg.xml te_msg.log
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_te_msg.cre c:\private\10202be9\persists\cccccc00.cre
+//
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+//
+LOAD_SUITE Te_msg
+
+START_TESTCASE NET-Integration-Msg-0101
+//! @SYMTestCaseID NET-Integration-Msg-0101
+
+RUN_TEST_STEP 100 Te_msg ConnectWithOverrides z:\testdata\configs\te_msg.ini
+END_TESTCASE NET-Integration-Msg-0101
+
+//
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+
--- a/networkingtestandutils/networkingintegrationtest/Te_Msg/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -25,10 +25,18 @@
// TE_msg - IBY
te_msg.iby /epoc32/rom/include/te_msg.iby
-// TE_msg - Target
-../Scripts/te_msg.script /epoc32/data/z/testdata/scripts/te_msg.script
+#ifdef SIROCCO_CODE_MIGRATION
+../Scripts/te_msg_wlan.script /epoc32/data/z/testdata/scripts/te_msg_wlan.script
+../testdata/te_msg_wlan.ini /epoc32/data/z/testdata/configs/te_msg_wlan.ini
+../testdata/cccccc00_te_msg.cre /epoc32/data/z/testdata/configs/cccccc00_te_msg.cre
+#else
+../Scripts/te_msg.script /epoc32/data/z/testdata/scripts/te_msg.script
../testdata/te_msg.ini /epoc32/data/z/testdata/configs/te_msg.ini
../testdata/te_msg.xml /epoc32/data/z/testdata/configs/te_msg.xml
+#endif
+
+// TE_msg - Target
+
// TE_msg - WINS
../Scripts/te_msg.script /epoc32/release/wins/udeb/z/testdata/scripts/te_msg.script
--- a/networkingtestandutils/networkingintegrationtest/Te_Msg/group/te_msg.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/group/te_msg.iby Tue Aug 31 16:45:15 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -22,8 +22,21 @@
file=ABI_DIR\DEBUG_DIR\Te_msg.exe System\libs\te_msg.exe
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\data\z\TestData\Scripts\te_msg_wlan.script TestData\Scripts\te_msg.script
+data=EPOCROOT##epoc32\data\z\TestData\Configs\te_msg_wlan.ini TestData\configs\te_msg.ini
+data=EPOCROOT##epoc32\data\z\TestData\Configs\cccccc00_te_msg.cre TestData\configs\cccccc00_te_msg.cre
+#else
data=EPOCROOT##epoc32\data\z\TestData\Scripts\TE_MSG.script TestData\Scripts\TE_MSG.script
data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_MSG.xml TestData\configs\TE_MSG.xml
data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_MSG.ini TestData\configs\TE_MSG.ini
+#endif
+
+
+#if defined(TEXT_ONLY_ROM)
+file=ABI_DIR\DEBUG_DIR\tsecdlg_text.dll sys\bin\tnotifiers\tsecdlg_text.dll
+#else
+file=ABI_DIR\DEBUG_DIR\tsecdlg.dll sys\bin\notifiers\tsecdlg.dll
+#endif
#endif
--- a/networkingtestandutils/networkingintegrationtest/Te_Msg/src/TeMsgStep.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/src/TeMsgStep.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -29,6 +29,7 @@
#include <commdbconnpref.h>
#include <e32std.h>
#include <securesocket.h>
+#include <e32property.h>
_LIT(KIap, "Iap");
@@ -46,9 +47,9 @@
#define PDD_NAME _L("EUART1")
#define LDD_NAME _L("ECOMM")
#endif
-
+#ifndef SIROCCO_CODE_MIGRATION
const TInt iapCount = 2;
-
+#endif
CTestConnectStep::CTestConnectStep():iIapNumber(0), iPort(0), iScheduler(NULL)
/**
* Constructor
@@ -80,6 +81,9 @@
{
iScheduler = new CActiveScheduler();
CActiveScheduler::Install(iScheduler);
+#ifdef SIROCCO_CODE_MIGRATION
+ TInt err;
+#else
INFO_PRINTF1(_L("Load PDD"));
TInt err = User::LoadPhysicalDevice(PDD_NAME);
if (err != KErrNone && err != KErrAlreadyExists)
@@ -88,7 +92,7 @@
SetTestStepResult(EFail);
User::Leave(err);
}
-
+#endif
INFO_PRINTF1(_L("Load LDD"));
err = User::LoadLogicalDevice(LDD_NAME);
if (err != KErrNone && err != KErrAlreadyExists)
@@ -155,6 +159,16 @@
INFO_PRINTF2((_L("IapNumber = %d")), iIapNumber);
TRequestStatus status;
+#ifdef SIROCCO_CODE_MIGRATION
+ TCommDbConnPref prefs;
+ prefs.SetIapId(iIapNumber);
+ prefs.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+ const TUid KMyPropertyCat = {0x101FD9C5};
+ const TUint32 KMyPropertyDestPortv4 = 67;
+ TInt err = RProperty::Define(KMyPropertyCat, KMyPropertyDestPortv4, RProperty::EInt, TSecurityPolicy(TSecurityPolicy::EAlwaysPass),
+ TSecurityPolicy(ECapabilityWriteDeviceData));
+ User::LeaveIfError(RProperty::Set(KMyPropertyCat, KMyPropertyDestPortv4, 93));
+#else
TInt rank = 1;
@@ -179,6 +193,7 @@
}
prefs.SetConnectionAttempts(rank-1);
+#endif
// Start the connection
iConnection.Start(prefs, status);
Binary file networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/cccccc00_te_msg.cre has changed
--- a/networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg.ini Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg.ini Tue Aug 31 16:45:15 2010 +0300
@@ -1,5 +1,5 @@
[IAP]
-IapNumber = 1
+IapNumber = 3
[TCP Config]
HostName = httpsmtpssl.test.intra
@@ -8,6 +8,6 @@
[General]
EchoPort = 543
-LookupAddress = 192.168.10.11
+LookupAddress = 192.168.40.50
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+[IAP]
+IapNumber = 3
+
+[TCP Config]
+HostName = httpsmtpssl.test.intra
+Port = 643
+DNSName = SSL21
+
+[General]
+EchoPort = 543
+LookupAddress = 192.168.40.50
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,1155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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:
+ CommDB Settings File
+ All Rights Reserved
+
+-->
+
+
+
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+ xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+ <Network operation="add">
+ <Name>NT RAS</Name>
+ </Network>
+ <Network operation="add">
+ <Name>Linux</Name>
+ </Network>
+ <Network operation="add">
+ <Name>Dummy</Name>
+ </Network>
+ <Network operation="add">
+ <Name>Hungry</Name>
+ </Network>
+ <Network operation="add">
+ <Name>Dummy (Long Timeout)</Name>
+ </Network>
+ <Network operation="add">
+ <Name>Hungry (Long Timeout)</Name>
+ </Network>
+</NetworkTable>
+
+<IAPTable>
+ <IAP operation="add">
+ <Name>Actual NT RAS</Name>
+ <IAPService>DialOutISP.NT RAS</IAPService>
+ <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+ <IAPNetwork>Network.NT RAS</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Office</LocationRef>
+ </IAP>
+ <IAP operation="add">
+ <Name>NTRas GPRS</Name>
+ <IAPService>OutgoingGPRS.NTRas GPRS</IAPService>
+ <IAPBearer>ModemBearer.Hungry (Long Timeout)</IAPBearer>
+ <IAPNetwork>Network.NT RAS</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Mobile</LocationRef>
+ </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+ <ModemBearer operation="template">
+ <Name>Default Modem</Name>
+ <Agent>CSD.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>0</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>Null Modem 115200bps</Name>
+ <Agent>csd.agt</Agent>
+ <IfName>ppp</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>NTRASTSY</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>4</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageValidityPeriod>0</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>0</MinimumSignalLevel>
+ <LastSocketActivityTimeout>15</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>5</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>Linux</Name>
+ <Agent>CSD.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>COMM::3</PortName>
+ <TSYName>NTRASTSY</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>5</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>0</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageValidityPeriod>0</MessageValidityPeriod>
+ <MessageDeliveryReport>TRUE</MessageDeliveryReport>
+ <MinimumSignalLevel>0</MinimumSignalLevel>
+ <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>20</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>Dummy</Name>
+ <Agent>NULLAGT.agt</Agent>
+ <IfName>dummynif</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>NTRASTSY</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>5</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>0</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageValidityPeriod>0</MessageValidityPeriod>
+ <MessageDeliveryReport>TRUE</MessageDeliveryReport>
+ <MinimumSignalLevel>0</MinimumSignalLevel>
+ <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>2</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>4</LastSocketClosedTimeout>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>Hungry</Name>
+ <Agent>NULLAGT.agt</Agent>
+ <IfName>hungrynif</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>NTRASTSY</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>5</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>0</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageValidityPeriod>0</MessageValidityPeriod>
+ <MessageDeliveryReport>TRUE</MessageDeliveryReport>
+ <MinimumSignalLevel>0</MinimumSignalLevel>
+ <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>2</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>4</LastSocketClosedTimeout>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>Dummy (Long Timeout)</Name>
+ <Agent>NULLAGT.agt</Agent>
+ <IfName>dummynif</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>0</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageValidityPeriod>0</MessageValidityPeriod>
+ <MessageDeliveryReport>TRUE</MessageDeliveryReport>
+ <MinimumSignalLevel>0</MinimumSignalLevel>
+ <LastSocketActivityTimeout>14</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>6</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>Hungry (Long Timeout)</Name>
+ <Agent>NULLAGT.agt</Agent>
+ <IfName>hungrynif</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>0</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageValidityPeriod>0</MessageValidityPeriod>
+ <MessageDeliveryReport>TRUE</MessageDeliveryReport>
+ <MinimumSignalLevel>0</MinimumSignalLevel>
+ <LastSocketActivityTimeout>100</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>8</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>12</LastSocketClosedTimeout>
+ </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+ <LANBearer operation="add">
+ <Name>Dummy LAN Bearer</Name>
+ <Agent>PSD.agt</Agent>
+ <IfName>ppp</IfName>
+ <LDDName>Dummy LDD</LDDName>
+ <PDDName>Dummy PDD</PDDName>
+ </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+ <LANService operation="add">
+ <Name>Ethernet</Name>
+ <IfNetworks>ip,ip6</IfNetworks>
+ <IpNetMask>255.255.255.0</IpNetMask>
+ <IpGateway>194.72.6.1</IpGateway>
+ <IpAddr>192.168.0.100</IpAddr>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+ <IpNameServer1>194.72.6.51</IpNameServer1>
+ <IpNameServer2>194.72.6.52</IpNameServer2>
+ </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+ <DialInISP operation="template">
+ <Name>Default Dial In ISP</Name>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <UseEdge>FALSE</UseEdge>
+ </DialInISP>
+ <DialInISP operation="add">
+ <Name>Dial In CS ISP</Name>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <UseEdge>FALSE</UseEdge>
+ </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+ <DialOutISP operation="template">
+ <Name>Default Dial Out ISP</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <PromptForLogin>TRUE</PromptForLogin>
+ <IfPromptForAuth>TRUE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerProtocol>0</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+ <DialOutISP operation="add">
+ <Name>NT RAS</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>TRUE</UseLoginScript>
+ <PromptForLogin>FALSE</PromptForLogin>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Type>INTERNETONLY</Type>
+ <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>RasUser</IfAuthName>
+ <IfAuthPass>pass</IfAuthPass>
+ <AuthRetries>0</AuthRetries>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <CallbackTimeout>0</CallbackTimeout>
+ <IpNameServer1>10.16.59.15</IpNameServer1>
+ <IpNameServer2>0.0.0.0</IpNameServer2>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerName>ASYNCHRONOUS</BearerName>
+ <BearerSpeed>UNSPECIFIED</BearerSpeed>
+ <BearerCE>UNSPECIFIED</BearerCE>
+ <BearerType>CSD</BearerType>
+ <ChannelCoding>UNSPECIFIED</ChannelCoding>
+ <AIUR>9600</AIUR>
+ <RequestedTimeSlots>0</RequestedTimeSlots>
+ <MaximumTimeSlots>0</MaximumTimeSlots>
+ <BearerProtocol>0</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+ <DialOutISP operation="add">
+ <Name>Linux</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <PromptForLogin>FALSE</PromptForLogin>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Description>Linux</Description>
+ <Type>INTERNETONLY</Type>
+ <LoginScript>New Record</LoginScript>
+ <LoginName>RasUser</LoginName>
+ <LoginPass>pass</LoginPass>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>RasUser</IfAuthName>
+ <IfAuthPass>pass</IfAuthPass>
+ <AuthRetries>0</AuthRetries>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <IfCallbackType>IETF0</IfCallbackType>
+ <CallbackTimeout>0</CallbackTimeout>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerName>ASYNCHRONOUS</BearerName>
+ <BearerSpeed>UNSPECIFIED</BearerSpeed>
+ <BearerCE>UNSPECIFIED</BearerCE>
+ <BearerType>CSD</BearerType>
+ <ChannelCoding>UNSPECIFIED</ChannelCoding>
+ <AIUR>9600</AIUR>
+ <RequestedTimeSlots>0</RequestedTimeSlots>
+ <MaximumTimeSlots>0</MaximumTimeSlots>
+ <BearerProtocol>0</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+ <DialOutISP operation="add">
+ <Name>Dummy</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <PromptForLogin>FALSE</PromptForLogin>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Description>Dummy</Description>
+ <Type>INTERNETONLY</Type>
+ <LoginScript>New Record</LoginScript>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfNetworks>ip,ip6</IfNetworks>
+ <AuthRetries>0</AuthRetries>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <IfCallbackType>IETF0</IfCallbackType>
+ <CallbackTimeout>0</CallbackTimeout>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerName>ASYNCHRONOUS</BearerName>
+ <BearerSpeed>UNSPECIFIED</BearerSpeed>
+ <BearerCE>UNSPECIFIED</BearerCE>
+ <BearerType>CSD</BearerType>
+ <ChannelCoding>UNSPECIFIED</ChannelCoding>
+ <AIUR>9600</AIUR>
+ <RequestedTimeSlots>0</RequestedTimeSlots>
+ <MaximumTimeSlots>0</MaximumTimeSlots>
+ <BearerProtocol>0</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+ <DialOutISP operation="add">
+ <Name>Bad NT RAS</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>TRUE</UseLoginScript>
+ <PromptForLogin>FALSE</PromptForLogin>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+ <Type>INTERNETONLY</Type>
+ <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>RasUser</IfAuthName>
+ <IfAuthPass>badpass</IfAuthPass>
+ <AuthRetries>0</AuthRetries>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <CallbackTimeout>0</CallbackTimeout>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerName>ASYNCHRONOUS</BearerName>
+ <BearerSpeed>UNSPECIFIED</BearerSpeed>
+ <BearerCE>UNSPECIFIED</BearerCE>
+ <BearerType>CSD</BearerType>
+ <ChannelCoding>UNSPECIFIED</ChannelCoding>
+ <AIUR>9600</AIUR>
+ <RequestedTimeSlots>0</RequestedTimeSlots>
+ <MaximumTimeSlots>0</MaximumTimeSlots>
+ <BearerProtocol>0</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+ <CDMA2000PacketService operation="add">
+ <Name>test name cdma2000</Name>
+ <IwfName>Test2000</IwfName>
+ <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+ <PdpType>IPV4</PdpType>
+ <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+ <ReqRevPriority>PRIORITY04</ReqRevPriority>
+ <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+ <ReqRevBitrate>32KBPS</ReqRevBitrate>
+ <ReqFwdLoss>LOSS1</ReqFwdLoss>
+ <ReqRevLoss>LOSS1</ReqRevLoss>
+ <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+ <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+ <MinFwdBitrate>8KBPS</MinFwdBitrate>
+ <MinRevBitrate>8KBPS</MinRevBitrate>
+ <AccptFwdLoss>LOSS2</AccptFwdLoss>
+ <AccptRevLoss>LOSS2</AccptRevLoss>
+ <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+ <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+ <DataCompression>FALSE</DataCompression>
+ <HeaderCompression>FALSE</HeaderCompression>
+ <AnonymousAccess>FALSE</AnonymousAccess>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>RasUser</IfAuthName>
+ <IfAuthPass>pass</IfAuthPass>
+ <AuthRetries>1</AuthRetries>
+ <IpNetMask>0.255.255.255</IpNetMask>
+ <IpGateway>10.0.0.1</IpGateway>
+ <EnableLCPExtension>TRUE</EnableLCPExtension>
+ <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+ <ApType>2</ApType>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <RlpMode>UNKNOWN</RlpMode>
+ <CDMAMobileIP>FALSE</CDMAMobileIP>
+ <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
+ </CDMA2000PacketService>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+ <Chargecard operation="add">
+ <Name>Dummy BT Chargecard</Name>
+ <AccountNumber>144,12345678</AccountNumber>
+ <Pin>0000</Pin>
+ <LocalRule>HG</LocalRule>
+ <NatRule>HFG</NatRule>
+ <IntlRule>HEFG</IntlRule>
+ </Chargecard>
+ <Chargecard operation="add">
+ <Name>Dummy Mercury Chargecard</Name>
+ <AccountNumber>0500800800,,12345678</AccountNumber>
+ <Pin>****</Pin>
+ <LocalRule>HG</LocalRule>
+ <NatRule>J,K,0FG</NatRule>
+ <IntlRule>HEFG</IntlRule>
+ </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+ <ConnectionPreferences operation="add">
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>2</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>PROMPT</DialogPref>
+ <BearerSet>PSD</BearerSet>
+ <IAPRef>IAP.NTRas GPRS</IAPRef>
+ </ConnectionPreferences>
+ <ConnectionPreferences operation="add">
+ <Name>ConnectionPreferencesTable2</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>CSD</BearerSet>
+ <IAPRef>IAP.Actual NT RAS</IAPRef>
+ </ConnectionPreferences>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+ <GlobalSettings operation="add">
+ <Name>GlobalSettingsTable1</Name>
+ <RedialAttempts>3</RedialAttempts>
+ <SmsBearer>2</SmsBearer>
+ <SmsReceiveMode>2</SmsReceiveMode>
+ <GPRSAttachMode>1</GPRSAttachMode>
+ <AcceptIncomingGprs>1</AcceptIncomingGprs>
+ <ConnectionAttempts>2</ConnectionAttempts>
+ <ModemForDataAndFax>2</ModemForDataAndFax>
+ <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+ <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
+ <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
+ <GPRSClassCBearer>GSM</GPRSClassCBearer>
+ <DefaultNetwork>Network.NT RAS</DefaultNetwork>
+ <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+ </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+ <IncomingGPRS operation="add">
+ <Name>Dummy Incoming GPRS Settings</Name>
+ <APN>Test</APN>
+ <PDPType>IPV4</PDPType>
+ <PDPAddress>0.0.0.0</PDPAddress>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <ReqPrecedence>1</ReqPrecedence>
+ <ReqDelay>1</ReqDelay>
+ <ReqReliability>1</ReqReliability>
+ <ReqPeakThroughput>1</ReqPeakThroughput>
+ <ReqMeanThroughput>1</ReqMeanThroughput>
+ <MinPrecedence>1</MinPrecedence>
+ <MinDelay>1</MinDelay>
+ <MinReliability>1</MinReliability>
+ <MinPeakThroughput>1</MinPeakThroughput>
+ <MinMeanThroughput>1</MinMeanThroughput>
+ <DataCompression>FALSE</DataCompression>
+ <HeaderCompression>FALSE</HeaderCompression>
+ <AnonymousAccess>FALSE</AnonymousAccess>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>RasUser</IfAuthName>
+ <IfAuthPass>pass</IfAuthPass>
+ <AuthRetries>1</AuthRetries>
+ <IpNameServer1>0.0.0.0</IpNameServer1>
+ <IpNameServer2>0.0.0.0</IpNameServer2>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <GprsUseEdge>FALSE</GprsUseEdge>
+ </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+ <OutgoingGPRS operation="add">
+ <Name>NTRas GPRS</Name>
+ <APN>Test</APN>
+ <PDPType>IPV4</PDPType>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+ <ReqPrecedence>2</ReqPrecedence>
+ <ReqDelay>4</ReqDelay>
+ <ReqReliability>3</ReqReliability>
+ <ReqPeakThroughput>3</ReqPeakThroughput>
+ <ReqMeanThroughput>31</ReqMeanThroughput>
+ <MinPrecedence>2</MinPrecedence>
+ <MinDelay>4</MinDelay>
+ <MinReliability>3</MinReliability>
+ <MinPeakThroughput>3</MinPeakThroughput>
+ <MinMeanThroughput>31</MinMeanThroughput>
+ <DataCompression>FALSE</DataCompression>
+ <HeaderCompression>FALSE</HeaderCompression>
+ <AnonymousAccess>FALSE</AnonymousAccess>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>RasUser</IfAuthName>
+ <IfAuthPass>pass</IfAuthPass>
+ <AuthRetries>1</AuthRetries>
+ <IpNameServer1>194.72.6.51</IpNameServer1>
+ <IpNameServer2>194.72.6.51</IpNameServer2>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <GprsUseEdge>FALSE</GprsUseEdge>
+ </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+ <DefaultGPRS operation="add">
+ <Name>Dummy Default GPRS Settings</Name>
+ <APN>Access point name</APN>
+ <PDPType>IPV6</PDPType>
+ <PDPAddress>www.wid.com</PDPAddress>
+ <Usage>1</Usage>
+ <Precedence>1</Precedence>
+ <Delay>1</Delay>
+ <Reliability>1</Reliability>
+ <PeakThroughput>1</PeakThroughput>
+ <MeanThroughput>1</MeanThroughput>
+ <MinPrecedence>1</MinPrecedence>
+ <MinDelay>1</MinDelay>
+ <MinReliability>1</MinReliability>
+ <MinPeakThroughput>1</MinPeakThroughput>
+ <MinMeanThroughput>1</MinMeanThroughput>
+ <DataCompression>TRUE</DataCompression>
+ <HeaderCompression>TRUE</HeaderCompression>
+ <GprsUseEdge>FALSE</GprsUseEdge>
+ <AnonymousAccess>TRUE</AnonymousAccess>
+ </DefaultGPRS>
+</DefaultGPRSTable>
+
+<ProxyTable>
+ <Proxy operation="add">
+ <Name>ProxyTable1</Name>
+ <ISPRef>DialOutISP.NT RAS</ISPRef>
+ <UseProxyServer>TRUE</UseProxyServer>
+ <ProtocolName>http</ProtocolName>
+ <ProxyServerName>www.dummyproxy.com</ProxyServerName>
+ <PortNumber>80</PortNumber>
+ <Exceptions>www.dummyproxy.com/exception</Exceptions>
+ </Proxy>
+</ProxyTable>
+
+<LocationTable>
+ <Location operation="template">
+ <Name>Default Location</Name>
+ <Mobile>TRUE</Mobile>
+ <UsePulseDial>FALSE</UsePulseDial>
+ <WaitForDialTone>FALSE</WaitForDialTone>
+ <PauseAfterDialout>0</PauseAfterDialout>
+ <IntlPrefixCode>+</IntlPrefixCode>
+ <NatPrefixCode>0</NatPrefixCode>
+ <NatCode>44</NatCode>
+ </Location>
+ <Location operation="add">
+ <Name>Office</Name>
+ <Mobile>FALSE</Mobile>
+ <UsePulseDial>FALSE</UsePulseDial>
+ <WaitForDialTone>FALSE</WaitForDialTone>
+ <PauseAfterDialout>0</PauseAfterDialout>
+ <IntlPrefixCode>00</IntlPrefixCode>
+ <NatPrefixCode>0</NatPrefixCode>
+ <NatCode>44</NatCode>
+ <AreaCode>171</AreaCode>
+ <DialOutCode>9,</DialOutCode>
+ </Location>
+ <Location operation="add">
+ <Name>Office Direct Dial</Name>
+ <Mobile>FALSE</Mobile>
+ <UsePulseDial>FALSE</UsePulseDial>
+ <WaitForDialTone>FALSE</WaitForDialTone>
+ <PauseAfterDialout>0</PauseAfterDialout>
+ <IntlPrefixCode>00</IntlPrefixCode>
+ <NatPrefixCode>0</NatPrefixCode>
+ <NatCode>44</NatCode>
+ <AreaCode>171</AreaCode>
+ </Location>
+ <Location operation="add">
+ <Name>Mobile</Name>
+ <Mobile>TRUE</Mobile>
+ <UsePulseDial>FALSE</UsePulseDial>
+ <WaitForDialTone>FALSE</WaitForDialTone>
+ <PauseAfterDialout>0</PauseAfterDialout>
+ <IntlPrefixCode>+</IntlPrefixCode>
+ <NatPrefixCode>0</NatPrefixCode>
+ <NatCode>44</NatCode>
+ </Location>
+ <Location operation="add">
+ <Name>Home</Name>
+ <Mobile>FALSE</Mobile>
+ <UsePulseDial>TRUE</UsePulseDial>
+ <WaitForDialTone>TRUE</WaitForDialTone>
+ <PauseAfterDialout>0</PauseAfterDialout>
+ <IntlPrefixCode>00</IntlPrefixCode>
+ <NatPrefixCode>0</NatPrefixCode>
+ <NatCode>44</NatCode>
+ <AreaCode>181</AreaCode>
+ </Location>
+</LocationTable>
+
+<SecureSocketTable>
+ <SecureSocket operation="add">
+ <Name>SecureSocketTable1</Name>
+ <ProtocolName>ssl3.0</ProtocolName>
+ <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+ </SecureSocket>
+ <SecureSocket operation="add">
+ <Name>SecureSocketTable2</Name>
+ <ProtocolName>tls1.0</ProtocolName>
+ <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+ </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+ <WAPAccessPoint operation="template">
+ <Name>Default Dial In ISP</Name>
+ <CurrentBearer>WAPIPBearer</CurrentBearer>
+ </WAPAccessPoint>
+ <WAPAccessPoint operation="add">
+ <Name>Dummy WAP Settings</Name>
+ <CurrentBearer>WAPIPBearer</CurrentBearer>
+ <StartPage>www.wapstart.com</StartPage>
+ </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+ <WAPIPBearer operation="template">
+ <Name>WAPIPBearerTable1</Name>
+ <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+ <WSPOption>CONNECTIONLESS</WSPOption>
+ <Security>FALSE</Security>
+ <IAPRef>IAP.-1</IAPRef>
+ <ProxyPortNumber>0</ProxyPortNumber>
+ </WAPIPBearer>
+ <WAPIPBearer operation="add">
+ <Name>WAPIPBearerTable2</Name>
+ <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+ <GatewayAddress>www.wapgateway.com</GatewayAddress>
+ <WSPOption>CONNECTIONORIENTED</WSPOption>
+ <Security>FALSE</Security>
+ <IAPRef>IAP.NTRas GPRS</IAPRef>
+ <ProxyPortNumber>1</ProxyPortNumber>
+ </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+ <WAPSMSBearer operation="template">
+ <Name>WAPSMSBearerTable1</Name>
+ <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+ <WSPOption>CONNECTIONLESS</WSPOption>
+ <Security>FALSE</Security>
+ </WAPSMSBearer>
+ <WAPSMSBearer operation="add">
+ <Name>WAPSMSBearerTable2</Name>
+ <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+ <GatewayAddress>+4412345678901</GatewayAddress>
+ <WSPOption>CONNECTIONORIENTED</WSPOption>
+ <Security>FALSE</Security>
+ <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+ </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
Binary file networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg_wlan1.xml has changed
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/cccccc00_itest1.cre has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/connectionpref_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences>
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/ipv4_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,16 @@
+[Test_Common]
+ipAddress=192.168.40.50
+
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=90
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/ipv6_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,15 @@
+[Test_Common]
+ipAddress=2001:618::20c:29ff:feb9:fe12
+
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=60
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_01_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,68 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 1.1 - CSD outgoing with Ipv4, Client timeout
+
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s1\csd.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Csd-0101
+//! @SYMTestCaseID NET-Integration-Csd-0101
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv4.ini
+
+
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s1\client_timeout.ini
+
+// check the network is NOT active
+//replace below
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+TEST_COMPLETE CSD_test1_1
+END_TESTCASE NET-Integration-Csd-0101
+
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 1.1 - CSD Outgoing with Ipv4
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_02_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,93 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRINT Integration Test 1.2 CSD Outgoing with Ipsec, Client timeout
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+#use ced to make the required database for ipsec
+#run_script z:\TestData\scripts\esock_test_unloadesockForced.script
+#ced z:\testdata\configs\integration\itest_s1\ipsec_csd.xml csd.log
+#run_script z:\TestData\scripts\esock_test_loadesock.script
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s1\csd.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Csd-0201
+//! @SYMTestCaseID NET-Integration-Csd-0201
+
+// run tests
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s1\client_timeout.ini
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+TEST_COMPLETE CSD_test1_02
+END_TESTCASE NET-Integration-Csd-0201
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_03_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,78 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 1.03 - CSD outgoing with ipv4 and ipv6
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s1\csd.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Csd-0301
+//! @SYMTestCaseID NET-Integration-Csd-0301
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// send some data
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// send some data
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv6.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s1\client_timeout.ini
+
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+TEST_COMPLETE CSD_test1_3
+END_TESTCASE NET-Integration-Csd-0301
+
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 1.03 - CSD outgoing with ipv4 and ipv6
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_10_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,89 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 1.10 - CSD Outgoing terminated By Rnif::Stop with Ipv4 and Ipsec
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s1\csd.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Csd-0601
+//! @SYMTestCaseID NET-Integration-Csd-0601
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// use Ipv4 socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv4.ini
+
+// close using rnif::stop
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+
+// short delay
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s1\rnif_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+TEST_COMPLETE CSD_test1_10
+END_TESTCASE NET-Integration-Csd-0601
+
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 1.10 - CSD Outgoing terminated By Rnif::Stop with Ipv4 and Ipsec
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_13_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,64 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 1.13 - CSD Outgoing terminated By Link failure with Ipv4
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s1\csd.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Csd-0901
+//! @SYMTestCaseID NET-Integration-Csd-0901
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// do something
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv4.ini
+
+// simulate link failure - get the user to do this
+print User action required to break link
+print Press a key to continue when this has been done
+pause
+
+// check the link is closed
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+TEST_COMPLETE CSD_test1_13
+END_TESTCASE NET-Integration-Csd-0901
+
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 1.13 - CSD Outgoing terminated By Link failure with Ipv4
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_17_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,81 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 1.17 - CSD outgoing with Ipv4 and Client timeout
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+LOAD_SUITE te_esockteststepsSuite -SharedData
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s1\csd.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+// open connection using gencon
+//run_test_step 3000 ts_genconn test1_1 z:\testdata\configs\integration\itest_s1\genconn.ini
+//original genconn.ini says to leave connected after opening.
+//the above call results in OpenSocketServ, OpenConnection, StartConnection which are now all provided by
+//TE_EsockTestSteps
+RUN_TEST_STEP 3000 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini CreateSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini ConnectSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini CreateConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini OpenConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite startrconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini StartConn1
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Csd-1301
+//! @SYMTestCaseID NET-Integration-Csd-1301
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s1\client_timeout.ini
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 1.17 - CSD outgoing (gencon) with Ipv4 and Client timeout
+TEST_COMPLETE test1_17
+
+END_TESTCASE NET-Integration-Csd-1301
+
+
+RUN_TEST_STEP 100 TE_Esock CloseServer
+run_script z:\TestData\scripts\te_esock_test_stopallinterfaces.script
+
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_wlan.xml has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/load_csd_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,41 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+// configure commdb for CSD Bearer Tests
+PRINT load commdb for CSD NTRAS (itest_s1) tests
+
+// create the directorys needed for logging and ipsec
+// log dirs
+run_utils mkdir c:\system\
+run_utils mkdir c:\system\data\
+run_utils mkdir c:\Logs\
+run_utils mkdir c:\Logs\testresults\
+
+// ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+// use ced to make the required database from csd.xml
+//ced z:\testdata\configs\integration\itest_s1\csd.xml csd.log
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+# Reload esock thread so that the next tests can be run
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/cccccc00_itest2.cre has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/connectionpref_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences>
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/ipv4_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,18 @@
+[Test_Common]
+ipAddress=192.168.40.50
+
+
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=90
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/itest2_01_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,67 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 2.01 - HSCSD outgoing client timeout with ipv4
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s2\hscsd.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest2.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-HsCsd-0101
+//! @SYMTestCaseID NET-Integration-HsCsd-0101
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s2\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s2\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s2\itest.ini
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s2\client_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 2.1 - HSCSD outgoing client timeout with ipv4
+test_complete HSCSD_test2_01
+
+END_TESTCASE NET-Integration-HsCsd-0101
+
+
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/itest2_wlan.xml has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/load_hscsd_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,28 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT load commdb for hscsd
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+// configure commdb for hscsd Tests
+// use ced to make the required database
+//ced z:\testdata\configs\integration\itest_s2\hscsd.xml hscsd.log
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest2.cre c:\private\10202be9\persists\cccccc00.cre
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
\ No newline at end of file
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/cccccc00_itest3.cre has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/connectionpref_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences>
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/ipv4_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,31 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+[Test_Common]
+ipAddress=192.168.40.50
+//#note - this is HTTPSMTPSSL on the test network
+//#This will have to be changed to an IP adddress
+//#on the internet to test on a live gprs network
+//#such as www.c-hacker.co.uk
+
+
+[SendData]
+NoPackets=10
+PacketSize=1600
+connectTimer=180
+Port=7
+UdpEnable=true
+UdpPacketSize=400
+UdpPort=9200
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/ipv6_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,31 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+[Test_Common]
+ipAddress=2001:618::20c:29ff:feb9:fe12
+
+//note above address is a temp hack into test network.
+//really need a ipv6 address for gprs test
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=30
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_01_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,66 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.1 - GPRS outgoing with Ipv4
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Gprs-0101
+//! @SYMTestCaseID NET-Integration-Gprs-0101
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s3\client_timeout.ini
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 3.1 - GPRS Outgoing with Ipv4
+TEST_COMPLETE test3_01
+
+END_TESTCASE NET-Integration-Gprs-0101
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_02_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,85 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration Test 3.2 GPRS Outgoing with Ipsec
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Gprs-0201
+//! @SYMTestCaseID NET-Integration-Gprs-0201
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s3\client_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 3.02 - GPRS Outgoing with Ipsec
+TEST_COMPLETE gprs_test_3_02
+
+END_TESTCASE NET-Integration-Gprs-0201
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_04_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,97 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.04 - GPRS Outgoing terminated By Client timeout with Ipv6,Ipv4 and Ipsec
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Gprs-0401
+//! @SYMTestCaseID NET-Integration-Gprs-0401
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv6.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s3\client_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT result for Integration test 3.04 - GPRS Outgoing terminated By Client timeout with Ipv6,Ipv4 and Ipsec
+TEST_COMPLETE
+
+END_TESTCASE NET-Integration-Gprs-0401
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_05_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,70 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT integration test 3.5 - GPRS outgoing with ipv4 and route timeout
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Gprs-0501
+//! @SYMTestCaseID NET-Integration-Gprs-0501
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// send Tcp Data (only)
+RUN_TEST_STEP 100 TE_Esock SendTcpData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// wait more than routetimout
+print wait for more than Commdb AgentRouteTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s3\client_timeout.ini
+
+
+
+// check the connection has been disconnected
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+TEST_COMPLETE GPRS_test3_05
+END_TESTCASE NET-Integration-Gprs-0501
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+// log result
+PRINT Result for Integration test 3.05 - GPRS Outgoing with ipv4 and route timeout
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_05c_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,71 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRINT integration test 3.05c - GPRS outgoing with ipv4 and route timeout after socket close
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Gprs-0701
+//! @SYMTestCaseID NET-Integration-Gprs-0701
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// send Tcp Data (only)
+RUN_TEST_STEP 100 TE_Esock SendTcpData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// wait more than routetimout
+print wait for more than Commdb AgentRouteTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s3\route_timeout.ini
+
+
+// check the connection has been disconnected
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+TEST_COMPLETE GPRS_test3_05c
+END_TESTCASE NET-Integration-Gprs-0701
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+// log result
+PRINT Result for Integration test 3.05c - GPRS Outgoing terminated By route timeout
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_09_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,69 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.09 - GPRS outgoing with ipv4 termination using rnif::stop
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Gprs-0801
+//! @SYMTestCaseID NET-Integration-Gprs-0801
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close sockets
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// close using rnif::stop
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+// Pause for a while allow sys to sort itself out
+delay 5000
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// delay here to allow certain phones to recover from Stop
+delay 30000
+
+// log result
+PRINT Result for Integration test 3.9 - GPRS outgoing with ipv4 termination using rnif::stop
+TEST_COMPLETE gprs_test3_09
+
+END_TESTCASE NET-Integration-Gprs-0801
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_10_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,85 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.10 - GPRS Outgoing terminated By Rnif::Stop with Ipv4 and Ipsec
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-Gprs-0901
+//! @SYMTestCaseID NET-Integration-Gprs-0901
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// use Ipv4 socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close using rnif::stop
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+
+// close sockets
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+TEST_COMPLETE test3_10
+END_TESTCASE NET-Integration-Gprs-0901
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 1.10 - GPRS Outgoing terminated By Rnif::Stop with Ipv4 and Ipsec
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_12_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,93 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.12 - GPRS Outgoing terminated By Link failure with Ipv6,Ipv4 and Ipsec
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-Gprs-1101
+//! @SYMTestCaseID NET-Integration-Gprs-1101
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv6.ini
+
+// close using rnif::stop
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+
+// close sockets
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+TEST_COMPLETE test3_12
+END_TESTCASE NET-Integration-Gprs-1101
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 1.12 - GPRS Outgoing terminated By Link failure with Ipv6,Ipv4 and Ipsec
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_13_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,63 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.13 - GPRS Outgoing terminated By Link failure with Ipv4
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-Gprs-1201
+//! @SYMTestCaseID NET-Integration-Gprs-1201
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do something
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// simulate link failure - get the user to do this
+print User action required to break link - must be within 30 secs
+print Press a key to continue when this has been done
+pause
+
+// check the link is closed
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// close sockets
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+TEST_COMPLETE test3_13
+END_TESTCASE NET-Integration-Gprs-1201
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+// log result
+PRINT Result for Integration test 1.13 - GPRS Outgoing terminated By Link failure with Ipv4
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_14_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,84 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.14 - GPRS Outgoing with Ipv4 and Ipsec
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-Gprs-1301
+//! @SYMTestCaseID NET-Integration-Gprs-1301
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// use Ipv4 socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// simulate link failure - get the user to do this
+print User action required to break link
+print Press a key to continue when this has been done
+pause
+
+// check the link is closed
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// close sockets
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+TEST_COMPLETE gprs_test3_14
+END_TESTCASE NET-Integration-Gprs-1301
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 3.14 - GPRS Outgoing with Ipv4 and Ipsec
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_16_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,95 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.16 - GPRS Outgoing with Ipv6 and Linkfailure
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-Gprs-1501
+//! @SYMTestCaseID NET-Integration-Gprs-1501
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// use socket connection
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv6.ini
+
+// simulate link failure - get the user to do this
+print User action required to break link
+print Press a key to continue when this has been done
+pause
+
+// check the link is closed
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+
+// close sockets
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+TEST_COMPLETE GPRS_Test3_16
+END_TESTCASE NET-Integration-Gprs-1501
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 1.16 - GPRS Outgoing with Ipv6 and Linkfailure
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_17_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,95 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.17 - GPRS outgoing with Ipv4 and Client timeout
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+LOAD_SUITE te_esockteststepsSuite -SharedData
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+
+
+// open connection using gencon
+//run_test_step 3000 ts_genconn test1_1 z:\testdata\configs\integration\itest_s3\genconn.ini
+//original genconn.ini says to leave connected after opening.
+//the above call results in OpenSocketServ, OpenConnection, StartConnection which are now all provided by
+//TE_EsockTestSteps
+RUN_TEST_STEP 3000 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini CreateSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini ConnectSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini CreateConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini OpenConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite startrconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini StartConn1
+
+
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-Gprs-1601
+//! @SYMTestCaseID NET-Integration-Gprs-1601
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// close connection using gencon
+//run_test_step 3000 ts_genconn test2_1
+//above results in calls to stopconnection, close connection, close socket serv
+RUN_TEST_STEP 3000 te_esockteststepsSuite stoprconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini StopConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite closerconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini CloseConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite closersocketservStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini CloseSockSvr1
+
+
+
+
+// Pause to allow connection to be closed by ts_genconn
+delay 5000
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// delay here to allow certain phones to recover from Stop
+delay 30000
+// log result
+PRINT Result for Integration test 3.17 - GPRS outgoing with Ipv4 and Client timeout
+
+TEST_COMPLETE GPRS_Test_3_17
+
+END_TESTCASE NET-Integration-Gprs-1601
+
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_wlan.xml has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/load_gprs_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,27 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT load commdb for GPRS
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+//ced z:\testdata\configs\integration\itest_s3\gprs.xml csd.log
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/cccccc00_itest4.cre has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/connectionpref_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences>
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/ipv4_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,12 @@
+[Test_Common]
+ipAddress=192.168.40.50
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=30
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/ipv6_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,14 @@
+[Test_Common]
+ipAddress=2001:618::20c:29ff:feb9:fe12
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=30
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_01_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,64 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 4.01 - CDMA outgoing with Ipv4
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest4.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-Cdma-0101
+//! @SYMTestCaseID NET-Integration-Cdma-0101
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s4\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s4\client_timeout.ini
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 4.01 - CDMA outgoing with Ipv4
+TEST_COMPLETE CDMA_test_4_01
+
+END_TESTCASE NET-Integration-Cdma-0101
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_06_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,83 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 4.06 - CDMA Outgoing terminated By Route Timeout with Ipv4 and Ipsec
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest4.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE NET-Integration-Cdma-0501
+//! @SYMTestCaseID NET-Integration-Cdma-0501
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// use socket connection
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s4\ipv4.ini
+
+// wait more than AgentRouteTimeout
+print wait for more than Commdb AgentRouteTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s4\rnif_timeout.ini
+
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s4\itest.ini
+TEST_COMPLETE CDMA_test4_06
+END_TESTCASE NET-Integration-Cdma-0501
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 4.06 - CDMA Outgoing terminated By Route Timeout with Ipv4 and Ipsec
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_11_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,75 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 4.11 - CDMA Outgoing terminated By Rnif::Stop with Ipv6,Ipv4
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest4.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-Cdma-1001
+//! @SYMTestCaseID NET-Integration-Cdma-1001
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// use Ipv4 socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s4\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// use Ipv6 socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s4\ipv6.ini
+
+// close using rnif::stop
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s4\itest.ini
+TEST_COMPLETE CDMA_test4_11
+END_TESTCASE NET-Integration-Cdma-1001
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 4.11 - CDMA Outgoing terminated By Rnif::Stop with Ipv6,Ipv4
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_17_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,84 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 4.17 - CDMA outgoing with Ipv4 and Client timeout
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+LOAD_SUITE te_esockteststepsSuite -SharedData
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest4.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+
+// open connection using gencon
+//run_test_step 3000 ts_genconn test1_1 z:\testdata\configs\integration\itest_s4\genconn-psd.ini
+//original genconn.ini says to leave connected after opening.
+//above call results in OpenSocketServ, OpenConnection, StartConnection which are all provided by
+//TE_EsockTestSteps
+RUN_TEST_STEP 3000 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\integration\itest_s4\te_teststeps.ini CreateSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\integration\itest_s4\te_teststeps.ini ConnectSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\integration\itest_s4\te_teststeps.ini CreateConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\integration\itest_s4\te_teststeps.ini OpenConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite startrconnectionStep z:\testdata\configs\integration\itest_s4\te_teststeps.ini StartConn1
+
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-Cdma-1601
+//! @SYMTestCaseID NET-Integration-Cdma-1601
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s4\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s4\client_timeout.ini
+
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 4.17 - CDMA outgoing with Ipv4 and Client timeout
+TEST_COMPLETE CDMA_test_4_17
+
+END_TESTCASE NET-Integration-Cdma-1601
+
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_wlan.xml has changed
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/cccccc00_itest5.cre has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/connectionpref_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences>
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/ipv4_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+[Test_Common]
+ipAddress=192.168.40.50
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=180
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/ipv6_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,12 @@
+[Test_Common]
+ipAddress=2001:618::20c:29ff:feb9:fe12
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=180
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_01_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,69 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 5.1 - IR CSD outgoing with Ipv4
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//below fails as '-i' confuses test tool, tried csd_ir.xml file, but test fails with it
+//CED z:\testdata\configs\integration\itest_s5\csd-ir.xml
+//Commented as part of sirocco code migration.
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+
+//RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-IrCsd-0101
+//! @SYMTestCaseID NET-Integration-IrCsd-0101
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s5\client_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 5.1 - IR CSD Outgoing with Ipv4
+TEST_COMPLETE IR_CSD_test5_1
+
+END_TESTCASE NET-Integration-IrCsd-0101
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_03_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,77 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 5.03 - IR CSD outgoing with ipv4 and ipv6
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//below fails as '-i' confuses test tool, tried csd_ir.xml file, but test fails with it
+//CED z:\testdata\configs\integration\itest_s5\csd-ir.xml
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+//RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-IrCsd-0301
+//! @SYMTestCaseID NET-Integration-IrCsd-0301
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv6.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s5\route_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 5.03 - IR CSD outgoing with ipv4 and ipv6
+TEST_COMPLETE IR_CSD_test5_03
+
+END_TESTCASE NET-Integration-IrCsd-0301
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_10_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,84 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 5.10 - IR CSD Outgoing terminated By Rnif::Stop with Ipv4 and Ipsec
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//below fails as '-i' confuses test tool, tried csd_ir.xml file, but test fails with it
+//CED z:\testdata\configs\integration\itest_s5\csd-ir.xml
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+//RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-IrCsd-1201
+//! @SYMTestCaseID NET-Integration-IrCsd-1201
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// use Ipv4 socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv4.ini
+
+// close using rnif::stop
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+TEST_COMPLETE IR_CSD_test5_10
+END_TESTCASE NET-Integration-IrCsd-1201
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 5.10 - IR CSD Outgoing terminated By Rnif::Stop with Ipv4 and Ipsec
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_12_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,94 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 5.12 - IR CSD Outgoing terminated By Link failure with Ipv6,Ipv4 and Ipsec
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-IrCsd-1401
+//! @SYMTestCaseID NET-Integration-IrCsd-1401
+
+
+// open Ipv4 socket
+#RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// use Ipv4 socket
+#RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv4.ini
+
+// close socket
+#RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv6.ini
+
+// close using rnif::stop
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+
+
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s4\itest.ini
+TEST_COMPLETE IR_CSD_test5_12
+END_TESTCASE NET-Integration-IrCsd-1401
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 5.12 - IR CSD Outgoing terminated By Link failure with Ipv6,Ipv4 and Ipsec
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_13_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,70 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 5.13 - IR CSD Outgoing terminated By Link failure with Ipv4
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//below fails as '-i' confuses test tool, tried csd_ir.xml file, but test fails with it
+//CED z:\testdata\configs\integration\itest_s5\csd-ir.xml
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+//RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-IrCsd-1501
+//! @SYMTestCaseID NET-Integration-IrCsd-1501
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// do something
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv4.ini
+
+// simulate link failure - get the user to do this
+print User action required to break link
+print Press a key to continue when this has been done
+pause
+
+// check the link is closed
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+TEST_COMPLETE IR_CSD_test5_13
+END_TESTCASE NET-Integration-IrCsd-1501
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// log result
+PRINT Result for Integration test 5.13 - IR CSD Outgoing terminated By Link failure with Ipv4
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_17_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,87 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRINT Integration test 5.17 - IR CSD outgoing with Ipv4 and Client timeout
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+LOAD_SUITE te_esockteststepsSuite -SharedData
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//tried csd-ir.xml - '-i' causes test tool problems, tried csd_ir.xml and tests fail
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+START_TESTCASE NET-Integration-IrCsd-1901
+//! @SYMTestCaseID NET-Integration-IrCsd-1901
+
+
+// open connection using gencon
+//run_test_step 3000 ts_genconn test1_1 z:\testdata\configs\integration\itest_s5\genconn.ini
+//original genconn.ini says to leave connected after opening.
+//above call results in OpenSocketServ, OpenConnection, StartConnection which are all provided by
+//TE_EsockTestSteps
+RUN_TEST_STEP 3000 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\integration\itest_s5\te_teststeps.ini CreateSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\integration\itest_s5\te_teststeps.ini ConnectSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\integration\itest_s5\te_teststeps.ini CreateConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\integration\itest_s5\te_teststeps.ini OpenConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite startrconnectionStep z:\testdata\configs\integration\itest_s5\te_teststeps.ini StartConn1
+
+END_TESTCASE NET-Integration-IrCsd-1901
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+START_TESTCASE NET-Integration-IrCsd-1902
+//! @SYMTestCaseID NET-Integration-IrCsd-1902
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// close socket server
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s5\client_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+
+// log result
+PRINT Result for Integration test 5.17 - IR CSD outgoing with Ipv4 and Client timeout
+TEST_COMPLETE IR_CSD_test5_17
+
+END_TESTCASE NET-Integration-IrCsd-1902
+
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_wlan.xml has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/load_ircsd_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,56 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+///
+//PRINT load commdb for IR_CSD
+
+//run_script z:\TestData\scripts\esock_test_unloadesockForced.script
+// configure commdb for IR_CSD Bearer Tests
+// use ced to make the required database
+//ced z:\testdata\configs\integration\itest_s5\csd-ir.xml csd_ir.log
+//run_script z:\TestData\scripts\esock_test_loadesock.script
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//convert above
+
+
+
+///
+PRINT load commdb for IR_CSD
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+// configure commdb for IR_CSD Bearer Tests
+// use ced to make the required database
+//ced z:\testdata\configs\integration\itest_s5\csd-ir.xml csd_ir.log
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
--- a/networkingtestandutils/networkingintegrationtest/te_Sblp/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/te_Sblp/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -34,10 +34,10 @@
../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
--- a/networkingtestandutils/networkingintegrationtest/te_Sblp/group/te_SblpSuite.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/te_Sblp/group/te_SblpSuite.iby Tue Aug 31 16:45:15 2010 +0300
@@ -22,6 +22,7 @@
#include <te_esockteststepssuite.iby>
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
--- a/networkingtestandutils/networkingunittest/dummynif_params/group/dummynif_params.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingunittest/dummynif_params/group/dummynif_params.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -29,9 +29,9 @@
USERINCLUDE ../inc
#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE \epoc32\include\ecom
-SYSTEMINCLUDE \epoc32\include\comms-infras
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/ecom
+SYSTEMINCLUDE /epoc32/include/comms-infras
#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SYSTEMINCLUDE /epoc32/include/platform/ecom
--- a/networkingtestandutils/networkingunittest/eabi/dummyetelu.def Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingunittest/eabi/dummyetelu.def Tue Aug 31 16:45:15 2010 +0300
@@ -992,4 +992,10 @@
_ZThn60_N9CCallBase46RecoverDataPortAndRelinquishOwnershipCompletedEi @ 991 NONAME
_ZThn60_NK9CCallBase14CheckOwnershipEm @ 992 NONAME
_ZThn60_NK9CCallBase19CheckPriorityClientEm @ 993 NONAME
+ _ZN10RPacketQoS10ConstructLEv @ 994 NONAME
+ _ZN10RPacketQoS8DestructEv @ 995 NONAME
+ _ZN14RPacketContext10ConstructLEv @ 996 NONAME
+ _ZN14RPacketContext23TProtocolConfigOptionV2C1Ev @ 997 NONAME
+ _ZN14RPacketContext23TProtocolConfigOptionV2C2Ev @ 998 NONAME
+ _ZN14RPacketContext8DestructEv @ 999 NONAME
--- a/networkingtestandutils/networkingunittest/group/DummyNifProtos.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingunittest/group/DummyNifProtos.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -41,10 +41,10 @@
USERINCLUDE ../../../linklayercontrol/networkinterfacemgr/agentprcore/inc
#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE \epoc32\include\ecom
-SYSTEMINCLUDE \epoc32\include\comms-infras
-SYSTEMINCLUDE \epoc32\include\networking
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/ecom
+SYSTEMINCLUDE /epoc32/include/comms-infras
+SYSTEMINCLUDE /epoc32/include/networking
#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SYSTEMINCLUDE /epoc32/include/platform/ecom
--- a/networkingtestandutils/networkingunittest/tdummyetel/etelQoS.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingunittest/tdummyetel/etelQoS.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -38,13 +38,13 @@
{
}
-void RPacketQoS::ConstructL()
+EXPORT_C void RPacketQoS::ConstructL()
{
__ASSERT_ALWAYS(iEtelPacketQoSPtrHolder == NULL, PanicClient(EEtelPanicHandleNotClosed));
iEtelPacketQoSPtrHolder = CPacketQoSPtrHolder::NewL(CEtelPacketPtrHolder::EMaxNumPacketQoSPtrSlots);
}
-void RPacketQoS::Destruct()
+EXPORT_C void RPacketQoS::Destruct()
{
delete iEtelPacketQoSPtrHolder;
iEtelPacketQoSPtrHolder = NULL;
--- a/networkingtestandutils/networkingunittest/tdummyetel/etelpckt.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkingtestandutils/networkingunittest/tdummyetel/etelpckt.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -45,7 +45,7 @@
{
}
-void RPacketContext::ConstructL()
+EXPORT_C void RPacketContext::ConstructL()
/**
* This function creates an instance of CPacketContextPtrHolder & assigns the iEtelPacketContextPtrHolder
* pointer to it.
@@ -54,8 +54,8 @@
__ASSERT_ALWAYS(iEtelPacketContextPtrHolder==NULL,PanicClient(EEtelPanicHandleNotClosed));
iEtelPacketContextPtrHolder = CPacketContextPtrHolder::NewL(CEtelPacketPtrHolder::EMaxNumPacketContextPtrSlots);
}
-
-void RPacketContext::Destruct()
+
+EXPORT_C void RPacketContext::Destruct()
/**
* This function deletes & NULLs the iEtelPacketContextPtrHolder pointer.
*/
@@ -986,7 +986,7 @@
-RPacketContext::TProtocolConfigOptionV2::TProtocolConfigOptionV2()
+EXPORT_C RPacketContext::TProtocolConfigOptionV2::TProtocolConfigOptionV2()
: TPacketBase(), iChallenge(0), iResponse(0), iId(0), iDnsAddresses(),
iMiscBuffer(0)
/**
--- a/networkprotocols/dnsproxy/test/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/dnsproxy/test/group/bld.inf Tue Aug 31 16:45:15 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"
@@ -37,6 +37,21 @@
//-- iby file for the test
t_dnsproxy.iby /epoc32/rom/include/t_dnsproxy.iby
+
+../testdata/resolver01.ini /epoc32/release/winscw/udeb/z/testdata/configs/resolver01.ini
+../testdata/resolver02.ini /epoc32/release/winscw/udeb/z/testdata/configs/resolver02.ini
+../testdata/resolver03.ini /epoc32/release/winscw/udeb/z/testdata/configs/resolver03.ini
+../testdata/resolver01.ini /epoc32/release/winscw/urel/z/testdata/configs/resolver01.ini
+../testdata/resolver02.ini /epoc32/release/winscw/urel/z/testdata/configs/resolver02.ini
+../testdata/resolver03.ini /epoc32/release/winscw/urel/z/testdata/configs/resolver03.ini
+
+#ifdef SIROCCO_CODE_MIGRATION
+../testdata/cccccc00_dnsproxy1.cre /epoc32/data/z/testdata/configs/cccccc00_dnsproxy1.cre
+../testdata/cccccc00_dnsproxy1.cre /epoc32/data/z/testdata/configs/cccccc00_dnsproxy2.cre
+../testdata/cccccc00_dnsproxy1.cre /epoc32/data/z/testdata/configs/cccccc00_dnsproxy3.cre
+../testdata/ns-dnsproxy-maintest-ops_wlan.ini /epoc32/data/z/testdata/configs/ns-dnsproxy-maintest-ops_wlan.ini
+../scripts/ns-dnsproxy-main-ops_wlan.script /epoc32/data/z/testdata/scripts/ns-dnsproxy-main-ops_wlan.script
+#else
//-- test script files
../scripts/ns-dnsproxy-main-ops.script /epoc32/release/winscw/udeb/z/testdata/scripts/ns-dnsproxy-main-ops.script
../testdata/ns-dnsproxy-maintest-ops.ini /epoc32/release/winscw/udeb/z/testdata/scripts/ns-dnsproxy-maintest-ops.ini
@@ -44,9 +59,6 @@
../testdata/testdnsproxy.xml /epoc32/release/winscw/udeb/z/testdata/configs/testdnsproxy.xml
../testdata/testdnsproxy2.xml /epoc32/release/winscw/udeb/z/testdata/configs/testdnsproxy2.xml
../testdata/testdnsproxy3.xml /epoc32/release/winscw/udeb/z/testdata/configs/testdnsproxy3.xml
-../testdata/resolver01.ini /epoc32/release/winscw/udeb/z/testdata/configs/resolver01.ini
-../testdata/resolver02.ini /epoc32/release/winscw/udeb/z/testdata/configs/resolver02.ini
-../testdata/resolver03.ini /epoc32/release/winscw/udeb/z/testdata/configs/resolver03.ini
//urel
../scripts/ns-dnsproxy-main-ops.script /epoc32/release/winscw/urel/z/testdata/scripts/ns-dnsproxy-main-ops.script
@@ -55,8 +67,6 @@
../testdata/testdnsproxy.xml /epoc32/release/winscw/urel/z/testdata/configs/testdnsproxy.xml
../testdata/testdnsproxy2.xml /epoc32/release/winscw/urel/z/testdata/configs/testdnsproxy2.xml
../testdata/testdnsproxy3.xml /epoc32/release/winscw/urel/z/testdata/configs/testdnsproxy3.xml
-../testdata/resolver01.ini /epoc32/release/winscw/urel/z/testdata/configs/resolver01.ini
-../testdata/resolver02.ini /epoc32/release/winscw/urel/z/testdata/configs/resolver02.ini
-../testdata/resolver03.ini /epoc32/release/winscw/urel/z/testdata/configs/resolver03.ini
+#endif
#endif
\ No newline at end of file
--- a/networkprotocols/dnsproxy/test/group/t_dnsproxy.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/dnsproxy/test/group/t_dnsproxy.iby Tue Aug 31 16:45:15 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"
@@ -25,15 +25,24 @@
file=ABI_DIR\DEBUG_DIR\tdnd_dnsproxy.exe sys\bin\tdnd_dnsproxy.exe
file=ABI_DIR\DEBUG_DIR\t_dnsproxy.exe system\programs\t_dnsproxy.exe
+data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\resolver01.ini testdata\configs\resolver01.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\resolver02.ini testdata\configs\resolver02.ini
+data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\resolver03.ini testdata\configs\resolver03.ini
+
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\data\z\testdata\configs\cccccc00_dnsproxy1.cre testdata\configs\cccccc00_dnsproxy1.cre
+data=EPOCROOT##epoc32\data\z\testdata\configs\cccccc00_dnsproxy2.cre testdata\configs\cccccc00_dnsproxy2.cre
+data=EPOCROOT##epoc32\data\z\testdata\configs\cccccc00_dnsproxy3.cre testdata\configs\cccccc00_dnsproxy3.cre
+data=EPOCROOT##epoc32\data\z\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+data=EPOCROOT##epoc32\data\z\testdata\scripts\ns-dnsproxy-main-ops_wlan.script testdata\scripts\ns-dnsproxy-main-ops.script
+#else
data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\scripts\ns-dnsproxy-main-ops.script testdata\scripts\ns-dnsproxy-main-ops.script
data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\scripts\ns-dnsproxy-maintest-ops.ini testdata\scripts\ns-dnsproxy-maintest-ops.ini
data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\tcpip_4dnxproxy.ini testdata\configs\tcpip_4dnxproxy.ini
data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\testdnsproxy.xml testdata\configs\testdnsproxy.xml
data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\testdnsproxy2.xml testdata\configs\testdnsproxy2.xml
data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\testdnsproxy3.xml testdata\configs\testdnsproxy3.xml
-data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\resolver01.ini testdata\configs\resolver01.ini
-data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\resolver02.ini testdata\configs\resolver02.ini
-data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\resolver03.ini testdata\configs\resolver03.ini
-
+#endif
#endif
+
--- a/networkprotocols/dnsproxy/test/group/t_dnsproxy.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/dnsproxy/test/group/t_dnsproxy.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -24,7 +24,7 @@
SOURCE t_dnsproxytestserver.cpp
SOURCE t_dnsproxymain.cpp
-USERINCLUDE ..\inc
+USERINCLUDE ../inc
#ifdef SYMBIAN_OLD_EXPORT_LOCATION
SYSTEMINCLUDE /epoc32/include
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocols/dnsproxy/test/scripts/ns-dnsproxy-main-ops_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,153 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT dnsproxy TEF3.0 tests
+PRINT Run test case(s) for suite ns-dnsproxy-main
+LOAD_SUITE t_dnsproxy -SharedData
+
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\101f7989
+RUN_UTILS MkDir c:\private\101f7989\esock
+RUN_UTILS MakeReadWrite c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS CopyFile c:\private\101f7989\esock\tcpip.ini c:\private\101f7989\esock\tcpip_old.ini
+RUN_UTILS CopyFile z:\testdata\configs\tcpip_4dnxproxy.ini c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS DeleteFile c:\private\200215F1\resolver.ini
+
+// Configure CommDB for the tests
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+//ced -i z:\testdata\configs\testdnsproxy.xml
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_dnsproxy1.cre c:\private\10202be9\persists\cccccc00.cre
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE NET-DNSProxy-globalUrl-001
+ START_TEST_BLOCK 300 t_dnsproxy z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+ CREATE_OBJECT DnsProxyMainTestWrapper MainTestSection
+ COMMAND MainTestSection New
+ COMMAND MainTestSection TestGlobal ParamSection_globalUrl-001
+ END_TEST_BLOCK
+END_TESTCASE NET-DNSProxy-globalUrl-001
+
+START_TESTCASE NET-DNSProxy-globalUrl-002
+ START_TEST_BLOCK 300 t_dnsproxy z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+ CREATE_OBJECT DnsProxyMainTestWrapper MainTestSection
+ COMMAND MainTestSection New
+ COMMAND MainTestSection TestGlobal ParamSection_globalUrl-002
+ END_TEST_BLOCK
+END_TESTCASE NET-DNSProxy-globalUrl-002
+
+START_TESTCASE NET-DNSProxy-globalUrl-003
+ START_TEST_BLOCK 300 t_dnsproxy z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+ CREATE_OBJECT DnsProxyMainTestWrapper MainTestSection
+ COMMAND MainTestSection New
+ COMMAND MainTestSection TestGlobal ParamSection_globalUrl-003
+ END_TEST_BLOCK
+END_TESTCASE NET-DNSProxy-globalUrl-003
+
+START_TESTCASE NET-DNSProxy-localUrl-001
+ START_TEST_BLOCK 300 t_dnsproxy z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+ CREATE_OBJECT DnsProxyMainTestWrapper MainTestSection
+ COMMAND MainTestSection New
+ COMMAND MainTestSection TestLocal ParamSection_localUrl-001
+ END_TEST_BLOCK
+END_TESTCASE NET-DNSProxy-localUrl-001
+
+START_TESTCASE NET-DNSProxy-localUrl-002
+ START_TEST_BLOCK 300 t_dnsproxy z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+ CREATE_OBJECT DnsProxyMainTestWrapper MainTestSection
+ COMMAND MainTestSection New
+ COMMAND MainTestSection TestLocal ParamSection_localUrl-002
+ END_TEST_BLOCK
+END_TESTCASE NET-DNSProxy-localUrl-002
+
+RUN_UTILS MkDir c:\private\200215F1\
+
+RUN_UTILS CopyFile z:\testdata\configs\resolver01.ini c:\private\200215F1\resolver.ini
+START_TESTCASE NET-DNSProxy-localUrl-002
+ START_TEST_BLOCK 300 t_dnsproxy z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+ CREATE_OBJECT DnsProxyMainTestWrapper MainTestSection
+ COMMAND MainTestSection New
+ COMMAND MainTestSection TestLocal ParamSection_localUrl-002-Fail
+ END_TEST_BLOCK
+END_TESTCASE NET-DNSProxy-localUrl-002
+
+RUN_UTILS MakeReadWrite c:\private\200215F1\resolver.ini
+RUN_UTILS CopyFile z:\testdata\configs\resolver02.ini c:\private\200215F1\resolver.ini
+START_TESTCASE NET-DNSProxy-localUrl-002
+ START_TEST_BLOCK 300 t_dnsproxy z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+ CREATE_OBJECT DnsProxyMainTestWrapper MainTestSection
+ COMMAND MainTestSection New
+ COMMAND MainTestSection TestLocal ParamSection_localUrl-002-Fail
+ END_TEST_BLOCK
+END_TESTCASE NET-DNSProxy-localUrl-002
+
+
+RUN_UTILS MakeReadWrite c:\private\200215F1\resolver.ini
+RUN_UTILS DeleteFile c:\private\200215F1\resolver.ini
+START_TESTCASE NET-DNSProxy-localUrl-003
+ START_TEST_BLOCK 300 t_dnsproxy z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+ CREATE_OBJECT DnsProxyMainTestWrapper MainTestSection
+ COMMAND MainTestSection New
+ COMMAND MainTestSection TestLocal ParamSection_localUrl-003
+ END_TEST_BLOCK
+END_TESTCASE NET-DNSProxy-localUrl-003
+
+START_TESTCASE NET-DNSProxy-localUrl-004
+ START_TEST_BLOCK 300 t_dnsproxy z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+ CREATE_OBJECT DnsProxyMainTestWrapper MainTestSection
+ COMMAND MainTestSection New
+ COMMAND MainTestSection TestLocal ParamSection_localUrl-004
+ END_TEST_BLOCK
+END_TESTCASE NET-DNSProxy-localUrl-004
+START_TESTCASE NET-DNSProxy-Connection-001
+ START_TEST_BLOCK 300 t_dnsproxy z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+ CREATE_OBJECT DnsProxyMainTestWrapper MainTestSection
+ COMMAND MainTestSection TestConnection ParamSection_conn-001
+ END_TEST_BLOCK
+END_TESTCASE NET-DNSProxy-Connection-001
+//ced -i z:\testdata\configs\testdnsproxy2.xml
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_dnsproxy2.cre c:\private\10202be9\persists\cccccc00.cre
+START_TESTCASE NET-DNSProxy-Connection-002
+ START_TEST_BLOCK 300 t_dnsproxy z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+ CREATE_OBJECT DnsProxyMainTestWrapper MainTestSection
+ COMMAND MainTestSection TestConnection ParamSection_conn-002
+ END_TEST_BLOCK
+END_TESTCASE NET-DNSProxy-Connection-002
+//ced -i z:\testdata\configs\testdnsproxy3.xml
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_dnsproxy3.cre c:\private\10202be9\persists\cccccc00.cre
+START_TESTCASE NET-DNSProxy-Connection-003
+ START_TEST_BLOCK 300 t_dnsproxy z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+ CREATE_OBJECT DnsProxyMainTestWrapper MainTestSection
+ COMMAND MainTestSection TestConnection ParamSection_conn-003
+ END_TEST_BLOCK
+END_TESTCASE NET-DNSProxy-Connection-003
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+RUN_UTILS MakeReadWrite c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS MakeReadWrite c:\private\101f7989\esock\tcpip_old.ini
+RUN_UTILS DeleteFile c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS CopyFile c:\private\101f7989\esock\tcpip_old.ini c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS DeleteFile c:\private\101f7989\esock\tcpip_old.ini
+
+
+
+//PRINT Completed_tef3_t_dnsproxy
--- a/networkprotocols/dnsproxy/test/src/hacked_servers.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/dnsproxy/test/src/hacked_servers.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -70,19 +70,6 @@
TInt BuildServerList();
void AddServerAddress(const TName &aInterface, const TInetAddr &aAddr);
void LockByAddress(const TInetAddr &aAddr, TUint32 aNid, TDnsServerFilter &aFilter);
- inline virtual void InterfaceSuffixList(TInt aServerId, RInetSuffixList& aSuffixList)
- {
- //dummy implementation
- RInetSuffixList suffixList;
- if (aServerId)
- aSuffixList = suffixList;
- }
- inline virtual void UpdateDomain(TDnsServerFilter &aFilter) const
- {
- //dummy implementation
- if (aFilter.iServerId)
- return;
- }
private:
// Build and add interface entry to the list (basic operation)
--- a/networkprotocols/dnsproxy/test/src/t_dnsproxymain.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/dnsproxy/test/src/t_dnsproxymain.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -168,9 +168,7 @@
ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KUSEIAP());
SetBlockResult(EFail);
}
-
-
- _LIT(KTestCaseName,"eth");
+
TBuf8<256> name8;
name8.Copy(pname16);
@@ -244,11 +242,17 @@
}
iUseNapt = ETrue;
+#ifdef SIROCCO_CODE_MIGRATION
+ _LIT(KInterfaceName,"wlan");
+ _LIT(KInterfaceName2,"wlan");
+#else
+ _LIT(KInterfaceName,"eth");
+ _LIT(KInterfaceName2,"eth");
+#endif
+
RSocket sock;
sock.Open(iSs,KAfInet, KSockDatagram, KProtocolInetUdp);
- _LIT(KInterfaceName,"eth");
TUint32 testaddr = GetInterfaceAddress(sock,KInterfaceName());
- _LIT(KInterfaceName2,"eth");
TUint32 ifindex = GetInterfaceIndex(sock, KInterfaceName2());
sock.Close();
@@ -775,11 +779,17 @@
}
iUseNapt = ETrue;
+#ifdef SIROCCO_CODE_MIGRATION
+ _LIT(KInterfaceName,"wlan");
+ _LIT(KInterfaceName2,"wlan");
+#else
+ _LIT(KInterfaceName,"eth");
+ _LIT(KInterfaceName2,"eth");
+#endif
+
RSocket sock;
sock.Open(iSs,KAfInet, KSockDatagram, KProtocolInetUdp);
- _LIT(KInterfaceName,"eth");
TUint32 testaddr = GetInterfaceAddress(sock,KInterfaceName());
- _LIT(KInterfaceName2,"eth");
TUint32 ifindex = GetInterfaceIndex(sock, KInterfaceName2());
sock.Close();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocols/dnsproxy/test/testdata/S-ced-hw-empty.cfg Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,557 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## ModemBearer
+##
+[ModemBearer]
+ADD_TEMPLATE
+ Id=0
+ Name=Default Modem
+ IfName=PPP
+ PortName=COMM::0
+ TSYName=MM
+ CSYName=ECUART
+ LastSocketActivityTimeout=30
+ LastSessionClosedTimeout=180
+ LastSocketClosedTimeout=30
+ 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
+ MessageCentreNumber=+44123456789
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ CommRole=0
+ SIRSettings=0
+ Agent=CSD.agt
+ FIELD_COUNT=70
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Id=2
+ Name=GPRS Modem
+ IfName=spud-rawip
+ PortName=DATAPORT::0
+ TSYName=PHONETSY
+ CSYName=DATAPORT
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ DataBits=5
+ 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
+ MessageCentreNumber=+44123456789
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=0
+ CommRole=0
+ SIRSettings=0
+ Agent=gprsumtsagent.agt
+ BCAStack=BcaToIsc
+ FIELD_COUNT=71
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Id=3
+ Name=CSD Modem
+ IfName=PPP
+ PortName=DATAPORT::0
+ TSYName=PHONETSY
+ CSYName=DATAPORT
+ LastSocketActivityTimeout=300
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=300
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=19200
+ Handshaking=196
+ SpecialRate=0
+ XonChar=17
+ XoffChar=19
+ FaxClassPref=AUTO
+ SpeakerPref=NEVER
+ SpeakerVolPref=QUIET
+ ModemInitString=ATZ
+ 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
+ MessageCentreNumber=+358508771010
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=0
+ CommRole=0
+ SIRSettings=0
+ Agent=csd.agt
+ FIELD_COUNT=70
+END_ADD
+
+
+############################################################
+## Location
+##
+[Location]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=Default Location
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+ FIELD_COUNT=9
+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
+
+
+############################################################
+## 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
+
+
+############################################################
+## GlobalSettings
+##
+[GlobalSettings]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=DefaultRecordName-1
+ WAPAccessPoint=1
+ ConnectionAttempts=1
+ RedialAttempts=0
+ SmsBearer=3
+ SmsReceiveMode=2
+ GPRSAttachMode=1
+ AcceptIncomingGprs=1
+ GPRSClassCBearer=GSM
+ ModemForDataAndFax=3
+ ModemForPhoneServicesAndSMS=3
+ LocationForDataAndFax=1
+ LocationForPhoneServicesAndSMS=1
+ MaxMBufHeap=1
+ DefaultNetwork=1
+ BearerAvailabilityCheckTSY=PHONETSY
+ FIELD_COUNT=17
+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
+ 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=29
+END_TEMPLATE
+
+
+############################################################
+## 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
+
+
+############################################################
+## OutgoingGPRS
+##
+[OutgoingGPRS]
+ADD_TEMPLATE
+ Id=0
+ Name=template
+ 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=TRUE
+ AnonymousAccess=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ AuthRetries=0
+ IpGateway=0.0.0.0
+ IpAddrFromServer=TRUE
+ IpAddr=0.0.0.0
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=0.0.0.0
+ IpNameServer2=0.0.0.0
+ Ip6DNSAddrFromServer=TRUE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=TRUE
+ GprsAccessPointType=2
+ QosWarningTimeout=-1
+ UmtsR99QoSAndOn=1
+ FIELD_COUNT=32
+END_TEMPLATE
+
+
+############################################################
+## DefaultGPRS
+##
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=Dummy Default GPRS Settings
+ Usage=1
+ PDPType=IPV6
+ PDPAddress=www.wid.com
+ Precedence=1
+ Delay=1
+ Reliability=1
+ PeakThroughput=1
+ MeanThroughput=1
+ MinPrecedence=1
+ MinDelay=1
+ MinReliability=1
+ MinPeakThroughput=1
+ MinMeanThroughput=1
+ DataCompression=TRUE
+ HeaderCompression=TRUE
+ GprsUseEdge=FALSE
+ AnonymousAccess=TRUE
+ FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+##
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=DefaultRecordName-1
+ Ranking=0
+ Direction=OUTGOING
+ BearerSet=CSD & WCDMA
+ DialogPref=PROMPT
+ IAP=0
+ FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## WAPAccessPoint
+##
+[WAPAccessPoint]
+ADD_TEMPLATE
+ Id=0
+ Name=Default Dial In ISP
+ CurrentBearer=WAPIPBearer
+ FIELD_COUNT=3
+END_TEMPLATE
+
+
+############################################################
+## WAPIPBearer
+##
+[WAPIPBearer]
+ADD_TEMPLATE
+ Id=0
+ Name=DefaultRecordName-1
+ AccessPointId=0
+ IAP=0
+ WSPOption=CONNECTIONLESS
+ Security=FALSE
+ ProxyPortNumber=0
+ FIELD_COUNT=7
+END_TEMPLATE
+
+
+############################################################
+## WAPSMSBearer
+##
+[WAPSMSBearer]
+ADD_TEMPLATE
+ Id=0
+ Name=DefaultRecordName-1
+ AccessPointId=0
+ WSPOption=CONNECTIONLESS
+ Security=FALSE
+ FIELD_COUNT=5
+END_TEMPLATE
+
+
+############################################################
+## 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
+
+############################################################
+## 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
Binary file networkprotocols/dnsproxy/test/testdata/cccccc00_dnsproxy1.cre has changed
Binary file networkprotocols/dnsproxy/test/testdata/cccccc00_dnsproxy2.cre has changed
Binary file networkprotocols/dnsproxy/test/testdata/cccccc00_dnsproxy3.cre has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocols/dnsproxy/test/testdata/connectionpref1_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences operation="add">
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.EthernetwithDaemonDynamicIP1</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocols/dnsproxy/test/testdata/connectionpref2_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences operation="add">
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.EthernetwithDaemonDynamicIP2</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocols/dnsproxy/test/testdata/connectionpref3_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences operation="add">
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.EthernetwithDaemonDynamicIP3</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocols/dnsproxy/test/testdata/ns-dnsproxy-maintest-ops_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,138 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+// For the meaning of querytype see dns_qry.h
+[MainTestSection]
+name = obj0
+object_value = 010
+domainname = local
+iap1=6
+iap2=1
+useiap=1
+
+
+[MainTestSection02]
+name = obj0
+object_value = 010
+domainname = local
+iap1=1
+iap2=6
+useiap=6
+
+
+[ParamSection_globalUrl-001]
+url = http://www.sample.net
+addr = 66.116.109.14
+querytype = 1
+queryresp = 0
+changeifaceinfo=0
+
+
+[ParamSection_globalUrl-001-Fail]
+url = http://www.sample.net
+addr = 66.116.109.14
+querytype = 1
+queryresp = -5120
+changeifaceinfo=0
+
+
+[ParamSection_globalUrl-002]
+url = http://www.sample.net
+addr = 66.116.109.14
+querytype = 12
+queryresp = 0
+changeifaceinfo=0
+
+
+[ParamSection_globalUrl-003]
+url = http://_sip._tls.nokia.com
+addr = 131.228.6.229
+querytype = 33
+queryresp = 0
+changeifaceinfo=0
+
+
+[ParamSection_localUrl-001]
+url = ccc.local
+addr = 10.192.192.138
+querytype = 1
+queryresp = 0
+updatedbflag = 0
+changeifaceinfo=0
+
+
+[ParamSection_localUrl-002]
+url = ccc.local
+addr = 10.192.192.138
+querytype = 1
+queryresp = 0
+updatedbflag = 1
+changeifaceinfo=0
+
+
+[ParamSection_localUrl-002-Fail]
+url = ccc.local
+addr = 10.192.192.138
+querytype = 1
+queryresp = -5120
+updatedbflag = 1
+changeifaceinfo=0
+
+
+[ParamSection_localUrl-003]
+url = ccc.local
+addr = 66.116.109.14
+querytype = 12
+queryresp = 0
+updatedbflag = 1
+changeifaceinfo=0
+
+
+[ParamSection_localUrl-004]
+url = ccc.local
+addr = 10.192.192.138
+querytype = 1
+queryresp = 0
+updatedbflag = 1
+changeifaceinfo=2
+
+
+[ParamSection_conn-001]
+name = obj0
+object_value = 010
+iap1=0
+iap2=1
+useiap=1
+expectation = 0
+
+
+[ParamSection_conn-002]
+name = obj0
+object_value = 010
+iap1=0
+iap2=2
+useiap=2
+expectation = 0
+
+
+[ParamSection_conn-003]
+name = obj0
+object_value = 010
+iap1=0
+iap2=3
+useiap=3
+expectation = 0
+[EchoClientSection]
+
Binary file networkprotocols/dnsproxy/test/testdata/te_dnsproxy_wlan.xml has changed
--- a/networkprotocols/ipeventnotifier/IPEventFactory/group/IPEventFactory.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/ipeventnotifier/IPEventFactory/group/IPEventFactory.iby Tue Aug 31 16:45:15 2010 +0300
@@ -18,7 +18,7 @@
#ifndef __IP_EVENT_FACTORY_IBY__
#define __IP_EVENT_FACTORY_IBY__
-#ifdef SYMBIAN_EXCLUDE_DHCP
+#ifndef __DHCP
REM Feature DHCP is not included in this ROM
#else
ECOM_PLUGIN(IPEventFactory.dll,1020469F.rsc)
--- a/networkprotocols/ipeventnotifier/IPEventTypes/group/IPEventTypes.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/ipeventnotifier/IPEventTypes/group/IPEventTypes.iby Tue Aug 31 16:45:15 2010 +0300
@@ -20,7 +20,7 @@
#ifndef __IP_EVENT_TYPES_IBY__
#define __IP_EVENT_TYPES_IBY__
-#ifdef SYMBIAN_EXCLUDE_DHCP
+#ifndef __DHCP
REM Feature DHCP is not included in this ROM
#else
--- a/networkprotocols/ipeventnotifier/group/ipeventnotifier.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/ipeventnotifier/group/ipeventnotifier.iby Tue Aug 31 16:45:15 2010 +0300
@@ -22,7 +22,7 @@
#define __IPEVENTNOTIFIER_IBY__
-#ifdef SYMBIAN_EXCLUDE_DHCP
+#ifndef __DHCP
REM Feature DHCP is not included in this ROM
#else
--- a/networkprotocols/ipeventnotifier/src/DHCPUnicastTranslator.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/ipeventnotifier/src/DHCPUnicastTranslator.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -128,7 +128,7 @@
#ifndef _DEBUG
if (udp.iHdr->DstPort() == 68)
#else
- if (udp.iHdr->DstPort() == 68 || udp.iHdr->DstPort() == 127 || udp.iHdr->DstPort() == 119 || udp.iHdr->DstPort() == 125
+ if (udp.iHdr->DstPort() == 68 || udp.iHdr->DstPort() == 127 || udp.iHdr->DstPort() == 119 || udp.iHdr->DstPort() == 94 || udp.iHdr->DstPort() == 125
#ifdef SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
|| udp.iHdr->DstPort() == 92 || udp.iHdr->DstPort() == 99
#endif//SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
--- a/networkprotocols/iphook/inhook6/inc/res_sock.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/iphook/inhook6/inc/res_sock.h Tue Aug 31 16:45:15 2010 +0300
@@ -119,7 +119,6 @@
TUint16 iSession; //< The session ID.
TInt iNext; //< Next indicator: 0, 1, 2, ... (query), or the result (on reply)
TUint32 iId; //< Address domain Id
- TInt iFlowRequestType; //< 0 for IMPLICIT; 1 for SUBCONNECTION EXPLICIT; 2 for CONNECTION EXPLICIT
};
// Need write access to members, and just for this, need to derive all
--- a/networkprotocols/iphook/inhook6/include/in_bind.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/iphook/inhook6/include/in_bind.h Tue Aug 31 16:45:15 2010 +0300
@@ -371,10 +371,6 @@
* the name servers or gateways. Some of the information comes from the neighbor
* discovery or service location protocols.
*
- * TSoInetInterfaceInfoExtnDnsSuffix structure can also be used for retreiving interface
- * information if we need values for supplementary fields like the domain search list
- * This support is available since Symbian OS vtb92 and later
- *
* @param aIndex
* previous index value, use ZERO to restart scan from beginning. <b>Note</b>: This
* is not same as "interface index", which identifies a interface in the system.
@@ -564,35 +560,6 @@
* @return System-wide error code
*/
virtual TInt SetOption(TUint aLevel, TUint aName, const TDesC8 &aOption, MProvdSecurityChecker &aChecker) = 0;
- /**
- * Enumerates domain suffix information on an interface.
- *
- * This function identifies the active interface enumerated for reading
- * by the parameter aActiveEnumInterface
- *
- * It then identifies the last domain suffix read on this inteface by the parameter
- * aDomainSuffixIndex
- *
- * To start, call first with aDomainSuffixIndex=0, and after that always give the previously
- * returned value as a parameter. When the return value is 0, all domain suffices
- * have been listed.
- *
- * The domain suffix thus read is saved to the reference TInetSuffix object passed in as argument
- *
- * @param aActiveEnumInterface
- * previously indexed interface's name saved during enumeration done using KSoInetNextInterface
- * Can be used to enumerate on specific interface by passing the interface name
- * @aDomainSuffixIndex
- * previous domain suffix index value, use ZERO to restart scan from beginning.
- * @retval aInfo
- * returns the information about the domain suffix on the interface
- * at next index position of the list of domain suffices for that interface
- * @return
- * @li = 0, if no next domain suffix exists
- * @li > 0, interface index, aInfo updated to describe this domain suffix in the list
- * @li = KErrNotFound, if interface does not exist (or) when no domain suffix available for the interface
- */
- virtual TInt DomainSuffixInfo(TName aActiveEnumInterface, TUint aDomainSuffixIndex, TInetSuffix &aInfo) = 0;
};
--- a/networkprotocols/tcpipv4v6prt/data/tcpip.eka2.ini Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/data/tcpip.eka2.ini Tue Aug 31 16:45:15 2010 +0300
@@ -30,4 +30,4 @@
[tcp]
tcp_alignopt= 1
-tcp_recv_buf= 131072
\ No newline at end of file
+tcp_recv_buf= 131072
--- a/networkprotocols/tcpipv4v6prt/data/tcpip.wins.ini Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/data/tcpip.wins.ini Tue Aug 31 16:45:15 2010 +0300
@@ -28,4 +28,4 @@
maxholdtime= 90
[tcp]
-tcp_recv_buf= 131072
+tcp_recv_buf= 131072
\ No newline at end of file
--- a/networkprotocols/tcpipv4v6prt/group/tcpip6.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/group/tcpip6.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -49,7 +49,7 @@
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-LIBRARY euser.lib esock.lib esocksvr.lib mbufmgr.lib insock.lib inhook6.lib nifman.lib hal.lib
+LIBRARY euser.lib esock.lib esocksvr.lib mbufmgr.lib insock.lib inhook6.lib nifman.lib
CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
--- a/networkprotocols/tcpipv4v6prt/inc/inet.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/inc/inet.h Tue Aug 31 16:45:15 2010 +0300
@@ -261,8 +261,6 @@
TUint iHeaderIncluded:1; // If true, user sends datagram packets with IP header
TUint iSynchSend:1; // If true, block socket write to UDP socket in PENDING and HOLD states
TInt iProtocolId;
- TInt iDomainSuffixIndex; // Interface domain suffix enumeration state
- TName iActiveEnumInterface; // Name of the interface previously enumerated with option KSoInetNextInterface
};
class TInet6SAPIter
--- a/networkprotocols/tcpipv4v6prt/inc/tcp.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/inc/tcp.h Tue Aug 31 16:45:15 2010 +0300
@@ -32,7 +32,6 @@
#include "frag.h"
#include "inet6log.h"
#include <in6_opt.h>
-#include <hal.h>
#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
#include <in_sock.h>
@@ -50,9 +49,7 @@
//
// Constants affecting protocol performance
//
-const TUint KOneSecondInUs = 1000000; //< For sec <-> usec conversions
-const TUint KOneSecondInMs = 1000; //< For sec <-> msec conversions
-const TUint KOneMsInUs = 1000; //< For msec <-> usec conversions
+const TUint KOneSecondUs = 1000000; //< Help for converting longer times to microseconds
const TUint KTcpMaximumWindow = 0x3fffffff; //< Maximum receive window size
const TUint KTcpMinimumWindow = 1024; //< Minimum receive window size
@@ -62,7 +59,7 @@
const TUint KTcpDefaultMSS = 65535; //< By default, MSS is not limited by user
const TUint KTcpStandardMSS = 536; //< Internet standard MSS
const TUint KTcpMinimumMSS = 64; //< Minimum acceptable MSS.
-const TUint KTcpMaxTransmit = 1; //< Transmit at most this many segments at one time.
+const TUint KTcpMaxTransmit = 2; //< Transmit at most this many segments at one time.
const TUint KTcpMinRTO = 1000000; //< us (1s)
const TUint KTcpMaxRTO = 60000000; //< us (60s)
@@ -517,10 +514,6 @@
// -1=linger disabled, >=0 linger enabled with given time in seconds.
TInt iLinger;
-
- //Introduce specifically for Browser usecase where in Normal shutdown is expected to close with in certain time.
- //current structure is using secs. This Bit will enable calculation in Mircosecs.
- TBool iMicroSecCalcFlag;
// Window scaling factor for the send window, advertised by the other end.
TUint8 iSndWscale:4;
@@ -789,28 +782,13 @@
inline TUint32 CProviderTCP6::TimeStamp()
{
- TInt tickPeriod;
- TUint64 ticsInMs;
- //
- HAL::Get( HAL::ENanoTickPeriod, tickPeriod );
- ticsInMs = (static_cast<TUint64> ( User::NTickCount() ) * tickPeriod)
- / KOneMsInUs;
- return static_cast<TUint32> ( ticsInMs );
- /*
- // This used to return micro seconds, but since the resolution of NTick
- // is something around ~1ms, we return now the timestamp in milliseconds
- // (which is more than sufficient resolution for this). This is done to
- // mittigate the risk of counter overflow.
- // The existing implementation is commented and not removed for future reference
- // if required.
- TTime now;
+ TTime now;
now.UniversalTime();
#ifdef I64LOW
return I64LOW(now.Int64());
#else
return (TUint32)now.Int64().GetTInt();
#endif
-*/
}
/**
--- a/networkprotocols/tcpipv4v6prt/src/iface.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/iface.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -617,7 +617,7 @@
// Wrap a packet into ICMP error reply
void IcmpSend(RMBufChain &aPacket, const TIcmpTypeCode aIcmp, const TUint32 aParameter = 0, const TInt aMC = 0);
-
+
private:
# ifdef WEAK_ES
TUint32 IsForMe(const TIp6Addr &aAddr, const CIp6Interface *const aSrcIf,
@@ -667,14 +667,9 @@
//
void RemoveInterface(CIp6Interface *aIf);
//
- // Modify Inet Interface information (SetOption part!) for TSoInet6InterfaceInfo input
- //
- TInt InetInterfaceOption(TUint aName, const TSoInet6InterfaceInfo &aInfo, const TInetSuffix* aDomainSuffix);
- //
- // Modify Inet Interface information (SetOption part!) for TSoInetInterfaceInfoExtnDnsSuffix input
- // To support supplementary interface fields i.e. domain search list for an interface
- //
- TInt InetInterfaceOption(TUint aName, const TSoInetInterfaceInfoExtnDnsSuffix &aInfo);
+ // Modify Inet Interface information (SetOption part!)
+ //
+ TInt InetInterfaceOption(TUint aName, const TSoInet6InterfaceInfo &aInfo);
//
// Query Interface Information
//
@@ -795,10 +790,7 @@
MDestinationCache *iDestinationCache; //< Destination cache (for transport protocol params).
public: // GCC doesn't compile Linkage, if this is private! -- msa
- RTimeout iTimeout; //< Hook to the timer service (MTimeoutManager)
-public:
- // Enumerate domain suffices on an interface and read suffix name to the reference object passed in
- virtual TInt DomainSuffixInfo(TName aActiveEnumInterface, TUint aDomainSuffixIndex, TInetSuffix &aDomainSuffix);
+ RTimeout iTimeout; //< Hook to the timer service (MTimeoutManager)
};
//
@@ -1871,11 +1863,6 @@
#endif //SYMBIAN_TCPIPDHCP_UPDATE
public: // GCC doesn't compile CIp6InterfaceLinkage, if this is private! -- msa
RTimeout iTimeout; //< Hook to the timer service (MTimeoutManager)
-private:
- RInetSuffixList iSuffixList; // Container to store list of optional domain search list on the interface
-private:
- // Process SetOpt request for updating domain suffices based on the function mode set on the structure passed in
- void ProcessDomainSuffixL(const TInetSuffix* aSuffix);
};
//
@@ -3425,15 +3412,6 @@
TPckgBuf<TSoIfConnectionInfo> netinfo;
netinfo().iIAPId = iRoute->iInterface.iScope[EScopeType_IAP];
netinfo().iNetworkId = iRoute->iInterface.iScope[EScopeType_NET];
-
- if(iInfo.iLockType == EScopeType_IAP && iInfo.iLockId != netinfo().iIAPId)
- {
- iInfo.iLockId = netinfo().iIAPId;
- #ifdef _LOG
- Log::Printf(_L("\t\tFlow[%u] Connect ConnectionInfo changed: Lock_type:%d, Lock_id:%d"),this,iInfo.iLockType, iInfo.iLockId);
- #endif
- }
-
Bearer(netinfo);
RefreshFlow();
return;
@@ -5557,13 +5535,13 @@
*/
TInt CIp6Interface::SetId(TIp6AddressInfo &aId, const TIp6Addr &aAddr, const TInt aPrefix, const TInt aAddressType)
{
+ // Should this also check whether address type is same?
+ // Changing just type does not work with this code!
+ // -- msa 24.10.2003
if (aPrefix < 0 || aPrefix > 128)
return 0; // Invalid length, do nothing!
if (TIp46Addr::Cast(aAddr).IsMulticast())
return 0; // A multicast address cannot be my own.
- // Should this also check whether address type is same?
- // Changing just type does not work with this code!
- // -- msa 24.10.2003
if (aId.IsSet() && aPrefix == aId.iPrefix && aAddr.IsEqual(aId.iId))
{
// Id has not changed but expecting some change in any of
@@ -7304,7 +7282,6 @@
// are wasted on destructor. Should not cause
// any problems... -- msa
Reset();
- iSuffixList.Close();
LOG(Log::Printf(_L("\tIF %u [%S] Deleted"), iScope[0], &iName));
}
@@ -9435,17 +9412,14 @@
// **************************
/**
// Locate the next interface after aIndex and return the
-// information and assigned interface index
-// The structure being used is a legacy type for retreiving basic information
-//
-// @param aIndex index in the interface list after which we need extract the interface information
-// @param aInfo Structure to store interface properties for the application layer to read
+// information and assigned interface index.
+//
// @return
// @li = 0, if no next interface exists
// @li > 0, interface index, aInfo updated to describe this interface
*/
TUint CIp6Manager::InterfaceInfo(TUint aIndex, TSoInetInterfaceInfo &aInfo) const
- {
+ {
// ..yes, this is silly O(n!) (?) algorithm for scanning the interfaces. Each time
// this is called, it has find and count all entries that come before the specified
// aIndex.
@@ -9597,44 +9571,8 @@
}
}
return 0;
- }
-
-// CIp6Manager::DomainSuffixInfo
-// *****************************
-/**
-// Locate the next domain suffix after aDomainSuffixIndex on the interface with name aActiveEnumInterface
-// and return the information and assigned domain suffix index.
-// The structure being used is a new type for retreiving extended information
-//
-// @param aActiveEnumInterface active interface name on which enumeration is to carried out
-// @param aDomainSuffixIndex index in the domain suffix list after which we need extract the information
-// @param aInfoStructure to store domain suffix properties for the application layer to read
-// @return
-// @li = 0, if no next domain suffix exists
-// @li > 0, interface index, aInfo updated to describe this domain suffix in the list
-// @li = KErrNotFound, if interface does not exist (or) when no domain suffix available for the interfce
-*/
-TInt CIp6Manager::DomainSuffixInfo(TName aActiveEnumInterface, TUint aDomainSuffixIndex, TInetSuffix &aDomainSuffix)
- {
- CIp6Interface* iface = FindInterface(aActiveEnumInterface);
-
- if (iface == NULL)
- {
- return KErrNotFound;
- }
-
- TInt count = iface->iSuffixList.Count();
- if(count == 0 || count < aDomainSuffixIndex)
- return KErrNotFound;
-
- if (count == aDomainSuffixIndex)
- return 0;
-
- aDomainSuffix.Copy(iface->iSuffixList[aDomainSuffixIndex]);
- aDomainSuffix.iDomainSuffixFunction = EInetFunctionUndefined;
-
- return ++aDomainSuffixIndex;
- }
+ }
+
TInt CIp6Manager::GetInterfaces(TDes8& aOption) const
{
@@ -10051,10 +9989,9 @@
// CIp6Manager::InetInterfaceOption
// ********************************
-// Modify Inet Interface information (SetOption part!) for TSoInet6InterfaceInfo input
-// For maintaining backward compatibility
-//
-TInt CIp6Manager::InetInterfaceOption(TUint aName, const TSoInet6InterfaceInfo &aInfo, const TInetSuffix* aDomainSuffix)
+// Modify Inet Interface information (SetOption part)
+//
+TInt CIp6Manager::InetInterfaceOption(TUint aName, const TSoInet6InterfaceInfo &aInfo)
{
#ifdef _LOG
TBuf<39> addressStr;
@@ -10211,15 +10148,6 @@
iface->iSMtu = iface->iRMtu = iface->iPMtu = aInfo.iMtu;
if (aInfo.iSpeedMetric > 0)
iface->iSpeedMetric = aInfo.iSpeedMetric;
-
- // Copy the domain search list (if any) to the interface object
- if (aDomainSuffix)
- {
- TRAPD(err, iface->ProcessDomainSuffixL(aDomainSuffix));
- if (err != KErrNone)
- return err;
- }
-
if (aInfo.iDoState)
{
if (aInfo.iState == EIfDown)
@@ -10337,51 +10265,6 @@
return KErrNone;
}
-// CIp6Manager::ProcessDomainSuffixL
-// *********************************
-// Process SetOpt calls with TSoInetInterfaceInfoExtnDnsSuffix which contains
-// domain suffix information for the interface in form of TInetSuffix structure
-// This function is responsible to perform domain suffix updates (i.e. add/delete/deleteall)
-// to the interface based on the operation mode specified in the structure
-void CIp6Interface::ProcessDomainSuffixL(const TInetSuffix* aSuffix)
- {
- if (aSuffix->iDomainSuffixFunction == EInetAddSuffix)
- {
- // Perform addition of the incoming suffix name to the list maintained by interface object
- iSuffixList.AppendL(aSuffix->iSuffixName);
- TSuffixName tmpBuf;
- tmpBuf.Copy(iSuffixList[iSuffixList.Count()-1]);
- LOG(Log::Printf( _L( "Added domain suffix to interface %S - %S"), &iName, &tmpBuf));
- }
- else if(aSuffix->iDomainSuffixFunction == EInetDeleteSuffix)
- {
- // Perform deletion of the suffix name from the list of suffices in the interface object
- TInt pos;
- pos = iSuffixList.Find(aSuffix->iSuffixName);
- User::LeaveIfError(pos);
- TSuffixName tmpBuf;
- tmpBuf.Copy(iSuffixList[pos]);
- iSuffixList.Remove(pos);
- LOG(Log::Printf( _L( "Removed domain suffix from interface %S - %S"), &iName, &tmpBuf));
- }
- else if (aSuffix->iDomainSuffixFunction == EInetDeleteAllSuffixes)
- {
- // Flush out all the suffix entries in the interface
- iSuffixList.Reset();
- LOG(Log::Printf( _L( "Removed all domain suffix from interface %S"), &iName));
- }
- }
-
-// CIp6Manager::InetInterfaceOption
-// ********************************
-// Modify Inet Interface information (SetOption part!) for TSoInetInterfaceInfoExtnDnsSuffix input
-// To support supplementary fields i.e. domain search list on an interface
-//
-TInt CIp6Manager::InetInterfaceOption(TUint aName, const TSoInetInterfaceInfoExtnDnsSuffix &aInfo)
- {
- return InetInterfaceOption(aName, (TSoInet6InterfaceInfo)aInfo, &aInfo.iDomainSuffix);
- }
-
//
// CIpManager::InterfaceOption
// ***************************
@@ -10521,18 +10404,10 @@
if (aName == KSoIpv4LinkLocal &&
aOption.Length() == sizeof(TSoInetIpv4LinkLocalInfo))
return SetIpv4LinkLocalOption((TSoInetIpv4LinkLocalInfo &)ref);
- if (aOption.Length() == sizeof(TSoInet6InterfaceInfo))
- {
- // if the SetOpt() requested with TSoInet6InterfaceInfo structure (legacy)
- return InetInterfaceOption(aName, (TSoInet6InterfaceInfo &)ref, NULL);
- }
- else if (aOption.Length() == sizeof(TSoInetInterfaceInfoExtnDnsSuffix))
- {
- // if the SetOpt() requested with new TSoInetInterfaceInfoExtnDnsSuffix structure
- return InetInterfaceOption(aName, (TSoInetInterfaceInfoExtnDnsSuffix &)ref);
- }
- else
+
+ if (aOption.Length() != sizeof(TSoInet6InterfaceInfo))
return KErrArgument;
+ return InetInterfaceOption(aName, (TSoInet6InterfaceInfo &)ref);
}
else if (aLevel == KSOLInterface)
{
--- a/networkprotocols/tcpipv4v6prt/src/in_trans.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/in_trans.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -756,7 +756,7 @@
return aChain.Length();
}
if(p != NULL)
- p->Unlink();
+ p->Unlink();
aChain = iNext;
iNext = m;
--- a/networkprotocols/tcpipv4v6prt/src/inet.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/inet.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -360,17 +360,9 @@
if (aName == STATIC_CAST(TUint, KSoInetEnumInterfaces)) // See *NOTE* above!
{
iInterfaceIndex = 0;
-
LOG(Log::Printf(_L("SetOpt\t%S SAP[%u] KSoInetEnumInterfaces"), &ProtocolName(), (TInt)this));
return KErrNone;
}
- if (aName == STATIC_CAST(TUint, KSoInetEnumDomainSuffix)) // See *NOTE* above!
- {
- iDomainSuffixIndex = 0;
-
- LOG(Log::Printf(_L("SetOpt\t%S SAP[%u] KSoInetEnumDomainSuffix"), &ProtocolName(), (TInt)this));
- return KErrNone;
- }
}
else if (aLevel == KSolInetRtCtrl)
{
@@ -427,27 +419,11 @@
(void) new (&opt) TSoInetInterfaceInfo; // Make sure descriptors are correct.
aOption.SetLength(sizeof(TSoInetInterfaceInfo));
((CProviderInet6Base *)this)->iInterfaceIndex = iProtocol->Interfacer()->InterfaceInfo(iInterfaceIndex, opt);
- ((CProviderInet6Base *)this)->iActiveEnumInterface.Copy(opt.iName);
-
if (iInterfaceIndex > 0)
return KErrNone;
else
return KErrNotFound;
}
- else if (aLevel == KSolInetIfCtrl && aName == STATIC_CAST(TUint, KSoInetNextDomainSuffix))
- {
- TInetSuffix& opt = *(TInetSuffix*)aOption.Ptr();
- if (STATIC_CAST(TUint, aOption.MaxLength()) < sizeof(TInetSuffix))
- return KErrTooBig;
- (void) new (&opt) TInetSuffix; // Make sure descriptors are correct.
- aOption.SetLength(sizeof(TInetSuffix));
- ((CProviderInet6Base *)this)->iDomainSuffixIndex = iProtocol->Interfacer()->DomainSuffixInfo(iActiveEnumInterface, iDomainSuffixIndex, opt);
-
- if (iDomainSuffixIndex > 0)
- return KErrNone;
- else
- return KErrNotFound;
- }
else if (aLevel == KSolInetRtCtrl && aName == STATIC_CAST(TUint, KSoInetNextRoute)) // See *NOTE* above!
{
TSoInetRouteInfo& opt = *(TSoInetRouteInfo*)aOption.Ptr();
--- a/networkprotocols/tcpipv4v6prt/src/res.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/res.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -268,8 +268,6 @@
public:
void NoDndAvailable();
RTimeout iTimeout;
-private:
- TInt iFlowRequestType; //< = 0 for IMPLICIT, 1 for SUBCONNECTION EXPLICIT, 2 for EXPLICIT
};
// CHostResolverLinkage
@@ -1171,8 +1169,6 @@
// Complete the request with network id
//
iRequest.iId = iCurrentId;
- // Set the flow request type to the DND request message
- iRequest.iFlowRequestType = iFlowRequestType;
#ifdef SYMBIAN_DNS_PUNYCODE
iRequest.iScope |= EScopeType_NET;
#else
@@ -1220,18 +1216,14 @@
return KErrArgument;
}
}
- else if (aName == static_cast<TUint>(KSoGetErrorCode))
+ else
+ if (aName == static_cast<TUint>(KSoGetErrorCode))
{
// Return a TCP/IP failure code appropriate to the last operation.
// Kludge - SetOption does not allow for any return value via aOption (being const), so
// return a positive value representing the error code.
return (iRequest.iType == KDnsRequestType_GetByAddress) ? -KErrDndAddrNotFound : -KErrDndNameNotFound;
}
- else if (aName == KSoFlowRequestType)
- {
- // Receive the flow request passed on from esock layer to the resolver
- iFlowRequestType = *reinterpret_cast<const TInt*>(aOption.Ptr());
- }
}
#else
--- a/networkprotocols/tcpipv4v6prt/src/tcp.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/tcp.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -263,13 +263,6 @@
#ifdef _LOG
LogPacket('<', seg, info, info->iOffset);
pkt.Set(seg, info->iOffset, pkt.iHdr->HeaderLength()); // LogPacket() may have realigned the header.
-
- if (!pkt.iHdr)
- {
- LOG(Log::Printf(_L("\ttcp Process() header alignment failed. Packet discarded")));
- seg.Free();
- return;
- }
#endif
// Verify TCP checksum
--- a/networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -140,8 +140,7 @@
// state chart above. It would be located between CLOSED and SYN-SENT.
//
-//The below is UID of the client(http client) using this option. We are not exposing this right now...
-const TUint32 KSoTcpLingerinMicroSec = 0x101F55F6;
+
#ifdef _LOG
const TText *CProviderTCP6::TcpState(TUint aState)
{
@@ -792,11 +791,6 @@
}
break;
- case KSoTcpLingerinMicroSec:
- RDebug::Printf("TSoTcpLingerinMicroSec is set");
- //Enable micro sec calculation for TCP linger timer. User (currently just exposed to browser)
- //will specify linger time in microsecs.
- iMicroSecCalcFlag=ETrue;
case KSoTcpLinger:
if (aOption.Length() < (TInt)sizeof(TSoTcpLingerOpt))
{
@@ -1204,16 +1198,7 @@
// Start linger timer. RSocket::Close() returns when timer
// expires or when all data has been succesfully transmitted.
//
- if(iMicroSecCalcFlag)
- {
- //expecting iLinger timer to be specified in microsec.This will be set currently by browser where in
- //it is expected to be close with in certian time
- iLingerTimer->Start(iLinger * 1);
- }
- else
- {
- iLingerTimer->Start(iLinger * KOneSecondInUs);
- }
+ iLingerTimer->Start(iLinger * KOneSecondUs);
}
SchedTransmit();
@@ -1803,7 +1788,7 @@
{
// The heaviest time check only if we are otherwise allowed to send the keepalive.
TUint32 time_now = TimeStamp();
- if (time_now - iLastTriggeredKeepAlive > KTcpKeepAliveTH * KOneSecondInMs)
+ if (time_now - iLastTriggeredKeepAlive > KTcpKeepAliveTH * KOneSecondUs)
{
iLastTriggeredKeepAlive = time_now;
LOG(Log::Printf(_L("\ttcp SAP[%u] CanSend(): Sending a Keep-Alive probe"), (TInt)this));
@@ -2462,7 +2447,7 @@
if (!iLastTimeout)
iLastTimeout = usec;
- TUint32 distance = (usec - iLastTimeout) / KOneSecondInMs; // seconds
+ TUint32 distance = (usec - iLastTimeout) / KOneSecondUs; // seconds
TUint32 interval = iBackoff ? Protocol()->KeepAliveRxmt() : Protocol()->KeepAliveIntv();
if (distance > interval)
@@ -2471,14 +2456,14 @@
LOG(Log::Printf(_L("\ttcp SAP[%u] KeepAliveTimeout(): Sending a Keep-Alive probe"), (TInt)this));
SendSegment(KTcpCtlACK, iSND.UNA - 1, 0);
iBackoff++;
- iRetransTimer->Restart(Protocol()->KeepAliveRxmt() * KOneSecondInUs);
+ iRetransTimer->Restart(Protocol()->KeepAliveRxmt() * KOneSecondUs);
}
else
{
// This branch is entered when the first keepalive has to be issued after an idle period.
distance = Protocol()->KeepAliveIntv() - distance;
iRetransTimer->Restart((distance > 1800) ?
- 1800 * KOneSecondInUs : (distance * KOneSecondInUs));
+ 1800 * KOneSecondUs : (distance * KOneSecondUs));
}
}
@@ -2487,7 +2472,7 @@
{
ASSERT(iRetransTimer);
iRetransTimer->Restart((Protocol()->KeepAliveIntv() > 1800) ?
- 1800 * KOneSecondInUs : (Protocol()->KeepAliveIntv() * KOneSecondInUs));
+ 1800 * KOneSecondUs : (Protocol()->KeepAliveIntv() * KOneSecondUs));
// Backoff is used for counting unacknowledged keepalive retransmissions during idle periods
iBackoff = 0;
iLastTimeout = TimeStamp();
@@ -3703,20 +3688,20 @@
{
// NewReno partial ACK processing.
- /* From RFC2582:
- If this ACK does *not* acknowledge all of the data up to and
- including "recover", then this is a partial ACK. In this case,
- retransmit the first unacknowledged segment. Deflate the
- congestion window by the amount of new data acknowledged, then
- add back one MSS and send a new segment if permitted by the new
- value of cwnd. This "partial window deflation" attempts to
- ensure that, when Fast Recovery eventually ends, approximately
- ssthresh amount of data will be outstanding in the network. Do
- not exit the Fast Recovery procedure (i.e., if any duplicate ACKs
- subsequently arrive, execute Steps 3 and 4 above).
-
- For the first partial ACK that arrives during Fast Recovery, also
- reset the retransmit timer.
+ /* From RFC2582:
+ If this ACK does *not* acknowledge all of the data up to and
+ including "recover", then this is a partial ACK. In this case,
+ retransmit the first unacknowledged segment. Deflate the
+ congestion window by the amount of new data acknowledged, then
+ add back one MSS and send a new segment if permitted by the new
+ value of cwnd. This "partial window deflation" attempts to
+ ensure that, when Fast Recovery eventually ends, approximately
+ ssthresh amount of data will be outstanding in the network. Do
+ not exit the Fast Recovery procedure (i.e., if any duplicate ACKs
+ subsequently arrive, execute Steps 3 and 4 above).
+
+ For the first partial ACK that arrives during Fast Recovery, also
+ reset the retransmit timer.
*/
iCwnd -= acked;
@@ -3733,13 +3718,6 @@
iDupAcks = Max(iDupAcks - acked / (TInt)iSMSS, 0);
}
}
- else if ( iDupAcks )
- {
- // New data acknowledged, and not ongoing any recovery action
- // Reset duplicate ack count
- LOG(Log::Printf(_L("\ttcp SAP[%u] ProcessSegments(): Reset iDupAcks to 0"), (TInt)this));
- iDupAcks = 0;
- }
// Reset limited transmit window
iLwnd = 0;
@@ -3915,8 +3893,16 @@
iFlags.iEcnSendCWR = ETrue;
}
}
- // This section used to hold the RetryACK concept, a reference can be checked
- // from older versions(9.2/9.3). Its being removed as not required.
+ if((iSND.NXT - ack) >0 && InState(ETcpEstablished) && (acked ==0))
+ {
+ iRetryAck++;
+ if(iRetryAck >=4) // 4 an arbitary number; as this count does not refer to dup_ack, this will not interfere with Fast retransmission
+ {
+ LOG(Log::Printf(_L("\ttcp SAP[%u] ProcessSegments(): retransmitting the segment"), (TInt)this));
+ SendSegments(ETrue);
+ iRetryAck = 0; // reset the retry count
+ }
+ }
}
}
--- a/networksecurity/ipsec/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -21,7 +21,6 @@
#include "../ipseccrypto/group/bld.inf"
#include "../ipsec_itest/group/bld.inf"
#include "../te_ipsec/group/bld.inf"
-#include "../te_ipsec_selector_confilict/group/bld.inf"
PRJ_EXPORTS
ipsec.iby /epoc32/rom/include/ipsec.iby
--- a/networksecurity/ipsec/group/ipsec.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/group/ipsec.iby Tue Aug 31 16:45:15 2010 +0300
@@ -30,7 +30,7 @@
REM IPSEC protocol and other core components
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
REM Feature IPSEC not included in this rom
@@ -42,6 +42,6 @@
file=ABI_DIR\DEBUG_DIR\lib_pfkey.dll System\Libs\lib_pfkey.dll
#include <ipseccrypto.iby>
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // __IPSEC
#endif // __IPSEC_IBY__
--- a/networksecurity/ipsec/ipsec6/group/ipsec6.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/group/ipsec6.iby Tue Aug 31 16:45:15 2010 +0300
@@ -28,7 +28,7 @@
#include <inhook6.iby>
#include <nifman.iby>
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
REM Feature IPSEC not included in this rom
@@ -43,6 +43,6 @@
file=ABI_DIR\DEBUG_DIR\ipsec6.prt system\libs\ipsec6.prt
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // __IPSEC
#endif // __IPSEC6_IBY__
--- a/networksecurity/ipsec/ipsec6/group/ipsec6.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/group/ipsec6.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -54,8 +54,6 @@
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib esock.lib esocksvr.lib mbufmgr.lib insock.lib inhook6.lib cryptospi.lib
-LIBRARY featdiscovery.lib
-
VENDORID 0x70000001
CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
--- a/networksecurity/ipsec/ipsec6/inc/sa_spec.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/inc/sa_spec.h Tue Aug 31 16:45:15 2010 +0300
@@ -51,10 +51,6 @@
// Final selector, do not look for "merge" selectors after this.
const TUint KPolicyFilter_FINAL = 0x20;
-//Exception flag for policy filter. This flag will allow only exception scope traffic and drop rest
-//special usecase for UMA traffic.
-const TUint KPolicyFilter_Exception = 0x40;
-
/**
* Ports is present in selector.
* The value indicates whether the content is actual port (1) or a packet
--- a/networksecurity/ipsec/ipsec6/inc/spdb.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/inc/spdb.h Tue Aug 31 16:45:15 2010 +0300
@@ -156,9 +156,6 @@
TUint32 iFilterData; //< The filter definition.
CTransportSelector *iTS; //< The transport selectors.
RPolicyActions iActions; //< The actions, when selector matches
-
- TInt iScope_Exception; // UMA scope exception
-
};
class CSecurityPolicy : public CBase
--- a/networksecurity/ipsec/ipsec6/src/key_msg.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/src/key_msg.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -762,7 +762,6 @@
* @return KErrNone or error code on fail.
*/
{
- TIpAddress src, dst, proxy; // Working space for the TPfkeyMessage Constructor!
TPfkeyMessage msg(aMsg, iEndPointCollection);
LOG(msg.LogPrint(_L("PFKEY"), iCrypto->Algorithms()));
--- a/networksecurity/ipsec/ipsec6/src/sa_crypt.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/src/sa_crypt.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -28,7 +28,6 @@
#include "ipseccrypto.h"
#include "keys.h"
#include <cryptospi/cryptospidef.h>
-
#ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
#include <cryptospi/cryptomacapi.h>
#endif //SYMBIAN_IPSEC_VOIP_SUPPORT
--- a/networksecurity/ipsec/ipsec6/src/sc_prt6.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/src/sc_prt6.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -16,8 +16,6 @@
// performing IPSEC checking and processing to packets.
//
-#include <featdiscovery.h>
-#include <featureuids.h>
#include <posthook.h>
#include <icmp6_hdr.h>
@@ -379,9 +377,6 @@
void CheckPacketId(RMBufHookPacket &aPacket);
TInt CheckFragmentPolicy();
- void CheckExceptionSelector(TBool &aException_flag) const; //To support UMA
- void CheckFeatureSupportL(TUid aFeature); //To check a Feature is enabled or not
-
MAssociationManager *iAssociationManager;
CProtocolIpsec *iProtocolIpsec;
MEventService *iEventService;
@@ -403,7 +398,6 @@
RIpAddress iMyself[KIpsecMaxNesting]; //< Related destination adresses (outer).
// List of incomplete fragmented packets.
CIpsecFragmentInfo *iFrags; //< Unfinished fragments.
- TBool iIPSecGANSupported; //To check whether FF_IPSEC_UMA_SUPPORT_ENABLE is defined and UMA supported
};
@@ -669,17 +663,6 @@
default:
break;
}
- //UMA support REQ417-40027
- switch (aPS.iFilterData & KPolicyFilter_Exception)
- {
- case KPolicyFilter_Exception:
- buf.Append(_L("UMAExceptionTrafficSelector"));
- break;
-
- default:
- break;
- }
-
if (aPS.iInterface)
buf.AppendFormat(_L("if=%d "), aPS.iInterface->iInterfaceIndex);
for (CTransportSelector *ts = aPS.iTS; ts != NULL; ts = ts->iOr)
@@ -1115,23 +1098,6 @@
TInt result = EIpsec_NoSelectorMatch;
aTunnels = 0;
TInt i = 0;
-
- //UMA support REQ417-40027
- TBool exception_flag = EFalse;
- TBool exception_drop_flag = EFalse;
-
-
- if (iIPSecGANSupported)
- {
- //Check for exception selector being loaded or not. This is required for Drop mode policy
- //If policy is set as
- // inbound = drop
- // outbound = drop
- // then instead returning Excetion selectors should be checked.
- CheckExceptionSelector(exception_flag);
- }
-
-
for (CPolicySelector *ps = iPolicy->iSelectors; ps != NULL; ps = ps->iNext)
{
// 1. Check filtering
@@ -1142,17 +1108,7 @@
if (ps->iTS == NULL || ps->iTS->Match(aKey))
{
if (ps->iFilterData & KPolicyFilter_DROP)
- {
- // UMA support REQ 417-40027
- if (iIPSecGANSupported && exception_flag)
- {
- //Work around for Exceptions
- exception_drop_flag = ETrue;
- break;
- }
-
- return EIpsec_NoSelectorMatch;
- }
+ return EIpsec_NoSelectorMatch;
const TInt N = ps->iActions.Count();
for (TInt k = 0; k < N; k++)
@@ -1179,77 +1135,15 @@
if (aSrc)
aSrc[aTunnels] = aKey.iLocal;
aTunnels++;
- }//if action
- }//for
-//UMA support REQ417-40027
- if(iIPSecGANSupported)
- {
- if(!exception_drop_flag)
- {
- //Check if drop mode is set with exception selectors...out from this result loop
- //and jump onto Expection selector handling.
- result = i;
- if (ps->iFilterData & KPolicyFilter_FINAL)
- break; // Final selector, no merge allowed!
- aFilter.iFlags |= KPolicyFilter_MERGE; // Mark "merge only".
- }
- }
- else
- {
- result = i;
- if (ps->iFilterData & KPolicyFilter_FINAL)
- break; // Final selector, no merge allowed!
- aFilter.iFlags |= KPolicyFilter_MERGE; // Mark "merge only".
- }
- }
- }
- if (iIPSecGANSupported)
- {
- if (result == EIpsec_NoSelectorMatch && exception_flag)
- {
- // No selector matches above. Check for Exception selector
- for (CPolicySelector *ps = iPolicy->iSelectors; ps != NULL; ps = ps->iNext)
- {
- if(((ps->iFilterData & KPolicyFilter_Exception) != KPolicyFilter_Exception))
- {
- //Skip till Exception selector is loaded
- continue;
- }//if
- else
- {
- if (ps->iInterface && ps->iInterface->iInterfaceIndex != aFilter.iIndex)
- {
- continue; ////Sanity Check;
- }
- if(aFilter.iFlags & KPolicyFilter_OUTBOUND )
- {
- //Check for Scopes for packet going out. Scope should be the tunnel end networkID configured for Tunnel need Exception
- TIpAddress iAddr = aKey.iLocal();
- TInt scope = iAddr.iScope;
- if(scope == ps->iScope_Exception)
- {
- LOG(Log::Printf(_L("Exception outbound- \n exception scope = %d\n, packet scope = %d\n"), ps->iScope_Exception, scope));
- result = NULL;
- break;
- }
- }//outbound filter
- if(aFilter.iFlags & KPolicyFilter_INBOUND)
- {
- //TODO comments
- TIpAddress iAddr = aKey.iRemote();
- TInt scope = iAddr.iScope;
- if(scope== ps->iScope_Exception)
- {
- LOG(Log::Printf(_L("Exception inbound- \n exception scope = %d\n ,packet scope = %d\n"), ps->iScope_Exception, scope));
- result = NULL;
- break;
- }
- }//INBOUND
- }//else
- }//for
- }//exception CHECK
- }///if (iIPSecGANSupported)
- return result;
+ }
+ }
+ result = i;
+ if (ps->iFilterData & KPolicyFilter_FINAL)
+ break; // Final selector, no merge allowed!
+ aFilter.iFlags |= KPolicyFilter_MERGE; // Mark "merge only".
+ }
+ }
+ return result;
}
@@ -1322,7 +1216,7 @@
iPktInfo.iRemote.Set(aHead.ip6.DstAddr(), aHead.iDstId);
CPolicyAction *items[KIpsecMaxNesting]; // Collected actions [0..count-1]
-
+
TInt tunnels = 0;
LOG(LogSelectorInfo(_L("OpenL\t"), iPktInfo, filter));
RPolicySelectorInfo final_info = iPktInfo;
@@ -2089,9 +1983,6 @@
}
// Not an ICMP or normal ICMP, do the policy check with current info
}
-
- //Check for the UMA feature support
- CheckFeatureSupportL(NFeature::KFeatureIdFfIpsecUmaSupportEnable);
for (;;)
{
CPolicyAction *items[KIpsecMaxNesting];
@@ -2350,10 +2241,6 @@
LogPolicySelector(seq, *ps);
if (ps->iFilterData & KPolicyFilter_DROP)
Log::Printf(_L("\t\t*DROP*"));
- //UMA support REQ417-40027
- if(ps->iFilterData & KPolicyFilter_Exception)
- Log::Printf(_L("\t\t = { UMAException %d }"),ps->iScope_Exception);
-
else if (N == 0)
Log::Printf(_L("\t\t*PASS*"));
else
@@ -2415,44 +2302,3 @@
copy.Free();
}
}
-
-void CProtocolSecpol::CheckFeatureSupportL(TUid aFeature)
- {
- // Check Gan support from feature manager
- iIPSecGANSupported = CFeatureDiscovery::IsFeatureSupportedL(aFeature);
- if(iIPSecGANSupported != (TInt)ETrue)
- {
- LOG(Log::Printf(_L("CProtocolSecpol::CheckFeatureSupport Error Checking Feature Support ")));
- }
- else
- {
- LOG(Log::Printf(_L("CProtocolSecpol::CheckFeatureSupport %d Feature Supported %d"),aFeature,iIPSecGANSupported));
- }
- }
-
-//UMA support
-//Check for exception selector being loaded or not. This is required for Drop mode policy
- //If policy is set as
- // inbound = drop
- // outbound = drop
- // then instead returning Excetion selectors should be checked.
-void CProtocolSecpol::CheckExceptionSelector(TBool &aException_flag) const
- {
- aException_flag = EFalse;
- if(iIPSecGANSupported)
- {
- for(CPolicySelector *policy_Exception = iPolicy->iSelectors; policy_Exception != NULL ; policy_Exception = policy_Exception->iNext)
- {
- if(((policy_Exception->iFilterData & KPolicyFilter_Exception) == KPolicyFilter_Exception))
- {
- aException_flag = ETrue;
- break;
- }//if
- }//for
- }//if
- else
- {
- LOG(Log::Printf(_L("CProtocolSecpol::CheckExceptionSelector Feature is not Supported")));
- }
- }
-
--- a/networksecurity/ipsec/ipsec6/src/spdb.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/src/spdb.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -20,16 +20,14 @@
/**
@file spdb.cpp
*/
-#include <featdiscovery.h>
-#include <featureuids.h>
-#include <networking/pfkeyv2.h>
-#include <networking/ipsecerr.h>
-#include <e32std.h>
-
-#include "sa_spec.h"
#include "epdb.h"
#include "spdb.h"
-
+#include <networking/pfkeyv2.h>
+#include "sa_spec.h"
+#include <networking/ipsecerr.h>
+#ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
+#include <e32std.h>
+#endif // SYMBIAN_IPSEC_VOIP_SUPPORT
#ifndef OLD_SELECTOR_ORDERING
/** @deprecated
* The old syntax allowed total mixing of "filter" and "selector"
@@ -168,10 +166,7 @@
void SetAddressOrEndPointL(RIpAddress &aAddr, TInt aMask, TInt aError);
void ParseAddressL(RIpAddress &aAddr, TInt aMask, TInt aError);
void ParseAddressAndMaskL(RIpAddress &aAddr, RIpAddress& aMask);
- void ParseSecurityBundleL(RPolicyActions &aBundle, CTransportSelector *aTS, CPolicySelector* aPs);//UMA support
void ParseSecurityBundleL(RPolicyActions &aBundle, CTransportSelector *aTS);
- void CheckFeatureSupportL(TUid aFeature);
-
#ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
void ParseAssociationParametersL(CPolicySpec *aSpec);
#else
@@ -188,12 +183,9 @@
token_type CheckProposalCloseAndMoreProposals(TInt &aPropBraces);
CSecurityProposalSpec* CreateProposalL(CPropList& aPropList);
#endif //SYMBIAN_IPSEC_VOIP_SUPPORT
-
-private:
TPtrC iToken; //< The current token.
CSecurityPolicy *iSp; //< The result of the parsing operation, The new policy
REndPoints &iEp; //< The End Point collection to use for the named endpoints.
- TBool iIPSecGANSupported; //To check whether FF_IPSEC_UMA_SUPPORT_ENABLE is defined and UMA supported
};
#ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
@@ -864,140 +856,18 @@
#endif // SYMBIAN_IPSEC_VOIP_SUPPORT
}
-/**
-* Parse security actions
-* @code [ sa-name '(' [ address ] ')' ]* '}'
-* @endcode
-*
-* Parse a (possibly empty) list of references to security specifications. This will
-* be the bundle of security actions for a selector.
-*
-* @retval aActions The colleted actions
-* @param aTS The traffic selector.
-* @param aPS the policy selector
-* * This is called only when UMA/ GAN is supported.
-*/
-void TParser::ParseSecurityBundleL(RPolicyActions &aActions, CTransportSelector *aTS, CPolicySelector *aPs)
- {
-
- LOG(Log::Printf(_L("TParser::ParseSecurityBundleL(RPolicyActions &aActions, CTransportSelector *aTS, CPolicySelector *aPs)")));
-
- if(iIPSecGANSupported)
- {
- LOG(Log::Printf(_L("TParser::ParseSecurityBundleL: UMA supported FF_IPSEC_UMA_SUPPORT_ENABLE defined")));
- }
- else
- {
- LOG(Log::Printf(_L("TParser::ParseSecurityBundleL:functionality not suppoted.FF_IPSEC_UMA_SUPPORT_ENABLE not defined")));
- User::Leave(KErrNotSupported);
- }
-
- _LIT(K_tunnel, "tunnel");
-
- token_type val;
-
- TUint opt = 0;
- _LIT(K_Exception, "UMAException");//UMA exception defined
- for (;;)
- {
- val = NextToken();
- //
- // Experimental addition, allow optional bundle items
- // by prefixing them with '?'...
- //
- if (opt == 0 && val == token_question)
- {
- opt = 1;
- continue;
- }
- else if (val != token_string)
- break;
- // A temporary(?) special kluge: if the keyword is 'tunnel'
- // assume this is a plain tunnel specification, without any
- // relation to the IPSEC. if nobody defined a "tunnel" sa
- // specification. (should probably disallow 'tunnel' as SA
- // spec name, to avoid confusion.. )
- //
- CPolicySpec *spec = iSp->FindSpec(iToken);
-
- if(spec== NULL && !iToken.Compare(K_Exception))
- {
- LOG(Log::Printf(_L("Found Exception Policy identifier")));
- //FInd Next token... Things looks hacky here. IPsec really need re-designing.
- TInt tokenVal = (TInt)NextToken();
- LOG(Log::Printf(_L("NextToken value is = [%d]"),tokenVal));
-
- TBuf8<32> buf;
- buf.Copy(iToken);
- TLex8 lex(buf);
- TInt scope;
- lex.Val(scope);
-
- //assiging scope to the policy. This will be policy selector with Exception scope being setalong with
- //exception flags
- aPs->iScope_Exception = scope;
- LOG(Log::Printf(_L("TParser::ParseSecurityBundleL, Exception tunnel Scope is = [%d]"),scope));
- while((val = NextToken())!= token_brace_right)
- {
- //do nothing
- } //while
- break;
- }
-
- // A temporary(?) special kluge: if the keyword is 'tunnel'
- // assume this is a plain tunnel specification, without any
- // relation to the IPSEC. if nobody defined a "tunnel" sa
- // specification. (should probably disallow 'tunnel' as SA
- // spec name, to avoid confusion.. )
- //
- if (spec == NULL && iToken.Compare(K_tunnel) != 0)
- User::Leave(EIpsec_PolicySpecNotFound);
-
- if (NextToken() != token_par_left)
- User::Leave(EIpsec_PolicyLeftParen);
-
- CPolicyAction *action = new (ELeave) CPolicyAction;
- if (aActions.Append(action) != KErrNone)
- {
- action->Close();
- User::Leave(KErrNoMemory);
- }
- if ((action->iSpec = spec) != NULL)
- spec->Open();
- // Record the current selector into each action (this is to make it
- // easier to generate the TS list into Acquire message).
- if ((action->iTS = aTS) != NULL)
- aTS->Open();
- action->iOptional = opt;
-
- if ((val = NextToken()) == token_string)
- {
- SetAddressOrEndPointL(action->iTunnel, 0, EIpsec_PolicyInvalidIpAddress);
- action->iIsTunnel = 1; // Flag a tunnel.
- val = NextToken();
- }
- if (val != token_par_right)
- User::Leave(EIpsec_PolicyRightParen);
- opt = 0; // Optional only affects single item at time.
- }
- if (val != token_brace_right)
- User::Leave(EIpsec_PolicyCloseBraceExpected);
- }
-
-/**
-* Parse security actions
-* @code [ sa-name '(' [ address ] ')' ]* '}'
-* @endcode
-*
-* Parse a (possibly empty) list of references to security specifications. This will
-* be the bundle of security actions for a selector.
-*
-* @retval aActions The colleted actions
-* @param aTS The traffic selector.
-* This is called in case of No UMA/ GAN support.
-*/
void TParser::ParseSecurityBundleL(RPolicyActions &aActions, CTransportSelector *aTS)
-//#endif
+ /**
+ * Parse security actions
+ * @code [ sa-name '(' [ address ] ')' ]* '}'
+ * @endcode
+ *
+ * Parse a (possibly empty) list of references to security specifications. This will
+ * be the bundle of security actions for a selector.
+ *
+ * @retval aActions The colleted actions
+ * @param aTS The traffic selector.
+ */
{
_LIT(K_tunnel, "tunnel");
@@ -1026,13 +896,6 @@
// spec name, to avoid confusion.. )
//
CPolicySpec *spec = iSp->FindSpec(iToken);
-
- // A temporary(?) special kluge: if the keyword is 'tunnel'
- // assume this is a plain tunnel specification, without any
- // relation to the IPSEC. if nobody defined a "tunnel" sa
- // specification. (should probably disallow 'tunnel' as SA
- // spec name, to avoid confusion.. )
- //
if (spec == NULL && iToken.Compare(K_tunnel) != 0)
User::Leave(EIpsec_PolicySpecNotFound);
@@ -1279,7 +1142,6 @@
KEYWORD("merge"),
KEYWORD("outbound"),
KEYWORD("inbound"),
- KEYWORD("UMAExceptionTrafficSelector"), //UMA support
KEYWORD("if"),
};
@@ -1289,7 +1151,6 @@
KEYENUM(merge),
KEYENUM(outbound),
KEYENUM(inbound),
- KEYENUM(UMAExceptionTrafficSelector),//exception bits
KEYENUM(if),
KEYENUM(max_parameters)
@@ -1298,9 +1159,6 @@
_LIT(K_drop, "drop");
token_type val;
-
- CheckFeatureSupportL(NFeature::KFeatureIdFfIpsecUmaSupportEnable);
-
//
aPs = new (ELeave) CPolicySelector();
@@ -1344,22 +1202,6 @@
User::Leave(EIpsec_PolicySyntaxError); // <-- need own error code?
aPs->iInterface = iSp->LookupInterfaceL(iToken);
break;
- case E_UMAExceptionTrafficSelector:
- if(iIPSecGANSupported)
- {
- //UMA support
- LOG(Log::Printf(_L("TParser::ParseSelectorL Setting Exception selector flag")));
- //The flags signifies special case for UMA/exception selectors. These selectors
- //will be present in case when there is no inbound and bypass filter data or selectors
- //are set. This selector will only allow traffic whose scope match the exception scope
- aPs->iFilterData|=KPolicyFilter_Exception;
- aPs->iFilterMask |= KPolicyFilter_Exception;
- }
- else
- {
- LOG(Log::Printf(_L("TParser::ParseSelectorL error GAN/ UMA feature is not enabled ")));
- }
- break;
default:
val = TransportSelectorL(aPs->iTS);
#if OLD_SELECTOR_ORDERING
@@ -1376,18 +1218,7 @@
if (val != token_equal)
User::Leave(EIpsec_PolicySyntaxError);
if (NextToken() == token_brace_left)
- {
- //UMA support RE417-40027
- if(iIPSecGANSupported)
- {
- ParseSecurityBundleL(aPs->iActions, aPs->iTS, aPs);
- }
- else
- {
- ParseSecurityBundleL(aPs->iActions, aPs->iTS);
-
- }
- }
+ ParseSecurityBundleL(aPs->iActions, aPs->iTS);
else if (iToken.Compare(K_drop) == 0)
aPs->iFilterData |= KPolicyFilter_DROP;
else
@@ -1401,24 +1232,6 @@
TParser::TParser(CSecurityPolicy *aSp, const TDesC &aPolicy, REndPoints &aEp) :
TLex(aPolicy), iSp(aSp), iEp(aEp)
{
-
- }
-/**
- * To check the feature support
- */
-void TParser::CheckFeatureSupportL(TUid aFeature)
- {
- // Check Gan support from feature manager
- iIPSecGANSupported = CFeatureDiscovery::IsFeatureSupportedL(aFeature);
-
- if(iIPSecGANSupported != (TInt)ETrue)
- {
- LOG(Log::Printf(_L("TParser::CheckFeatureSupport Error Checking Feature Support")));
- }
- else
- {
- LOG(Log::Printf(_L("TParser::CheckFeatureSupport %d Feature Supported %d"),aFeature,iIPSecGANSupported));
- }
}
void TParser::ParseL(TUint aStartOffset)
--- a/networksecurity/ipsec/ipsec_itest/group/ts_ipsec.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsec_itest/group/ts_ipsec.iby Tue Aug 31 16:45:15 2010 +0300
@@ -37,7 +37,7 @@
data=EPOCROOT##epoc32\data\Z\TestData\configs\ts_ipsec_mh3.ini testdata\configs\ts_ipsec_mh3.ini
data=EPOCROOT##epoc32\data\Z\TestData\configs\ts_ipsec_mh4.ini testdata\configs\ts_ipsec_mh4.ini
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
REM Feature IPSEC not included in this rom
data=EPOCROOT##epoc32\data\Z\TestData\scripts\ts_ipsec_removed.script testdata\scripts\ts_ipsec_removed.script
#else
@@ -84,7 +84,7 @@
REM file=ABI_DIR\DEBUG_DIR\FAKE_IPSECNOTIF.DLL System\TNotifiers\FAKE_IPSECNOTIF.DLL
#endif
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
REM Feature IPSEC not included in this rom so below apis added for tests to link
file=ABI_DIR\DEBUG_DIR\ipsecpolapi.dll System\Libs\ipsecpolapi.dll
file=ABI_DIR\DEBUG_DIR\vpnapi.dll SYSTEM_BINDIR\vpnapi.dll
--- a/networksecurity/ipsec/ipseccrypto/group/ipseccrypto.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipseccrypto/group/ipseccrypto.iby Tue Aug 31 16:45:15 2010 +0300
@@ -23,7 +23,7 @@
#ifndef __IPSECCRYPTO_IBY__
#define __IPSECCRYPTO_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
REM Feature IPSEC not included in this rom
@@ -31,6 +31,6 @@
file=ABI_DIR\DEBUG_DIR\ipseccrypto.prt System\Libs\ipseccrypto.prt
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // __IPSEC
#endif
--- a/networksecurity/ipsec/ipseccrypto/src/ipseccrypto_prt.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipseccrypto/src/ipseccrypto_prt.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -25,7 +25,6 @@
#include "keys.h"
#include <cryptospi/cryptospidef.h>
-
#include "cryptosymmetriccipherapi.h"
#ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
#include "ruleselector.h"
--- a/networksecurity/ipsec/ipsecpol/group/ipsecpol.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/group/ipsecpol.iby Tue Aug 31 16:45:15 2010 +0300
@@ -22,7 +22,7 @@
#ifndef __IPSECPOL_IBY__
#define __IPSECPOL_IBY__
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
REM Feature IPSECPOL not included in this rom
@@ -32,6 +32,6 @@
file=ABI_DIR\DEBUG_DIR\ipsecpol.exe System\Programs\ipsecpol.exe
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // __IPSEC
#endif // __IPSECPOL_IBY__
\ No newline at end of file
--- a/networksecurity/ipsec/ipsecpol/group/ipsecpol.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/group/ipsecpol.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -54,9 +54,6 @@
LIBRARY euser.lib efsrv.lib
LIBRARY ipsecpolparser.lib esock.lib insock.lib
-LIBRARY commdb.lib
-LIBRARY commsdat.lib
-LIBRARY featdiscovery.lib
VENDORID 0x70000001
CAPABILITY ProtServ NetworkControl
--- a/networksecurity/ipsec/ipsecpol/inc/ipsecpol.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/inc/ipsecpol.h Tue Aug 31 16:45:15 2010 +0300
@@ -90,9 +90,7 @@
EIpsecPolicyGetDebugInfo,
EIpsecPolicyCancelDebug,
EIpsecPolicyAvailableSelectors,
- EIpsecPolicyEnumerateSelectors,
- EIpsecPolicySetOption,
-
+ EIpsecPolicyEnumerateSelectors
};
enum TAutoloadFlags
--- a/networksecurity/ipsec/ipsecpol/inc/ipsecpolmanhandler.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/inc/ipsecpolmanhandler.h Tue Aug 31 16:45:15 2010 +0300
@@ -27,12 +27,10 @@
#include <f32file.h>
#include <es_sock.h>
#include <in_sock.h>
-#include <featdiscovery.h>
#include "ipsecpolapi.h"
#include "ipsecpol.h"
#include "autoloadlistitem.h"
-#include "log_ipsecpol.H"
#ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
#include "spdb.h"
#endif // SYMBIAN_IPSEC_VOIP_SUPPORT
@@ -54,7 +52,6 @@
const TInt KDropMode = 0; // Drop mode
const TInt KInboundBypass = (1 << 0); // Inbound bypass mode
const TInt KOutboundBypass = (1 << 1); // Outbound bypass mode
-const TInt KSymmetricBypass = (KInboundBypass | KOutboundBypass ); // To allow UMA traffic
//
// Forward declarations
@@ -82,8 +79,6 @@
TBool iActiveState; // EFalse = loaded, not active; ETrue = active
TInt iBypassOrDropMode; // See flags below
TPolicyType iPolicyType;
- TBool iException; // UMA exception
-
};
typedef CArrayFixFlat<TActivePolicyListEntry*> CActivePolicyList;
@@ -189,7 +184,7 @@
TInt DeletePolicyFromList();
TInt SearchPolicyFromListAndActivate();
-
+
TInt GetAvailableSelectors(const RMessage2& aMsg);
TInt GetSelectorsCount(const RMessage2& aMsg);
@@ -345,16 +340,6 @@
//determines whether the last manual autoload policy has been unloaded
TBool IsLastManualLoadPolicy(TUint32 aPolicyHandle);
- //Exception Selectors to be loaded.
- TInt AddExceptionSelectors();
-
- //Check for Exception policy loading. Work around done for UMA. Need to check more.
- TBool CheckException();
-
- //Method to set the SID of the application that load policy
- void SetOptL(const RMessage2& aMsg);
-
-
private:
// Read the algorithms.conf file
void ReadAlgorithmsFileL();
@@ -373,17 +358,6 @@
TInt CalculatePolicyBypassDropMode(CSecurityPolicy& aSp) const;
- //UMA support
- void SearchIAPIdL( const TUint32& aNetId, TUint32& aIapId );
- TBool CheckUMAL(TUint32 aIapId);
- void CheckFeatureSupportL(TUid aFeature);////To check a Feature flag is enabled or not
-
- /**
- *This method to check the exception.
- **/
- void CheckUMAEXception(TUint32 aVpnNetId);
-
-
public:
// List containing all loaded policies
@@ -469,13 +443,6 @@
TInetAddr iTunnel;
CArrayFixFlat<TIpsecSelectorInfo>* iSelectorInfoArray;
-
- //UMA support
- TBool iCurrentException;
- //This variable holds sid of the application that loads
- //exception policies
- TUint32 iAppSid;
- TBool iIPSecGANSupported; //To check whether FF_IPSEC_UMA_SUPPORT_ENABLE is defined and UMA supported
- };
+ };
#endif
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmanconflict.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmanconflict.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -106,8 +106,6 @@
TBool
CIPSecPolicyManagerHandler::CalculateCombinedPolicyBypassDropMode()
{
- LOG(Log::Printf(_L("CalculateCombinedPolicyBypassDropMode\n")));
-
// Combined mode is 'bypass_everything_else' by default
TInt combinedMode(KInboundBypass | KOutboundBypass);
@@ -149,7 +147,6 @@
// the combined policy into IPsec protocol component
TBool changed = (iBypassOrDropMode != combinedMode);
iBypassOrDropMode = combinedMode;
- LOG(Log::Printf(_L("combined policy mode %d\n"), iBypassOrDropMode));
return(changed);
}
@@ -330,13 +327,6 @@
{
continue;
}
- //UMA support REQ 417-40027
- //loading bypass policy with activated drop_mode policy. Above mentioned is only one way traffic.
- if ((iIPSecGANSupported) && (iFunction & KAddDhcpBypassSelectors)
- && (remotePort == 68 || localPort == 67))
- {
- continue;
- }
// Iterate to next selector if IKE bypass is requested and selector
// contains ports utilized with IKE
@@ -567,20 +557,7 @@
aPolicySelector->iRemoteMask.Address(),
ps->iRemote.Address(),
ps->iRemoteMask.Address());
- //UMA support
- TBool flag_exception = EFalse;
- if( iIPSecGANSupported )
- {
- flag_exception = CheckException();
- LOG(Log::Printf(_L("::CompareSelectorsL, exception policy is = %d\n"), flag_exception));
- //Not performing overlapping because UMA loads with any to any selector. Now if any to any will result in
- //overlapping as 0.0.0.0 0.0.0.0 will encrypt every packet, which dont leads exceptions and overlapping as concern
- if(flag_exception ||iCurrentException )
- {
- continue;
- }
- }
-
+
if (overlappingOccurs)
{
err = ESelectorConflict;
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmanhandler.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmanhandler.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -28,19 +28,11 @@
#include "ipsecpolparser.h"
#include "secpolreader.h"
-#include <comms-infras/dbaccess.h>
-#include <commdbconnpref.h>
-#include <featureuids.h>
-#include <e32debug.h>
-
#define FIRST_ARGUMENT 0
#define SECOND_ARGUMENT 1
#define THIRD_ARGUMENT 2
#define FOURTH_ARGUMENT 3
-const TUint KAppSidDefault = 0xFFFFFFFF;
-const TUint32 KGANAppSid = 0x2002E241;
-
//
// Create IPSecPolicyManagerHandler object
//
@@ -73,9 +65,6 @@
iPreloadPolicyHandle.iHandle = 0;
- CheckFeatureSupportL(NFeature::KFeatureIdFfIpsecUmaSupportEnable);
-
- iAppSid = KAppSidDefault;
#ifdef TESTFLAG
@@ -85,6 +74,7 @@
ReadAlgorithmsFileL();
iSelectorInfoArray = new (ELeave) CArrayFixFlat<TIpsecSelectorInfo> (2);
+
}
//
@@ -184,24 +174,6 @@
iSelectorInfoArray = NULL;
}
-/**
- * To check the feature support
- */
-void CIPSecPolicyManagerHandler::CheckFeatureSupportL(TUid aFeature)
- {
- // Check Gan support from feature manager
- TRAPD(err,iIPSecGANSupported = CFeatureDiscovery::IsFeatureSupportedL(aFeature));
-
- if(KErrNone != err)
- {
- LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::CheckFeatureSupport Error Checking Feature Support %d"),err));
- }
- else
- {
- LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::CheckFeatureSupport %d Feature Supported %d"),aFeature,iIPSecGANSupported));
- }
- }
-
//
// Release resources allocated for a call
//
@@ -300,7 +272,7 @@
TPckg<TZoneInfoSet>pckgZoneInfoSet(zoneInfoSet);
aMsg.ReadL(THIRD_ARGUMENT, pckgZoneInfoSet);
}
- iVPNNetId = 0;
+ iVPNNetId = 0;
if (zoneInfoSet.iSelectorZone.iScope != KScopeNone)
{
iVPNNetId = zoneInfoSet.iSelectorZone.iId;
@@ -310,24 +282,10 @@
{
iGwNetId = zoneInfoSet.iEndPointZone.iId;
}
-
LOG(Log::Printf(_L("LoadPolicy request VPN NetId: %d GW NetId: %d\n"),
iVPNNetId, iGwNetId));
- if(iIPSecGANSupported)
- {
- LOG(Log::Printf(_L(" iIPSecGANSupported is true \n")));
- TRAPD( err, CheckUMAEXception((TUint32)iVPNNetId))
- if( err != KErrNone)
- {
- LOG(Log::Printf(_L("NO UMA Exception \n")));
- }
- else
- {
- LOG(Log::Printf(_L("UMA Exception is added \n")));
- }
- }
-
+
// Parse the policy file from string format to the ipsecpolparser
// class object format
ParseCurrentPolicyL();
@@ -341,92 +299,19 @@
// the one that is attempted to be loaded. If so, return with error
TInt activepolicyBypassDropMode;
- //UMA support REQ 417-40027
- TBool flag_exception =EFalse;
- // It is ok to compare with the first active policy. Every subsequent policy would have been compared against the first one
-
- /* FORMAT OF UMA POLICY
- * remote 0.0.0.0 0.0.0.0 = { UMA_VPN_POLICY($SGW_IP_ADDRESS) }
- * inbound = { }
- * outbound = { }
- */
- //Checking for exception loading. Exceptions are policies for USE CASES having conflict for loading of bypass
- //and drop policy. UMA being an excetion should be allowed to load policy. It doesnt make sense not to start UMA.
- if(iIPSecGANSupported)
- {
- flag_exception = CheckException();
- LOG(Log::Printf(_L("Is exception policy already activated= %d\n"), flag_exception));
- }
- else
- {
- LOG(Log::Printf(_L("UMA/GAN not supported and exception policy activated status = %d\n"), flag_exception));
- }
-
//coverity[var_compare_op]
//intentional null comparision if there is no policylist do nothing.
if (iActivePolicyList && iActivePolicyList->Count())
{
- //UMA support REq417-40027
- if(iIPSecGANSupported)
- {
- if(flag_exception)
- {
- activepolicyBypassDropMode = iBypassOrDropMode;
- }
- else
- {
- activepolicyBypassDropMode = iActivePolicyList->At(0)->iBypassOrDropMode;
- }
- }
- else
- {
- // It is ok to compare with the first active policy. Every subsequent policy would have been compared against the first one
- //coverity[var_compare_op]
- // It is ok to compare with the first active policy. Every subsequent policy would have been compared against the first one
- activepolicyBypassDropMode = iActivePolicyList->At(0)->iBypassOrDropMode;
- }
-
+ //coverity[var_compare_op]
+ // It is ok to compare with the first active policy. Every subsequent policy would have been compared against the first one
+ activepolicyBypassDropMode = iActivePolicyList->At(0)->iBypassOrDropMode;
if((policyBypassDropMode == KDropMode && (( activepolicyBypassDropMode & KInboundBypass) || (activepolicyBypassDropMode & KOutboundBypass))) ||
(((policyBypassDropMode & KInboundBypass) || (policyBypassDropMode & KOutboundBypass)) && activepolicyBypassDropMode == KDropMode ))
{
- if(iIPSecGANSupported)
- {
- //should not Allow loading drop mode policy all the time
- //condition for allowing drop mode policy loading are
- //1) There should not be any other bypass policy loaded before.
- //2) or loaded bypass policy is UMA bypass policy
-
- TBool allowDropLoad = ETrue;
- for(int count = 0; count < iActivePolicyList->Count(); count++ )
- {
- if((iActivePolicyList->At(count)->iBypassOrDropMode & KSymmetricBypass) &&(!(iActivePolicyList->At(count)->iException)))
- {
- //ipsec bypass policy is already loaded.
- LOG(Log::Printf(_L("\n should not allow loading of drop policy \n")));
- allowDropLoad = EFalse;
- break;
- }//else do nothing
- }
-
- if(allowDropLoad && (policyBypassDropMode == KDropMode))
- {
- LOG(Log::Printf(_L("Allowing loading drop mode policy, with activated exception bypass\n")));
- }
- else if((((policyBypassDropMode & KInboundBypass) || (policyBypassDropMode & KOutboundBypass)) && iCurrentException) && activepolicyBypassDropMode == KDropMode )
- {
- LOG(Log::Printf(_L("Allowing loading exception bypass mode policy, with activated drop mode\n")));
- }
- else
- {
- ErrorHandlingL (ESelectorConflict,0);
- }
- }
- else
- {
- ErrorHandlingL (ESelectorConflict,0);
- }
+ ErrorHandlingL (ESelectorConflict,0);
}
- }
+ }
// Add VPNNetId to CPolicySelector and GwNetId to CSecpolBundleItem objects
UpdateSelectorsAndTunnels();
@@ -459,7 +344,6 @@
ApiCallCompleted();
return KErrNone;
}
-
//
//
@@ -505,8 +389,9 @@
iGwNetId = zoneInfoSet.iEndPointZone.iId;
}
- LOG(Log::Printf(_L("******LoadPolicy request VPN NetId: %d GW NetId: %d****\n"),
+ LOG(Log::Printf(_L("LoadPolicy request VPN NetId: %d GW NetId: %d\n"),
iVPNNetId, iGwNetId));
+
if (scopedLoad)
{
// Load BeforescopedLoadPolicies before
@@ -642,12 +527,11 @@
{
ErrorHandlingL(ret, 0 );
}
- LOG(Log::Printf(_L("::ActivatePolicy, request to parse all policies\n")));
+
// Parse all active policy files from string format
// to IPSecPolParser class object formats
ParseAllPolicyFilesL();
- LOG(Log::Printf(_L("::ActivatePolicy request to calculate combined\n")));
// Calculate the combined policy Bypass/Drop mode
CalculateCombinedPolicyBypassDropMode();
@@ -670,24 +554,6 @@
ErrorHandlingL(ENoMemory, err);
}
- //UMA support REQ417-40027
- TBool flag_exception = EFalse;
- if(iIPSecGANSupported)
- {
- flag_exception = CheckException();
- if(flag_exception || iCurrentException)
- {
- if(iBypassOrDropMode != KSymmetricBypass)
- {
- err = AddExceptionSelectors();
- if (err != KErrNone)
- {
- ErrorHandlingL(ENoMemory, err);
- }
- }//if symmetry
- }//flag_exception
- }
-
// Send the algorithms table and the string format policy file to
// IPSec protocol component using Secpol socket
SendAlgorithmsAndPolicyToIPSecL(_L("secpol6"));
@@ -826,20 +692,6 @@
{
ErrorHandlingL(ENoMemory, err);
}
-//UMA support
- TBool flag_exception = EFalse;
- if(iIPSecGANSupported)
- {
- flag_exception = CheckException();
- if(flag_exception)
- {
- LOG(Log::Printf(_L("::ProcessUnloadPolicy, Adding exception selectors")));
- if(iBypassOrDropMode != KSymmetricBypass)
- {
- AddExceptionSelectors();
- }
- }
- }
// Send the algorithms table and the string format policy file to
// IPSec protocol component using Secpol socket
@@ -882,9 +734,7 @@
// Check if given policy contains 'drop_everything_else' rule
// and add IKE, DHCP and MIPv4 bypass selectors if necessary
- //UMA support REQ417-40027
- //DHCP selectors & IKE selectors should be added even when UMA is UP
- if (aBypassDropMode == KDropMode ||(iIPSecGANSupported && iCurrentException))
+ if (aBypassDropMode == KDropMode)
{
// Allow plain IKE negotiation packets. Write the bypass
// selectors to the end of selector list, but they will
@@ -903,11 +753,10 @@
ErrorHandlingL(ENoMemory, err);
}
}
- //UMA support REQ417-40027
- TBool UMAFLAG = ETrue;
- // Allow plain DHCP negotiation packets. Write bypass mode
+
+ // Allow plain DHCP negotiation packets. Write bypass mode
// selectors for DHCP ports (67, 68) to the end of selector list.
- if (aFunction & KAddDhcpBypassSelectors || (iIPSecGANSupported && UMAFLAG))
+ if (aFunction & KAddDhcpBypassSelectors)
{
TInt err = BuildDhcpProtocolString(iPolBfr);
if (err != KErrNone)
@@ -969,11 +818,6 @@
entry->iPolicyHandle.iHandle = iCurrentPolicyHandle.iHandle;
entry->iPolicyBuf = iPolBfr;
entry->iPolicyType = aPolType;
- if(iIPSecGANSupported)
- {
- entry->iException = iCurrentException ;
- }
-
iPolBfr = NULL;
CleanupStack::PushL(entry->iPolicyBuf);
@@ -1607,8 +1451,8 @@
if (autoloadListItem != NULL)
{
CleanupStack::PushL(autoloadListItem);
- iScopedAutoloadPolicyPairs.AppendL(autoloadListItem);
- CleanupStack::Pop(autoloadListItem);
+ iScopedAutoloadPolicyPairs.AppendL(autoloadListItem);
+ CleanupStack::Pop(autoloadListItem);
}
}
@@ -2319,163 +2163,3 @@
return KErrNone;
}
-
-//Checking excetion flags
-TBool CIPSecPolicyManagerHandler::CheckException()
- {
- int count_=0;
- TBool flag_exception = EFalse;
- while(count_ < iActivePolicyList->Count())
- {
- if(iActivePolicyList->At(count_)->iException)
- {
- LOG(Log::Printf(_L("::CheckException, Exception policy Activated")));
- flag_exception = ETrue;
- break;
- }
- else
- {
- LOG(Log::Printf(_L(" Exception is not presnt iActivePolicyList->At(%d)"), count_));
- }
- count_ ++;
- }
- return flag_exception;
-
- }
-
-
-/**
- *This method to find out the iapid from network id
- *@param aNetId : network id
- *@param aIapId : iapid
- *@return void
- */
-
-void CIPSecPolicyManagerHandler::SearchIAPIdL( const TUint32& aNetId,
- TUint32& aIapId )
- {
- LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::SearchIAPIdL Entry\n")));
-
- CCommsDatabase* commsDatabase = CCommsDatabase::NewL();
- CleanupStack::PushL(commsDatabase);
-
- // Make hidden records visible
- commsDatabase->ShowHiddenRecords();
-
- // Open IAP table view by matching IAP_NETWORK Id
- CCommsDbTableView* commsDbTableView =
- commsDatabase->OpenViewMatchingUintLC( TPtrC( IAP ),
- TPtrC( IAP_NETWORK ),
- aNetId );
-
- User::LeaveIfError( commsDbTableView->GotoFirstRecord() );
-
- commsDbTableView->ReadUintL(TPtrC( COMMDB_ID ), aIapId );
-
- LOG(Log::Printf(_L("CMPMCommsDatAccess::SearchIAPIdL - Found IAP IdId: = %d\n"),aIapId));
-
- CleanupStack::PopAndDestroy(commsDbTableView);
- CleanupStack::PopAndDestroy(commsDatabase);
-
- LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::SearchIAPIdL Exit \n")));
- }
-
-/**
- *This API call is to pass the sid or any other relevent information
- *from other components to IPSec module.
- *
- *@param
- *@param
- *@return
- */
- void CIPSecPolicyManagerHandler::SetOptL(const RMessage2& aMsg)
- {
- LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::SetOptL\n")));
- //Read the option name from the RMessage
- TUint optionName;
- TPckg<TUint> optionNamePkg(optionName) ;
- aMsg.ReadL(FIRST_ARGUMENT, optionNamePkg);
- //Read the option level from the RMessage
- TUint optionLevel;
- TPckg<TUint> optionLevelPkg(optionLevel) ;
- aMsg.ReadL(SECOND_ARGUMENT, optionLevelPkg);
- LOG(Log::Printf(_L("option name = %d and option level is = %d \n"), iAppSid, optionLevel));
- //Read option value
- HBufC8* optionValue;
- TInt dataLen = aMsg.GetDesLength(THIRD_ARGUMENT);
- optionValue = HBufC8::NewL(dataLen);
- CleanupStack::PushL(optionValue);
- TPtr8 optionValuePtr(optionValue->Des());
- aMsg.ReadL(THIRD_ARGUMENT, optionValuePtr);
-
- if(optionLevel == KOptionLevelDefault)
- {
- if(optionName == KOptionNameSid)
- {
- TLex8 lex(*optionValue);
- TUint dataValue;
- lex.Val(dataValue);
- iAppSid = dataValue;//store the appsid value.
- LOG(Log::Printf(_L("Application sid value is %d \n"), iAppSid));
- }//else donothing as of now
- else
- {
- User::Leave(KErrArgument);
- LOG(Log::Printf(_L(" \nwrong Name\n")));
- }
- }
- else
- {
- User::Leave(KErrArgument);
- LOG(Log::Printf(_L(" Wrong option KOptionLevelDefault\n")));
- }
- CleanupStack::PopAndDestroy();
- LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::SetOptL\n")));
- }
-
-/**
- *This method to check the exception.
- **/
-TBool CIPSecPolicyManagerHandler::CheckUMAL(TUint32 aIapId)
- {
- CMDBSession* cmdbSession;
- CCDIAPRecord* ptrIapRecord1;
- ptrIapRecord1 = static_cast<CCDIAPRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord));
- CleanupStack::PushL(ptrIapRecord1);
- cmdbSession = CMDBSession::NewL(CMDBSession::LatestVersion());
- CleanupStack::PushL(cmdbSession);
- cmdbSession->SetAttributeMask( ECDHidden | ECDPrivate );
- ptrIapRecord1->SetRecordId(aIapId);
- ptrIapRecord1->LoadL(*cmdbSession);
-
- TUint32 secureId;
- secureId = ptrIapRecord1->iAppSid;
- LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::CheckUMAL Secure id is = %d\n"), secureId));
- CleanupStack::PopAndDestroy(cmdbSession);
- CleanupStack::PopAndDestroy(ptrIapRecord1);
- TBool result = EFalse;
- if(secureId == KGANAppSid)
- {
- LOG(Log::Printf(_L("\n Exception added to the selector ")));
- result = ETrue;
- }
- else
- {
- LOG(Log::Printf(_L(" No Exception added \n")));
- }
- return result;
- }
-
-/**
- *This method to check the exception.
- **/
-void CIPSecPolicyManagerHandler::CheckUMAEXception(TUint32 aVpnNetId)
- {
- LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::CheckUMAEXception Entry \n")));
- TUint32 aIapId;
- SearchIAPIdL(aVpnNetId, aIapId);
- iCurrentException = CheckUMAL(aIapId);
- LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::CheckUMAEXception Exit \n")));
- }
-
-
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmansession.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmansession.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -192,12 +192,6 @@
case EIpsecPolicyEnumerateSelectors:
Status = iServer->iIPSecPolicyManagerHandler->GetSelectorsCount(aMessage);
break;
-
- case EIpsecPolicySetOption: //UMA support
- TRAPD(err,iServer->iIPSecPolicyManagerHandler->SetOptL(aMessage));
- Status = err;
- break;
-
default:
Status = KErrNotSupported;
break;
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmanutil.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmanutil.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -265,15 +265,6 @@
// Inbound, protocol UDP, local_port 68
stringBuf.Append(_L8(" inbound protocol 17 local_port 68 = { }\n"));
- if(iIPSecGANSupported)
- {
- // Outbound, protocol UDP, remote_port 67
- stringBuf.Append(_L8(" outbound protocol 17 remote_port 68 = { }\n"));
- // Inbound, protocol UDP, local_port 68
- stringBuf.Append(_L8(" inbound protocol 17 local_port 67 = { }\n"));
- }
-
-
// Write the string to file
err = TPolicyParser::BufferAppend(aPolBfr, stringBuf);
return err;
@@ -437,29 +428,8 @@
compWord |= 0x00400000;
}
- //UMA support Req417-40027
- if(iIPSecGANSupported && policySelector->iSequenceNumber==0 && policySelector->iRemote.IsUnspecified() && policySelector->iRemoteMask.IsUnspecified())
- {
- LOG(Log::Printf(_L("::Buildcomparision, building comparison words for any to any selector\n")));
-
- //building lowest comparision word for any to any selector. Any to any selector should fall at the end of
- //all selector list (except bypass selectors. If not then selector falling after this selector will have
- //no significance.
- compWord = 0x000000001;
- policySelector->iCompWord = compWord;
- continue;
- }
-
- // Each selector has at least this bit set on.
- if(iIPSecGANSupported)
- {
- //Change to accomodate any to any selector.
- compWord |= 0x00000010;
- }
- else
- {
- compWord |= 0x00000001;
- }
+ // Each selector has at least this bit set on
+ compWord |= 0x00000001;
// Store comparison word to the selector
policySelector->iCompWord = compWord;
@@ -620,38 +590,9 @@
}
}
-
-//
-// UMAExceptionTrafficSelector = {UMAException %d }
-// This occurs only if the current policies are exception policy.
-// The network ID is supplied in braces any matching scope traffic will be honoured.
-///////////////////////////////////////////////////////////////////
//
-TInt
-CIPSecPolicyManagerHandler::AddExceptionSelectors()
- {
- LOG(Log::Printf(_L("Add Exception selectors\n")));
- TInt err(KErrNone);
- if(iIPSecGANSupported)
- {
- TBuf8<128> stringBuf;
- stringBuf.Format(_L8(" UMAExceptionTrafficSelector = {UMAException %d }\n"),iVPNNetId);
- err = TPolicyParser::BufferAppend(iPolBfr, stringBuf);
- return err;
- }
- else
- {
- LOG(Log::Printf(_L("UMA/GAN support is not enabled and CIPSecPolicyManagerHandler::AddExceptionSelectors not supported")));
- return KErrNotSupported;
- }
- }
-
-
-
-///////////////////////////////////////////////////////////////////
// This function adds the following selectors to the end of the
// string format policy file:
-// inbound = { }%d
// inbound = { }
// outbound = { }
//
@@ -665,12 +606,10 @@
{
TBuf8<128> stringBuf;
TInt err(KErrNone);
- LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::AddInboundOutboundSelectorPair()\n")));
// If drop mode, return immediately
if (iBypassOrDropMode == KDropMode)
{
- LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::AddInboundOutboundSelectorPair(), not adding selectors combined mode is drop\n")));
return err;
}
--- a/networksecurity/ipsec/ipsecpolapi/bwins/IPSECPOLAPIU.DEF Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsecpolapi/bwins/IPSECPOLAPIU.DEF Tue Aug 31 16:45:15 2010 +0300
@@ -14,5 +14,4 @@
?UnloadPolicy@RIpsecPolicyServ@@QAEXABUTPolicyHandle@@AAVTRequestStatus@@@Z @ 13 NONAME ; public: void __thiscall RIpsecPolicyServ::UnloadPolicy(struct TPolicyHandle const &,class TRequestStatus &)
?Version@RIpsecPolicyServ@@QBE?AVTVersion@@XZ @ 14 NONAME ; public: class TVersion __thiscall RIpsecPolicyServ::Version(void)const
?AvailableSelectors@RIpsecPolicyServ@@QAEXABVTDesC8@@PAV?$CArrayFixFlat@UTIpsecSelectorInfo@@@@AAVTRequestStatus@@@Z @ 15 NONAME ; void RIpsecPolicyServ::AvailableSelectors(class TDesC8 const &, class CArrayFixFlat<struct TIpsecSelectorInfo> *, class TRequestStatus &)
- ?SetOpt@RIpsecPolicyServ@@QAEHIIABVTDesC8@@@Z @ 16 NONAME ; int RIpsecPolicyServ::SetOpt(unsigned int, unsigned int, class TDesC8 const &)
--- a/networksecurity/ipsec/ipsecpolapi/eabi/ipsecpolapiU.DEF Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsecpolapi/eabi/ipsecpolapiU.DEF Tue Aug 31 16:45:15 2010 +0300
@@ -16,5 +16,4 @@
_ZN16RIpsecPolicyServD2Ev @ 15 NONAME ; RIpsecPolicyServ::~RIpsecPolicyServ [not-in-charge](void)
_ZN16RIpsecPolicyServC2Ev @ 16 NONAME ; RIpsecPolicyServ::RIpsecPolicyServ[not-in-charge](void)
_ZN16RIpsecPolicyServ18AvailableSelectorsERK6TDesC8P13CArrayFixFlatI18TIpsecSelectorInfoER14TRequestStatus @ 17 NONAME
- _ZN16RIpsecPolicyServ6SetOptEjjRK6TDesC8 @ 18 NONAME
--- a/networksecurity/ipsec/ipsecpolapi/inc/ipsecpolapi.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsecpolapi/inc/ipsecpolapi.h Tue Aug 31 16:45:15 2010 +0300
@@ -156,9 +156,6 @@
const TInt KAddIkeBypassSelectors = (1 << 0); //< Add IKE bypass selectors to the policy
const TInt KAddIpsecBypassSelectors = (1 << 1); //< Add an bypass selector for traffic identified with a TIpsecSelectorInfo structure
const TInt KAddDhcpBypassSelectors = (1 << 2); //< Add DHCP bypass selectors to the policy
-
-const TInt KAddUMAExceptionSelectors = (1<<3); ///< Add UMA information to the policy
-
/*
* A flag uset in GetDebugInfo call.
*
@@ -167,19 +164,6 @@
const TInt KParsingErrorInfo = (1 << 1); //< Return information about a policy parsing error
/**
- * An integer constant which identifies an option.Level
- *
- **/
-const TInt KOptionLevelDefault = 0x1000;
-
-
-/**
- * An integer constant which identifies an option.
- *
- **/
-const TInt KOptionNameSid = 0x1020;
-
-/**
* IPSec Policy API methods return the following error codes
* in the TRequestStatus parameter.
* NOTE! The error code values below MUST be kept in sync with
@@ -206,8 +190,6 @@
typedef TPckg<TInetAddr> TInetAddrPckg;
-
-
/**
* RIpsecPolicyServ API is used by clients to:
* Users who load and unload policies
@@ -418,22 +400,7 @@
* system wide error codes.
*/
IMPORT_C void AvailableSelectors(const TDesC8& aGateway, CArrayFixFlat<TIpsecSelectorInfo>* aSelectors, TRequestStatus& aStatus);
-
- /**
- *Sets an option.
- *RIpsecPolicyServ implementations may provide options that can be set with this method.
- *Eg:- Seting SID of an appliction that is going to load policy file. Then that application
- *Can call this api with option name 'KOptionLevelDefault' and option level 'KOptionNameSid' and provide the SID value.
- *
- *@param aOptionName : An integer constant which identifies an option
- *@param aOptionLevel : An integer constant which identifies level of an option
- *@param aOption : An option value as descriptor
- *@return TInt: KErrNone if succsess
- */
- IMPORT_C TInt SetOpt(TUint aOptionName, TUint aOptionLevel, const TDesC8 &aOption);
-
-
-private:
+private:
void EnumerateSelectors(const TDesC8& aGateway, TInt& aCount);
private:
--- a/networksecurity/ipsec/ipsecpolapi/src/ipsecpolapi.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/ipsecpolapi/src/ipsecpolapi.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -16,6 +16,7 @@
//
#include <e32math.h>
+
#include "ipsecpol.h"
#include "ipsecpolapi.h"
#include "clistatic.h"
@@ -38,7 +39,7 @@
//
// Connect to the server attempting to start it if necessary
//
- {
+ {
TInt retry=2;
for (;;)
{
@@ -155,20 +156,3 @@
SendReceive(EIpsecPolicyEnumerateSelectors, TIpcArgs(&aGateway, &selectorCount));
}
- /**
- *Sets an option.
- *RIpsecPolicyServ implementations may provide options that can be set with this method.
- *Eg:- Seting SID of an appliction that is going to load policy file. Then that application
- *Can call this api with option name - and option level - and provide the SID value.
- *
- *@param aOptionName : An integer constant which identifies an option
- *@param aOptionLevel : An integer constant which identifies level of an option
- *@param aOption : An option value
- *@return TInt: KErrNone if succsess
- */
-EXPORT_C TInt RIpsecPolicyServ::SetOpt(TUint aOptionName, TUint aOptionLevel, const TDesC8 &aOption)
- {
- TPckg<TUint> optionNamePkg(aOptionName);
- TPckg<TUint> pkgOptionLevel(aOptionLevel);
- return SendReceive(EIpsecPolicySetOption, TIpcArgs( &optionNamePkg, &pkgOptionLevel, &aOption));
- }
--- a/networksecurity/ipsec/lib_pfkey/include/lib_pfkey.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/lib_pfkey/include/lib_pfkey.h Tue Aug 31 16:45:15 2010 +0300
@@ -177,20 +177,15 @@
class RSADB
{
public:
- /**
- * Opens the handle to stack side SADB
- * @param aServer
- * A socketserver session to use
- * @return KErrNone if successful
- */
+
IMPORT_C TInt Open(RSocketServ& aServer);
IMPORT_C void Close();
- // Send Request
+
IMPORT_C void SendRequest(const TDesC8& aMsg, TRequestStatus& aStatus);
IMPORT_C void CancelSend();
- // Separate Read Request
+
IMPORT_C void ReadRequest(TDes8& aMsg, TRequestStatus& aStatus);
IMPORT_C void CancelRecv();
--- a/networksecurity/ipsec/te_ipsec/group/t_ipsec.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/ipsec/te_ipsec/group/t_ipsec.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -35,11 +35,11 @@
USERINCLUDE ../inc
#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE \epoc32\include\test
-SYSTEMINCLUDE \epoc32\include\ecom
-SYSTEMINCLUDE \epoc32\include\comms-infras
-SYSTEMINCLUDE \epoc32\include\networking
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/test
+SYSTEMINCLUDE /epoc32/include/ecom
+SYSTEMINCLUDE /epoc32/include/comms-infras
+SYSTEMINCLUDE /epoc32/include/networking
#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SYSTEMINCLUDE /epoc32/include/platform/test
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_EXPORTS
-
-PRJ_TESTEXPORTS
-
-//script files
-../scripts/ns-ipsec-ike-selectorconflict_common.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_common.script
-
-../scripts/ns-ipsec-ike-selectorconflict_bbd1.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_bbd1.script
-../scripts/ns-ipsec-ike-selectorconflict_bbd2.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_bbd2.script
-../scripts/ns-ipsec-ike-selectorconflict_bbd3.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_bbd3.script
-
-
-../scripts/ns-ipsec-ike-selectorconflict_bdd1.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_bdd1.script
-../scripts/ns-ipsec-ike-selectorconflict_bdd2.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_bdd2.script
-../scripts/ns-ipsec-ike-selectorconflict_bdd3.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_bdd3.script
-
-
-../scripts/ns-ipsec-ike-selectorconflict-uma1.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict-uma1.script
-../scripts/ns-ipsec-ike-selectorconflict-uma2.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict-uma2.script
-../scripts/ns-ipsec-ike-selectorconflict-uma3.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict-uma3.script
-../scripts/ns-ipsec-ike-selectorconflict-uma4.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict-uma4.script
-../scripts/ns-ipsec-ike-selectorconflict-uma5.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict-uma5.script
-../scripts/ns-ipsec-ike-selectorconflict-uma6.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict-uma6.script
-
-../scripts/ns-ipsec-ike-selectorconflict_coverage.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_coverage.script
-
-//.ini file
-../scripts/ns-ipsec-ikev1test-ops.ini z:/testdata/scripts/ns-ipsec-ikev1test-ops.ini
-
-//.ini file
-../testdata/te_2483.pin z:/testdata/configs/te_2483.pin
-../testdata/te_2483.pol z:/testdata/configs/te_2483.pol
-../testdata/te_2483_drop.pin z:/testdata/configs/te_2483_drop.pin
-../testdata/te_2483_drop.pol z:/testdata/configs/te_2483_drop.pol
-
-//.xml
-../testdata/te_ethced_2483vpn.xml z:/testdata/configs/te_ethced_2483vpn.xml
-../testdata/te_ethced_2483.xml z:/testdata/configs/te_ethced_2483.xml
-../testdata/te_ethced_2483vpn_drop.xml z:/testdata/configs/te_ethced_2483vpn_drop.xml
-
-./te_ipsec_selector_confilict.iby /epoc32/rom/include/te_ipsec_selector_confilict.iby
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-te_ipsec_selector_confilict.mmp
\ No newline at end of file
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/group/te_ipsec_selector_confilict.iby Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* 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 __T_IPSEC_SELECTOR_CONFLICT_IBY__
-#define __T_IPSEC_SELECTOR_CONFLICT_IBY__
-
-#include <ipsec.iby>
-#include <vpn.iby>
-#include <integrationtest.iby>
-
-file=ABI_DIR\DEBUG_DIR\te_ipsec_selector_conflict.exe System\Libs\te_ipsec_selector_conflict.exe
-
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ikev1test-ops.ini testdata\scripts\ns-ipsec-ikev1test-ops.ini
-
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_common.script testdata\scripts\ns-ipsec-ike-selectorconflict_common.script
-
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_bbd1.script testdata\scripts\ns-ipsec-ike-selectorconflict_bbd1.script
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_bbd2.script testdata\scripts\ns-ipsec-ike-selectorconflict_bbd2.script
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_bbd3.script testdata\scripts\ns-ipsec-ike-selectorconflict_bbd3.script
-
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_bdd1.script testdata\scripts\ns-ipsec-ike-selectorconflict_bdd1.script
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_bdd2.script testdata\scripts\ns-ipsec-ike-selectorconflict_bdd2.script
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_bdd3.script testdata\scripts\ns-ipsec-ike-selectorconflict_bdd3.script
-
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict-uma1.script testdata\scripts\ns-ipsec-ike-selectorconflict-uma1.script
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict-uma2.script testdata\scripts\ns-ipsec-ike-selectorconflict-uma2.script
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict-uma3.script testdata\scripts\ns-ipsec-ike-selectorconflict-uma3.script
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict-uma4.script testdata\scripts\ns-ipsec-ike-selectorconflict-uma4.script
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict-uma5.script testdata\scripts\ns-ipsec-ike-selectorconflict-uma5.script
-data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict-uma6.script testdata\scripts\ns-ipsec-ike-selectorconflict-uma6.script
-
-data=EPOCROOT##epoc32\data\Z\TestData\configs\te_ethced_2483.xml testdata\configs\te_ethced_2483.xml
-data=EPOCROOT##epoc32\data\Z\TestData\configs\te_ethced_2483vpn.xml testdata\configs\te_ethced_2483vpn.xml
-data=EPOCROOT##epoc32\data\Z\TestData\configs\te_ethced_2483vpn_drop.xml testdata\configs\te_ethced_2483vpn_drop.xml
-
-data=EPOCROOT##epoc32\data\Z\TestData\configs\te_2483.pin testdata\configs\te_2483.pin
-data=EPOCROOT##epoc32\data\Z\TestData\configs\te_2483_drop.pin testdata\configs\te_2483_drop.pin
-data=EPOCROOT##epoc32\data\Z\TestData\configs\te_2483.pol testdata\configs\te_2483.pol
-data=EPOCROOT##epoc32\data\Z\TestData\configs\te_2483.pin testdata\configs\te_2483_drop.pol
-
-#endif
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/group/te_ipsec_selector_confilict.mmp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-TARGET te_ipsec_selector_conflict.exe
-TARGETTYPE exe
-UID 0x1000007A 0x10282F36
-CAPABILITY NetworkServices NetworkControl WriteDeviceData ReadDeviceData
-MACRO DATA_CAGING
-
-SOURCEPATH ../src
-SOURCE te_loadpolicy_bbd.cpp
-SOURCE te_loadpolicy_bdd.cpp
-SOURCE te_loadpolicy_uma.cpp
-SOURCE te_ipsectestserver.cpp
-SOURCE te_coverage_test.cpp
-
-USERINCLUDE ../inc
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/platform
-SYSTEMINCLUDE /epoc32/include/platform/test
-SYSTEMINCLUDE /epoc32/include/platform/ecom
-SYSTEMINCLUDE /epoc32/include/platform/comms-infras
-SYSTEMINCLUDE /epoc32/include/platform/networking
-///
-LIBRARY euser.lib
-LIBRARY esock.lib
-LIBRARY commdb.lib
-LIBRARY netmeta.lib
-LIBRARY insock.lib
-LIBRARY testexecuteutils.lib
-LIBRARY testexecutelogclient.lib
-LIBRARY bafl.lib
-LIBRARY ipsecpolapi.lib
-LIBRARY lib_pfkey.lib
-LIBRARY commdb.lib
-LIBRARY commsdat.lib
-
-VENDORID 0x70000001
-
-SMPSAFE
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_coverage_test.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-/**
- * @file ts_ipsec_crypto.h header file for main test code for IPsec
- */
-
-#if (!defined __TEF_IPSEC_COVERAGE_TEST_H__)
-#define __TEF_IPSEC_COVERAGE_TEST_H__
-
-
-//local includes here
-
-#include "te_IPSec_Load_Policy_Base.h"
-
-#include <ipsecpolapi.h>
-#include <comms-infras\dbaccess.h>
-#include <CommDbConnPref.h>
-#include <featureuids.h>
-#include <e32Debug.h>
-
-/**
- * This class is to test the policy loading in the order of Bypasss policy,Drop Policy, Drop Policy
- *
- */
-
-class CT_CoverageTest : public CT_IPSec_Load_Policy_Base
- {
-public:
- CT_CoverageTest();
- ~CT_CoverageTest();
-
- static CT_CoverageTest* NewL();
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
- virtual TCleanupOperation CleanupOperation()
- {
- return CleanupOperation;
- }
-
-protected:
- void ConstructL();
-
-private:
- static void CleanupOperation(TAny* aAny)
- {
- TInt* number = static_cast<TInt*>(aAny);
- delete number;
- }
-
- inline void DoCmdNewL(const TDesC& aEntry);
- void DoLoadBypassModePolicy(const TDesC& aSection);
- void DoCmdClose(const TDesC& /*aSection*/);
- void DoUnloadBypassPolicy(const TDesC& /*aSection*/);
- void DoUnloadDropPolicy(const TDesC& /*aSection*/);
- void DoLoadDropModePolicy(const TDesC& /*aSection*/);
- void DoLoadNewBypassModePolicy(const TDesC& /*aSection*/);
- void DoUnloadNewBypassPolicy(const TDesC& /*aSection*/);
-
-protected:
-
- TZoneInfoSet iMyZoneInfoSet;
- RIpsecPolicyServ iDrpPolicyServer;
- TPolicyHandlePckg iDrpPolicyHandle;
- RIpsecPolicyServ iBypsPolicyServer;
- TPolicyHandlePckg iBypsPolicyHandle;
- TPolicyHandlePckg iNewBypsPolicyHandle;
- };
-
-#endif //__TEF_IPSEC_COVERAGE_TEST_H__
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsec_load_policy_base.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-// 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 the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Connection Test Step Header
-//
-//
-
-/**
- @file
-*/
-#ifndef __TEF_IPSEC_LOAD_POLICY_BASE__
-#define __TEF_IPSEC_LOAD_POLICY_BASE__
-
-
-//system includes here
-#include<DataWrapper.h>
-
-//local includes here
-//---------------------------------------------------------------------------
-class CT_IPSec_Load_Policy_Base : public CDataWrapper
-{
-public:
- virtual ~CT_IPSec_Load_Policy_Base()
- {
- delete iObject;
- iObject = NULL;
- }
-
- CT_IPSec_Load_Policy_Base(): iObject(NULL)
- {
-
- }
-
- virtual TAny* GetObject() { return iObject; }
-
- virtual void SetObjectL(TAny* aObject)
- {
- DestroyData();
- iObject = static_cast<TInt*> (aObject);
- }
-
- virtual void DisownObjectL()
- {
- iObject = NULL;
- }
-
- void DestroyData()
- {
- delete iObject;
- iObject=NULL;
- }
-
-protected:
-
- virtual void DoDelay(const TDesC& /*aSection*/) {};
- virtual TBool DoCommandL(const TTEFFunction& /* aCommand */, const TTEFSectionName& /*aSection*/, const TInt /*aAsyncErrorIndex*/){return ETrue;}
-
- /*
- *Execute the test (test case code).
- */
- virtual void DoCmdTestConnection(const TDesC& /*aSection*/){};
-
- /*
- *Execute the test for sending data(test case code).
- */
- virtual void DoCmdSendPacket(const TDesC& /*aSection*/){};
-
-protected :
- TInt* iObject;
-
-public :
- virtual void StopWaiting(){};
-};
-
-#endif//__TEF_IPSEC_LOAD_POLICY_BASE__
-
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsecconst.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
-* 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 the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#ifndef __TEF_IPSEC_CONST_H__
-#define __TEF_IPSEC_CONST_H__
-
-#include <e32base.h>
-#include <es_sock.h>
-#include <e32cmn.h>
-#include <in_sock.h>
-#include <commdbconnpref.h>
-#include <comms-infras/es_parameterbundle.h>
-
-#if defined(SYMBIAN_CRYPTO)
-#include <cryptostrength.h>
-#else
-#include <cryptalg.h>
-#endif
-
-const TInt KSockBufferLength=7;
-
-//test case name use the following
-_LIT(KIPSecTestBypass, "IPSecTestByPassPolicy");
-_LIT(KIPSecTestDrop, "IPSecTestDropPolicy");
-_LIT(KIPSecTestUMA, "IPSecTestUMAPolicy");
-_LIT(KIPSecCoverageTest, "IPSecTestCoverage");
-
-_LIT(KIPSecSendPacketTest, "IPSecSendPacket");
-_LIT(KIPSecNATKeepAliveTest, "IPSecNATKeepAlive");
-_LIT(KIPSecDPDKeepAliveTest, "IPSecDPDKeepAlive");
-_LIT(KIPSecNATTimeOutTest, "IPSecConfNatTimeout");
-_LIT(KIPSecDPDTimeOutTest,"IPSecConfDPDTimeout");
-_LIT(KIPSecDelConnMgrTest,"IPSecDelConnMgrTest");
-_LIT(KIPSecNATRestartTimerTest,"IPSecNATRestartTimerTest");
-_LIT(KIPSecAddConnWatcherTest,"IPSecAddConnWatcherTest");
-_LIT(KIPSecDelConnWatcherTest,"IPSecDelConnWatcherTest");
-_LIT(KIPSecTimerTest,"IPSecTimerTest");
-
-// Commands
-_LIT(KCloseConnection,"Close");
-_LIT(KSendPackets, "SendPacket");
-_LIT(KDelayCMD, "Delay");
-_LIT(KReportEvt, "ReportEvt");
-_LIT(KReStartEvtCMD, "ReStartEvt");
-//commands use the following
-_LIT(KNewCMD,"New");
-_LIT(KTestLoadBypassPolicy, "LoadBypassModePolicy");
-_LIT(KTestLoadDropPolicy, "LoadDropModePolicy");
-_LIT(KLoadBypasspolicy, "LoadBypassModePolicy");
-_LIT(KTestLoadDropModePolicy, "LoadDropModePolicy");
-_LIT(KLoadNewDroppolicy, "LoadNewDropModePolicy");
-_LIT(KLoadNewBypassPolicy, "LoadNewBypassModePolicy");
-_LIT(KUnloadDropPolicy, "UnloadDropModePolicy");
-_LIT(KUnloadBypassPolicy, "UnloadBypassModePolicy");
-_LIT(KUnloadUMAPolicy, "UnloadUMAModePolicy");
-_LIT(KLOadUMAPolicy, "LOadUMAModePolicy");
-_LIT(KLoadUMAByPassPolicy, "LoadByPassModePolicy");
-_LIT(KUnloadNewBypassPolicy,"UnloadNewBypassModePolicy");
-_LIT(KUnloadNewDropPolicy,"UnloadNewDropModePolicy");
-
-
-
-_LIT(KCloseConnectionCMD,"Close");
-_LIT(KSendPacketsCMD, "SendPacket");
-_LIT(KReportEvtCMD, "ReportEvt");
-_LIT(KAddConnWatcherCMD, "AddConnWatcher");
-_LIT(KDelConnWatcherCMD, "DelConnWatcher");
-_LIT(KDelConnMgrCMD, "DelConnMgr");
-_LIT(KIPSecSecondCon, "KIPSecSecondCon");
-
-/// Command parameters
-_LIT(KObjectValue, "object_value");
-_LIT(KTOSorTrafficClass, "TosOrTrafficClass");
-_LIT(KPort, "port");
-_LIT(KIapid, "iapid");
-_LIT(KDestAddr, "destaddr");
-_LIT(KDelay, "Delay");
-_LIT(KLocaladdr, "localaddr");
-_LIT(KIPSecNATTimeOutValDPDTest, "IPSecNATTimeOutVal1");
-_LIT(KIPSecDPDTimeOutValDPDTest,"IPSecDPDTimeOutVal1");
-_LIT(KIPSecNATRestartTimerAfter,"IPSecNATRestartTimerAfter");
-_LIT(KIPSecDelay,"IPSecDelay");
-
-//parameters use the following
-_LIT(KParamObjectValue, "object_value");
-_LIT(KParamPort, "port");
-_LIT(KParamIapid, "iapid");
-_LIT(KParamDestIPAddr, "destaddr");
-_LIT(KParamDelay, "Delay");
-_LIT(KParamLocaladdr, "localaddr");
-_LIT(KParamIPSecNATTimeOutValDPDTest, "IPSecNATTimeOutVal1");
-_LIT(KParamIPSecDPDTimeOutValDPDTest,"IPSecDPDTimeOutVal1");
-_LIT(KParamIPSecNATRestartTimerAfter,"IPSecNATRestartTimerAfter");
-_LIT(KIPSecNATTimeOutValue,"IPSecNATTimeOutVal");
-_LIT(KIPSecDPDTimeOutValue,"IPSecDPDTimeOutVal");
-_LIT(KParamIPSecDelay,"IPSecDelay");
-_LIT(KParamDestIPAddr1, "destaddr1");
-_LIT(KParamDestIPAddr2, "destaddr2");
-_LIT(KParamLocaladdr1, "localaddr1");
-_LIT(KParamLocaladdr2, "localaddr2");
-_LIT(KDrive, "drive");
-_LIT(KMsvServerPattern, "!MsvServer*");
-
-#endif /*__TEF_IPSEC_CONST_H__*/
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsectestserver.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-/**
-@test
-@internalComponent
-
-This contains CT_IPSecTestServer
-*/
-
-#ifndef __TEF_IPSEC_TESTSERVER_H__
-#define __TEF_IPSEC_TESTSERVER_H__
-
-#include <test/testblockcontroller.h>
-#include <test/testserver2.h>
-#include "te_ipsecconst.h"
-#include "te_loadpolicy_bbd.h"
-#include "te_loadpolicy_bdd.h"
-#include "te_selectorconflict.h"
-#include "te_loadpolicy_uma.h"
-#include "te_coverage_test.h"
-
-
-class CT_LoadPolicyTestBlock : public CTestBlockController
- {
-public:
- static CT_LoadPolicyTestBlock* NewL();
- CT_LoadPolicyTestBlock() : CTestBlockController() {}
- ~CT_LoadPolicyTestBlock() {}
-
- CDataWrapper* CreateDataL(const TDesC& aData)
- {
- CDataWrapper* wrapper = NULL;
-
- if (KIPSecTestBypass() == aData)
- {
- wrapper = CT_LoadPolicyBBD::NewL();
- }
- else if (KIPSecTestUMA() == aData)
- {
- wrapper = CT_LoadPolicyUMA::NewL();
- }
- else if (KIPSecTestDrop() == aData)
- {
- wrapper = CT_LoadPolicyBDD::NewL();
- }
- else if (KIPSecCoverageTest() == aData)
- {
- wrapper = CT_CoverageTest::NewL();
- }
- else
- {
- wrapper = NULL;
- }
- return wrapper;
- }
- };
-
-class CT_LoadPolicyTestServer : public CTestServer2
- {
-public:
- CT_LoadPolicyTestServer() {}
- ~CT_LoadPolicyTestServer() {}
-
- static CT_LoadPolicyTestServer* NewL();
-
- CT_LoadPolicyTestBlock* CreateTestBlock()
- {
- CT_LoadPolicyTestBlock* controller = new (ELeave) CT_LoadPolicyTestBlock();
- return controller;
- }
- };
-
-#endif //__TEF_IPSEC_TESTSERVER_H__
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_bbd.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-/**
- * @file ts_ipsec_crypto.h header file for main test code for IPsec
- */
-
-#if (!defined __TEF_IPSEC_LOADPOLICY_BDD_H__)
-#define __TEF_IPSEC_LOADPOLICY_BDD_H__
-
-
-//local includes here
-#include "ipsecpolapi.h"
-#include "te_IPSec_Load_Policy_Base.h"
-
-
-/**
- * This class is to test the policy loading in the order of Bypasss policy,Drop Policy, Drop Policy
- *
- */
-
-class CT_LoadPolicyBBD : public CT_IPSec_Load_Policy_Base
- {
-public:
- CT_LoadPolicyBBD();
- ~CT_LoadPolicyBBD();
-
- static CT_LoadPolicyBBD* NewL();
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
- virtual TCleanupOperation CleanupOperation()
- {
- return CleanupOperation;
- }
-
-protected:
- void ConstructL();
-
-private:
- static void CleanupOperation(TAny* aAny)
- {
- TInt* number = static_cast<TInt*>(aAny);
- delete number;
- }
-
- inline void DoCmdNewL(const TDesC& aEntry);
- void DoLoadBypassModePolicy(const TDesC& aSection);
- void DoCmdClose(const TDesC& /*aSection*/);
- void DoUnloadBypassPolicy(const TDesC& /*aSection*/);
- void DoUnloadDropPolicy(const TDesC& /*aSection*/);
- void DoLoadDropModePolicy(const TDesC& /*aSection*/);
- void DoLoadNewBypassModePolicy(const TDesC& /*aSection*/);
- void DoUnloadNewBypassPolicy(const TDesC& /*aSection*/);
-
-protected:
-
- TZoneInfoSet iMyZoneInfoSet;
- RIpsecPolicyServ iDrpPolicyServer;
- TPolicyHandlePckg iDrpPolicyHandle;
- RIpsecPolicyServ iBypsPolicyServer;
- TPolicyHandlePckg iBypsPolicyHandle;
- TPolicyHandlePckg iNewBypsPolicyHandle;
- };
-
-#endif //__TEF_IPSEC_LOADPOLICY_BDD_H__
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_bdd.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-/**
- * @file ts_ipsec_crypto.h header file for main test code for IPsec
- */
-
-#if (!defined __TEF_IPSEC_LOADPOLICYBDD_H__)
-#define __TEF_IPSEC_LOADPOLICYBDD_H_
-
-//local includes here
-#include "ipsecpolapi.h"
-#include "te_ipsec_load_policy_base.h"
-
-//forward declaration
-class CT_SelectorConflict;
-
-class CT_LoadPolicyBDD : public CT_IPSec_Load_Policy_Base
- {
-public:
- CT_LoadPolicyBDD();
- ~CT_LoadPolicyBDD();
-
- static CT_LoadPolicyBDD* NewL();
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
- virtual TCleanupOperation CleanupOperation()
- {
- return CleanupOperation;
- }
-
-protected:
- void ConstructL();
-
-private:
- static void CleanupOperation(TAny* aAny)
- {
- TInt* number = static_cast<TInt*>(aAny);
- delete number;
- }
-
- inline void DoCmdNewL(const TDesC& aEntry);
- void DoLoadDropModePolicy(const TDesC& aSection);
- void DoCmdClose(const TDesC& /*aSection*/);
- void DoLoadBypassModePolicy(const TDesC& /*aSection*/);
- void DoLoadNewDropModePolicy(const TDesC& /*aSection*/);
- void DoUnloadBypassPolicy(const TDesC& /*aSection*/);
- void DoUnloadDropPolicy(const TDesC& /*aSection*/);
- void DoUnloadNewDropModePolicy(const TDesC& /*aSection*/);
-protected:
-
- TZoneInfoSet iMyZoneInfoSet;
- RIpsecPolicyServ iDrpPolicyServer;
- TPolicyHandlePckg iDrpPolicyHandle;
- RIpsecPolicyServ iBypsPolicyServer;
- TPolicyHandlePckg iBypsPolicyHandle;
- TPolicyHandlePckg iNewDrpPolicyHandle;
- };
-
-#endif // __TEF_IPSEC_LOADPOLICYBDD_H_
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_uma.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-/**
- * @file ts_ipsec_crypto.h header file for main test code for IPsec
- */
-
-#if (!defined __TEF_IPSEC_LOADPOLICY_UMA_H__)
-#define __TEF_IPSEC_LOADPOLICY_UMA_H__
-
-//local includes here
-#include "te_IPSec_Load_Policy_Base.h"
-#include "ipsecpolapi.h"
-
-//forward declaration
-class CT_SelectorConflict;
-class RIpsecPolicyServ;
-
-
-/**
- * This class is to test the policy loading in the order of Bypasss policy,Drop Policy, Drop Policy
- *
- */
-
-class CT_LoadPolicyUMA : public CT_IPSec_Load_Policy_Base
- {
-public:
- CT_LoadPolicyUMA();
- ~CT_LoadPolicyUMA();
-
- static CT_LoadPolicyUMA* NewL();
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
- virtual TCleanupOperation CleanupOperation()
- {
- return CleanupOperation;
- }
-
-protected:
- void ConstructL();
-
-private:
- static void CleanupOperation(TAny* aAny)
- {
- TInt* number = static_cast<TInt*>(aAny);
- delete number;
- }
-
- inline void DoCmdNewL(const TDesC& aEntry);
- void DoLoadUMAPolicy(const TDesC& aSection);
- void DoCmdClose(const TDesC& /*aSection*/);
- void DoUnloadBypassPolicy(const TDesC& /*aSection*/);
- void DoUnloadDropPolicy(const TDesC& /*aSection*/);
- void DoLoadDropModePolicy(const TDesC& /*aSection*/);
- void DoLoadBypassModePolicy(const TDesC& /*aSection*/);
- void DoUnloadUMAPolicy(const TDesC& /*aSection*/);
-
-protected:
- TZoneInfoSet iMyZoneInfoSet;
- RIpsecPolicyServ iDrpPolicyServer;
- TPolicyHandlePckg iDrpPolicyHandle;
- RIpsecPolicyServ iBypsPolicyServer;
- TPolicyHandlePckg iBypsPolicyHandle;
- TPolicyHandlePckg iUMAPolicyHandle;
- };
-
-#endif //__TEF_IPSEC_LOADPOLICY_UMA_H__
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_selectorconflict.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-// 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 the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Connection Test Step Header
-//
-//
-
-/**
- @file
-*/
-#ifndef __TEF_IPSEC_SELECTORCONFLICT_H__
-#define __TEF_IPSEC_SELECTORCONFLICT_H__
-
-#include <es_sock.h>
-#include <e32base.h>
-#include <testexecutestepbase.h>
-//local includes here
-#include "te_IPSec_Load_Policy_Base.h"
-
-//---------------------------------------------------------------------------
-class CT_SelectorConflict : public CTimer
-{
-public:
- ~CT_SelectorConflict();
- static CT_SelectorConflict* NewL(int aIapId);
- void RecvUDP();
- void SendTcpPacketL();
- void RecvTcpPacketL();
- void ConnectL(TInt aPort, TPtrC16 aIpDAddr);
- void Close();
- void delay(CT_IPSec_Load_Policy_Base *aBase, TInt KDelayTime);
- TBool GetKeepAlive();
- void SetKeepAlive( TBool aKeepAlivetimeout);
- void start(int aIapId);
-
-private:
- CT_SelectorConflict();
- void ConstructL(int aIapId);
-
- void RunL();
- void DoCancel();
- TInt RunError(TInt /*aError*/);
-private:
- RSocketServ iSs;
- RSocket iSock;
- RSocket iRecvSock;
- RConnection iConn;
- TBuf8<256> iRecvBuf;
- TSockAddr iSenderAddr;
- TSockXfrLength iBytesRead;
- TBool iKeepalive;
- CT_IPSec_Load_Policy_Base *iPtrKeepAlive;
-public :
- static CT_SelectorConflict *iSelfPtr;
-};
-
-#endif// __TEF_IPSEC_SELECTORCONFLICT_H__
-
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma1.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_bbd1.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 8 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-ced -i z:\testdata\configs\Te_ethced_2483.xml ced.log
-ced -i z:\testdata\configs\Te_ethced_2483VPN.xml ced.log
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
-
-//copy .pol file from data folder to private folder
-//RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA1
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA1
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//!
-//! 1.Load bypass mode policy
-//! 2.Make connection with secure gateway and send some packets
-//! 3.Load another bypass policy
-//! 4.Load drop mode policy
-//!
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestUMAPolicy IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LOadUMAModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection LoadByPassModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadUMAModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA1
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma2.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_bbd2.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 08 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-ced -i z:\testdata\configs\Te_ethced_2483.xml ced.log
-ced -i z:\testdata\configs\Te_ethced_2483VPN.xml ced.log
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
-
-//copy .pol file from data folder to private folder
-//RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
-
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA2
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA2
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//!
-//! 1.Load bypass mode policy
-//! 2.Make connection with secure gateway and send some packets
-//! 3.Load drop mode policy
-//! 4.Load another bypass mode policy
-//!
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestUMAPolicy IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LOadUMAModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection LoadByPassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadUMAModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA2
-
-
-RUN_UTILS DeleteFile c:\Te_ethced_2483VPN.xml
-RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma3.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_bbd1.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 8 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-ced -i z:\testdata\configs\Te_ethced_2483.xml ced.log
-ced -i z:\testdata\configs\Te_ethced_2483VPN.xml ced.log
-
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
-
-//copy .pol file from data folder to private folder
-RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
-
-
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA3
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA3
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//!
-//! 1.Load bypass mode policy
-//! 2.Make connection with secure gateway and send some packets
-//! 3.Load another bypass policy
-//! 4.Load drop mode policy
-//!
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestUMAPolicy IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LOadUMAModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadByPassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA3
-
-
-RUN_UTILS DeleteFile c:\Te_ethced_2483VPN.xml
-RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma4.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_ddb1.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 08 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-ced -i z:\testdata\configs\Te_ethced_2483.xml ced.log
-ced -i z:\testdata\configs\Te_ethced_2483VPN_drop.xml ced.log
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pin c:\private\101f7993\te_2483_drop.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pin
-
-//copy .pol file from data folder to private folder
-RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pol c:\private\101f7993\te_2483_drop.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pol
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA4
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA4
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//!
-//! 1.Load drop mode policy
-//! 2.Make connection with secure gateway and send some packets
-//! 3.Load another drop mode policy
-//! 4.Load bypass mode policy
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestUMAPolicy IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LoadByPassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection LOadUMAModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadUMAModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA4
-
-RUN_UTILS DeleteFile c:\Te_ethced_2483VPN_drop.xml
-RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma5.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_ddb2.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 08 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-ced -i z:\testdata\configs\Te_ethced_2483.xml ced.log
-ced -i z:\testdata\configs\Te_ethced_2483VPN_drop.xml ced.log
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pin c:\private\101f7993\te_2483_drop.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pin
-
-//copy .pol file from data folder to private folder
-RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pol c:\private\101f7993\te_2483_drop.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pol
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA5
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA5
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//! 1.Load drop mode policy
-//! 2.Make connection with secure gateway and send some packets
-//! 3.Load bypass mode policy
-//! 4.Load another drop mode policy
-//!
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestUMAPolicy IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadByPassModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LOadUMAModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA5
-
-RUN_UTILS DeleteFile c:\Te_ethced_2483VPN_drop.xml
-RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma6.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_ddb3.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 08 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-ced -i z:\testdata\configs\Te_ethced_2483.xml ced.log
-ced -i z:\testdata\configs\Te_ethced_2483VPN_drop.xml ced.log
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pin c:\private\101f7993\te_2483_drop.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pin
-
-//copy .pol file from data folder to private folder
-RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pol c:\private\101f7993\te_2483_drop.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pol
-
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA6
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA6
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//!
-//! 1.Load bypass mode policy
-//! 2.Load drop mode policy
-//! 3.Make connection with secure gateway and send some packets
-//! 4.Load another drop mode policy
-//!
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestUMAPolicy IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LoadByPassModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection LOadUMAModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadUMAModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA6
-
-RUN_UTILS DeleteFile c:\Te_ethced_2483VPN_drop.xml
-RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd1.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_bbd1.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 8 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN.xml c:\Te_ethced_2483VPN.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
-
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
-
-//copy .pol file from data folder to private folder
-RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
-
-//run batch file to ping the linux machine. Pol file is change, so need ceding again.
-RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
-
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD1
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD1
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//!
-//! 1.Load bypass mode policy
-//! 2.Make connection with secure gateway and send some packets
-//! 3.Load another bypass policy
-//! 4.Load drop mode policy
-//!
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestByPassPolicy IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LoadBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection LoadNewBypassModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadNewBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD1
-
-//!RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-
-
-RUN_UTILS DeleteFile c:\Te_ethced_2483VPN.xml
-RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd2.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_bbd2.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 08 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN.xml c:\Te_ethced_2483VPN.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
-
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
-
-//copy .pol file from data folder to private folder
-//RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
-
-//run batch file to ping the linux machine. Pol file is change, so need ceding again.
-RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD2
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD2
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//!
-//! 1.Load bypass mode policy
-//! 2.Make connection with secure gateway and send some packets
-//! 3.Load drop mode policy
-//! 4.Load another bypass mode policy
-//!
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestByPassPolicy IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LoadBypassModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection LoadNewBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadNewBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD2
-
-
-RUN_UTILS DeleteFile c:\Te_ethced_2483VPN.xml
-RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd3.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_bbd1.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 8 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN.xml c:\Te_ethced_2483VPN.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
-
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
-
-//copy .pol file from data folder to private folder
-RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
-
-//run batch file to ping the linux machine. Pol file is change, so need ceding again.
-RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
-
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD3
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD3
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//!
-//! 1.Load bypass mode policy
-//! 2.Make connection with secure gateway and send some packets
-//! 3.Load another bypass policy
-//! 4.Load drop mode policy
-//!
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestByPassPolicy IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadBypassModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadNewBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD3
-
-
-RUN_UTILS DeleteFile c:\Te_ethced_2483VPN.xml
-RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd1.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_ddb1.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 08 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN_drop.xml c:\Te_ethced_2483VPN_drop.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN_drop.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN_drop.xml
-
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pin c:\private\101f7993\te_2483_drop.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pin
-
-//copy .pol file from data folder to private folder
-RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pol c:\private\101f7993\te_2483_drop.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pol
-
-
-//run batch file to ping the linux machine. Pol file is change, so need ceding again.
-//RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-//RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN_drop.xml
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD1
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD1
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//!
-//! 1.Load drop mode policy
-//! 2.Make connection with secure gateway and send some packets
-//! 3.Load another drop mode policy
-//! 4.Load bypass mode policy
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestDropPolicy IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection LoadNewDropModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadNewDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD1
-
-RUN_UTILS DeleteFile c:\Te_ethced_2483VPN_drop.xml
-RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd2.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_ddb2.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 08 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN_drop.xml c:\Te_ethced_2483VPN_drop.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN_drop.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN_drop.xml
-
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pin c:\private\101f7993\te_2483_drop.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pin
-
-//copy .pol file from data folder to private folder
-RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pol c:\private\101f7993\te_2483_drop.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pol
-
-
-//run batch file to ping the linux machine. Pol file is change, so need ceding again.
-//RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-//RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN_drop.xml
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD2
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD2
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//! 1.Load drop mode policy
-//! 2.Make connection with secure gateway and send some packets
-//! 3.Load bypass mode policy
-//! 4.Load another drop mode policy
-//!
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestDropPolicy IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection LoadNewDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadNewDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD2
-
-RUN_UTILS DeleteFile c:\Te_ethced_2483VPN_drop.xml
-RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd3.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_ddb3.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 08 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN_drop.xml c:\Te_ethced_2483VPN_drop.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN_drop.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN_drop.xml
-
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pin c:\private\101f7993\te_2483_drop.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pin
-
-//copy .pol file from data folder to private folder
-RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pol c:\private\101f7993\te_2483_drop.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pol
-
-
-//run batch file to ping the linux machine. Pol file is change, so need ceding again.
-RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN_drop.xml
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD3
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD3
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//!
-//! 1.Load bypass mode policy
-//! 2.Load drop mode policy
-//! 3.Make connection with secure gateway and send some packets
-//! 4.Load another drop mode policy
-//!
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestDropPolicy IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LoadBypassModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND !Error=-5146 IKE-Policy-TestWrapperSection LoadNewDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD3
-
-RUN_UTILS DeleteFile c:\Te_ethced_2483VPN_drop.xml
-RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_common.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-//
-// 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:
-//
-
-
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-PRINT IPSec_Selector_Conflict TEF3.0 tests
-
-RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict_bbd1.script
-RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict_bbd2.script
-RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict_bbd3.script
-RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict_bdd1.script
-RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict_bdd2.script
-RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict_bdd3.script
-RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict-uma1.script
-RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict-uma2.script
-RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict-uma3.script
-RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict-uma4.script
-RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict-uma5.script
-RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict-uma6.script
-
-
-PRINT Completed_tef3_te_IPSec_Selector_Conflict
-
-
-
-PRINT Completed_tef3_t_ipsec
-
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_coverage.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////
-//! @file ns-ipsec-ike-selectorconflict_bbd1.script
-//! @SYMScriptAuthor suresh
-//! @SYMTestSuiteName te_ipsec_selector_conflict
-//! @SYMScriptCreationDate thursday july 8 12:23:00 IST 2010
-/////////////////////////////////////////////////////////////////
-
-PRINT Run test case(s) for suite te_ipsec_selector_conflict
-
-// ToDo: Remember to load the relevant suite before starting any test case(s)
-LOAD_SUITE te_ipsec_selector_conflict -SharedData
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-
-RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN.xml c:\Te_ethced_2483VPN.xml
-RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
-
-
-//Create private folder
-RUN_UTILS MkDir c:\private\101f7993\
-
-//copy .pin file from data folder to private folder - one time job
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
-
-//copy .pol file from data folder to private folder
-RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
-RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
-RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
-
-//run batch file to ping the linux machine. Pol file is change, so need ceding again.
-RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
-
-
-START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD1
-//! @SYMTestCaseID NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD1
-//! @SYMCreationDate 08-07-2010
-//! @SYMAuthor suresh babu k
-//! @SYMTestCaseDesc IPSec SELECTOR CONFLICT DURING POLICY LOADING
-//!
-//! DUT should act as the Initiator for Phase 1.
-//!
-//!
-//! 1.Load bypass mode policy
-//! 2.Make connection with secure gateway and send some packets
-//! 3.Load another bypass policy
-//! 4.Load drop mode policy
-//!
-//!
-//! DH Group - 2
-//!
-//! Phase 2
-//! Security Protocol - ESP
-//! Encapsulation Mode - Tunnel
-//! Encryption Algorithm - AES with 128-bit keys in CBC mode
-//! Authentication Algorithm - AES-XCBC-MAC-96
-//! @SYMREQ REQ10662
-
-
- START_TEST_BLOCK 100 te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
- CREATE_OBJECT IPSecTestCoverage IKE-Policy-TestWrapperSection
- COMMAND IKE-Policy-TestWrapperSection New
- COMMAND IKE-Policy-TestWrapperSection LoadBypassModePolicy Value1ParamSection COMMAND
- COMMAND IKE-Policy-TestWrapperSection LoadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadBypassModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection UnloadDropModePolicy Value1ParamSection
- COMMAND IKE-Policy-TestWrapperSection Close Value1ParamSection
- END_TEST_BLOCK
-
-END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD1
-
-//!RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
-
-
-RUN_UTILS DeleteFile c:\Te_ethced_2483VPN.xml
-RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ikev1test-ops.ini Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-
-[IKE-Policy-TestWrapperSection]
-name = obj0
-object_value = 001
-
-
-[Value1ParamSection]
-#port 7000 is used by net cat
-#port = 7000
-port = 8000
-iapid = 12
-
-#destination and local ip address
-#destaddr = 192.168.1.1
-#localaddr = 192.168.1.2
-
-localaddr = 10.225.208.102
-destaddr = 10.225.208.183
-
-#for testing configuring nat timeout value
-IPSecNATTimeOutVal = 10
-IPSecDPDTimeOutVal = 0
-
-
-#for testing configuring dpd timeout value
-#current NAT time out value is 10 sec and dpd time out is 0 . now increase NAT time out to 30 sec
-#and dpd time out to 21 sec that is greater than default NAT time out
-#now dpd event should reach with in 25 sec.
-
-IPSecNATTimeOutVal1 = 30
-IPSecDPDTimeOutVal1 = 21
-
-
-[EchoClientSection]
-
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_coverage_test.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,526 +0,0 @@
-/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-** @File :- te_loadpolicy_bbd.cpp Implements loading the policy
-*/
-
-
-/**
- * @file ts_ipsec_polapi.cpp Implements main test code for IPsec
- */
-
-#include "te_coverage_test.h"
-#include "te_ipsecconst.h"
-#include "te_selectorconflict.h"
-#include <ES_SOCK.H>
-#include "lib_pfkey.h"
-#include "pfkey_ext.h"
-#include "pfkey_send.h"
-#include <commdbconnpref.h>
-#include <ipsecpolapi.h>
-
-#if defined(SYMBIAN_CRYPTO)
-#include <cryptostrength.h>
-#else
-#include <cryptalg.h>
-#endif
-
-_LIT8( KMyPolicy,
-"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
-IpSec Policy LOADING\r\n\
-[POLICY]\r\n\
-sa trans_1 = {\r\n\
-esp\r\n\
-encrypt_alg 12\r\n\
-src_specific\r\n\
-}\r\n\
-outbound remote 10.225.208.183 255.255.255.255 protocol 17 = { trans_1(10.225.208.183) }\r\n\
-inbound local 10.225.208.102 255.255.255.255 protocol 17 = { trans_1(10.225.208.183) }\r\n\
-inbound = {}\r\n\
-outbound = {}\r\n" );
-
-
-_LIT8( KMyPolicy1,
-"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
-IpSec Policy LOADING\r\n\
-[POLICY]\r\n\
-sa trans_2 = {\r\n\
-esp\r\n\
-encrypt_alg 12\r\n\
-src_specific\r\n\
-}\r\n\
-outbound remote 10.225.208.49 255.255.255.255 protocol 17 = { trans_2(10.225.208.49) }\r\n\
-inbound local 10.225.208.155 255.255.255.255 protocol 17 = { trans_2(10.225.208.49) }\r\n" );
-
-_LIT8( KMyPolicy2,
-"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
-IpSec Policy LOADING\r\n\
-[POLICY]\r\n\
-sa trans_3 = {\r\n\
-esp\r\n\
-encrypt_alg 12\r\n\
-src_specific\r\n\
-}\r\n\
-outbound remote 192.168.1.1 255.255.255.255 protocol 17 = { trans_3() }\r\n\
-inbound local 192.168.1.2 255.255.255.255 protocol 17 = { trans_3() }\r\n\
-inbound = {}\r\n\
-outbound = {}\r\n" );
-
-
-/**
-Purpose: Constructor of CT_IPSecIKEV2TestWrapper class
-@internalComponent
-*/
-CT_CoverageTest::CT_CoverageTest()
- {
- }
-
-/**
-Purpose: Destructor of CT_CoverageTest class
-@internalComponent
-*/
-CT_CoverageTest::~CT_CoverageTest()
- {
- delete iObject;
- iObject = NULL;
- }
-
-/**
-Purpose: Command fuction of CT_CoverageTest class
-@internalComponent
-*/
-CT_CoverageTest* CT_CoverageTest::NewL()
- {
- CT_CoverageTest* ret = new (ELeave) CT_CoverageTest();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-
-/**
-Purpose: Command fuction for a wrapper class
-@internalComponent
-*/
-void CT_CoverageTest::ConstructL()
- {
- TInt errfound;
-
- iObject = new (ELeave) TInt;
- errfound = iDrpPolicyServer.Connect();
- if( errfound != KErrNone )
- {
- ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
- SetBlockResult(EFail);
- return;
- }
- errfound=iBypsPolicyServer.Connect();
- if( errfound != KErrNone )
- {
- ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
- SetBlockResult(EFail);
- return;
- }
-
- iMyZoneInfoSet.iSelectorZone.iScope = KScopeNetwork;
- iMyZoneInfoSet.iSelectorZone.iId = 8;
- iMyZoneInfoSet.iEndPointZone.iScope = KScopeNetwork;
- iMyZoneInfoSet.iEndPointZone.iId = 7;
-
- }
-
-
-/**
-Purpose: Command fuction for a wrapper class
-@internalComponent
-*/
-TBool CT_CoverageTest::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex)
- {
- TBool ret = ETrue;
-
- // Print out the parameters for debugging
- INFO_PRINTF2( _L("<font size=2 color=990000><b>aCommand = %S</b></font>"), &aCommand );
- INFO_PRINTF2( _L("aSection = %S"), &aSection );
- INFO_PRINTF2( _L("aAsyncErrorIndex = %D"), aAsyncErrorIndex );
-
- if(KNewCMD() == aCommand)
- {
- DoCmdNewL(aSection);
- }
- else if(KTestLoadBypassPolicy() == aCommand)
- {
- DoLoadBypassModePolicy(aSection);
- }
- else if (KTestLoadDropModePolicy() == aCommand)
- {
- DoLoadDropModePolicy(aSection);
- }
- else if (KLoadNewBypassPolicy() == aCommand)
- {
- DoLoadNewBypassModePolicy(aSection);
- }
- else if (KUnloadDropPolicy() == aCommand)
- {
- DoUnloadDropPolicy(aSection);
- }
- else if (KUnloadBypassPolicy() == aCommand)
- {
- DoUnloadBypassPolicy(aSection);
- }
- else if (KUnloadNewBypassPolicy() == aCommand)
- {
- DoUnloadNewBypassPolicy(aSection);
- }
- else if (KCloseConnection() == aCommand)
- {
- DoCmdClose(aSection);
- }
- else
- {
- ret = EFalse;
- }
-
- return ret;
- }
-
-
-/**
-Purpose: To create a new object of the CTEFTest type through the API.
-
-Ini file options:
- iniData - The data from the ini file at the section provided.
-
-@internalComponent
-@param aSection Current ini file command section
-*/
-void CT_CoverageTest::DoCmdNewL(const TDesC& aSection)
- {
- TInt objectValue = 0;
- TInt iapid =0;
- if (!GetIntFromConfig(aSection, KObjectValue(), objectValue))
- {
- ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
- SetBlockResult(EFail);
- }
- else
- {
- *iObject = objectValue;
-
- if(!GetIntFromConfig(aSection, KIapid(), iapid))
- {
- ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
- SetBlockResult(EFail);
- }
- else
- {
- }
- }
- }
-
-/**
- * Bypass policy loading for ONB scripts
- */
-void CT_CoverageTest::DoLoadBypassModePolicy(const TDesC& /*aSection*/)
- {
-
- TInt errfound=iBypsPolicyServer.Connect();
- if( errfound != KErrNone )
- {
- ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
- SetBlockResult(EFail);
- return;
- }
- /***
- * this code is to check the UMA setopt function
- * if we call with 0 then it is considered as UMA policy
- */
- TInt sur = 0x2002E241;
- _LIT8(KFormatStr,"%D");
- TBuf8<50> sidbuf;
- sidbuf.Format(KFormatStr,sur);
- TLex8 lex(sidbuf);
- TInt intval;
- TInt err = lex.Val(intval);
-
- //this test case is to cove all the conditions.
- //in this case all the parmeters are proper
- TInt error = iBypsPolicyServer.SetOpt(KOptionNameSid, KOptionLevelDefault, sidbuf);
- if ( KErrNone != error )
- {
- ERR_PRINTF2(_L("DoLoadUMAPolicy->LoadPolicy ERROR in setOpt to the policy server %d"), error);
- SetError(error);
- SetBlockResult(EFail);
- return ;
- }
-
-
- //in this case second parm is correct
- error = iBypsPolicyServer.SetOpt(0 , KOptionLevelDefault, sidbuf);
- if ( KErrArgument != error )
- {
- ERR_PRINTF2(_L("DoLoadUMAPolicy->LoadPolicy ERROR in setOpt to the policy server %d"), error);
- SetError(error);
- SetBlockResult(EFail);
- return ;
- }
-
- //in this case second parm is correct
- error = iBypsPolicyServer.SetOpt(KOptionNameSid , 0, sidbuf);
- if ( KErrArgument != error )
- {
- ERR_PRINTF2(_L("DoLoadUMAPolicy->LoadPolicy ERROR in setOpt to the policy server %d"), error);
- SetError(error);
- SetBlockResult(EFail);
- return ;
- }
-
- RSocketServ pSocketServ;
- /** Handle to SADB socket */
- RSADB pSADB;
- err = pSocketServ.Connect();
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to connect RSocketServ with error: %d"), err);
- SetBlockResult(EFail);
- }
- err = pSADB.Open(pSocketServ);
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to open RSADB with error: %d"), err);
- SetBlockResult(EFail);
- }
-
- HBufC8 *policyData = HBufC8::NewLC( KMyPolicy().Length() + 256); // Allow size for IP spec.
- TPtr8 policyDataPtr(policyData->Des());
- policyDataPtr.Append(KMyPolicy);
- ///
- CMDBSession *cmdbSession = CMDBSession::NewL(CMDBSession::LatestVersion());
- CleanupStack::PushL(cmdbSession);
- CCDIAPRecord *iapRecord = (CCDIAPRecord*)CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord);
- CleanupStack::PushL(iapRecord);
- iapRecord->SetRecordId(12);
- iapRecord->LoadL(*cmdbSession);
- iapRecord->iAppSid = 0x2002E241;
- iapRecord->ModifyL(*cmdbSession);
- CleanupStack::PopAndDestroy(iapRecord);
- CleanupStack::PopAndDestroy(cmdbSession);
-
- //
- TRequestStatus status;
- iBypsPolicyServer.LoadPolicy( *policyData, iBypsPolicyHandle, status, iMyZoneInfoSet);
- User::WaitForRequest(status);
- TInt err1 = status.Int();
- if(err1 == KErrNone)
- {
- iBypsPolicyServer.ActivatePolicy(iBypsPolicyHandle(), status );
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- SetBlockResult(EPass);
- }
- else
- {
- SetError(status.Int());
- ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy failed with error: %d"),err1);
- SetBlockResult(EFail);
- }
- CleanupStack::PopAndDestroy(policyData);
- pSADB.Close();
- pSocketServ.Close();
- }
-
-/*
-*Execute the test for closing the connection.
-*/
-void CT_CoverageTest::DoLoadDropModePolicy(const TDesC& /*aSection*/)
- {
- RSocketServ pSocketServ;
- /** Handle to SADB socket */
- RSADB pSADB;
- TInt err;
-
- err = pSocketServ.Connect();
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to connect RSocketServ with error: %d"), err);
- SetBlockResult(EFail);
- }
- err = pSADB.Open(pSocketServ);
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to open RSADB with error: %d"), err);
- SetBlockResult(EFail);
- }
-
- HBufC8 *policyData = HBufC8::NewLC( KMyPolicy1().Length() + 256); // Allow size for IP spec.
- TPtr8 policyDataPtr(policyData->Des());
- policyDataPtr.Append(KMyPolicy1);
- ///
- CMDBSession *cmdbSession = CMDBSession::NewL(CMDBSession::LatestVersion());
- CleanupStack::PushL(cmdbSession);
- CCDIAPRecord *iapRecord = (CCDIAPRecord*)CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord);
- CleanupStack::PushL(iapRecord);
- iapRecord->SetRecordId(12);
- iapRecord->LoadL(*cmdbSession);
- iapRecord->iAppSid = 0;
- iapRecord->ModifyL(*cmdbSession);
- CleanupStack::PopAndDestroy(iapRecord);
- CleanupStack::PopAndDestroy(cmdbSession);
- ///
- //storing the SID information to the policy server which
- //is used to identify the UMA policy in ipsec policy manager handler.
- TInt error=0 ;
- //pPolicyServer.SetOpt(KOptionNameSid, KOptionLevelDefault, sidbuf);
- //ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy ERROR in setOpt to the policy server %s"), sidBuffer);
- RDebug::Printf("\n see the value \n");
- if ( KErrNone != error )
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy ERROR in setOpt to the policy server %d"), error);
- }
-
- TRequestStatus status;
- iDrpPolicyServer.LoadPolicy( *policyData, iDrpPolicyHandle, status, iMyZoneInfoSet);
- User::WaitForRequest(status);
- TInt err1 = status.Int();
- if(err1 == KErrNone)
- {
- iDrpPolicyServer.ActivatePolicy(iDrpPolicyHandle(), status );
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- SetBlockResult(EPass);
- }
- else
- {
- SetError(status.Int());
- ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy failed with error: %d"),err1);
- SetBlockResult(EFail);
- }
- CleanupStack::PopAndDestroy(policyData);
- pSADB.Close();
- pSocketServ.Close();
- }
-
-
-void CT_CoverageTest::DoLoadNewBypassModePolicy(const TDesC& /*aSection*/)
- {
- RSocketServ pSocketServ;
- /** Handle to SADB socket */
- RSADB pSADB;
- TInt err;
-
- err = pSocketServ.Connect();
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadNewBypassModePolicy():- Failed to connect RSocketServ with error: %d"), err);
- SetBlockResult(EFail);
- }
- err = pSADB.Open(pSocketServ);
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadNewBypassModePolicy():- Failed to open RSADB with error: %d"), err);
- SetBlockResult(EFail);
- }
-
- HBufC8 *policyData = HBufC8::NewLC( KMyPolicy2().Length() + 256); // Allow size for IP spec.
- TPtr8 policyDataPtr(policyData->Des());
- policyDataPtr.Append(KMyPolicy2);
-
-
- TRequestStatus status;
- iBypsPolicyServer.LoadPolicy( *policyData, iNewBypsPolicyHandle, status, iMyZoneInfoSet);
- User::WaitForRequest(status);
-
- err = status.Int();
- if( err == KErrNone)
- {
- iBypsPolicyServer.ActivatePolicy( iNewBypsPolicyHandle(), status );
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- SetBlockResult(EPass);
- }
- else
- {
- SetError(status.Int());
- ERR_PRINTF2(_L("DoLoadNewBypassPolicy():- LoadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- CleanupStack::PopAndDestroy(policyData);
- pSADB.Close();
- pSocketServ.Close();
- }
-
-
-/*
-*Execute the test to unload the policy.
-*/
-void CT_CoverageTest::DoUnloadDropPolicy(const TDesC& /*aSection*/)
- {
- TRequestStatus status;
- iDrpPolicyServer.UnloadPolicy(iDrpPolicyHandle(),status);
- User::WaitForRequest(status);
- TInt err = status.Int();
- if( err != KErrNone)
- {
- SetError(err);
- ERR_PRINTF2(_L("DoUnloadDropPolicy():- UnloadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- }
-
-/*
-*Execute the test to unload the policy.
-*/
-void CT_CoverageTest::DoUnloadNewBypassPolicy(const TDesC& /*aSection*/)
- {
- TRequestStatus status;
- iBypsPolicyServer.UnloadPolicy(iNewBypsPolicyHandle(),status);
- User::WaitForRequest(status);
- TInt err = status.Int();
- if( err != KErrNone)
- {
- SetError(err);
- ERR_PRINTF2(_L("DoUnloadNewBypassPolicy():- UnloadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- }
-
-/*
-*Execute the test to unload the policy.
-*/
-void CT_CoverageTest::DoUnloadBypassPolicy(const TDesC& /*aSection*/)
- {
- TRequestStatus status;
- iBypsPolicyServer.UnloadPolicy(iBypsPolicyHandle(),status);
- User::WaitForRequest(status);
- TInt err = status.Int();
- if( err != KErrNone)
- {
- SetError(err);
- ERR_PRINTF2(_L("DoUnloadBypassPolicy():- UnloadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- }
-
-
-/*
-*Execute the test for closing the connection.
-*/
-void CT_CoverageTest::DoCmdClose(const TDesC& /*aSection*/)
- {
- SetBlockResult(EPass);
- }
-
-
-
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_ipsectestserver.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-//local includes here
-#include "te_ipsectestserver.h"
-
-//system includes here
-
-//implementation for the classes
-CT_LoadPolicyTestServer* CT_LoadPolicyTestServer::NewL()
- {
- CT_LoadPolicyTestServer* server = new (ELeave) CT_LoadPolicyTestServer();
- CleanupStack::PushL(server);
- server->ConstructL();
- CleanupStack::Pop(server);
- return server;
- }
-
-LOCAL_C void MainL()
- {
-#if (defined __DATA_CAGING__)
- RProcess().DataCaging(RProcess::EDataCagingOn);
- RProcess().SecureApi(RProcess::ESecureApiOn);
-#endif
- CActiveScheduler* sched=NULL;
- sched=new(ELeave) CActiveScheduler;
- CActiveScheduler::Install(sched);
- CT_LoadPolicyTestServer* server = NULL;
- TRAPD(err, server = CT_LoadPolicyTestServer::NewL());
- if(!err)
- {
- RProcess::Rendezvous(KErrNone);
- sched->Start();
- }
- delete server;
- delete sched;
- }
-
-GLDEF_C TInt E32Main()
- {
- CTrapCleanup* cleanup = CTrapCleanup::New();
- if(cleanup == NULL)
- {
- return KErrNoMemory;
- }
- TRAP_IGNORE(MainL());
- delete cleanup;
- return KErrNone;
- }
-
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_bbd.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,466 +0,0 @@
-/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-** @File :- te_loadpolicy_bbd.cpp Implements loading the policy
-*/
-
-
-/**
- * @file ts_ipsec_polapi.cpp Implements main test code for IPsec
- */
-
-#include "te_loadpolicy_bbd.h"
-#include "te_ipsecconst.h"
-#include "te_selectorconflict.h"
-#include <ES_SOCK.H>
-#include "lib_pfkey.h"
-#include "pfkey_ext.h"
-#include "pfkey_send.h"
-#include <commdbconnpref.h>
-
-
-#if defined(SYMBIAN_CRYPTO)
-#include <cryptostrength.h>
-#else
-#include <cryptalg.h>
-#endif
-
-_LIT8( KMyPolicy,
-"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
-IpSec Policy LOADING\r\n\
-[POLICY]\r\n\
-sa trans_1 = {\r\n\
-esp\r\n\
-encrypt_alg 12\r\n\
-src_specific\r\n\
-}\r\n\
-outbound remote 10.225.208.183 255.255.255.255 protocol 17 = { trans_1(10.225.208.183) }\r\n\
-inbound local 10.225.208.102 255.255.255.255 protocol 17 = { trans_1(10.225.208.183) }\r\n\
-inbound = {}\r\n\
-outbound = {}\r\n" );
-
-
-_LIT8( KMyPolicy1,
-"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
-IpSec Policy LOADING\r\n\
-[POLICY]\r\n\
-sa trans_2 = {\r\n\
-esp\r\n\
-encrypt_alg 12\r\n\
-src_specific\r\n\
-}\r\n\
-outbound remote 10.225.208.49 255.255.255.255 protocol 17 = { trans_2(10.225.208.49) }\r\n\
-inbound local 10.225.208.155 255.255.255.255 protocol 17 = { trans_2(10.225.208.49) }\r\n" );
-
-_LIT8( KMyPolicy2,
-"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
-IpSec Policy LOADING\r\n\
-[POLICY]\r\n\
-sa trans_3 = {\r\n\
-esp\r\n\
-encrypt_alg 12\r\n\
-src_specific\r\n\
-}\r\n\
-outbound remote 192.168.1.1 255.255.255.255 protocol 17 = { trans_3() }\r\n\
-inbound local 192.168.1.2 255.255.255.255 protocol 17 = { trans_3() }\r\n\
-inbound = {}\r\n\
-outbound = {}\r\n" );
-
-
-/**
-Purpose: Constructor of CT_IPSecIKEV2TestWrapper class
-@internalComponent
-*/
-CT_LoadPolicyBBD::CT_LoadPolicyBBD()
- {
- }
-
-/**
-Purpose: Destructor of CT_LoadPolicyBBD class
-@internalComponent
-*/
-CT_LoadPolicyBBD::~CT_LoadPolicyBBD()
- {
- delete iObject;
- iObject = NULL;
- }
-
-/**
-Purpose: Command fuction of CT_LoadPolicyBBD class
-@internalComponent
-*/
-CT_LoadPolicyBBD* CT_LoadPolicyBBD::NewL()
- {
- CT_LoadPolicyBBD* ret = new (ELeave) CT_LoadPolicyBBD();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-
-/**
-Purpose: Command fuction for a wrapper class
-@internalComponent
-*/
-void CT_LoadPolicyBBD::ConstructL()
- {
- TInt errfound;
-
- iObject = new (ELeave) TInt;
- errfound = iDrpPolicyServer.Connect();
- if( errfound != KErrNone )
- {
- ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
- SetBlockResult(EFail);
- return;
- }
- errfound=iBypsPolicyServer.Connect();
- if( errfound != KErrNone )
- {
- ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
- SetBlockResult(EFail);
- return;
- }
-
- iMyZoneInfoSet.iSelectorZone.iScope = KScopeNetwork;
- iMyZoneInfoSet.iSelectorZone.iId = 8;
- iMyZoneInfoSet.iEndPointZone.iScope = KScopeNetwork;
- iMyZoneInfoSet.iEndPointZone.iId = 7;
-
- }
-
-
-/**
-Purpose: Command fuction for a wrapper class
-@internalComponent
-*/
-TBool CT_LoadPolicyBBD::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex)
- {
- TBool ret = ETrue;
-
- // Print out the parameters for debugging
- INFO_PRINTF2( _L("<font size=2 color=990000><b>aCommand = %S</b></font>"), &aCommand );
- INFO_PRINTF2( _L("aSection = %S"), &aSection );
- INFO_PRINTF2( _L("aAsyncErrorIndex = %D"), aAsyncErrorIndex );
-
- if(KNewCMD() == aCommand)
- {
- DoCmdNewL(aSection);
- }
- else if(KTestLoadBypassPolicy() == aCommand)
- {
- DoLoadBypassModePolicy(aSection);
- }
- else if (KTestLoadDropModePolicy() == aCommand)
- {
- DoLoadDropModePolicy(aSection);
- }
- else if (KLoadNewBypassPolicy() == aCommand)
- {
- DoLoadNewBypassModePolicy(aSection);
- }
- else if (KUnloadDropPolicy() == aCommand)
- {
- DoUnloadDropPolicy(aSection);
- }
- else if (KUnloadBypassPolicy() == aCommand)
- {
- DoUnloadBypassPolicy(aSection);
- }
- else if (KUnloadNewBypassPolicy() == aCommand)
- {
- DoUnloadNewBypassPolicy(aSection);
- }
- else if (KCloseConnection() == aCommand)
- {
- DoCmdClose(aSection);
- }
- else
- {
- ret = EFalse;
- }
-
- return ret;
- }
-
-
-/**
-Purpose: To create a new object of the CTEFTest type through the API.
-
-Ini file options:
- iniData - The data from the ini file at the section provided.
-
-@internalComponent
-@param aSection Current ini file command section
-*/
-void CT_LoadPolicyBBD::DoCmdNewL(const TDesC& aSection)
- {
- TInt objectValue = 0;
- TInt iapid =0;
- if (!GetIntFromConfig(aSection, KObjectValue(), objectValue))
- {
- ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
- SetBlockResult(EFail);
- }
- else
- {
- *iObject = objectValue;
-
- if(!GetIntFromConfig(aSection, KIapid(), iapid))
- {
- ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
- SetBlockResult(EFail);
- }
- else
- {
- }
- }
- }
-
-/**
- * Bypass policy loading for ONB scripts
- */
-void CT_LoadPolicyBBD::DoLoadBypassModePolicy(const TDesC& /*aSection*/)
- {
- RSocketServ pSocketServ;
- /** Handle to SADB socket */
- RSADB pSADB;
- TInt err;
-
- err = pSocketServ.Connect();
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadBypassModePolicy():- Failed to connect RSocketServ with error: %d"), err);
- SetBlockResult(EFail);
- }
- err = pSADB.Open(pSocketServ);
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadBypassModePolicy():- Failed to open RSADB with error: %d"), err);
- SetBlockResult(EFail);
- }
-
-
- HBufC8 *policyData = HBufC8::NewLC( KMyPolicy().Length() + 256); // Allow size for IP spec.
- TPtr8 policyDataPtr(policyData->Des());
- policyDataPtr.Append(KMyPolicy);
-
- TRequestStatus status;
- iBypsPolicyServer.LoadPolicy( *policyData, iBypsPolicyHandle, status, iMyZoneInfoSet);
- User::WaitForRequest(status);
-
- err = status.Int();
- if( err == KErrNone)
- {
- iBypsPolicyServer.ActivatePolicy( iBypsPolicyHandle(), status );
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- SetBlockResult(EPass);
- }
- else
- {
- SetError(status.Int());
- ERR_PRINTF2(_L("DoLoadNewBypassPolicy():- LoadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- CleanupStack::PopAndDestroy(policyData);
- pSADB.Close();
- pSocketServ.Close();
- }
-
-/*
-*Execute the test for closing the connection.
-*/
-void CT_LoadPolicyBBD::DoLoadDropModePolicy(const TDesC& /*aSection*/)
- {
- RSocketServ pSocketServ;
- /** Handle to SADB socket */
- RSADB pSADB;
- TInt err;
-
- err = pSocketServ.Connect();
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to connect RSocketServ with error: %d"), err);
- SetBlockResult(EFail);
- }
- err = pSADB.Open(pSocketServ);
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to open RSADB with error: %d"), err);
- SetBlockResult(EFail);
- }
-
- HBufC8 *policyData = HBufC8::NewLC( KMyPolicy1().Length() + 256); // Allow size for IP spec.
- TPtr8 policyDataPtr(policyData->Des());
- policyDataPtr.Append(KMyPolicy1);
- /***
- * this code is to check the UMA setopt function
- *
- */
- TInt sur = 0x2002E241;
- _LIT8(KFormatStr,"%D");
- TBuf8<50> sidbuf;
- sidbuf.Format(KFormatStr,sur);
- TLex8 lex(sidbuf);
- TInt intval;
- err = lex.Val(intval);
-
- //storing the SID information to the policy server which
- //is used to identify the UMA policy in ipsec policy manager handler.
- TInt error=0 ;
- //pPolicyServer.SetOpt(KOptionNameSid, KOptionLevelDefault, sidbuf);
- //ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy ERROR in setOpt to the policy server %s"), sidBuffer);
- RDebug::Printf("\n see the value \n");
- if ( KErrNone != error )
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy ERROR in setOpt to the policy server %d"), error);
- }
-
- TRequestStatus status;
- iDrpPolicyServer.LoadPolicy( *policyData, iDrpPolicyHandle, status, iMyZoneInfoSet);
- User::WaitForRequest(status);
- TInt err1 = status.Int();
- if(err1 == KErrNone)
- {
- iDrpPolicyServer.ActivatePolicy(iDrpPolicyHandle(), status );
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- SetBlockResult(EPass);
- }
- else
- {
- SetError(status.Int());
- ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy failed with error: %d"),err1);
- SetBlockResult(EFail);
- }
- CleanupStack::PopAndDestroy(policyData);
- pSADB.Close();
- pSocketServ.Close();
- }
-
-
-void CT_LoadPolicyBBD::DoLoadNewBypassModePolicy(const TDesC& /*aSection*/)
- {
- RSocketServ pSocketServ;
- /** Handle to SADB socket */
- RSADB pSADB;
- TInt err;
-
- err = pSocketServ.Connect();
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadNewBypassModePolicy():- Failed to connect RSocketServ with error: %d"), err);
- SetBlockResult(EFail);
- }
- err = pSADB.Open(pSocketServ);
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadNewBypassModePolicy():- Failed to open RSADB with error: %d"), err);
- SetBlockResult(EFail);
- }
-
- HBufC8 *policyData = HBufC8::NewLC( KMyPolicy2().Length() + 256); // Allow size for IP spec.
- TPtr8 policyDataPtr(policyData->Des());
- policyDataPtr.Append(KMyPolicy2);
-
-
- TRequestStatus status;
- iBypsPolicyServer.LoadPolicy( *policyData, iNewBypsPolicyHandle, status, iMyZoneInfoSet);
- User::WaitForRequest(status);
-
- err = status.Int();
- if( err == KErrNone)
- {
- iBypsPolicyServer.ActivatePolicy( iNewBypsPolicyHandle(), status );
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- SetBlockResult(EPass);
- }
- else
- {
- SetError(status.Int());
- ERR_PRINTF2(_L("DoLoadNewBypassPolicy():- LoadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- CleanupStack::PopAndDestroy(policyData);
- pSADB.Close();
- pSocketServ.Close();
- }
-
-
-/*
-*Execute the test to unload the policy.
-*/
-void CT_LoadPolicyBBD::DoUnloadDropPolicy(const TDesC& /*aSection*/)
- {
- TRequestStatus status;
- iDrpPolicyServer.UnloadPolicy(iDrpPolicyHandle(),status);
- User::WaitForRequest(status);
- TInt err = status.Int();
- if( err != KErrNone)
- {
- SetError(err);
- ERR_PRINTF2(_L("DoUnloadDropPolicy():- UnloadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- }
-
-/*
-*Execute the test to unload the policy.
-*/
-void CT_LoadPolicyBBD::DoUnloadNewBypassPolicy(const TDesC& /*aSection*/)
- {
- TRequestStatus status;
- iBypsPolicyServer.UnloadPolicy(iNewBypsPolicyHandle(),status);
- User::WaitForRequest(status);
- TInt err = status.Int();
- if( err != KErrNone)
- {
- SetError(err);
- ERR_PRINTF2(_L("DoUnloadNewBypassPolicy():- UnloadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- }
-
-/*
-*Execute the test to unload the policy.
-*/
-void CT_LoadPolicyBBD::DoUnloadBypassPolicy(const TDesC& /*aSection*/)
- {
- TRequestStatus status;
- iBypsPolicyServer.UnloadPolicy(iBypsPolicyHandle(),status);
- User::WaitForRequest(status);
- TInt err = status.Int();
- if( err != KErrNone)
- {
- SetError(err);
- ERR_PRINTF2(_L("DoUnloadBypassPolicy():- UnloadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- }
-
-
-/*
-*Execute the test for closing the connection.
-*/
-void CT_LoadPolicyBBD::DoCmdClose(const TDesC& /*aSection*/)
- {
- SetBlockResult(EPass);
- }
-
-
-
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_bdd.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,442 +0,0 @@
-/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-/**
- * @file ts_ipsec_polapi.cpp Implements main test code for IPsec
- */
-
-#include "te_loadpolicy_bdd.h"
-#include "te_ipsecconst.h"
-#include "te_selectorconflict.h"
-#include "te_ipsecconst.h"
-#include <ES_SOCK.H>
-#include "lib_pfkey.h"
-#include "pfkey_ext.h"
-#include "pfkey_send.h"
-#include "ipsecpolapi.h"
-#include <commdbconnpref.h>
-
-
-#if defined(SYMBIAN_CRYPTO)
-#include <cryptostrength.h>
-#else
-#include <cryptalg.h>
-#endif
-
-
-_LIT8( KMyPolicy,
-"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
-IpSec Policy LOADING\r\n\
-[POLICY]\r\n\
-sa trans_1 = {\r\n\
-esp\r\n\
-encrypt_alg 12\r\n\
-src_specific\r\n\
-}\r\n\
-remote 10.225.208.183 255.255.255.255 = { trans_1(10.225.208.183) }\r\n" );
-
-
-_LIT8( KMyPolicy1,
-"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
-IpSec Policy LOADING\r\n\
-[POLICY]\r\n\
-sa trans_2 = {\r\n\
-esp\r\n\
-encrypt_alg 12\r\n\
-src_specific\r\n\
-}\r\n\
-outbound remote 10.225.208.99 255.255.255.0 protocol 17 = { trans_2(10.225.208.99) }\r\n\
-inbound local 10.225.208.155 255.255.255.0 protocol 17 = { trans_2(10.225.208.99) }\r\n\
-inbound = {}\r\n\
-outbound = {}\r\n" );
-
-_LIT8( KMyPolicy2,
-"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
-IpSec Policy LOADING\r\n\
-[POLICY]\r\n\
-sa trans_1 = {\r\n\
-esp\r\n\
-encrypt_alg 12\r\n\
-src_specific\r\n\
-}\r\n\
-remote 10.225.208.1 255.255.255.255 = { trans_1(10.225.208.1) }\r\n" );
-
-
-
-/**
-Purpose: Constructor of CT_IPSecIKEV2TestWrapper class
-@internalComponent
-*/
-CT_LoadPolicyBDD::CT_LoadPolicyBDD()
- {
- }
-
-
-/**
-Purpose: Destructor of CT_LoadPolicyBDD class
-@internalComponent
-*/
-CT_LoadPolicyBDD::~CT_LoadPolicyBDD()
- {
- delete iObject;
- iObject = NULL;
- }
-
-
-/**
-Purpose: Command fuction of CT_LoadPolicyBDD class
-@internalComponent
-*/
-CT_LoadPolicyBDD* CT_LoadPolicyBDD::NewL()
- {
- CT_LoadPolicyBDD* ret = new (ELeave) CT_LoadPolicyBDD();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-
-/**
-Purpose: Command fuction for a wrapper class
-@internalComponent
-*/
-void CT_LoadPolicyBDD::ConstructL()
- {
- TInt errfound;
-
- iObject = new (ELeave) TInt;
- errfound = iDrpPolicyServer.Connect();
- if( errfound != KErrNone )
- {
- ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
- SetBlockResult(EFail);
- return;
- }
- errfound=iBypsPolicyServer.Connect();
- if( errfound != KErrNone )
- {
- ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
- SetBlockResult(EFail);
- return;
- }
-
- iMyZoneInfoSet.iSelectorZone.iScope = KScopeNetwork;
- iMyZoneInfoSet.iSelectorZone.iId = 8;
- iMyZoneInfoSet.iEndPointZone.iScope = KScopeNetwork;
- iMyZoneInfoSet.iEndPointZone.iId = 7;
- }
-
-
-/**
-Purpose: Command fuction for a wrapper class
-@internalComponent
-*/
-TBool CT_LoadPolicyBDD::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex)
- {
- TBool ret = ETrue;
-
- // Print out the parameters for debugging
- INFO_PRINTF2( _L("<font size=2 color=990000><b>aCommand = %S</b></font>"), &aCommand );
- INFO_PRINTF2( _L("aSection = %S"), &aSection );
- INFO_PRINTF2( _L("aAsyncErrorIndex = %D"), aAsyncErrorIndex );
-
- if(KNewCMD() == aCommand)
- {
- DoCmdNewL(aSection);
- }
- else if(KTestLoadDropPolicy() == aCommand)
- {
- DoLoadDropModePolicy(aSection);
- }
- else if (KLoadBypasspolicy()== aCommand)
- {
- DoLoadBypassModePolicy(aSection);
- }
- else if (KLoadNewDroppolicy()== aCommand)
- {
- DoLoadNewDropModePolicy(aSection);
- }
- else if (KUnloadDropPolicy() == aCommand)
- {
- DoUnloadDropPolicy(aSection);
- }
- else if (KUnloadBypassPolicy() == aCommand)
- {
- DoUnloadBypassPolicy(aSection);
- }
- else if (KUnloadNewDropPolicy() == aCommand)
- {
- DoUnloadNewDropModePolicy(aSection);
- }
- else if (KCloseConnection() == aCommand)
- {
- DoCmdClose(aSection);
- }
- else
- {
- ret = EFalse;
- }
-
- return ret;
- }
-
-
-/**
-Purpose: To create a new object of the CTEFTest type through the API.
-
-Ini file options:
- iniData - The data from the ini file at the section provided.
-
-@internalComponent
-@param aSection Current ini file command section
-*/
-void CT_LoadPolicyBDD::DoCmdNewL(const TDesC& aSection)
- {
- TInt objectValue = 0;
- TInt iapid =0;
- if (!GetIntFromConfig(aSection, KObjectValue(), objectValue))
- {
- ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
- SetBlockResult(EFail);
- }
- else
- {
- *iObject = objectValue;
-
- if(!GetIntFromConfig(aSection, KIapid(), iapid))
- {
- ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
- SetBlockResult(EFail);
- }
- else
- {
-
- }
- }
- }
-
-
-void CT_LoadPolicyBDD::DoLoadDropModePolicy(const TDesC& /*aSection*/)//this will load a drop mode policy
- {
- RSocketServ pSocketServ;
- /** Handle to SADB socket */
- RSADB pSADB;
- TInt err;
-
- err = pSocketServ.Connect();
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to connect RSocketServ with error: %d"), err);
- SetBlockResult(EFail);
- }
- err = pSADB.Open(pSocketServ);
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to open RSADB with error: %d"), err);
- SetBlockResult(EFail);
- }
- HBufC8 *policyData = HBufC8::NewLC( KMyPolicy().Length() + 256); // Allow size for IP spec.
- TPtr8 policyDataPtr(policyData->Des());
- policyDataPtr.Append(KMyPolicy);
-
- TRequestStatus status;
- iDrpPolicyServer.LoadPolicy( *policyData, iDrpPolicyHandle, status, iMyZoneInfoSet);
- User::WaitForRequest(status);
-
- err = status.Int();
- if( err == KErrNone)
- {
- iDrpPolicyServer.ActivatePolicy( iDrpPolicyHandle(), status );
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- SetBlockResult(EPass);
- }
- else
- {
- SetError(status.Int());
- ERR_PRINTF2(_L("DoLoadDropModePolicy():- LoadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- CleanupStack::PopAndDestroy(policyData);
- pSADB.Close();
- pSocketServ.Close();
-
- }
-
-void CT_LoadPolicyBDD::DoLoadBypassModePolicy(const TDesC& /*aSection*/)
- {
- RSocketServ pSocketServ;
- /** Handle to SADB socket */
- RSADB pSADB;
- TInt err;
-
- err = pSocketServ.Connect();
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadBypassModePolicy():- Failed to connect RSocketServ with error: %d"), err);
- SetBlockResult(EFail);
- }
- err = pSADB.Open(pSocketServ);
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadBypassModePolicy():- Failed to open RSADB with error: %d"), err);
- SetBlockResult(EFail);
- }
-
- HBufC8 *policyData = HBufC8::NewLC( KMyPolicy1().Length() + 256); // Allow size for IP spec.
- TPtr8 policyDataPtr(policyData->Des());
- policyDataPtr.Append(KMyPolicy1);
-
- TRequestStatus status;
- iBypsPolicyServer.LoadPolicy( *policyData,iBypsPolicyHandle, status, iMyZoneInfoSet);
- User::WaitForRequest(status);
-
- if(status.Int() == KErrNone)
- {
- iBypsPolicyServer.ActivatePolicy( iBypsPolicyHandle(), status );
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- SetBlockResult(EPass);
- }
- else
- {
- SetError(status.Int());
- ERR_PRINTF2(_L("DoLoadBypassModePolicy():- LoadPolicy failed with error: %d"), status.Int());
- SetBlockResult(EFail);
- }
- CleanupStack::PopAndDestroy(policyData);
- pSADB.Close();
- pSocketServ.Close();
- }
-
-
-
-
-void CT_LoadPolicyBDD::DoLoadNewDropModePolicy(const TDesC& /*aSection*/)
- {
- RSocketServ pSocketServ;
- /** Handle to SADB socket */
- RSADB pSADB;
- TInt err;
-
- err = pSocketServ.Connect();
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadNewDropModePolicy():- Failed to connect RSocketServ with error: %d"), err);
- SetBlockResult(EFail);
- }
- err = pSADB.Open(pSocketServ);
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadNewDropModePolicy():- Failed to open RSADB with error: %d"), err);
- SetBlockResult(EFail);
- }
-
- HBufC8 *policyData = HBufC8::NewLC( KMyPolicy2().Length() + 256); // Allow size for IP spec.
- TPtr8 policyDataPtr(policyData->Des());
- policyDataPtr.Append(KMyPolicy2);
-
-
- TRequestStatus status;
- iDrpPolicyServer.LoadPolicy( *policyData, iNewDrpPolicyHandle, status, iMyZoneInfoSet);
- User::WaitForRequest(status);
-
- if(status.Int() == KErrNone)
- {
- iDrpPolicyServer.ActivatePolicy( iNewDrpPolicyHandle(), status );
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- SetBlockResult(EPass);
- }
- else
- {
- SetError(status.Int());
- ERR_PRINTF2(_L("DoLoadNewDropModePolicy():- LoadPolicy failed with error: %d"), status.Int());
- SetBlockResult(EFail);
- }
- CleanupStack::PopAndDestroy(policyData);
- pSADB.Close();
- pSocketServ.Close();
- }
-
-
-/*
-*Execute the test to unload the policy.
-*/
-void CT_LoadPolicyBDD::DoUnloadDropPolicy(const TDesC& /*aSection*/)
- {
- TRequestStatus status;
- iDrpPolicyServer.UnloadPolicy(iDrpPolicyHandle(),status);
- User::WaitForRequest(status);
- TInt err = status.Int();
- if( err != KErrNone)
- {
- SetError(err);
- ERR_PRINTF2(_L("DoUnloadDropPolicy():- UnloadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- }
-
-/*
-*Execute the test to unload the policy.
-*/
-void CT_LoadPolicyBDD::DoUnloadBypassPolicy(const TDesC& /*aSection*/)
- {
- TRequestStatus status;
- iBypsPolicyServer.UnloadPolicy(iBypsPolicyHandle(),status);
- User::WaitForRequest(status);
- TInt err = status.Int();
- if( err != KErrNone)
- {
- SetError(err);
- ERR_PRINTF2(_L("DoUnloadBypassPolicy():- UnloadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- }
-
-/*
-*Execute the test to unload the policy.
-*/
-void CT_LoadPolicyBDD::DoUnloadNewDropModePolicy(const TDesC& /*aSection*/)
- {
-
- TRequestStatus status;
- iDrpPolicyServer.UnloadPolicy(iNewDrpPolicyHandle(),status);
- User::WaitForRequest(status);
- TInt err = status.Int();
- if( err != KErrNone)
- {
- SetError(err);
- ERR_PRINTF2(_L("DoUnloadNewDropPolicy():- UnloadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
-
- }
-
-
-/*
-*Execute the test for closing the connection.
-*/
-void CT_LoadPolicyBDD::DoCmdClose(const TDesC& /*aSection*/)
- {
- SetBlockResult(EPass);
- }
-
-
-
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_uma.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,507 +0,0 @@
-/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* @File :- te_loadpolicy_uma.cpp Implements loading the policy
-*
-*/
-
-
-/**
- * @file ts_ipsec_polapi.cpp Implements main test code for IPsec
- */
-
-#include "te_loadpolicy_uma.h"
-#include "te_ipsecconst.h"
-#include "te_selectorconflict.h"
-#include <ES_SOCK.H>
-#include "lib_pfkey.h"
-#include "pfkey_ext.h"
-#include "pfkey_send.h"
-#include <commdbconnpref.h>
-
-
-#if defined(SYMBIAN_CRYPTO)
-#include <cryptostrength.h>
-#else
-#include <cryptalg.h>
-#endif
-
-_LIT8( KMyPolicy,
-"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
-IpSec Policy LOADING\r\n\
-[POLICY]\r\n\
-sa trans_1 = {\r\n\
-esp\r\n\
-encrypt_alg 12\r\n\
-src_specific\r\n\
-}\r\n\
-outbound remote 10.225.208.86 255.255.255.255 protocol 17 = { trans_1(10.225.208.86) }\r\n\
-inbound local 10.225.208.102 255.255.255.255 protocol 17 = { trans_1(10.225.208.86) }\r\n\
-inbound = {}\r\n\
-outbound = {}\r\n" );
-
-
-_LIT8( KMyPolicy1,
-"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
-IpSec Policy LOADING\r\n\
-[POLICY]\r\n\
-sa trans_2 = {\r\n\
-esp\r\n\
-encrypt_alg 12\r\n\
-src_specific\r\n\
-}\r\n\
-outbound remote 10.225.208.49 255.255.255.255 protocol 17 = { trans_2(10.225.208.49) }\r\n\
-inbound local 10.225.208.155 255.255.255.255 protocol 17 = { trans_2(10.225.208.49) }\r\n" );
-
-_LIT8( KMyPolicy2,
-"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
-IpSec Policy LOADING\r\n\
-[POLICY]\r\n\
-sa trans_3 = {\r\n\
-esp\r\n\
-encrypt_alg 12\r\n\
-src_specific\r\n\
-}\r\n\
-outbound remote 192.168.1.1 255.255.255.255 protocol 17 = { trans_3() }\r\n\
-inbound local 192.168.1.2 255.255.255.255 protocol 17 = { trans_3() }\r\n\
-inbound = {}\r\n\
-outbound = {}\r\n" );
-
-
-/**
-Purpose: Constructor of CT_IPSecIKEV2TestWrapper class
-@internalComponent
-*/
-CT_LoadPolicyUMA::CT_LoadPolicyUMA()
- {
- }
-/**
-Purpose: Destructor of CT_LoadPolicyUMA class
-@internalComponent
-*/
-CT_LoadPolicyUMA::~CT_LoadPolicyUMA()
- {
- delete iObject;
- iObject = NULL;
- }
-
-/**
-Purpose: Command fuction of CT_LoadPolicyUMA class
-@internalComponent
-*/
-CT_LoadPolicyUMA* CT_LoadPolicyUMA::NewL()
- {
- CT_LoadPolicyUMA* ret = new (ELeave) CT_LoadPolicyUMA();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-/**
-Purpose: Command fuction for a wrapper class
-@internalComponent
-*/
-void CT_LoadPolicyUMA::ConstructL()
- {
- TInt errfound;
- iObject = new (ELeave) TInt;
-
- errfound = iDrpPolicyServer.Connect();
- if( errfound != KErrNone )
- {
- ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
- SetBlockResult(EFail);
- return;
- }
- errfound=iBypsPolicyServer.Connect();
- if( errfound != KErrNone )
- {
- ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
- SetBlockResult(EFail);
- return;
- }
-
- iMyZoneInfoSet.iSelectorZone.iScope = KScopeNetwork;
- iMyZoneInfoSet.iSelectorZone.iId = 8;
- iMyZoneInfoSet.iEndPointZone.iScope = KScopeNetwork;
- iMyZoneInfoSet.iEndPointZone.iId = 7;
- }
-
-/**
-Purpose: Command fuction for a wrapper class
-@internalComponent
-*/
-TBool CT_LoadPolicyUMA::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex)
- {
- TBool ret = ETrue;
-
- // Print out the parameters for debugging
- INFO_PRINTF2( _L("<font size=2 color=990000><b>aCommand = %S</b></font>"), &aCommand );
- INFO_PRINTF2( _L("aSection = %S"), &aSection );
- INFO_PRINTF2( _L("aAsyncErrorIndex = %D"), aAsyncErrorIndex );
-
- if(KNewCMD() == aCommand)
- {
- DoCmdNewL(aSection);
- }
- else if(KLOadUMAPolicy() == aCommand)
- {
- DoLoadUMAPolicy(aSection);
- }
- else if (KTestLoadDropModePolicy() == aCommand)
- {
- DoLoadDropModePolicy(aSection);
- }
- else if (KLoadUMAByPassPolicy() == aCommand)
- {
- DoLoadBypassModePolicy(aSection);
- }
- else if (KUnloadDropPolicy() == aCommand)
- {
- DoUnloadDropPolicy(aSection);
- }
- else if (KUnloadBypassPolicy() == aCommand)
- {
- DoUnloadBypassPolicy(aSection);
- }
- else if (KUnloadUMAPolicy() == aCommand)
- {
- DoUnloadUMAPolicy(aSection);
- }
- else if (KCloseConnection() == aCommand)
- {
- DoCmdClose(aSection);
- }
- else
- {
- ret = EFalse;
- }
-
- return ret;
- }
-
-
-/**
-Purpose: To create a new object of the CTEFTest type through the API.
-
-Ini file options:
- iniData - The data from the ini file at the section provided.
-
-@internalComponent
-@param aSection Current ini file command section
-*/
-void CT_LoadPolicyUMA::DoCmdNewL(const TDesC& aSection)
- {
- TInt objectValue = 0;
- TInt iapid =0;
- if (!GetIntFromConfig(aSection, KObjectValue(), objectValue))
- {
- ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
- SetBlockResult(EFail);
- }
- else
- {
- *iObject = objectValue;
-
- if(!GetIntFromConfig(aSection, KIapid(), iapid))
- {
- ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
-
- SetBlockResult(EFail);
- }
- else
- {
- }
- }
- }
-
-/**
- * UMA policy loading for ONB scripts
- */
-void CT_LoadPolicyUMA::DoLoadUMAPolicy(const TDesC& /*aSection*/)
- {
- RSocketServ pSocketServ;
- /** Handle to SADB socket */
- RSADB pSADB;
- TInt err;
-
- err = pSocketServ.Connect();
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadUMAPolicy():- Failed to connect RSocketServ with error: %d"), err);
- SetBlockResult(EFail);
- }
- err = pSADB.Open(pSocketServ);
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadUMAPolicy():- Failed to open RSADB with error: %d"), err);
- SetBlockResult(EFail);
- }
-
- /***
- * this code is to check the UMA setopt function
- * if we call with 0 then it is considered as UMA policy
- */
- TInt sur = 0;
- _LIT8(KFormatStr,"%D");
- TBuf8<50> sidbuf;
- sidbuf.Format(KFormatStr,sur);
- TLex8 lex(sidbuf);
- TInt intval;
- err = lex.Val(intval);
-
- //storing the SID information to the policy server which
- //is used to identify the UMA policy in ipsec policy manager handler.
- TInt error = iBypsPolicyServer.SetOpt(KOptionNameSid, KOptionLevelDefault, sidbuf);
- if ( KErrNone != error )
- {
- ERR_PRINTF2(_L("DoLoadUMAPolicy->LoadPolicy ERROR in setOpt to the policy server %d"), error);
- SetError(error);
- SetBlockResult(EFail);
- return ;
- }
-
- HBufC8 *policyData = HBufC8::NewLC( KMyPolicy().Length() + 256); // Allow size for IP spec.
- TPtr8 policyDataPtr(policyData->Des());
- policyDataPtr.Append(KMyPolicy);
- TRequestStatus status;
- iBypsPolicyServer.LoadPolicy( *policyData, iUMAPolicyHandle, status, iMyZoneInfoSet);
- User::WaitForRequest(status);
- err = status.Int();
- if( err == KErrNone)
- {
- iBypsPolicyServer.ActivatePolicy( iUMAPolicyHandle(), status );
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- SetBlockResult(EPass);
- }
- else
- {
- SetError(status.Int());
- ERR_PRINTF2(_L("DoLoadUMAPolicy():- LoadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- CleanupStack::PopAndDestroy(policyData);
- pSADB.Close();
- pSocketServ.Close();
- }
-
-/*
-*Execute the test for loading the drop mode policy.
-*/
-void CT_LoadPolicyUMA::DoLoadDropModePolicy(const TDesC& /*aSection*/)
- {
- RSocketServ pSocketServ;
- /** Handle to SADB socket */
- RSADB pSADB;
- TInt err;
-
- err = pSocketServ.Connect();
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to connect RSocketServ with error: %d"), err);
- SetBlockResult(EFail);
- }
- err = pSADB.Open(pSocketServ);
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to open RSADB with error: %d"), err);
- SetBlockResult(EFail);
- }
-
-
- /***
- * this code is to check the UMA setopt function
- * if we call with 0 then it is considered as UMA policy
- * in this case we are passing some other value
- */
- TInt sur = 0x100;
- _LIT8(KFormatStr,"%D");
- TBuf8<50> sidbuf;
- sidbuf.Format(KFormatStr,sur);
- /* if you want to check the value un comment this part of the code
- TLex8 lex(sidbuf);
- TInt intval;
- TInt err = lex.Val(intval);
- */
-
- //storing the SID information to the policy server which
- //is used to identify the UMA policy in ipsec policy manager handler.
- TInt error = iBypsPolicyServer.SetOpt(KOptionNameSid, KOptionLevelDefault, sidbuf);
- if ( KErrNone != error )
- {
- ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy ERROR in setOpt to the policy server %d"), error);
- SetError(error);
- SetBlockResult(EFail);
- return ;
- }
- HBufC8 *policyData = HBufC8::NewLC( KMyPolicy1().Length() + 256); // Allow size for IP spec.
- TPtr8 policyDataPtr(policyData->Des());
- policyDataPtr.Append(KMyPolicy1);
-
- TRequestStatus status;
- iDrpPolicyServer.LoadPolicy( *policyData, iDrpPolicyHandle, status, iMyZoneInfoSet);
- User::WaitForRequest(status);
- TInt err1 = status.Int();
- if(err1 == KErrNone)
- {
- iDrpPolicyServer.ActivatePolicy(iDrpPolicyHandle(), status );
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- SetBlockResult(EPass);
- }
- else
- {
- SetError(status.Int());
- ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy failed with error: %d"),err1);
- SetBlockResult(EFail);
- }
- CleanupStack::PopAndDestroy(policyData);
-
- pSADB.Close();
- pSocketServ.Close();
- }
-
-
-void CT_LoadPolicyUMA::DoLoadBypassModePolicy(const TDesC& /*aSection*/)
- {
- RSocketServ pSocketServ;
- /** Handle to SADB socket */
- RSADB pSADB;
- TInt err;
-
- err = pSocketServ.Connect();
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadBypassModePolicy():- Failed to connect RSocketServ with error: %d"), err);
- SetBlockResult(EFail);
- }
- err = pSADB.Open(pSocketServ);
- if ( err != KErrNone)
- {
- ERR_PRINTF2(_L("DoLoadBypassModePolicy():- Failed to open RSADB with error: %d"), err);
- SetBlockResult(EFail);
- }
-
- /***
- * this code is to check the UMA setopt function
- * if we call with 0 then it is considered as UMA policy
- * in this case we are passing some other value
- *
- * this is done becoze we don't have any value present in comms database or it could be a big bug
- */
- TInt sur = 0x100;
- _LIT8(KFormatStr,"%D");
- TBuf8<50> sidbuf;
- sidbuf.Format(KFormatStr,sur);
- TLex8 lex(sidbuf);
- TInt intval;
- err = lex.Val(intval);
-
- //storing the SID information to the policy server which
- //is used to identify the UMA policy in ipsec policy manager handler.
- TInt error = iBypsPolicyServer.SetOpt(KOptionNameSid, KOptionLevelDefault, sidbuf);
- if ( KErrNone != error )
- {
- ERR_PRINTF2(_L("DoLoadBypassModePolicy->LoadPolicy ERROR in setOpt to the policy server %d"), error);
- SetError(error);
- SetBlockResult(EFail);
- return ;
- }
- HBufC8 *policyData = HBufC8::NewLC( KMyPolicy2().Length() + 256); // Allow size for IP spec.
- TPtr8 policyDataPtr(policyData->Des());
- policyDataPtr.Append(KMyPolicy2);
- TRequestStatus status;
- iBypsPolicyServer.LoadPolicy( *policyData, iBypsPolicyHandle, status, iMyZoneInfoSet);
- User::WaitForRequest(status);
- err = status.Int();
- if( err == KErrNone)
- {
- iBypsPolicyServer.ActivatePolicy( iBypsPolicyHandle(), status );
- User::WaitForRequest(status);
- User::LeaveIfError(status.Int());
- SetBlockResult(EPass);
- }
- else
- {
- SetError(status.Int());
- ERR_PRINTF2(_L("DoLoadBypassModePolicy():- LoadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- CleanupStack::PopAndDestroy(policyData);
- pSADB.Close();
- pSocketServ.Close();
- }
-
-/*
-*Execute the test to unload the policy.
-*/
-void CT_LoadPolicyUMA::DoUnloadDropPolicy(const TDesC& /*aSection*/)
- {
- TRequestStatus status;
- iDrpPolicyServer.UnloadPolicy(iDrpPolicyHandle(),status);
- User::WaitForRequest(status);
- TInt err = status.Int();
- if( err != KErrNone)
- {
- SetError(err);
- ERR_PRINTF2(_L("DoUnloadDropPolicy():- UnloadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- }
-
-/*
-*Execute the test to unload the policy.
-*/
-void CT_LoadPolicyUMA::DoUnloadUMAPolicy(const TDesC& /*aSection*/)
- {
- TRequestStatus status;
- iBypsPolicyServer.UnloadPolicy(iUMAPolicyHandle(),status);
- User::WaitForRequest(status);
- TInt err = status.Int();
- if( err != KErrNone)
- {
- SetError(err);
- ERR_PRINTF2(_L("DoUnloadUMAPolicy():- UnloadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- }
-/*
-*Execute the test for unload the policy.
-*/
-void CT_LoadPolicyUMA::DoUnloadBypassPolicy(const TDesC& /*aSection*/)
- {
- TRequestStatus status;
- iBypsPolicyServer.UnloadPolicy(iBypsPolicyHandle(),status);
- User::WaitForRequest(status);
- TInt err = status.Int();
- if( err != KErrNone)
- {
- SetError(err);
- ERR_PRINTF2(_L("DoUnloadBypassPolicy():- UnloadPolicy failed with error: %d"), err);
- SetBlockResult(EFail);
- }
- }
-
-/*
-*Execute the test for closing the connection.
-*/
-void CT_LoadPolicyUMA::DoCmdClose(const TDesC& /*aSection*/)
- {
- SetBlockResult(EPass);
- }
-
-
-
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483.pin Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[POLICYNAME]
-Symbian VPN Test Policy (2)
-[POLICYDESCRIPTION]
-Test for Symbian OS's VPN API
-[POLICYVERSION]
-1.0
-[ISSUERNAME]
-Symbian
-[CONTACTINFO]
-ahamed.rafik@nokia.com
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483.pol Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-SECURITY_FILE_VERSION: 3
-[INFO]
-VPN Policy for VPN Client
-[POLICY]
-sa symbian_esp = {
- esp
- encrypt_alg 12
- auth_alg 3
- identity_remote 10.225.208.183
- src_specific
- hard_lifetime_addtime 3600
- hard_lifetime_usetime 3600
-}
-
-
-remote 10.225.208.183 255.255.255.255 = { symbian_esp(10.225.208.183) }
-
-inbound = { }
-outbound = { }
-
-[IKE]
-IKE_VERSION: 1
-ADDR: 10.225.208.86 255.255.255.255
-USE_MOBIKE: TRUE
-SEND_NOTIFICATION: TRUE
-GROUP_DESCRIPTION_II: MODP_1024
-USE_COMMIT: FALSE
-IPSEC_EXPIRE: FALSE
-SEND_CERT: FALSE
-INITIAL_CONTACT: FALSE
-RESPONDER_LIFETIME: FALSE
-REPLAY_STATUS: FALSE
-CRACK_LAM_TYPE: OTP
-USE_INTERNAL_ADDR: FALSE
-USE_NAT_PROBE: FALSE
-PROPOSALS: 1
-ENC_ALG: AES128-CBC
-AUTH_METHOD: PRE-SHARED
-HASH_ALG: SHA1
-GROUP_DESCRIPTION: MODP_1024
-GROUP_TYPE: DEFAULT
-LIFETIME_KBYTES: 5000
-LIFETIME_SECONDS: 3600
-PRF: NONE
-PRESHARED_KEYS:
-FORMAT: STRING_FORMAT
-KEY: 9 IPSEC_IOT
-
-[DUMMY]
-MODE: Main
-ep local_end_point_msk = { ? 0.0.0.0 }
-ep local_end_point = { ? 0.0.0.0 }
-ep local_end_point = { ? 0.0.0.0%8 }
-
-local local_end_point 0.0.0.0 = { symbian_esp(10.253.4.99) }
-remote 0.0.0.0 0.0.0.0 = { symbian_esp(10.253.4.99) }
-
-
-remote 0.0.0.0 0.0.0.0 = { symbian_esp(10.253.4.99) }
-remote 10.253.4.99%8 255.255.255.255 = { symbian_esp(sgw1) }
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483_drop.pin Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[POLICYNAME]
-Symbian VPN Test Policy (2)
-[POLICYDESCRIPTION]
-Test for Symbian OS's VPN API
-[POLICYVERSION]
-1.0
-[ISSUERNAME]
-Symbian
-[CONTACTINFO]
-ahamed.rafik@nokia.com
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483_drop.pol Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-SECURITY_FILE_VERSION: 3
-[INFO]
-VPN Policy for VPN Client
-[POLICY]
-sa symbian_esp = {
- esp
- encrypt_alg 12
- auth_alg 3
- identity_remote 10.225.208.183
- src_specific
- hard_lifetime_addtime 3600
- hard_lifetime_usetime 3600
-}
-
-
-remote 10.225.208.183 255.255.255.255 = { symbian_esp(10.225.208.183) }
-
-[IKE]
-IKE_VERSION: 1
-ADDR: 10.225.208.183 255.255.255.255
-USE_MOBIKE: TRUE
-SEND_NOTIFICATION: TRUE
-GROUP_DESCRIPTION_II: MODP_1024
-USE_COMMIT: FALSE
-IPSEC_EXPIRE: FALSE
-SEND_CERT: FALSE
-INITIAL_CONTACT: FALSE
-RESPONDER_LIFETIME: FALSE
-REPLAY_STATUS: FALSE
-CRACK_LAM_TYPE: OTP
-USE_INTERNAL_ADDR: FALSE
-USE_NAT_PROBE: FALSE
-PROPOSALS: 1
-ENC_ALG: AES128-CBC
-AUTH_METHOD: PRE-SHARED
-HASH_ALG: SHA1
-GROUP_DESCRIPTION: MODP_1024
-GROUP_TYPE: DEFAULT
-LIFETIME_KBYTES: 5000
-LIFETIME_SECONDS: 3600
-PRF: NONE
-PRESHARED_KEYS:
-FORMAT: STRING_FORMAT
-KEY: 9 IPSEC_IOT
-
-[DUMMY]
-MODE: Main
-ep local_end_point_msk = { ? 0.0.0.0 }
-ep local_end_point = { ? 0.0.0.0 }
-ep local_end_point = { ? 0.0.0.0%8 }
-
-local local_end_point 0.0.0.0 = { symbian_esp(10.253.4.99) }
-remote 0.0.0.0 0.0.0.0 = { symbian_esp(10.253.4.99) }
-
-
-remote 0.0.0.0 0.0.0.0 = { symbian_esp(10.253.4.99) }
-remote 10.253.4.99%8 255.255.255.255 = { symbian_esp(sgw1) }
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483.xml Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
- All Rights Reserved
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
- xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
- <Network operation="add">
- <Name>Intranet</Name>
- </Network>
- <Network operation="add">
- <Name>mRouter</Name>
- </Network>
-</NetworkTable>
-
-<IAPTable>
- <IAP operation="add">
- <Name>NT RAS with Null Modem</Name>
- <IAPService>DialOutISP.NT RAS</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>CSD IAP PlaceHolder01</Name>
- <IAPService>DialOutISP.ISP01</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>CSD IAP PlaceHolder02</Name>
- <IAPService>DialOutISP.ISP02</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>GPRS IAP PlaceHolder01</Name>
- <IAPService>OutgoingGPRS.GPRS01</IAPService>
- <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Mobile</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>GPRS IAP PlaceHolder02</Name>
- <IAPService>OutgoingGPRS.GPRS02</IAPService>
- <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Mobile</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet No Daemon Static IP</Name>
- <IAPService>LANService.Ethernet No Daemon</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Incorrect ethernet setup 1</Name>
- <IAPService>LANService.Ethernet Bad Daemon</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.mRouter</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Incorrect ethernet setup 2</Name>
- <IAPService>LANService.Ethernet Static IP</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.mRouter</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet with Daemon Static IP</Name>
- <IAPService>LANService.Ethernet Static IP</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Incorrect ethernet setup 3</Name>
- <IAPService>LANService.Ethernet</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.mRouter</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet with Daemon Dynamic IP</Name>
- <IAPService>LANService.Ethernet</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
-</IAPTable>
-
-<ModemBearerTable>
- <ModemBearer operation="template">
- <Name>Default Modem</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Null Modem 115200bps</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>US Robotics Sportster</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>57600</Rate>
- <Handshaking>244</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT&F1</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT&d2</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Dacom Surfer</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>57600</Rate>
- <Handshaking>244</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT&F</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT&d2</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GSM Mobile Phone via Infrared</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>IRCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>IRCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>196</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GSM Mobile Phone via Serial</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>19200</Rate>
- <Handshaking>196</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GPRS Ericsson R520m via IR</Name>
- <Agent>PSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>IRCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>IRCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GPRS Ericsson R520m/T68i via Serial</Name>
- <Agent>PSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>19200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <IspInitString>*99***1#</IspInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GPRS Motorola Mobile Phone via Serial</Name>
- <Agent>PSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>57600</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>WinTunnel Modem</Name>
- <Agent>null.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::6</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterWinsBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>WINS::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>WINSCSY</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterRs232Bearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterIrBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>IRCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>IRCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterBtBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>BTCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>BTCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterUsbBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>ACM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECACM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
- <LANBearer operation="add">
- <Name>EKA1 Target Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>ethercard</LDDFilename>
- <LDDName>EtherCard</LDDName>
- <PDDFilename>EtherSmc</PDDFilename>
- <PDDName>EtherCard.Smc</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-
- <LANBearer operation="add">
- <Name>EKA2 Target Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>enet</LDDFilename>
- <LDDName>Ethernet</LDDName>
- <PDDFilename>ethernet</PDDFilename>
- <PDDName>Ethernet.Assabet</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-
- <LANBearer operation="add">
- <Name>EKA1 Emulator Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>ethercard</LDDFilename>
- <LDDName>Ethercard</LDDName>
- <PDDFilename>etherwins</PDDFilename>
- <PDDName>Ethercard.wins</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-
- <LANBearer operation="add">
- <Name>EKA2 Emulator Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>enet</LDDFilename>
- <LDDName>=Ethernet</LDDName>
- <PDDFilename>ethernet</PDDFilename>
- <PDDName>Ethernet.Wins</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
- <LANService operation="add">
- <Name>Ethernet</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.32.194.254</IpGateway>
- <IpAddr>10.32.194.251</IpAddr>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.52</IpNameServer2>
- <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
- <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>Ethernet Static IP</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>192.168.20.2</IpGateway>
- <IpAddr>192.168.20.13</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.52</IpNameServer2>
- <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
- <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>Ethernet Bad Daemon</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.32.194.254</IpGateway>
- <IpAddr>10.32.194.251</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.52</IpNameServer2>
- <ConfigDaemonManagerName>NonExistingServ</ConfigDaemonManagerName>
- <ConfigDaemonName>NonExistingServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>Ethernet No Daemon</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.32.194.254</IpGateway>
- <IpAddr>10.32.194.251</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.52</IpNameServer2>
- </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
- <DialInISP operation="template">
- <Name>Default Dial In ISP</Name>
- <UseLoginScript>FALSE</UseLoginScript>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Default Dial In ISP</Description>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <UseEdge>FALSE</UseEdge>
- </DialInISP>
- <DialInISP operation="add">
- <Name>Dial In ISP01</Name>
- <UseLoginScript>FALSE</UseLoginScript>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Dial In ISP01</Description>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <UseEdge>FALSE</UseEdge>
- </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
- <DialOutISP operation="template">
- <Name>Default Dial Out ISP</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>TRUE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Default Dial Out ISP</Description>
- <DefaultTelNum>Default Dial Out ISP</DefaultTelNum>
- <LoginName>TRUE</LoginName>
- <LoginPass>TRUE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>FALSE</IfNetworks>
- <IfAuthName>TRUE</IfAuthName>
- <IfAuthPass>TRUE</IfAuthPass>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>NT RAS</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>TRUE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Test</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP01</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP01</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP02</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP02</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP03</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP03</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP04</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP04</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP05</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP05</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>mRouterDialOutIsp</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>mRouterDialOutIsp</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>IfAuthPass=</IfAuthName>
- <IfAuthPass>AuthRetries=0</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
- <CDMA2000PacketService operation="add">
- <Name>test name cdma2000</Name>
- <IwfName>Test2000</IwfName>
- <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
- <PdpType>IPV4</PdpType>
- <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
- <ReqRevPriority>PRIORITY04</ReqRevPriority>
- <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
- <ReqRevBitrate>32KBPS</ReqRevBitrate>
- <ReqFwdLoss>LOSS1</ReqFwdLoss>
- <ReqRevLoss>LOSS1</ReqRevLoss>
- <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
- <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
- <MinFwdBitrate>32KBPS</MinFwdBitrate>
- <MinRevBitrate>32KBPS</MinRevBitrate>
- <AccptFwdLoss>LOSS2</AccptFwdLoss>
- <AccptRevLoss>LOSS2</AccptRevLoss>
- <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
- <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <AuthRetries>1</AuthRetries>
- <IpNetMask>0.255.255.255</IpNetMask>
- <IpGateway>10.0.0.1</IpGateway>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <EnableLCPExtension>TRUE</EnableLCPExtension>
- <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
- <ApType>2</ApType>
- <QosWarningTimeout>1000000</QosWarningTimeout>
- <RlpMode>TRANSPARENT</RlpMode>
- <CDMAMobileIP>FALSE</CDMAMobileIP>
- <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
- </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
- <Chargecard operation="add">
- <Name>Dummy BT Chargecard</Name>
- <AccountNumber>144,12345678</AccountNumber>
- <Pin>0000</Pin>
- <LocalRule>HG</LocalRule>
- <NatRule>HFG</NatRule>
- <IntlRule>HEFG</IntlRule>
- </Chargecard>
- <Chargecard operation="add">
- <Name>Dummy Mercury Chargecard</Name>
- <AccountNumber>0500800800,,12345678</AccountNumber>
- <Pin>****</Pin>
- <LocalRule>HG</LocalRule>
- <NatRule>J,K,0FG</NatRule>
- <IntlRule>HEFG</IntlRule>
- </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
- <ConnectionPreferences operation="add">
- <Name>ConnectionPreferencesTable1</Name>
- <Ranking>0</Ranking>
- <Direction>OUTGOING</Direction>
- <DialogPref>DONOTPROMPT</DialogPref>
- <BearerSet>LAN</BearerSet>
- <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
- </ConnectionPreferences>
- <ConnectionPreferences operation="add">
- <Name>ConnectionPreferencesTable2</Name>
- <Ranking>1</Ranking>
- <Direction>OUTGOING</Direction>
- <DialogPref>DONOTPROMPT</DialogPref>
- <BearerSet>LAN</BearerSet>
- <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
- </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
- <GlobalSettings operation="add">
- <Name>GlobalSettingsTable1</Name>
- <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
- <RedialAttempts>3</RedialAttempts>
- <SmsBearer>2</SmsBearer>
- <SmsReceiveMode>2</SmsReceiveMode>
- <GPRSAttachMode>1</GPRSAttachMode>
- <AcceptIncomingGprs>1</AcceptIncomingGprs>
- <ConnectionAttempts>2</ConnectionAttempts>
- <ModemForDataAndFax>2</ModemForDataAndFax>
- <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
- <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
- <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
- <GPRSClassCBearer>GSM</GPRSClassCBearer>
- <DefaultNetwork>Network.Intranet</DefaultNetwork>
- <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
- </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
- <IncomingGPRS operation="add">
- <Name>Incoming GPRS Settings PlaceHolder</Name>
- <APN>Test</APN>
- <PDPType>IPV4</PDPType>
- <PDPAddress>0.0.0.0</PDPAddress>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <ReqPrecedence>1</ReqPrecedence>
- <ReqDelay>1</ReqDelay>
- <ReqReliability>1</ReqReliability>
- <ReqPeakThroughput>1</ReqPeakThroughput>
- <ReqMeanThroughput>1</ReqMeanThroughput>
- <MinPrecedence>1</MinPrecedence>
- <MinDelay>1</MinDelay>
- <MinReliability>1</MinReliability>
- <MinPeakThroughput>1</MinPeakThroughput>
- <MinMeanThroughput>1</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>1</AuthRetries>
- <IpNameServer1>0.0.0.0</IpNameServer1>
- <IpNameServer2>0.0.0.0</IpNameServer2>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
- <OutgoingGPRS operation="add">
- <Name>GPRS01</Name>
- <APN>gprs01APNPlaceHolder</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>0</ReqPrecedence>
- <ReqDelay>0</ReqDelay>
- <ReqReliability>0</ReqReliability>
- <ReqPeakThroughput>0</ReqPeakThroughput>
- <ReqMeanThroughput>0</ReqMeanThroughput>
- <MinPrecedence>0</MinPrecedence>
- <MinDelay>0</MinDelay>
- <MinReliability>0</MinReliability>
- <MinPeakThroughput>0</MinPeakThroughput>
- <MinMeanThroughput>0</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <AuthRetries>1</AuthRetries>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <GprsAccessPointType>0</GprsAccessPointType>
- <QosWarningTimeout>0</QosWarningTimeout>
- </OutgoingGPRS>
- <OutgoingGPRS operation="add">
- <Name>GPRS02</Name>
- <APN>gprs02APNPlaceHolder</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>0</ReqPrecedence>
- <ReqDelay>0</ReqDelay>
- <ReqReliability>0</ReqReliability>
- <ReqPeakThroughput>0</ReqPeakThroughput>
- <ReqMeanThroughput>0</ReqMeanThroughput>
- <MinPrecedence>0</MinPrecedence>
- <MinDelay>0</MinDelay>
- <MinReliability>0</MinReliability>
- <MinPeakThroughput>0</MinPeakThroughput>
- <MinMeanThroughput>0</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <AuthRetries>1</AuthRetries>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <GprsAccessPointType>0</GprsAccessPointType>
- <QosWarningTimeout>0</QosWarningTimeout>
- </OutgoingGPRS>
- <OutgoingGPRS operation="add">
- <Name>GPRS03</Name>
- <APN>gprs03APNPlaceHolder</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>0</ReqPrecedence>
- <ReqDelay>0</ReqDelay>
- <ReqReliability>0</ReqReliability>
- <ReqPeakThroughput>0</ReqPeakThroughput>
- <ReqMeanThroughput>0</ReqMeanThroughput>
- <MinPrecedence>0</MinPrecedence>
- <MinDelay>0</MinDelay>
- <MinReliability>0</MinReliability>
- <MinPeakThroughput>0</MinPeakThroughput>
- <MinMeanThroughput>0</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <AuthRetries>1</AuthRetries>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <GprsAccessPointType>0</GprsAccessPointType>
- <QosWarningTimeout>0</QosWarningTimeout>
- </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
- <DefaultGPRS operation="add">
- <Name>Dummy Default GPRS Settings</Name>
- <APN>Access point name</APN>
- <PDPType>IPV6</PDPType>
- <PDPAddress>www.wid.com</PDPAddress>
- <Usage>1</Usage>
- <Precedence>1</Precedence>
- <Delay>1</Delay>
- <Reliability>1</Reliability>
- <PeakThroughput>1</PeakThroughput>
- <MeanThroughput>1</MeanThroughput>
- <MinPrecedence>1</MinPrecedence>
- <MinDelay>1</MinDelay>
- <MinReliability>1</MinReliability>
- <MinPeakThroughput>1</MinPeakThroughput>
- <MinMeanThroughput>1</MinMeanThroughput>
- <DataCompression>TRUE</DataCompression>
- <HeaderCompression>TRUE</HeaderCompression>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <AnonymousAccess>TRUE</AnonymousAccess>
- </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
- <Proxy operation="add">
- <Name>ProxyTable1</Name>
- <ISPRef>DialOutISP.NT RAS</ISPRef>
- <UseProxyServer>TRUE</UseProxyServer>
- <ProtocolName>http</ProtocolName>
- <ProxyServerName>www.dummyproxy.com</ProxyServerName>
- <PortNumber>80</PortNumber>
- <Exceptions>www.dummyproxy.com/exception</Exceptions>
- </Proxy>
-</ProxyTable>
-
-<LocationTable>
- <Location operation="template">
- <Name>Default Location</Name>
- <Mobile>TRUE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>+</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>44</AreaCode>
- <DialOutCode>44</DialOutCode>
- <DisableCallWaitingCode>44</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Office</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>171</AreaCode>
- <DialOutCode>9,</DialOutCode>
- <DisableCallWaitingCode>9,</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Office Direct Dial</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>171</AreaCode>
- <DialOutCode>171</DialOutCode>
- <DisableCallWaitingCode>171</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Mobile</Name>
- <Mobile>TRUE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>+</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>44</AreaCode>
- <DialOutCode>44</DialOutCode>
- <DisableCallWaitingCode>44</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Home</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>TRUE</UsePulseDial>
- <WaitForDialTone>TRUE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>181</AreaCode>
- <DialOutCode>181</DialOutCode>
- <DisableCallWaitingCode>181</DisableCallWaitingCode>
- </Location>
-</LocationTable>
-
-<SecureSocketTable>
- <SecureSocket operation="add">
- <Name>SecureSocketTable1</Name>
- <ProtocolName>ssl3.0</ProtocolName>
- <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
- </SecureSocket>
- <SecureSocket operation="add">
- <Name>SecureSocketTable2</Name>
- <ProtocolName>tls1.0</ProtocolName>
- <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
- </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
- <WAPAccessPoint operation="template">
- <Name>Default Dial In ISP</Name>
- <CurrentBearer>WAPIPBearer</CurrentBearer>
- </WAPAccessPoint>
- <WAPAccessPoint operation="add">
- <Name>Dummy WAP Settings</Name>
- <CurrentBearer>WAPIPBearer</CurrentBearer>
- <StartPage>www.wapstart.com</StartPage>
- </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
- <WAPIPBearer operation="template">
- <Name>WAPIPBearerTable1</Name>
- <AccessPoint>WAPAccessPoint.-1</AccessPoint>
- <GatewayAddress>0</GatewayAddress>
- <WSPOption>CONNECTIONLESS</WSPOption>
- <Security>FALSE</Security>
- <IAPRef>IAP.-1</IAPRef>
- <ProxyPortNumber>0</ProxyPortNumber>
- <ProxyLogin>0</ProxyLogin>
- <ProxyPassword>0</ProxyPassword>
- </WAPIPBearer>
- <WAPIPBearer operation="add">
- <Name>WAPIPBearerTable2</Name>
- <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
- <GatewayAddress>www.wapgateway.com</GatewayAddress>
- <WSPOption>CONNECTIONORIENTED</WSPOption>
- <Security>FALSE</Security>
- <IAPRef>IAP.CSD IAP PlaceHolder01</IAPRef>
- <ProxyPortNumber>1</ProxyPortNumber>
- <ProxyLogin>1</ProxyLogin>
- <ProxyPassword>1</ProxyPassword>
- </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
- <WAPSMSBearer operation="template">
- <Name>WAPSMSBearerTable1</Name>
- <AccessPoint>WAPAccessPoint.-1</AccessPoint>
- <GatewayAddress>0</GatewayAddress>
- <WSPOption>CONNECTIONLESS</WSPOption>
- <Security>FALSE</Security>
- <ServiceCentreAddress>0</ServiceCentreAddress>
- </WAPSMSBearer>
- <WAPSMSBearer operation="add">
- <Name>WAPSMSBearerTable2</Name>
- <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
- <GatewayAddress>+4412345678901</GatewayAddress>
- <WSPOption>CONNECTIONORIENTED</WSPOption>
- <Security>FALSE</Security>
- <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
- </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483vpn.xml Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- CommDB Settings File
- Copyright (c) 2003, Symbian Ltd.
- All Rights Reserved
--->
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
- xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
- <Network operation="add">
- <Name>NT RAS</Name>
- </Network>
- <Network operation="add">
- <Name>Linux</Name>
- </Network>
- <Network operation="add">
- <Name>Dummy</Name>
- </Network>
- <Network operation="add">
- <Name>Hungry</Name>
- </Network>
- <Network operation="add">
- <Name>Dummy (Long Timeout)</Name>
- </Network>
- <Network operation="add">
- <Name>Hungry (Long Timeout)</Name>
- </Network>
- <Network operation="add">
- <Name>Intranet</Name>
- </Network>
- <Network operation="add">
- <Name>VPN</Name>
- </Network>
-
-</NetworkTable>
-
-<IAPTable>
- <IAP operation="add">
- <Name>Hungry</Name>
- <IAPService>DialOutISP.Dummy</IAPService>
- <IAPBearer>ModemBearer.Hungry</IAPBearer>
- <IAPNetwork>Network.Hungry</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office Direct Dial</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>NTRas GPRS</Name>
- <IAPService>OutgoingGPRS.NTRas GPRS</IAPService>
- <IAPBearer>ModemBearer.Hungry (Long Timeout)</IAPBearer>
- <IAPNetwork>Network.NT RAS</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Mobile</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Default Dial In ISP</Name>
- <IAPService>DialInISP.Dial In CS ISP</IAPService>
- <IAPBearer>ModemBearer.Linux</IAPBearer>
- <IAPNetwork>Network.NT RAS</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Home</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Linux</Name>
- <IAPService>DialOutISP.Linux</IAPService>
- <IAPBearer>ModemBearer.Linux</IAPBearer>
- <IAPNetwork>Network.Linux</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office Direct Dial</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Dummy</Name>
- <IAPService>DialOutISP.Dummy</IAPService>
- <IAPBearer>ModemBearer.Dummy</IAPBearer>
- <IAPNetwork>Network.Dummy</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office Direct Dial</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Actual NT RAS</Name>
- <IAPService>DialOutISP.NT RAS</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.NT RAS</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Virtual Comm port</Name>
- <IAPService>DialOutISP.Linux</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Linux</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Bad NT RAS</Name>
- <IAPService>DialOutISP.Bad NT RAS</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.NT RAS</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Dummy (Long Timeout)</Name>
- <IAPService>DialOutISP.Dummy</IAPService>
- <IAPBearer>ModemBearer.Dummy (Long Timeout)</IAPBearer>
- <IAPNetwork>Network.Dummy (Long Timeout)</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Hungry (Long Timeout)</Name>
- <IAPService>DialOutISP.Dummy</IAPService>
- <IAPBearer>ModemBearer.Hungry (Long Timeout)</IAPBearer>
- <IAPNetwork>Network.Hungry (Long Timeout)</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>VPN Test Ethernet</Name>
- <IAPService>LANService.VPN Tests Ethernet Service</IAPService>
- <IAPBearer>LANBearer.VPN Tests Ethernet Bearer</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>VPN Test IAP</Name>
- <IAPService>VpnService.VPN Test Service</IAPService>
- <IAPBearer>VirtualBearer.VPN Test Bearer</IAPBearer>
- <IAPNetwork>Network.VPN</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet with Daemon Dynamic IP</Name>
- <IAPService>LANService.Ethernet</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
-
-</IAPTable>
-
-<ModemBearerTable>
- <ModemBearer operation="template">
- <Name>Default Modem</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Null Modem 115200bps</Name>
- <Agent>csd.agt</Agent>
- <IfName>ppp</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>NTRASTSY</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageValidityPeriod>0</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>0</MinimumSignalLevel>
- <LastSocketActivityTimeout>15</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>5</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Linux</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::3</PortName>
- <TSYName>NTRASTSY</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>5</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageValidityPeriod>0</MessageValidityPeriod>
- <MessageDeliveryReport>TRUE</MessageDeliveryReport>
- <MinimumSignalLevel>0</MinimumSignalLevel>
- <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>20</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Dummy</Name>
- <Agent>NULLAGT.agt</Agent>
- <IfName>dummynif</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>NTRASTSY</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>5</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageValidityPeriod>0</MessageValidityPeriod>
- <MessageDeliveryReport>TRUE</MessageDeliveryReport>
- <MinimumSignalLevel>0</MinimumSignalLevel>
- <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>2</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>4</LastSocketClosedTimeout>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Hungry</Name>
- <Agent>NULLAGT.agt</Agent>
- <IfName>hungrynif</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>NTRASTSY</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>5</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageValidityPeriod>0</MessageValidityPeriod>
- <MessageDeliveryReport>TRUE</MessageDeliveryReport>
- <MinimumSignalLevel>0</MinimumSignalLevel>
- <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>2</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>4</LastSocketClosedTimeout>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Dummy (Long Timeout)</Name>
- <Agent>NULLAGT.agt</Agent>
- <IfName>dummynif</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageValidityPeriod>0</MessageValidityPeriod>
- <MessageDeliveryReport>TRUE</MessageDeliveryReport>
- <MinimumSignalLevel>0</MinimumSignalLevel>
- <LastSocketActivityTimeout>14</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>6</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Hungry (Long Timeout)</Name>
- <Agent>NULLAGT.agt</Agent>
- <IfName>hungrynif</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageValidityPeriod>0</MessageValidityPeriod>
- <MessageDeliveryReport>TRUE</MessageDeliveryReport>
- <MinimumSignalLevel>0</MinimumSignalLevel>
- <LastSocketActivityTimeout>100</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>8</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>12</LastSocketClosedTimeout>
- </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
- <LANBearer operation="add">
- <Name>Dummy LAN Bearer</Name>
- <Agent>PSD.agt</Agent>
- <IfName>ppp</IfName>
- <LDDName>Dummy LDD</LDDName>
- <PDDName>Dummy PDD</PDDName>
- </LANBearer>
- <LANBearer operation="add">
- <Name>VPN Tests Ethernet Bearer</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>enet</LDDFilename>
- <LDDName>=Ethernet</LDDName>
- <PDDFilename>ethernet</PDDFilename>
- <PDDName>Ethernet.Wins</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
- <LANBearer operation="add">
- <Name>EKA2 Emulator Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>enet</LDDFilename>
- <LDDName>=Ethernet</LDDName>
- <PDDFilename>ethernet</PDDFilename>
- <PDDName>Ethernet.Wins</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
- <LANService operation="add">
- <Name>Ethernet</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.225.208.1</IpGateway>
- <IpAddr>10.225.208.102</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <IpNameServer1>172.30.251.128</IpNameServer1>
- <IpNameServer2>172.30.251.130</IpNameServer2>
- <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
- <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>VPN Tests Ethernet Service</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.254.0</IpNetMask>
- <IpGateway>10.253.5.254</IpGateway>
- <IpAddr>10.253.4.2</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <IpNameServer1>10.253.16.1</IpNameServer1>
- <IpNameServer2>10.192.59.6</IpNameServer2>
- </LANService>
-
-</LANServiceTable>
-
-<DialInISPTable>
- <DialInISP operation="template">
- <Name>Default Dial In ISP</Name>
- <UseLoginScript>FALSE</UseLoginScript>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <UseEdge>FALSE</UseEdge>
- </DialInISP>
- <DialInISP operation="add">
- <Name>Dial In CS ISP</Name>
- <UseLoginScript>FALSE</UseLoginScript>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <UseEdge>FALSE</UseEdge>
- </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
- <DialOutISP operation="template">
- <Name>Default Dial Out ISP</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>TRUE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>0</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>NT RAS</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>TRUE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Type>INTERNETONLY</Type>
- <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpNameServer1>10.16.59.15</IpNameServer1>
- <IpNameServer2>0.0.0.0</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerName>ASYNCHRONOUS</BearerName>
- <BearerSpeed>UNSPECIFIED</BearerSpeed>
- <BearerCE>UNSPECIFIED</BearerCE>
- <BearerType>CSD</BearerType>
- <ChannelCoding>UNSPECIFIED</ChannelCoding>
- <AIUR>9600</AIUR>
- <RequestedTimeSlots>0</RequestedTimeSlots>
- <MaximumTimeSlots>0</MaximumTimeSlots>
- <BearerProtocol>0</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>Linux</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Linux</Description>
- <Type>INTERNETONLY</Type>
- <LoginScript>New Record</LoginScript>
- <LoginName>RasUser</LoginName>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <IfCallbackType>IETF0</IfCallbackType>
- <CallbackTimeout>0</CallbackTimeout>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerName>ASYNCHRONOUS</BearerName>
- <BearerSpeed>UNSPECIFIED</BearerSpeed>
- <BearerCE>UNSPECIFIED</BearerCE>
- <BearerType>CSD</BearerType>
- <ChannelCoding>UNSPECIFIED</ChannelCoding>
- <AIUR>9600</AIUR>
- <RequestedTimeSlots>0</RequestedTimeSlots>
- <MaximumTimeSlots>0</MaximumTimeSlots>
- <BearerProtocol>0</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>Dummy</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Dummy</Description>
- <Type>INTERNETONLY</Type>
- <LoginScript>New Record</LoginScript>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfNetworks>ip,ip6</IfNetworks>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <IfCallbackType>IETF0</IfCallbackType>
- <CallbackTimeout>0</CallbackTimeout>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerName>ASYNCHRONOUS</BearerName>
- <BearerSpeed>UNSPECIFIED</BearerSpeed>
- <BearerCE>UNSPECIFIED</BearerCE>
- <BearerType>CSD</BearerType>
- <ChannelCoding>UNSPECIFIED</ChannelCoding>
- <AIUR>9600</AIUR>
- <RequestedTimeSlots>0</RequestedTimeSlots>
- <MaximumTimeSlots>0</MaximumTimeSlots>
- <BearerProtocol>0</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>Bad NT RAS</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>TRUE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <Type>INTERNETONLY</Type>
- <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>badpass</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerName>ASYNCHRONOUS</BearerName>
- <BearerSpeed>UNSPECIFIED</BearerSpeed>
- <BearerCE>UNSPECIFIED</BearerCE>
- <BearerType>CSD</BearerType>
- <ChannelCoding>UNSPECIFIED</ChannelCoding>
- <AIUR>9600</AIUR>
- <RequestedTimeSlots>0</RequestedTimeSlots>
- <MaximumTimeSlots>0</MaximumTimeSlots>
- <BearerProtocol>0</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-
-
-<ChargecardTable>
- <Chargecard operation="add">
- <Name>Dummy BT Chargecard</Name>
- <AccountNumber>144,12345678</AccountNumber>
- <Pin>0000</Pin>
- <LocalRule>HG</LocalRule>
- <NatRule>HFG</NatRule>
- <IntlRule>HEFG</IntlRule>
- </Chargecard>
- <Chargecard operation="add">
- <Name>Dummy Mercury Chargecard</Name>
- <AccountNumber>0500800800,,12345678</AccountNumber>
- <Pin>****</Pin>
- <LocalRule>HG</LocalRule>
- <NatRule>J,K,0FG</NatRule>
- <IntlRule>HEFG</IntlRule>
- </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
- <ConnectionPreferences operation="add">
- <Name>ConnectionPreferencesTable1</Name>
- <Ranking>0</Ranking>
- <Direction>OUTGOING</Direction>
- <DialogPref>PROMPT</DialogPref>
- <BearerSet>PSD</BearerSet>
- <IAPRef>IAP.NTRas GPRS</IAPRef>
- </ConnectionPreferences>
- <ConnectionPreferences operation="add">
- <Name>ConnectionPreferencesTable2</Name>
- <Ranking>1</Ranking>
- <Direction>OUTGOING</Direction>
- <DialogPref>DONOTPROMPT</DialogPref>
- <BearerSet>Virtual</BearerSet>
- <IAPRef>IAP.VPN Test IAP</IAPRef>
- </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
- <GlobalSettings operation="add">
- <Name>GlobalSettingsTable1</Name>
- <RedialAttempts>3</RedialAttempts>
- <SmsBearer>2</SmsBearer>
- <SmsReceiveMode>2</SmsReceiveMode>
- <GPRSAttachMode>1</GPRSAttachMode>
- <AcceptIncomingGprs>1</AcceptIncomingGprs>
- <ConnectionAttempts>2</ConnectionAttempts>
- <ModemForDataAndFax>2</ModemForDataAndFax>
- <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
- <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
- <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
- <GPRSClassCBearer>GSM</GPRSClassCBearer>
- <DefaultNetwork>Network.NT RAS</DefaultNetwork>
- <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
- </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
- <IncomingGPRS operation="add">
- <Name>Dummy Incoming GPRS Settings</Name>
- <APN>Test</APN>
- <PDPType>IPV4</PDPType>
- <PDPAddress>0.0.0.0</PDPAddress>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <ReqPrecedence>1</ReqPrecedence>
- <ReqDelay>1</ReqDelay>
- <ReqReliability>1</ReqReliability>
- <ReqPeakThroughput>1</ReqPeakThroughput>
- <ReqMeanThroughput>1</ReqMeanThroughput>
- <MinPrecedence>1</MinPrecedence>
- <MinDelay>1</MinDelay>
- <MinReliability>1</MinReliability>
- <MinPeakThroughput>1</MinPeakThroughput>
- <MinMeanThroughput>1</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>1</AuthRetries>
- <IpNameServer1>0.0.0.0</IpNameServer1>
- <IpNameServer2>0.0.0.0</IpNameServer2>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
- <OutgoingGPRS operation="add">
- <Name>NTRas GPRS</Name>
- <APN>Test</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>2</ReqPrecedence>
- <ReqDelay>4</ReqDelay>
- <ReqReliability>3</ReqReliability>
- <ReqPeakThroughput>3</ReqPeakThroughput>
- <ReqMeanThroughput>31</ReqMeanThroughput>
- <MinPrecedence>2</MinPrecedence>
- <MinDelay>4</MinDelay>
- <MinReliability>3</MinReliability>
- <MinPeakThroughput>3</MinPeakThroughput>
- <MinMeanThroughput>31</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>1</AuthRetries>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.51</IpNameServer2>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
- <DefaultGPRS operation="add">
- <Name>Dummy Default GPRS Settings</Name>
- <APN>Access point name</APN>
- <PDPType>IPV6</PDPType>
- <PDPAddress>www.wid.com</PDPAddress>
- <Usage>1</Usage>
- <Precedence>1</Precedence>
- <Delay>1</Delay>
- <Reliability>1</Reliability>
- <PeakThroughput>1</PeakThroughput>
- <MeanThroughput>1</MeanThroughput>
- <MinPrecedence>1</MinPrecedence>
- <MinDelay>1</MinDelay>
- <MinReliability>1</MinReliability>
- <MinPeakThroughput>1</MinPeakThroughput>
- <MinMeanThroughput>1</MinMeanThroughput>
- <DataCompression>TRUE</DataCompression>
- <HeaderCompression>TRUE</HeaderCompression>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <AnonymousAccess>TRUE</AnonymousAccess>
- </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
- <Proxy operation="add">
- <Name>ProxyTable1</Name>
- <ISPRef>DialOutISP.NT RAS</ISPRef>
- <UseProxyServer>TRUE</UseProxyServer>
- <ProtocolName>http</ProtocolName>
- <ProxyServerName>www.dummyproxy.com</ProxyServerName>
- <PortNumber>80</PortNumber>
- <Exceptions>www.dummyproxy.com/exception</Exceptions>
- </Proxy>
-</ProxyTable>
-
-<LocationTable>
- <Location operation="template">
- <Name>Default Location</Name>
- <Mobile>TRUE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>+</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- </Location>
- <Location operation="add">
- <Name>Office</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>171</AreaCode>
- <DialOutCode>9,</DialOutCode>
- </Location>
- <Location operation="add">
- <Name>Office Direct Dial</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>171</AreaCode>
- </Location>
- <Location operation="add">
- <Name>Mobile</Name>
- <Mobile>TRUE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>+</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- </Location>
- <Location operation="add">
- <Name>Home</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>TRUE</UsePulseDial>
- <WaitForDialTone>TRUE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>181</AreaCode>
- </Location>
-</LocationTable>
-
-<SecureSocketTable>
- <SecureSocket operation="add">
- <Name>SecureSocketTable1</Name>
- <ProtocolName>ssl3.0</ProtocolName>
- <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
- </SecureSocket>
- <SecureSocket operation="add">
- <Name>SecureSocketTable2</Name>
- <ProtocolName>tls1.0</ProtocolName>
- <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
- </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
- <WAPAccessPoint operation="template">
- <Name>Default Dial In ISP</Name>
- <CurrentBearer>WAPIPBearer</CurrentBearer>
- </WAPAccessPoint>
- <WAPAccessPoint operation="add">
- <Name>Dummy WAP Settings</Name>
- <CurrentBearer>WAPIPBearer</CurrentBearer>
- <StartPage>www.wapstart.com</StartPage>
- </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
- <WAPIPBearer operation="template">
- <Name>WAPIPBearerTable1</Name>
- <AccessPoint>WAPAccessPoint.-1</AccessPoint>
- <WSPOption>CONNECTIONLESS</WSPOption>
- <Security>FALSE</Security>
- <IAPRef>IAP.-1</IAPRef>
- <ProxyPortNumber>0</ProxyPortNumber>
- </WAPIPBearer>
- <WAPIPBearer operation="add">
- <Name>WAPIPBearerTable2</Name>
- <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
- <GatewayAddress>www.wapgateway.com</GatewayAddress>
- <WSPOption>CONNECTIONORIENTED</WSPOption>
- <Security>FALSE</Security>
- <IAPRef>IAP.NTRas GPRS</IAPRef>
- <ProxyPortNumber>1</ProxyPortNumber>
- </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
- <WAPSMSBearer operation="template">
- <Name>WAPSMSBearerTable1</Name>
- <AccessPoint>WAPAccessPoint.-1</AccessPoint>
- <WSPOption>CONNECTIONLESS</WSPOption>
- <Security>FALSE</Security>
- </WAPSMSBearer>
- <WAPSMSBearer operation="add">
- <Name>WAPSMSBearerTable2</Name>
- <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
- <GatewayAddress>+4412345678901</GatewayAddress>
- <WSPOption>CONNECTIONORIENTED</WSPOption>
- <Security>FALSE</Security>
- <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
- </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
- <VirtualBearer operation="add">
- <Name>VPN Test Bearer</Name>
- <Agent>vpnconnagt.agt</Agent>
- <IfName>tunnelnif</IfName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </VirtualBearer>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-<VpnService operation="add">
- <Name>VPN Test Service</Name>
- <Policy>te_2483</Policy>
- <HomeIAP>IAP.Ethernet with Daemon Dynamic IP</HomeIAP>
- <HomeNetwork>Network.VPN</HomeNetwork>
- </VpnService>
-</VpnServiceTable>
-
-</CommDB:Config>
\ No newline at end of file
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483vpn_drop.xml Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- CommDB Settings File
- Copyright (c) 2003, Symbian Ltd.
- All Rights Reserved
--->
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
- xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
- <Network operation="add">
- <Name>NT RAS</Name>
- </Network>
- <Network operation="add">
- <Name>Linux</Name>
- </Network>
- <Network operation="add">
- <Name>Dummy</Name>
- </Network>
- <Network operation="add">
- <Name>Hungry</Name>
- </Network>
- <Network operation="add">
- <Name>Dummy (Long Timeout)</Name>
- </Network>
- <Network operation="add">
- <Name>Hungry (Long Timeout)</Name>
- </Network>
- <Network operation="add">
- <Name>Intranet</Name>
- </Network>
- <Network operation="add">
- <Name>VPN</Name>
- </Network>
-
-</NetworkTable>
-
-<IAPTable>
- <IAP operation="add">
- <Name>Hungry</Name>
- <IAPService>DialOutISP.Dummy</IAPService>
- <IAPBearer>ModemBearer.Hungry</IAPBearer>
- <IAPNetwork>Network.Hungry</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office Direct Dial</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>NTRas GPRS</Name>
- <IAPService>OutgoingGPRS.NTRas GPRS</IAPService>
- <IAPBearer>ModemBearer.Hungry (Long Timeout)</IAPBearer>
- <IAPNetwork>Network.NT RAS</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Mobile</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Default Dial In ISP</Name>
- <IAPService>DialInISP.Dial In CS ISP</IAPService>
- <IAPBearer>ModemBearer.Linux</IAPBearer>
- <IAPNetwork>Network.NT RAS</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Home</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Linux</Name>
- <IAPService>DialOutISP.Linux</IAPService>
- <IAPBearer>ModemBearer.Linux</IAPBearer>
- <IAPNetwork>Network.Linux</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office Direct Dial</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Dummy</Name>
- <IAPService>DialOutISP.Dummy</IAPService>
- <IAPBearer>ModemBearer.Dummy</IAPBearer>
- <IAPNetwork>Network.Dummy</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office Direct Dial</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Actual NT RAS</Name>
- <IAPService>DialOutISP.NT RAS</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.NT RAS</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Virtual Comm port</Name>
- <IAPService>DialOutISP.Linux</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Linux</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Bad NT RAS</Name>
- <IAPService>DialOutISP.Bad NT RAS</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.NT RAS</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Dummy (Long Timeout)</Name>
- <IAPService>DialOutISP.Dummy</IAPService>
- <IAPBearer>ModemBearer.Dummy (Long Timeout)</IAPBearer>
- <IAPNetwork>Network.Dummy (Long Timeout)</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Hungry (Long Timeout)</Name>
- <IAPService>DialOutISP.Dummy</IAPService>
- <IAPBearer>ModemBearer.Hungry (Long Timeout)</IAPBearer>
- <IAPNetwork>Network.Hungry (Long Timeout)</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>VPN Test Ethernet</Name>
- <IAPService>LANService.VPN Tests Ethernet Service</IAPService>
- <IAPBearer>LANBearer.VPN Tests Ethernet Bearer</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>VPN Test IAP</Name>
- <IAPService>VpnService.VPN Test Service</IAPService>
- <IAPBearer>VirtualBearer.VPN Test Bearer</IAPBearer>
- <IAPNetwork>Network.VPN</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet with Daemon Dynamic IP</Name>
- <IAPService>LANService.Ethernet</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
-
-</IAPTable>
-
-<ModemBearerTable>
- <ModemBearer operation="template">
- <Name>Default Modem</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Null Modem 115200bps</Name>
- <Agent>csd.agt</Agent>
- <IfName>ppp</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>NTRASTSY</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageValidityPeriod>0</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>0</MinimumSignalLevel>
- <LastSocketActivityTimeout>15</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>5</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Linux</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::3</PortName>
- <TSYName>NTRASTSY</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>5</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageValidityPeriod>0</MessageValidityPeriod>
- <MessageDeliveryReport>TRUE</MessageDeliveryReport>
- <MinimumSignalLevel>0</MinimumSignalLevel>
- <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>20</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Dummy</Name>
- <Agent>NULLAGT.agt</Agent>
- <IfName>dummynif</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>NTRASTSY</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>5</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageValidityPeriod>0</MessageValidityPeriod>
- <MessageDeliveryReport>TRUE</MessageDeliveryReport>
- <MinimumSignalLevel>0</MinimumSignalLevel>
- <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>2</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>4</LastSocketClosedTimeout>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Hungry</Name>
- <Agent>NULLAGT.agt</Agent>
- <IfName>hungrynif</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>NTRASTSY</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>5</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageValidityPeriod>0</MessageValidityPeriod>
- <MessageDeliveryReport>TRUE</MessageDeliveryReport>
- <MinimumSignalLevel>0</MinimumSignalLevel>
- <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>2</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>4</LastSocketClosedTimeout>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Dummy (Long Timeout)</Name>
- <Agent>NULLAGT.agt</Agent>
- <IfName>dummynif</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageValidityPeriod>0</MessageValidityPeriod>
- <MessageDeliveryReport>TRUE</MessageDeliveryReport>
- <MinimumSignalLevel>0</MinimumSignalLevel>
- <LastSocketActivityTimeout>14</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>6</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Hungry (Long Timeout)</Name>
- <Agent>NULLAGT.agt</Agent>
- <IfName>hungrynif</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageValidityPeriod>0</MessageValidityPeriod>
- <MessageDeliveryReport>TRUE</MessageDeliveryReport>
- <MinimumSignalLevel>0</MinimumSignalLevel>
- <LastSocketActivityTimeout>100</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>8</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>12</LastSocketClosedTimeout>
- </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
- <LANBearer operation="add">
- <Name>Dummy LAN Bearer</Name>
- <Agent>PSD.agt</Agent>
- <IfName>ppp</IfName>
- <LDDName>Dummy LDD</LDDName>
- <PDDName>Dummy PDD</PDDName>
- </LANBearer>
- <LANBearer operation="add">
- <Name>VPN Tests Ethernet Bearer</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>enet</LDDFilename>
- <LDDName>=Ethernet</LDDName>
- <PDDFilename>ethernet</PDDFilename>
- <PDDName>Ethernet.Wins</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
- <LANBearer operation="add">
- <Name>EKA2 Emulator Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>enet</LDDFilename>
- <LDDName>=Ethernet</LDDName>
- <PDDFilename>ethernet</PDDFilename>
- <PDDName>Ethernet.Wins</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
- <LANService operation="add">
- <Name>Ethernet</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.225.208.1</IpGateway>
- <IpAddr>10.225.208.102</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <IpNameServer1>172.30.251.128</IpNameServer1>
- <IpNameServer2>172.30.251.130</IpNameServer2>
- <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
- <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>VPN Tests Ethernet Service</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.254.0</IpNetMask>
- <IpGateway>10.253.5.254</IpGateway>
- <IpAddr>10.253.4.2</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <IpNameServer1>10.253.16.1</IpNameServer1>
- <IpNameServer2>10.192.59.6</IpNameServer2>
- </LANService>
-
-</LANServiceTable>
-
-<DialInISPTable>
- <DialInISP operation="template">
- <Name>Default Dial In ISP</Name>
- <UseLoginScript>FALSE</UseLoginScript>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <UseEdge>FALSE</UseEdge>
- </DialInISP>
- <DialInISP operation="add">
- <Name>Dial In CS ISP</Name>
- <UseLoginScript>FALSE</UseLoginScript>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <UseEdge>FALSE</UseEdge>
- </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
- <DialOutISP operation="template">
- <Name>Default Dial Out ISP</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>TRUE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>0</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>NT RAS</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>TRUE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Type>INTERNETONLY</Type>
- <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpNameServer1>10.16.59.15</IpNameServer1>
- <IpNameServer2>0.0.0.0</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerName>ASYNCHRONOUS</BearerName>
- <BearerSpeed>UNSPECIFIED</BearerSpeed>
- <BearerCE>UNSPECIFIED</BearerCE>
- <BearerType>CSD</BearerType>
- <ChannelCoding>UNSPECIFIED</ChannelCoding>
- <AIUR>9600</AIUR>
- <RequestedTimeSlots>0</RequestedTimeSlots>
- <MaximumTimeSlots>0</MaximumTimeSlots>
- <BearerProtocol>0</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>Linux</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Linux</Description>
- <Type>INTERNETONLY</Type>
- <LoginScript>New Record</LoginScript>
- <LoginName>RasUser</LoginName>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <IfCallbackType>IETF0</IfCallbackType>
- <CallbackTimeout>0</CallbackTimeout>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerName>ASYNCHRONOUS</BearerName>
- <BearerSpeed>UNSPECIFIED</BearerSpeed>
- <BearerCE>UNSPECIFIED</BearerCE>
- <BearerType>CSD</BearerType>
- <ChannelCoding>UNSPECIFIED</ChannelCoding>
- <AIUR>9600</AIUR>
- <RequestedTimeSlots>0</RequestedTimeSlots>
- <MaximumTimeSlots>0</MaximumTimeSlots>
- <BearerProtocol>0</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>Dummy</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Dummy</Description>
- <Type>INTERNETONLY</Type>
- <LoginScript>New Record</LoginScript>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfNetworks>ip,ip6</IfNetworks>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <IfCallbackType>IETF0</IfCallbackType>
- <CallbackTimeout>0</CallbackTimeout>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerName>ASYNCHRONOUS</BearerName>
- <BearerSpeed>UNSPECIFIED</BearerSpeed>
- <BearerCE>UNSPECIFIED</BearerCE>
- <BearerType>CSD</BearerType>
- <ChannelCoding>UNSPECIFIED</ChannelCoding>
- <AIUR>9600</AIUR>
- <RequestedTimeSlots>0</RequestedTimeSlots>
- <MaximumTimeSlots>0</MaximumTimeSlots>
- <BearerProtocol>0</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>Bad NT RAS</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>TRUE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <Type>INTERNETONLY</Type>
- <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>badpass</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerName>ASYNCHRONOUS</BearerName>
- <BearerSpeed>UNSPECIFIED</BearerSpeed>
- <BearerCE>UNSPECIFIED</BearerCE>
- <BearerType>CSD</BearerType>
- <ChannelCoding>UNSPECIFIED</ChannelCoding>
- <AIUR>9600</AIUR>
- <RequestedTimeSlots>0</RequestedTimeSlots>
- <MaximumTimeSlots>0</MaximumTimeSlots>
- <BearerProtocol>0</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-
-
-<ChargecardTable>
- <Chargecard operation="add">
- <Name>Dummy BT Chargecard</Name>
- <AccountNumber>144,12345678</AccountNumber>
- <Pin>0000</Pin>
- <LocalRule>HG</LocalRule>
- <NatRule>HFG</NatRule>
- <IntlRule>HEFG</IntlRule>
- </Chargecard>
- <Chargecard operation="add">
- <Name>Dummy Mercury Chargecard</Name>
- <AccountNumber>0500800800,,12345678</AccountNumber>
- <Pin>****</Pin>
- <LocalRule>HG</LocalRule>
- <NatRule>J,K,0FG</NatRule>
- <IntlRule>HEFG</IntlRule>
- </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
- <ConnectionPreferences operation="add">
- <Name>ConnectionPreferencesTable1</Name>
- <Ranking>0</Ranking>
- <Direction>OUTGOING</Direction>
- <DialogPref>PROMPT</DialogPref>
- <BearerSet>PSD</BearerSet>
- <IAPRef>IAP.NTRas GPRS</IAPRef>
- </ConnectionPreferences>
- <ConnectionPreferences operation="add">
- <Name>ConnectionPreferencesTable2</Name>
- <Ranking>1</Ranking>
- <Direction>OUTGOING</Direction>
- <DialogPref>DONOTPROMPT</DialogPref>
- <BearerSet>Virtual</BearerSet>
- <IAPRef>IAP.VPN Test IAP</IAPRef>
- </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
- <GlobalSettings operation="add">
- <Name>GlobalSettingsTable1</Name>
- <RedialAttempts>3</RedialAttempts>
- <SmsBearer>2</SmsBearer>
- <SmsReceiveMode>2</SmsReceiveMode>
- <GPRSAttachMode>1</GPRSAttachMode>
- <AcceptIncomingGprs>1</AcceptIncomingGprs>
- <ConnectionAttempts>2</ConnectionAttempts>
- <ModemForDataAndFax>2</ModemForDataAndFax>
- <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
- <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
- <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
- <GPRSClassCBearer>GSM</GPRSClassCBearer>
- <DefaultNetwork>Network.NT RAS</DefaultNetwork>
- <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
- </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
- <IncomingGPRS operation="add">
- <Name>Dummy Incoming GPRS Settings</Name>
- <APN>Test</APN>
- <PDPType>IPV4</PDPType>
- <PDPAddress>0.0.0.0</PDPAddress>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <ReqPrecedence>1</ReqPrecedence>
- <ReqDelay>1</ReqDelay>
- <ReqReliability>1</ReqReliability>
- <ReqPeakThroughput>1</ReqPeakThroughput>
- <ReqMeanThroughput>1</ReqMeanThroughput>
- <MinPrecedence>1</MinPrecedence>
- <MinDelay>1</MinDelay>
- <MinReliability>1</MinReliability>
- <MinPeakThroughput>1</MinPeakThroughput>
- <MinMeanThroughput>1</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>1</AuthRetries>
- <IpNameServer1>0.0.0.0</IpNameServer1>
- <IpNameServer2>0.0.0.0</IpNameServer2>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
- <OutgoingGPRS operation="add">
- <Name>NTRas GPRS</Name>
- <APN>Test</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>2</ReqPrecedence>
- <ReqDelay>4</ReqDelay>
- <ReqReliability>3</ReqReliability>
- <ReqPeakThroughput>3</ReqPeakThroughput>
- <ReqMeanThroughput>31</ReqMeanThroughput>
- <MinPrecedence>2</MinPrecedence>
- <MinDelay>4</MinDelay>
- <MinReliability>3</MinReliability>
- <MinPeakThroughput>3</MinPeakThroughput>
- <MinMeanThroughput>31</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>1</AuthRetries>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.51</IpNameServer2>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
- <DefaultGPRS operation="add">
- <Name>Dummy Default GPRS Settings</Name>
- <APN>Access point name</APN>
- <PDPType>IPV6</PDPType>
- <PDPAddress>www.wid.com</PDPAddress>
- <Usage>1</Usage>
- <Precedence>1</Precedence>
- <Delay>1</Delay>
- <Reliability>1</Reliability>
- <PeakThroughput>1</PeakThroughput>
- <MeanThroughput>1</MeanThroughput>
- <MinPrecedence>1</MinPrecedence>
- <MinDelay>1</MinDelay>
- <MinReliability>1</MinReliability>
- <MinPeakThroughput>1</MinPeakThroughput>
- <MinMeanThroughput>1</MinMeanThroughput>
- <DataCompression>TRUE</DataCompression>
- <HeaderCompression>TRUE</HeaderCompression>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <AnonymousAccess>TRUE</AnonymousAccess>
- </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
- <Proxy operation="add">
- <Name>ProxyTable1</Name>
- <ISPRef>DialOutISP.NT RAS</ISPRef>
- <UseProxyServer>TRUE</UseProxyServer>
- <ProtocolName>http</ProtocolName>
- <ProxyServerName>www.dummyproxy.com</ProxyServerName>
- <PortNumber>80</PortNumber>
- <Exceptions>www.dummyproxy.com/exception</Exceptions>
- </Proxy>
-</ProxyTable>
-
-<LocationTable>
- <Location operation="template">
- <Name>Default Location</Name>
- <Mobile>TRUE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>+</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- </Location>
- <Location operation="add">
- <Name>Office</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>171</AreaCode>
- <DialOutCode>9,</DialOutCode>
- </Location>
- <Location operation="add">
- <Name>Office Direct Dial</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>171</AreaCode>
- </Location>
- <Location operation="add">
- <Name>Mobile</Name>
- <Mobile>TRUE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>+</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- </Location>
- <Location operation="add">
- <Name>Home</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>TRUE</UsePulseDial>
- <WaitForDialTone>TRUE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>181</AreaCode>
- </Location>
-</LocationTable>
-
-<SecureSocketTable>
- <SecureSocket operation="add">
- <Name>SecureSocketTable1</Name>
- <ProtocolName>ssl3.0</ProtocolName>
- <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
- </SecureSocket>
- <SecureSocket operation="add">
- <Name>SecureSocketTable2</Name>
- <ProtocolName>tls1.0</ProtocolName>
- <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
- </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
- <WAPAccessPoint operation="template">
- <Name>Default Dial In ISP</Name>
- <CurrentBearer>WAPIPBearer</CurrentBearer>
- </WAPAccessPoint>
- <WAPAccessPoint operation="add">
- <Name>Dummy WAP Settings</Name>
- <CurrentBearer>WAPIPBearer</CurrentBearer>
- <StartPage>www.wapstart.com</StartPage>
- </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
- <WAPIPBearer operation="template">
- <Name>WAPIPBearerTable1</Name>
- <AccessPoint>WAPAccessPoint.-1</AccessPoint>
- <WSPOption>CONNECTIONLESS</WSPOption>
- <Security>FALSE</Security>
- <IAPRef>IAP.-1</IAPRef>
- <ProxyPortNumber>0</ProxyPortNumber>
- </WAPIPBearer>
- <WAPIPBearer operation="add">
- <Name>WAPIPBearerTable2</Name>
- <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
- <GatewayAddress>www.wapgateway.com</GatewayAddress>
- <WSPOption>CONNECTIONORIENTED</WSPOption>
- <Security>FALSE</Security>
- <IAPRef>IAP.NTRas GPRS</IAPRef>
- <ProxyPortNumber>1</ProxyPortNumber>
- </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
- <WAPSMSBearer operation="template">
- <Name>WAPSMSBearerTable1</Name>
- <AccessPoint>WAPAccessPoint.-1</AccessPoint>
- <WSPOption>CONNECTIONLESS</WSPOption>
- <Security>FALSE</Security>
- </WAPSMSBearer>
- <WAPSMSBearer operation="add">
- <Name>WAPSMSBearerTable2</Name>
- <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
- <GatewayAddress>+4412345678901</GatewayAddress>
- <WSPOption>CONNECTIONORIENTED</WSPOption>
- <Security>FALSE</Security>
- <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
- </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
- <VirtualBearer operation="add">
- <Name>VPN Test Bearer</Name>
- <Agent>vpnconnagt.agt</Agent>
- <IfName>tunnelnif</IfName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </VirtualBearer>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-<VpnService operation="add">
- <Name>VPN Test Service</Name>
- <Policy>te_2483_drop</Policy>
- <HomeIAP>IAP.Ethernet with Daemon Dynamic IP</HomeIAP>
- <HomeNetwork>Network.VPN</HomeNetwork>
- </VpnService>
-</VpnServiceTable>
-
-</CommDB:Config>
\ No newline at end of file
--- a/networksecurity/tls/group/BLD.INF Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/group/BLD.INF Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -89,13 +89,6 @@
../ts_tls/scripts/tls_oom.ini z:/testdata/configs/tls_oom.ini
../ts_tls/scripts/tls1.ini z:/testdata/configs/tls1.ini
../ts_tls/scripts/tls2.ini z:/testdata/configs/tls2.ini
-
-// ini files 39,40,41 and 42 are used for the REQ 415-8346
-../ts_tls/scripts/tls39.ini z:/testdata/configs/tls39.ini
-../ts_tls/scripts/tls40.ini z:/testdata/configs/tls40.ini
-../ts_tls/scripts/tls41.ini z:/testdata/configs/tls41.ini
-../ts_tls/scripts/tls42.ini z:/testdata/configs/tls42.ini
-
../ts_tls/scripts/TLS_RSA_WITH_NULL_SHA.ini z:/testdata/configs/tls_rsa_with_null_sha.ini
../ts_tls/scripts/TLS_RSA_WITH_NULL_MD5.ini z:/testdata/configs/tls_rsa_with_null_md5.ini
../ts_tls/scripts/TLS_SNE_SINGLE_SERVER.ini z:/testdata/configs/tls_sne_single_server.ini
--- a/networksecurity/tls/group/SSL.MMP Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/group/SSL.MMP Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -57,7 +57,6 @@
LIBRARY netsm.lib
LIBRARY netmsg.lib
LIBRARY crypto.lib
-LIBRARY featdiscovery.lib
START WINS
--- a/networksecurity/tls/group/ts_tls.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/group/ts_tls.iby Tue Aug 31 16:45:15 2010 +0300
@@ -33,16 +33,69 @@
data=EPOCROOT##epoc32\data\Z\private\101f72a6\keys.dat private\101f72a6\keys.dat
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\data\Z\testdata\configs\cccccc00_ssl_30.cre testdata\configs\cccccc00_ssl_30.cre
+data=EPOCROOT##epoc32\data\Z\testdata\configs\cccccc00_tls_psk.cre testdata\configs\cccccc00_tls_psk.cre
+data=EPOCROOT##epoc32\data\Z\testdata\scripts\tls_oom_wlan.script testdata\scripts\tls_oom.script
+data=EPOCROOT##epoc32\data\Z\testdata\scripts\tls_psk_wlan.script testdata\scripts\tls_psk.script
+data=EPOCROOT##epoc32\data\Z\testdata\scripts\ssl_ntras_30_wlan.script testdata\scripts\ssl_ntras_30.script
+data=EPOCROOT##epoc32\data\Z\testdata\scripts\ssl_ntras_31_wlan.script testdata\scripts\ssl_ntras_31.script
+#else
data=EPOCROOT##epoc32\data\Z\testdata\configs\tls_ntras.cfg testdata\configs\tls_ntras.cfg
data=EPOCROOT##epoc32\data\Z\testdata\configs\tls_ethernet.xml testdata\configs\tls_ethernet.xml
data=EPOCROOT##epoc32\data\Z\testdata\scripts\tls_oom.script testdata\scripts\tls_oom.script
data=EPOCROOT##epoc32\data\Z\testdata\scripts\tls_psk.script testdata\scripts\tls_psk.script
data=EPOCROOT##epoc32\data\Z\testdata\scripts\ssl_ntras_30.script testdata\scripts\ssl_ntras_30.script
data=EPOCROOT##epoc32\data\Z\testdata\scripts\ssl_ntras_31.script testdata\scripts\ssl_ntras_31.script
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
+
data=EPOCROOT##epoc32\data\Z\testdata\configs\tls_t_secdlg_in.dat testdata\configs\tls_t_secdlg_in.dat
data=EPOCROOT##epoc32\data\Z\testdata\configs\cacerts_psk.dat testdata\configs\cacerts_psk.dat
data=EPOCROOT##epoc32\data\Z\testdata\configs\certclients_psk.dat testdata\configs\certclients_psk.dat
data=EPOCROOT##epoc32\data\Z\testdata\configs\keys_psk.dat testdata\configs\keys_psk.dat
+
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls3_wlan.ini testdata\configs\tls3.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls4_wlan.ini testdata\configs\tls4.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls5_wlan.ini testdata\configs\tls5.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls8_wlan.ini testdata\configs\tls8.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls9_wlan.ini testdata\configs\tls9.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls11_wlan.ini testdata\configs\tls11.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls12_wlan.ini testdata\configs\tls12.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls13_wlan.ini testdata\configs\tls13.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls14_wlan.ini testdata\configs\tls14.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls16_wlan.ini testdata\configs\tls16.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls19_wlan.ini testdata\configs\tls19.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls20_wlan.ini testdata\configs\tls20.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls21_wlan.ini testdata\configs\tls21.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls22_wlan.ini testdata\configs\tls22.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls23_wlan.ini testdata\configs\tls23.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls24_wlan.ini testdata\configs\tls24.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls25_wlan.ini testdata\configs\tls25.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls26_wlan.ini testdata\configs\tls26.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls28_wlan.ini testdata\configs\tls28.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls5b_wlan.ini testdata\configs\tls5b.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tlsA_wlan.ini testdata\configs\tlsA.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tlssa_wlan.ini testdata\configs\tlssa.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls2f_wlan.ini testdata\configs\tls2f.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls35_wlan.ini testdata\configs\tls35.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls36_wlan.ini testdata\configs\tls36.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls37_wlan.ini testdata\configs\tls37.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls38_wlan.ini testdata\configs\tls38.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls_oom_wlan.ini testdata\configs\tls_oom.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls1_wlan.ini testdata\configs\tls1.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls2_wlan.ini testdata\configs\tls2.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_RSA_WITH_NULL_SHA_wlan.ini testdata\configs\TLS_RSA_WITH_NULL_SHA.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_RSA_WITH_NULL_MD5_wlan.ini testdata\configs\TLS_RSA_WITH_NULL_MD5.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_SNE_SINGLE_SERVER_wlan.ini testdata\configs\TLS_SNE_SINGLE_SERVER.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_SNE_MULTIPLE_SERVER_wlan.ini testdata\configs\TLS_SNE_MULTIPLE_SERVER.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_RC4_128_SHA_wlan.ini testdata\configs\TLS_PSK_WITH_RC4_128_SHA.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_SNE_SINGLE_SERVER_NEG_wlan.ini testdata\configs\TLS_SNE_SINGLE_SERVER_NEG.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA_wlan.ini testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_AES_256_CBC_SHA_wlan.ini testdata\configs\TLS_PSK_WITH_AES_256_CBC_SHA.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_3DES_EDE_CBC_SHA_wlan.ini testdata\configs\TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK_wlan.ini testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini
+#else
data=EPOCROOT##epoc32\data\Z\testdata\configs\tls3.ini testdata\configs\tls3.ini
data=EPOCROOT##epoc32\data\Z\testdata\configs\tls4.ini testdata\configs\tls4.ini
data=EPOCROOT##epoc32\data\Z\testdata\configs\tls5.ini testdata\configs\tls5.ini
@@ -70,10 +123,6 @@
data=EPOCROOT##epoc32\data\Z\testdata\configs\tls36.ini testdata\configs\tls36.ini
data=EPOCROOT##epoc32\data\Z\testdata\configs\tls37.ini testdata\configs\tls37.ini
data=EPOCROOT##epoc32\data\Z\testdata\configs\tls38.ini testdata\configs\tls38.ini
-data=EPOCROOT##epoc32\data\Z\testdata\configs\tls39.ini testdata\configs\tls39.ini
-data=EPOCROOT##epoc32\data\Z\testdata\configs\tls40.ini testdata\configs\tls40.ini
-data=EPOCROOT##epoc32\data\Z\testdata\configs\tls41.ini testdata\configs\tls41.ini
-data=EPOCROOT##epoc32\data\Z\testdata\configs\tls42.ini testdata\configs\tls42.ini
data=EPOCROOT##epoc32\data\Z\testdata\configs\tls_oom.ini testdata\configs\tls_oom.ini
data=EPOCROOT##epoc32\data\Z\testdata\configs\tls1.ini testdata\configs\tls1.ini
data=EPOCROOT##epoc32\data\Z\testdata\configs\tls2.ini testdata\configs\tls2.ini
@@ -87,5 +136,6 @@
data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_AES_256_CBC_SHA.ini testdata\configs\TLS_PSK_WITH_AES_256_CBC_SHA.ini
data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini testdata\configs\TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini
data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
#endif
--- a/networksecurity/tls/group/ts_tls.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/group/ts_tls.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -20,8 +20,6 @@
UID 0x1000008d 0x101F52C4
VENDORID 0x70000001
-MACRO HTTP_ALLOW_UNTRUSTED_CERTIFICATES
-
SOURCEPATH ../ts_tls
SOURCE COMINIT.CPP
--- a/networksecurity/tls/protocol/tlsconnection.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/protocol/tlsconnection.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -26,8 +26,6 @@
#include "applicationdata.h"
#include <es_sock.h>
#include <in_sock.h>
-#include <featdiscovery.h>
-#include <featureuids.h>
#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
#include <ssl_internal.h>
@@ -156,17 +154,7 @@
User::LeaveIfError( SetProtocol(aProtocol) );
iTlsProvider->Attributes()->iCurrentCipherSuite.iLoByte = 0x00;
iTlsProvider->Attributes()->iCurrentCipherSuite.iHiByte = 0x00;
- TBool allowUntrustedCertificates = EFalse;
- allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates);
-
- if( allowUntrustedCertificates )
- {
- iTlsProvider->Attributes()->iDialogMode = ETTLSDialogModeAllowAutomatic;
- }
- else
- {
- iTlsProvider->Attributes()->iDialogNonAttendedMode = EFalse;
- }
+ iTlsProvider->Attributes()->iDialogNonAttendedMode = EFalse;
iDialogMode = EDialogModeAttended;
iGenericSocket = new(ELeave)CGenericSecureSocket<RSocket>(aSocket);
@@ -175,17 +163,18 @@
LOG(Log::Printf(_L("iRecordParser %x - %x"), iRecordParser, (TUint)iRecordParser + sizeof( CRecordParser ));)
iRecordComposer = new(ELeave)CRecordComposer( *iGenericSocket, *iTlsProvider );
TBuf<32> tempBuf;
- tempBuf.Copy(aProtocol);
- tempBuf.UpperCase();
- TInt ret = tempBuf.Compare(KProtocolVerSSL30);
- if (!ret)
- {
- iRecordComposer->SetVersion(&KSSL3_0);
- }
- else
- {
- iRecordComposer->SetVersion(&KTLS1_0);
- }
+ tempBuf.Copy(aProtocol);
+ tempBuf.UpperCase();
+ TInt ret = tempBuf.Compare(KProtocolVerSSL30);
+ if (!ret)
+ {
+ iRecordComposer->SetVersion(&KSSL3_0);
+ }
+ else
+ {
+ iRecordComposer->SetVersion(&KTLS1_0);
+ }
+
LOG(Log::Printf(_L("iRecordComposer %x - %x"), iRecordComposer, (TUint)iRecordComposer + sizeof( CRecordComposer ));)
#ifdef _DEBUG
@@ -218,17 +207,7 @@
User::LeaveIfError( SetProtocol(aProtocol) );
iTlsProvider->Attributes()->iCurrentCipherSuite.iLoByte = 0x00;
iTlsProvider->Attributes()->iCurrentCipherSuite.iHiByte = 0x00;
- TBool allowUntrustedCertificates = EFalse;
- allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates);
-
- if( allowUntrustedCertificates )
- {
- iTlsProvider->Attributes()->iDialogMode = ETTLSDialogModeAttended;
- }
- else
- {
- iTlsProvider->Attributes()->iDialogNonAttendedMode = EFalse;
- }
+ iTlsProvider->Attributes()->iDialogNonAttendedMode = EFalse;
iDialogMode = EDialogModeAttended;
iRecordParser = new(ELeave)CRecordParser( aSocket, *iTlsProvider );
@@ -932,56 +911,23 @@
// TDialogMode enum or has the value EDialogModeUnattended/EDialogModeAttended.
// Otherwise, it must return KErrArgument
TInt ret = KErrNone;
- TBool allowUntrustedCertificates = EFalse;
- TRAP(ret, allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates));
-
- if(KErrNone == ret)
- {
- TTLSDialogMode tlsDialogMode( ETTLSDialogModeAttended );
- switch(aDialogMode)
- {
- case EDialogModeUnattended:
- {
- if( allowUntrustedCertificates )
- {
- tlsDialogMode = ETTLSDialogModeUnattended;
- iDialogMode = aDialogMode;
- break;
- }
- }
- case EDialogModeAttended:
- {
- if( allowUntrustedCertificates )
- {
- tlsDialogMode = ETTLSDialogModeAttended;
- }
- iDialogMode = aDialogMode;
- break;
- }
- case EDialogModeAllowAutomatic:
- {
- tlsDialogMode = ETTLSDialogModeAllowAutomatic;
- iDialogMode = aDialogMode;
- break;
- }
-
- default: //-- wrong mode
- LOG(Log::Printf(_L("SetDialogMode() - Unknown dialog mode, default setting (Attended mode) being used"));)
- return KErrArgument;
- };
+
+ switch(aDialogMode)
+ {
+ case EDialogModeUnattended:
+ case EDialogModeAttended:
+ iDialogMode = aDialogMode;
+ break;
+
+ default: //-- wrong mode
+ LOG(Log::Printf(_L("SetDialogMode() - Unknown dialog mode, default setting (Attended mode) being used"));)
+ return KErrArgument;
+ };
- if ( iTlsProvider )
- {
- if( allowUntrustedCertificates )
- {
- iTlsProvider->Attributes()->iDialogMode = tlsDialogMode;
- }
- else
- {
- iTlsProvider->Attributes()->iDialogNonAttendedMode = (iDialogMode == EDialogModeUnattended);
- }
- }
- }
+ if ( iTlsProvider )
+ {
+ iTlsProvider->Attributes()->iDialogNonAttendedMode = (iDialogMode == EDialogModeUnattended);
+ }
return ret;
}
--- a/networksecurity/tls/secsock/SecureSocketInterface.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/secsock/SecureSocketInterface.h Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -64,9 +64,6 @@
EDialogModeAttended,
/** Untrusted certificates are canceled without user confirmation. */
EDialogModeUnattended
- ,
- /** Untrusted certificates are automatically allowed without user confirmation. */
- EDialogModeAllowAutomatic
};
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/TestWrapper.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,940 +0,0 @@
-// 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:
-//
-
-#include <windows.h>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <stdlib.h>
-#include <direct.h>
-
-
-using namespace std;
-STARTUPINFO startupInfo;
-PROCESS_INFORMATION processInfo;
-STARTUPINFO startupInfoTls;
-PROCESS_INFORMATION processInfoTls;
-const char* CodenomiconPath = "C:/Program Files/Codenomicon/tlsc-31/testtool/tlsc-31.jar";
-const char* TestToolWrapperPath = "D:\\TlsTestWrapper\\";
-
-int ReadConfigurations(const string& fileName, string& configSettings);
-int GetPlatformAndBuild(const string& fileName, string& platform, string& build);
-int RunTlsTestTool(const string& config, const string& jarPath);
-int RunEpocTlsTest(const string& platform, const string& build);
-int ParseLog(const string& fileDir, string& reportName);
-int GetLogDirectory(const string& configFileName, string& logDir);
-void ConvertPath(string& path);
-int GetPlatformAndBuild(const string& fileName, string& platform, string& build);
-void GetEpocDrive(string& drive);
-void RemoveSpacesAround(string& inString);
-int EpocPreTestConfig(const string& drive, const string& platform, const string& build);
-int EpocPostTestConfig(const string& drive, const string& platform, const string& build);
-void WaitForEpocTest();
-
-/* this function is used to read the configuration settings from the config file
- for Codenomicon TLS Client test tool
-
- its parameters are:
- 1) fileName(in): this contains the name of the config file
- 2) configSettings(out): on return, this contains the configuration settings
-*/
-int ReadConfigurations(const string& fileName, string& configSettings)
- {
- ifstream configFile(fileName.c_str());
- if(configFile.is_open())
- {
- string configLine;
-
- // go to the codenomicon params section
- getline(configFile,configLine);
- while(configLine.find("[params]", 0) == string::npos)
- {
- getline(configFile,configLine);
- if(configFile.eof())
- {
- cout<<"\ncould not find [params] section in config file"<<endl;
- return -1;
- }
- }
-
- // reached the params section, now read the configuration settings
- while(!configFile.eof())
- {
- getline(configFile, configLine);
-
- if(!configLine.empty())
- {
- // chop off any blank spaces before the config options
- while(configLine[0] == ' ')
- {
- configLine.erase(0, 1);
- }
-
- // add to config string only if the line is not a comment
- if(configLine[0] != '/' && configLine[1] != '/')
- {
- // codenomicon expects each config setting to be preceeded with --
- configSettings = configSettings + " --" + configLine;
- }
- }
- }
-
- configFile.close();
- }
- else
- {
- cout << "Unable to open config file: "<< fileName;
- return -1;
- }
- }
-
-/* this function is used to remove spaces before as well as after a word
-
- its parameter is:
- 1) inString (in/out): this contains the input string and on return is contains
- the string without any spaces before or after the word
-*/
-
-void RemoveSpacesAround(string& inString)
- {
- int i = 0;
- while(inString[i] == ' ')
- {
- inString.erase(i, 1);
- ++i;
- }
-
- i = inString.length();
- while(inString[i] == ' ')
- {
- inString.erase(i, 1);
- --i;
- }
-
- }
-
-/* this function is used to read the platform and build from the config file for
- which the test has to be run
-
- its parameters are:
- 1) fileName(in): this contains the name of the config file
- 2) platform(out): on return, this contains the platform
- 3) build(out): on return, this contains the build
-*/
-
-int GetPlatformAndBuild(const string& fileName, string& platform, string& build)
- {
- ifstream configFile(fileName.c_str());
- if(!configFile.is_open())
- {
- cout<<"Failed to open config file: "<<fileName<<endl;
- return -1;
- }
-
- string configLine;
- bool foundPlatform = false;
- bool foundBuild = false;
- int posPlatform = -1;
- int posBuild = -1;
-
-
- // read the platform and build section from the file in a single pass
- while(!configFile.eof())
- {
- getline(configFile,configLine);
- posPlatform = configLine.find("[platform]", 0);
- if(posPlatform != string::npos)
- {
- // found platform section, its value is after the [platform], i.e. 10 positions after it
- platform = configLine.substr(posPlatform + 10, configLine.length());
- RemoveSpacesAround(platform);
- foundPlatform = true;
- if(foundBuild)
- {
- configFile.close();
- return 0;
- }
- }
-
- posBuild = configLine.find("[build]", 0);
- if(posBuild != string::npos)
- {
- // found the build section, its value is after the [build], i.e. 7 positions after it
- build = configLine.substr(posBuild + 7, configLine.length());
- RemoveSpacesAround(build);
- foundBuild = true;
- if(foundPlatform)
- {
- configFile.close();
- return 0;
- }
- }
- }
-
- // could not find either platform or build or both
- if(!foundPlatform)
- {
- cout<<"\nCould not find Platform section"<<endl;
- }
- if(!foundBuild)
- {
- cout<<"Could not find Build section"<<endl;
- }
-
- configFile.close();
- return -1;
- }
-
-
-/* this function runs the TLS test tool i.e. Codenomicon.
-
- its parameters are:
- 1) config(in): the configuration options for the Codenomicon tool
- 2) jarPath(in): the path of the Codenomicon jar file
-*/
-
-int RunTlsTestTool(const string& config, const string& jarPath)
- {
- string command = "java -Xmx128M -jar " + jarPath + config;
- //cout<<endl<<command<<endl;
-
- //return system(command.c_str());
-
-
- ZeroMemory(&startupInfoTls, sizeof(startupInfoTls));
- startupInfoTls.cb = sizeof(startupInfoTls);
-
- ZeroMemory(&processInfoTls, sizeof(processInfoTls));
-
- // string tlsTestProgram = driveLetter +":/epoc32/RELEASE/"+ platform +"/"+ build +"/TlsClientTest";
- //cout<<"\ntls test program path: "<<tlsTestProgram<<endl;
-
- cout<<"Launching Codenomicon TLS test tool"<<endl;
- // create a separate process for Codenomicon TLS test tool
- if(!CreateProcess( NULL, // no module name (use command line)
- (char*)command.c_str(), // Codenomicon TLS test tool
- NULL, // process handle not inheritable
- NULL, // thread handle not inheritable
- FALSE, // set handle inheritance to FALSE
- 0, // no creation flags
- NULL, // use parent's environment block
- NULL, // use parent's starting directory
- &startupInfoTls, // pointer to STARTUPINFO structure
- &processInfoTls) // pointer to PROCESS_INFORMATION structure
- )
- {
- int ret = GetLastError();
- cout<<"CreateProcess for Codenomicon TLS test tool failed: "<<ret<<endl;
- return ret;
- }
-
- return 0;
- }
-
-/* this function parses the log file and prepares a report file
-
- its parameters are:
- 1) logDir (in): the logging directory
- 2) reportName (out): name of the report file
-*/
-
-int ParseLog(const string& logDir, string& reportName)
- {
- int totalError = 0; // keeps track of the total number of errors
- int length = logDir.length();
-
- string summaryFileName; // stores the name of the summary file generated by Codenomicon
- if(logDir[length-1] == '/')
- {
- summaryFileName = logDir + "summary.txt";
- }
- else
- {
- summaryFileName = logDir + "/summary.txt";
- }
-
- string logFileName; // stores the name of log file generated by Codenomicon
- if(logDir[length-1] == '/')
- {
- logFileName = logDir + "main.log";
- }
- else
- {
- logFileName = logDir + "/main.log";
- }
-
- // create a report file in the log directory
- string report = logDir + reportName;
- ofstream outFile(report.c_str());
- if(!outFile.is_open())
- {
- cout << "Unable to create report file";
- return -1;
- }
-
- // open the summary file and copy its contents to the report file
- // also find out the total number of tests run
- int totalTests = 0;
-
- ifstream summaryFile(summaryFileName.c_str());
- if(summaryFile.is_open())
- {
- string summaryLine;
- while(!summaryFile.eof())
- {
- getline(summaryFile, summaryLine);
-
- // check if the line has total number of tests
- if(summaryLine.find("Test cases", 0) != string::npos)
- {
- // found the line, now get the number from the string
- // the number is in the end of the line and it has spaces before it
- int len = summaryLine.length();
- int i = len;
- while(summaryLine[i--] != ' ')
- { }
-
- string totalTestsString = summaryLine.substr(i, summaryLine.length());
- totalTests = atoi(totalTestsString.c_str());
- }
- }
-
- summaryFile.close();
- }
- else
- {
- cout << "Unable to open summary file generated by Codenomicon";
- outFile.close();
- return -1;
- }
-
- // open the log file
- ifstream logFile(logFileName.c_str());
- string line;
- string nextLine;
-
- if(!logFile.is_open())
- {
- cout << "Unable to open log file";
- outFile.close();
- return -1;
- }
-
- //outFile<<"List of test cases failed"<<endl<<"========================="<<endl;
- while(!logFile.eof())
- {
- getline (logFile,line);
- if((!line.empty()) && ((line.find("ERROR", 0) != string::npos) || (line.find("error", 0) != string::npos)))
- {
- /* if(line.find("ERROR Expected", 0) == string::npos) */
- {
- // read next line and check if it contains the string "Test case #"
- getline(logFile,nextLine);
- if((!nextLine.empty()) && (nextLine.find("Test case #", 0) != string::npos))
- {
- totalError++;
-
- // write line and nextLine to report
- //outFile<<line<<endl<<nextLine<<endl;
- }
- else
- {
- // get the next line as sometimes a line is in between for events and octets
- getline(logFile, nextLine);
- if((!nextLine.empty()) && (nextLine.find("Test case #", 0) != string::npos))
- {
- totalError++;
-
- // write line and nextLine to report
- //outFile<<line<<endl<<nextLine<<endl;
- }
- }
- }
- }
- }
-
- outFile<<totalTests-totalError<<endl; // print total no of tests passed
- outFile<<totalError<<endl; // print total no of tests failed
- logFile.close();
- outFile.close();
-
- return 0;
- }
-
-/* this function gets the log directory by reading the config file
-
- its parameters are:
- 1) configFileName (in): the name of the config file
- 2) logDir (out): on return contains the logging directory
-*/
-
-int GetLogDirectory(const string& configFileName, string& logDir)
- {
- ifstream configFile(configFileName.c_str());
- string configLine;
-
- if(configFile.is_open())
- {
- while(!configFile.eof())
- {
- getline(configFile,configLine);
- if(!configLine.empty())
- {
- unsigned int i = configLine.find("log-dir", 0);
- if(i != string::npos)
- {
- // found line containing log-dir, extract log directory
- logDir = configLine;
-
- // erase from first char of the line to the end of "log-dir"
- logDir.erase(0, i+7);
-
- // chop off any blank spaces before log directory name
- while(logDir[0] == ' ')
- {
- logDir.erase(0, 1);
- }
- }
- }
- }
-
- configFile.close();
- }
- else
- {
- cout << "Unable to open file";
- return -1;
- }
-
- }
-
-/* this function converts backward slashes "\" to forward slashes "/" .
- this is needed to prevent interpretation of backward slashes as format
- specifiers.
-
- its parameter is:
- 1) path (in/out): on calling, it contains the path possibly containing backward
- slashes. on returning, it has path containing no backward slashes
-*/
-
-void ConvertPath(string& path)
- {
- for(int i = 0; i<path.length(); i++)
- {
- if(path[i] == '\\')
- {
- path[i] = '/';
- }
- }
- }
-
-/* this function gets the epoc drive
-
- its parameters are:
- 1) driveLetter (out): on return contains the epoc drive
-*/
-
-void GetEpocDrive(string& driveLetter)
- {
- // get the current drive
- char currentDrive = _getdrive();
- currentDrive = currentDrive + 'A' -1;
-
- driveLetter = "C";
- driveLetter[0] = currentDrive;
- }
-
-/* this function launches the epoc side TLS test.
-
- its parameters are:
- 1) drive (in): the epoc drive
- 2) platform (in): the platform for which the test will be run (e.g. WINSCW)
- 3) build (in): the build for which the test will be run (e.g. UDEB)
-*/
-
-int RunEpocTlsTest(const string& driveLetter, const string& platform, const string& build)
- {
- ZeroMemory(&startupInfo, sizeof(startupInfo));
- startupInfo.cb = sizeof(startupInfo);
-
- ZeroMemory(&processInfo, sizeof(processInfo));
-
- string tlsTestProgram = driveLetter +":/epoc32/RELEASE/"+ platform +"/"+ build +"/TlsClientTest";
-
-
- //before we launch the TLS test program we have to configure Epoc
- cout<<"\nConfiguring Epoc for TLS test program"<<endl;
- int ret = EpocPreTestConfig(driveLetter, platform, build);
- if(ret != 0)
- {
- return ret;
- }
-
- cout<<"Launching epoc client side test"<<endl;
- // create a separate process for epoc test
- if(!CreateProcess( NULL, // no module name (use command line)
- (char*)tlsTestProgram.c_str(), // epoc TLS client test
- NULL, // process handle not inheritable
- NULL, // thread handle not inheritable
- FALSE, // set handle inheritance to FALSE
- 0, // no creation flags
- NULL, // use parent's environment block
- NULL, // use parent's starting directory
- &startupInfo, // pointer to STARTUPINFO structure
- &processInfo) // pointer to PROCESS_INFORMATION structure
- )
- {
- int ret = GetLastError();
- cout<<"CreateProcess failed: "<<ret<<endl;
- cout<<"Tried to execute: "<<tlsTestProgram<<endl;
-
- // restore the original settings for epoc
- ret = EpocPostTestConfig(driveLetter, platform, build);
- if(ret != 0)
- {
- cout<<"Failed to restore original commsDat settings: "<<ret<<endl;
- }
- return ret;
- }
-
- return 0;
- }
-
-/* this function configures Epoc for running the TLS test. this involves backing
- up the current commsDat and configuring the commsDat for loopback using WinTAP
-
- its parameters are:
- 1) drive (in): the drive on which epoc is mapped
- 2) platform (in): the platform (e.g. WINSCW)
- 3) build (in): the build (e.g. UDEB)
-*/
-
-int EpocPreTestConfig(const string& drive, const string& platform, const string& build)
- {
- string testToolPath = TestToolWrapperPath;
-
- // create a directory for backup
- string backupDir = "mkdir "+ testToolPath + "backup";
- int ret = system(backupDir.c_str());
-
- // make backup of existing epoc.ini and secdlg.dll
- string backupEpoc = "copy /Y " + drive + ":\\epoc32\\data\\epoc.ini " + testToolPath + "backup\\epoc.ini";
- ret = system(backupEpoc.c_str());
- /* if(ret != 0)
- {
- cout<<"failed to copy epoc.ini: "<<endl<<backupEpoc<<endl<<" failed"<<endl;
- return ret;
- }
- */
- string backupSec = "copy /Y " + drive + ":\\epoc32\\release\\" + platform + "\\" + build + "\\secdlg.dll " + testToolPath + "backup\\secdlg.dll";
- ret = system(backupSec.c_str());
- /* if(ret != 0)
- {
- cout<<"failed to copy secdlg.dll: "<<endl<<backupSec<<endl<<" failed"<<endl;
- return ret;
- } */
-
- // delete secdlg.dll from epoc drive
- string deletesecdlg = "del " + drive + ":\\epoc32\\release\\" + platform + "\\" + build + "\\secdlg.dll ";
- ret = system(deletesecdlg.c_str());
- /* if(ret != 0)
- {
- cout<<"failed to delete secdlg.dll: "<<endl<<deletesecdlg<<endl<<" failed"<<endl;
- return ret;
- }
- */
- // copy the epoc_shell.ini, wintapstaticnogateway.xml, ethertap.pdd and tsecdlg.dll to epoc
-
- string copyShellIni = "copy /Y " + testToolPath + "epoc_shell.ini " + drive + ":\\epoc32\\data\\epoc.ini";
- ret = system(copyShellIni.c_str());
- if(ret != 0)
- {
- cout<<"failed to copy epoc.ini: "<<endl<<copyShellIni<<endl<<" failed"<<endl;
- return ret;
- }
-
- string copyXml = "copy /Y " + testToolPath + "wintapstaticnogateway.xml " + drive + ":\\epoc32\\" + platform + "\\c";
- ret = system(copyXml.c_str());
- if(ret != 0)
- {
- cout<<"failed to copy wintapstaticnogateway.xml: "<<endl<<copyXml<<endl<<" failed"<<endl;
- return ret;
- }
-
- string copyPdd = "copy /Y " + testToolPath + "ethertap.pdd " + drive + ":\\epoc32\\release\\" + platform + "\\udeb";
- ret = system(copyPdd.c_str());
- if(ret != 0)
- {
- cout<<"failed to copy ethertap.pdd: "<<endl<<copyPdd<<endl<<" failed"<<endl;
- return ret;
- }
-
- string copyDll = "copy /Y " + testToolPath + "tsecdlg.dll " + drive + ":\\epoc32\\release\\" + platform + "\\udeb";
- ret = system(copyDll.c_str());
- if(ret != 0)
- {
- cout<<"failed to copy tsecdlg.dll: "<<endl<<copyDll<<endl<<" failed"<<endl;
- return ret;
- }
-
- // launch 'ceddump' to retrieve the current commsDat configuration
- string cedDump = drive + ":/epoc32/release/" + platform + "/" + build + "/ceddump";
- ret = system(cedDump.c_str());
- if(ret != 0)
- {
- cout<<"failed to launch ceddump: "<<endl<<cedDump<<endl<<"failed"<<endl;
- return ret;
- }
-
- // delete the old backup file, if it exists
- string delBackup = "del " + drive + ":\\epoc32\\" + platform + "\\c\\tlsbackup.cfg";
- cout<<"\ntrying to delete old backup file: tlsbackup.cfg"<<endl;
- ret = system(delBackup.c_str());
- if(ret != 0)
- {}
-
- // make a backup of current commsDat configuration
- string backup = "rename " + drive + ":\\epoc32\\" + platform + "\\c\\cedout.cfg tlsbackup.cfg";
- ret = system(backup.c_str());
- if(ret != 0)
- {
- cout<<"failed to save current commsDat: "<<endl<<backup<<endl<<"failed"<<endl;
- return ret;
- }
-
- // set up commsDat for loopback using WinTAP
- string winTap = drive + ":\\epoc32\\release\\" + platform + "\\" + build + "\\ced c:\\WinTapStaticNoGateway.xml";
- ret = system(winTap.c_str());
- if(ret != 0)
- {
- cout<<"failed commsDat setup for WinTap: "<<endl<<winTap<<endl<<"failed"<<endl;
- return ret;
- }
- // copy epoc.ini so that the techview boots up in GUI mode - the test runs only in GUI mode
- string copyIni = "copy /Y " + testToolPath + "epoc.ini " + drive + ":\\epoc32\\data\\epoc.ini";
- ret = system(copyIni.c_str());
- if(ret != 0)
- {
- cout<<"failed to copy epoc.ini: "<<endl<<copyIni<<endl<<" failed"<<endl;
- return ret;
- }
-
-
- return 0;
- }
-
-/* this function restores the commsDat setup to the original settings (i.e. to that
- of before running TLS test
-
- its parameters are:
- 1) drive (in): the drive on which epoc is mapped
- 2) platform (in): the platform (e.g. WINSCW)
- 3) build (in): the build (e.g. UDEB)
-*/
-
-int EpocPostTestConfig(const string& drive, const string& platform, const string& build)
- {
- string testToolPath = TestToolWrapperPath;
-
- string copyShellIni = "copy /Y " + testToolPath + "epoc_shell.ini " + drive + ":\\epoc32\\data\\epoc.ini";
- int ret = system(copyShellIni.c_str());
- if(ret != 0)
- {
- cout<<"failed to copy epoc.ini: "<<endl<<copyShellIni<<endl<<" failed"<<endl;
- return ret;
- }
-
- // restore previous commsDat setup
- string prevSetting = drive + ":\\epoc32\\release\\" + platform + "\\" + build + "\\ced c:\\tlsbackup.cfg";
- ret = system(prevSetting.c_str());
- if(ret != 0)
- {
- cout<<"failed to restore previous commsDat setup: "<<endl<<prevSetting<<endl<<"failed"<<endl;
- return ret;
- }
-
- // rename the backup file to original
- string backup = "rename " + drive + ":\\epoc32\\" + platform + "\\c\\tlsbackup.cfg cedout.cfg";
- ret = system(backup.c_str());
- if(ret != 0)
- {
- cout<<"failed to restore backup file: "<<endl<<backup<<endl<<"failed"<<endl;
- return ret;
- }
-
- // restore original epoc.ini and secdlg.dll
- string backupEpoc = "copy /Y " + testToolPath + "backup\\epoc.ini " + drive + ":\\epoc32\\data\\epoc.ini " ;
- ret = system(backupEpoc.c_str());
- if(ret != 0)
- {
- cout<<"failed to copy epoc.ini: "<<endl<<backupEpoc<<endl<<" failed"<<endl;
- return ret;
- }
-
- string backupSec = "copy /Y " + testToolPath + "backup\\secdlg.dll " + drive + ":\\epoc32\\release\\" + platform + "\\" + build + "\\secdlg.dll " ;
- ret = system(backupSec.c_str());
- if(ret != 0)
- {
- cout<<"failed to copy secdlg.dll: "<<endl<<backupSec<<endl<<" failed"<<endl;
- return ret;
- }
- // delete tsecdlg.dll from epoc drive
- string deletesecdlg = "del " + drive + ":\\epoc32\\release\\" + platform + "\\" + build + "\\tsecdlg.dll ";
- ret = system(deletesecdlg.c_str());
- if(ret != 0)
- {
- cout<<"failed to delete tsecdlg.dll: "<<endl<<deletesecdlg<<endl<<" failed"<<endl;
- return ret;
- }
-
-
- return 0;
-
- }
-
-/* this function waits for Epoc TLS client test to finish
-*/
-
-void WaitForEpocTest()
- {
- DWORD dwExitCode;
- GetExitCodeProcess(processInfo.hProcess, &dwExitCode);
- while(dwExitCode == STILL_ACTIVE)
- {
- cout<<".";
- GetExitCodeProcess(processInfo.hProcess, &dwExitCode);
- Sleep(1000);
- }
- }
-
-bool ProcessRunning(HANDLE handle)
- {
- DWORD dwExitCode;
- GetExitCodeProcess(handle, &dwExitCode);
- if(dwExitCode == STILL_ACTIVE)
- {
- return true;
- }
- else
- {
- return false;
- }
- }
-
-int PingEpoc()
- {
- int ret = system("ping -n 1 -w 20000 192.168.0.2");
- return ret;
- }
-
-/* this program takes one argument:
- 1) config file in text format
-*/
-int main(int argc, char* argv[])
- {
- if(argc != 2)
- {
- cout << argv[0]
- << " [config file] "<<endl;
-
- return -1;
- }
-
- string fileName = argv[1];
-
- string configSettings = " --no-gui ";
- int ret = ReadConfigurations(fileName, configSettings);
- if(ret != 0)
- {
- return ret;
- }
-
- string drive;
- string platform;
- string build;
-
- GetEpocDrive(drive);
-
- ret = GetPlatformAndBuild(fileName, platform, build);
- if(ret != 0)
- {
- return ret;
- }
-
- // kill the previously running tlsclienttest program, if any
- // cout<<"zzz before killing"<<endl;
- // ret = system("TASKKILL /F /IM tlsclienttest.exe /T");
- // cout<<"zzz after killing1: "<<ret<<endl;
- // ret = system("TASKKILL /F /IM java.exe /T");
- // cout<<"zzz after killing2: "<<ret<<endl;
- // run epoc side TLS test client
- ret = RunEpocTlsTest(drive, platform, build);
- if(ret != 0)
- {
- cout<<"Exiting program"<<endl;
- return ret;
- }
-
- string jarPath = CodenomiconPath;
- jarPath += "\"";
- string quotedJarPath = "\"" + jarPath;
-
- // run Codenomicon TLS Client test tool
- cout<<"Launching Codenomicon TLS Client test tool"<<endl;
- ret = RunTlsTestTool(configSettings, quotedJarPath);
- if(ret != 0)
- {
- return ret;
- }
-
- // now Epoc TLS Client test should be executed till Codenomicon tool is running
-/* while(TlsTestToolRunning())
- {
- WaitForEpocTest();
-
- // check if the Codenomicon test tool is still running
- if(TlsTestToolRunning())
- {
- // Codenomicon test tool still running, run epoc side TLS test client again
- ret = RunEpocTlsTest(drive, platform, build);
- if(ret != 0)
- {
- cout<<"Exiting program"<<endl;
- return ret;
- }
- }
- }
- */
-
- HANDLE handles[2];
- handles[0] = processInfo.hProcess;
- handles[1] = processInfoTls.hProcess;
- /* Commented code starts-*/
- // wait for any of the process to finish
- WaitForMultipleObjects(2, handles, false, INFINITE);
-
- // if epoc side TLS test finished and Codenomicon
- // tool is still running, then terminate Codenomicon process
- if(!ProcessRunning(processInfo.hProcess))
- {
- if(ProcessRunning(processInfoTls.hProcess))
- {
- // not a clean way, but have to terminate Codenomicon test tool
- TerminateProcess(processInfoTls.hProcess, 1);
- }
- }
-
- // if Codenomicon test tool is finished, then terminate the epoc side test
- if(!ProcessRunning(processInfoTls.hProcess))
- {
- if(ProcessRunning(processInfo.hProcess))
- {
- // not a clean way, but we have to terminate epoc test
- TerminateProcess(processInfo.hProcess, 1);
- }
- }
-
- /* commented code ends*/
-
- // change started ****************
-
- // while(ProcessRunning(processInfo.hProcess) && ProcessRunning(processInfoTls.hProcess))
- /* while(1)
- {
- // wait for any of the process to finish
- WaitForMultipleObjects(2, handles, false, 20000);
-
- // if epoc side TLS test finished and Codenomicon
- // tool is still running, then terminate Codenomicon process
- if(!ProcessRunning(processInfo.hProcess))
- {
- cout<<"\nepoc finished, terminating codenomicon"<<endl;
- if(ProcessRunning(processInfoTls.hProcess))
- {
- // not a clean way, but have to terminate Codenomicon test tool
- TerminateProcess(processInfoTls.hProcess, 1);
- return 0;
- }
- }
-
- // if Codenomicon test tool is finished, then terminate the epoc side test
- if(!ProcessRunning(processInfoTls.hProcess))
- {
- cout<<"\ncodenomicon finished, terminating epoc"<<endl;
- if(ProcessRunning(processInfo.hProcess))
- {
- // not a clean way, but we have to terminate epoc test
- TerminateProcess(processInfo.hProcess, 1);
- return 0;
- }
- }
-
- // check if the epoc side TLS test has crashed
- ret = PingEpoc();
- if(ret != 0)
- {
- // epoc not responding, kill the processes and return
- if(ProcessRunning(processInfoTls.hProcess))
- {
- TerminateProcess(processInfoTls.hProcess, 1);
- }
-
- if(ProcessRunning(processInfo.hProcess))
- {
- TerminateProcess(processInfo.hProcess, 1);
- }
-
- return ret;
- }
- }
-
- */
-
-// change ends ****************
-
- /* now that the test tool has executed, we need to get the results from the log file
- but first we need the log directory for reading the log file
- */
- /* string logDir;
- ret = GetLogDirectory(fileName, logDir);
- if(ret != 0)
- {
- cout<<"\nwaiting for Epoc TLS Client test to exit";
- // wait for epoc tls test to finish
- WaitForEpocTest();
-
- // restore previous commsDat settings
- ret = EpocPostTestConfig(drive, platform, build);
- return ret;
- }
- */
- // convert the backward slashes to forward slashes in the path
- // ConvertPath(logDir);
-
- // prepare a report from the log file
- // string outFile("report.txt");
- // ret = ParseLog(logDir, outFile);
-
- // wait for epoc tls test to finish
- // cout<<"\nwaiting for Epoc TLS Client test to exit";
- // WaitForEpocTest();
-
- // restore previous commsDat settings
-// cout<<"\nrestoring previous commsDat settings"<<endl;
- ret = EpocPostTestConfig(drive, platform, build);
-
- return ret;
- }
-
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configssl3.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 24,25,28-33,35
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\ssl3
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configssl3alert.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 11973-13220
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\ssl3alert
\ No newline at end of file
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configssl3ccs.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 8193-8408
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\ssl3ccs
\ No newline at end of file
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configssl3handshake.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 13221-13231
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\ssl3handshake
\ No newline at end of file
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configssl3hs02.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 7122-7530
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\ssl3hs02
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configssl3hs0b.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 7531-7906
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\ssl3hs0b
\ No newline at end of file
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configssl3hs0c.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 9005-9612
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\ssl3hs0c
\ No newline at end of file
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configssl3hs0d.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 9613-11972
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\ssl3hs0d
\ No newline at end of file
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configssl3hs0e.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 7907-8192
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\ssl3hs0e
\ No newline at end of file
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configssl3hs14.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 8409-8750
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\ssl3hs14
\ No newline at end of file
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configssl3hs17.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 8751-9004
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\ssl3hs17
\ No newline at end of file
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls10.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 0-4,6,7,10-15,17,21
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls10
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls10handshake.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 7105-7121
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls10handshake
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls1alert.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 4890-6137
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls1alert
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls1ccs.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 1110-1325
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls1ccs
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls1hs02.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 39-107,112-141,149-447
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls1hs02
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls1hs0b.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 448-516,521-550,558-823
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls1hs0b
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls1hs0c.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 1922-2529
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls1hs0c
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls1hs0d.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 2530-4889
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls1hs0d
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls1hs0e.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 824-1109
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls1hs0e
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls1hs14.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 1326-1667
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls1hs14
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls1hs17.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 1668-1921
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls1hs17
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls1srccs.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 6547-6762
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls1srccs
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls1srhs02.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 6138-6546
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls1srhs02
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/scripts/configtls1srhs14.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 6763-7104
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\tls1srhs14
--- a/networksecurity/tls/test/codenomicon/TLS test wrapper/tlsconfig.txt Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[platform] winscw
-[build] udeb
-
-//codenomicon parameters
-[params]
-index 0
-listen-port 443
-server-name 192.168.0.1
-log-dir d:\tls\logs\
--- a/networksecurity/tls/test/codenomicon/TlsClientTest/Bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-// Copyright (c) 2000-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:
-// Component description file
-//
-//
-
-
-PRJ_TESTEXPORTS
-.\WinTapStaticNoGateway.xml \epoc32\winscw\c\WinTapStaticNoGateway.xml
-
-PRJ_TESTMMPFILES
-TlsClientTest.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/test/codenomicon/TlsClientTest/bld.nf Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,23 @@
+// Copyright (c) 2000-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:
+// Component description file
+//
+//
+
+
+PRJ_TESTEXPORTS
+.\WinTapStaticNoGateway.xml \epoc32\winscw\c\WinTapStaticNoGateway.xml
+
+PRJ_TESTMMPFILES
+TlsClientTest.mmp
--- a/networksecurity/tls/test/te_tlsunittest/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/test/te_tlsunittest/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -17,7 +17,7 @@
../scripts/te_tlsunittest.script z:/testdata/scripts/te_tlsunittest.script
../configs/te_tlsunittest.ini z:/testdata/configs/te_tlsunittest.ini
-../configs/CACerts_clientauth.dat z:/testdata/configs/CACerts_clientauth.dat
+../configs/CACerts_clientauth.dat z:/testdata/configs/cacerts_clientauth.dat
../configs/certclients_clientauth.dat z:/testdata/configs/certclients_clientauth.dat
../configs/keys_clientauth.dat z:/testdata/configs/keys_clientauth.dat
../configs/t_secdlg_in.dat z:/testdata/configs/t_secdlg_in.dat
--- a/networksecurity/tls/ts_tls/COMINIT.CPP Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/ts_tls/COMINIT.CPP Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -30,6 +30,7 @@
GLDEF_C void CommInitL()
{
+#ifndef SIROCCO_CODE_MIGRATION
TInt err;
// When bootstrapping C32 we have to avoid the PhBkSyncServer being started, since
// it needs a different CommDB
@@ -60,5 +61,6 @@
err=User::LoadLogicalDevice(LDD_NAME);
if (err!=KErrNone && err!=KErrAlreadyExists)
User::Leave(err);
+#endif //SIROCCO_CODE_MIGRATION
}
--- a/networksecurity/tls/ts_tls/T_Autossl_Const.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_Autossl_Const.h Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -37,11 +37,6 @@
_LIT( KCfgProtocol, "Protocol" );
_LIT( KCfgUseGenericSocket, "UseGenericSocket");
_LIT( KCfgEAPKeyDerivation, "EAPKeyDerivation");
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
-_LIT( KCfgSSLDialogMode, "SSLDialogMode");
-_LIT( KCfgSSLDialogModeValue, "SSLDialogModeValue");
-_LIT( KCfgExpectedErrorCode, "ExpectedErrorCode");
-#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
const TInt KDefCfgCipher = 0;
const TInt KDefCfgIPPort = 0;
@@ -51,11 +46,6 @@
const TInt KDefCfgMaxThreshold = 1000;
const TBool KDefUseGenericSocket = EFalse;
const TBool KDefEAPKeyDerivation = EFalse;
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
-const TBool KDefSSLDialogMode = EFalse;
-const TInt KDefSSLDialogModeValue = 0;
-const TInt KDefErrorValue = 0;
-#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
_LIT( KDefCfgIPAddress, "default" );
_LIT( KDefCfgDNSName, "www.default.com" );
--- a/networksecurity/tls/ts_tls/T_TLS_cntrl.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_TLS_cntrl.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -215,28 +215,6 @@
iEAPKeyDerivation = KDefEAPKeyDerivation;
}
iTestStep->Log( _L("EAPKeyDerivation: %D"), iEAPKeyDerivation);
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
- // iTLSDialogMode;
- if (!iTestStep->GetBoolFromConfig(KSectionName, KCfgSSLDialogMode, iTLSDialogMode ))
- {
- iTLSDialogMode = KDefSSLDialogMode;
- }
- iTestStep->Log( _L("TLSDialogMode: %D"), iTLSDialogMode);
-
- // iTLSDialogModeValue;
- if (!iTestStep->GetIntFromConfig(KSectionName, KCfgSSLDialogModeValue, iTLSDialogModeValue ))
- {
- iTLSDialogModeValue = KDefSSLDialogModeValue;
- }
- iTestStep->Log( _L("TLSDialogModeValue: %D"), iTLSDialogModeValue);
-
- // iExpectedErrorCode (-7548: KErrSSLAlertUnknownCA)
- if (!iTestStep->GetIntFromConfig(KSectionName, KCfgExpectedErrorCode, iExpectedErrorCode ))
- {
- iExpectedErrorCode = KDefErrorValue;
- }
- iTestStep->Log( _L("ExpectedErrorCode: %D"), iExpectedErrorCode);
-#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
// On to next state
iRunState = EFindFreeTest;
@@ -275,13 +253,9 @@
{
iTestStep->Log( _L("Using test object %d"), i );
}
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+
iTLSTest[i]->ConnectL( iAddress, iPortNum, iPage, iCipherSuites,
- iCipher, iSimpleGet, iTestEndDelay, iDNSName, iProtocol, iUseGenericSocket, iEAPKeyDerivation, iTLSDialogMode, iTLSDialogModeValue, iExpectedErrorCode ); //ajit
-#else
- iTLSTest[i]->ConnectL( iAddress, iPortNum, iPage, iCipherSuites,
- iCipher, iSimpleGet, iTestEndDelay, iDNSName, iProtocol, iUseGenericSocket, iEAPKeyDerivation ); //ajit
-#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+ iCipher, iSimpleGet, iTestEndDelay, iDNSName, iProtocol, iUseGenericSocket, iEAPKeyDerivation );
iRunState = EWaitForComplete;
break; // break from the for loop
--- a/networksecurity/tls/ts_tls/T_TLS_cntrl.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_TLS_cntrl.h Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -95,11 +95,7 @@
TBuf<32> iProtocol;
TBool iUseGenericSocket;
TBool iEAPKeyDerivation;
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
- TBool iTLSDialogMode;
- TInt iTLSDialogModeValue;
- TInt iExpectedErrorCode;
-#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+
RSemaphore iSemaphore;
};
--- a/networksecurity/tls/ts_tls/T_TLS_test.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_TLS_test.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -288,29 +288,7 @@
{
iTestStep->Log( _L("Failed to set Protocol for use: (%d)"),err );
}
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
- if(iTLSDialogMode)
- {
- iStatus = iTlsSocket->SetOpt(KSoDialogMode,KSolInetSSL,iTLSDialogModeValue);
- if ( iStatus != KErrNone )
- {
- if(iExpectedErrorCode == iStatus.Int())
- {
- iTestStep->Log( _L("iTlsSocket->SetOpt() failed with KErrArgument because of invalid DialogModeValue "));
- iRunState = EConnectionClosed;
- iTestPassed = ETrue;
- }
- else
- {
- iTestStep->Log( _L("iTlsSocket->SetOpt() failed with error: %d"), iStatus.Int());
- }
- iTlsSocket->Close();
- iTimer.After( iStatus, 1000000 );
- SetActive();
- break;
- }
- }
-#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+
// Set the domain name we're connecting to...
iStatus = iTlsSocket->SetOpt(KSoSSLDomainName,KSolInetSSL, iDNSName);
if ( iStatus != KErrNone )
@@ -352,30 +330,17 @@
if ( iStatus != KErrNone )
{
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
- if(iExpectedErrorCode == iStatus.Int())
- {
- iTestStep->Log( _L("Received Untrusted CA"));
- iRunState = EConnectionClosed;
- iTestPassed = ETrue;
- }
- else
- {
-#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
- TPtrC errorText = iTestStep->EpocErrorToText(iStatus.Int());
- iTestStep->Log( _L("ESecureConnected:%S %d"),&errorText, iStatus.Int() );
- iTestStep->Log( KStateErrReceivePage, iStatus.Int() );
- iTestStep->Log( KStateErrReceivePage, iStatus.Int() );
- iRunState = EConnectionClosed;
- iTestPassed = EFalse;
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
- }
-#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
- iTlsSocket->Close();
- iTimer.After( iStatus, 1000000 );
- SetActive();
- break;
- }
+ TPtrC errorText = iTestStep->EpocErrorToText(iStatus.Int());
+ iTestStep->Log( _L("ESecureConnected:%S %d"),&errorText, iStatus.Int() );
+ iTestStep->Log( KStateErrReceivePage, iStatus.Int() );
+ iTestStep->Log( KStateErrReceivePage, iStatus.Int() );
+ iRunState = EConnectionClosed;
+ iTestPassed = EFalse;
+ iTlsSocket->Close();
+ iTimer.After( iStatus, 1000000 );
+ SetActive();
+ break;
+ }
else
{
iTestStep->Log( _L("ESecureConnected:KErrNone %d"),iStatus.Int() );
@@ -756,7 +721,7 @@
// Cancel the connect
iSocket.CancelConnect();
}
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+
void CTLSTest::ConnectL( const TDesC &aAddress,
const TInt aPortNum,
const TDesC &aPage,
@@ -767,23 +732,7 @@
const TDesC8& aDNSName ,
const TDesC& aProtocol,
TBool aUseGenericSocket,
- TBool aEAPKeyDerivation,
- TBool aTLSDialogMode,
- TInt aTLSDialogModeValue,
- TInt aExpectedErrorCode )
-#else
-void CTLSTest::ConnectL( const TDesC &aAddress,
- const TInt aPortNum,
- const TDesC &aPage,
- const TDesC8 &aCipherSuite,
- const TInt aCipher,
- const TInt aSimpleGet,
- const TInt aTestEndDelay,
- const TDesC8& aDNSName ,
- const TDesC& aProtocol,
- TBool aUseGenericSocket,
- TBool aEAPKeyDerivation )
-#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+ TBool aEAPKeyDerivation )
{
#if 0
iRunState = EDummyConnection;
@@ -824,11 +773,7 @@
iTestEndDelay = aTestEndDelay;
iUseGenericSocket = aUseGenericSocket;
iEAPKeyDerivation = aEAPKeyDerivation;
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
- iTLSDialogMode = aTLSDialogMode;
- iTLSDialogModeValue = aTLSDialogModeValue;
- iExpectedErrorCode = aExpectedErrorCode;
-#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+
// Print info to the log
iTestStep->Log( _L("*****Connecting to*****") );
iTestStep->Log( _L("%s:%d "), iAddress.PtrZ(), iPortNum );
--- a/networksecurity/tls/ts_tls/T_TLS_test.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_TLS_test.h Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -70,7 +70,6 @@
// Construct/destruct
static CTLSTest *NewL();
~CTLSTest();
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
void ConnectL( const TDesC &aAddress,
const TInt aPortNum,
const TDesC &aPage,
@@ -81,23 +80,7 @@
const TDesC8& aDNSName,
const TDesC& aProtocol,
TBool aUseGenericSocket,
- TBool aEAPKeyDerivation,
- TBool aTLSDialogMode,
- TInt aTLSDialogModeValue,
- TInt aExpectedErrorCode );
-#else
- void ConnectL( const TDesC &aAddress,
- const TInt aPortNum,
- const TDesC &aPage,
- const TDesC8 &aCipherSuite,
- const TInt aCipher,
- const TInt aSimpleGet,
- const TInt aTestEndDelay,
- const TDesC8& aDNSName,
- const TDesC& aProtocol,
- TBool aUseGenericSocket,
- TBool aEAPKeyDerivation );
-#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+ TBool aEAPKeyDerivation );
void SetConsole( CTestStepTls * aTestStep );
TBool InUse();
@@ -136,11 +119,7 @@
TBool iCiphersMatch; // true if expected cipher was selected by the server
TBool iUseGenericSocket;
TBool iEAPKeyDerivation;
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
- TBool iTLSDialogMode;
- TInt iTLSDialogModeValue;
- TInt iExpectedErrorCode;
-#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+
TSockXfrLength iBytesRead;
TBuf8<5000> iRcvBuffer;
TBuf8<256> iSndBuffer;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/Tls_ethernet_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,2122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of "Eclipse Public License v1.0"
+ 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:
+ CommDB Settings File
+ All Rights Reserved
+
+-->
+
+
+
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+ xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+ <Network operation="add">
+ <Name>Intranet</Name>
+ </Network>
+ <Network operation="add">
+ <Name>mRouter</Name>
+ </Network>
+</NetworkTable>
+
+<IAPTable>
+ <IAP operation="add">
+ <Name>NT RAS with Null Modem</Name>
+ <IAPService>DialOutISP.NT RAS</IAPService>
+ <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+ <IAPNetwork>Network.Intranet</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Office</LocationRef>
+ </IAP>
+ <IAP operation="add">
+ <Name>CSD IAP PlaceHolder01</Name>
+ <IAPService>DialOutISP.ISP01</IAPService>
+ <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+ <IAPNetwork>Network.Intranet</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Office</LocationRef>
+ </IAP>
+ <IAP operation="add">
+ <Name>CSD IAP PlaceHolder02</Name>
+ <IAPService>DialOutISP.ISP02</IAPService>
+ <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+ <IAPNetwork>Network.Intranet</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Office</LocationRef>
+ </IAP>
+ <IAP operation="add">
+ <Name>GPRS IAP PlaceHolder01</Name>
+ <IAPService>OutgoingGPRS.GPRS01</IAPService>
+ <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
+ <IAPNetwork>Network.Intranet</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Mobile</LocationRef>
+ </IAP>
+ <IAP operation="add">
+ <Name>GPRS IAP PlaceHolder02</Name>
+ <IAPService>OutgoingGPRS.GPRS02</IAPService>
+ <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
+ <IAPNetwork>Network.Intranet</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Mobile</LocationRef>
+ </IAP>
+ <IAP operation="add">
+ <Name>Ethernet No Daemon Static IP</Name>
+ <IAPService>LANService.Ethernet No Daemon</IAPService>
+ <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+ <IAPNetwork>Network.Intranet</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Office</LocationRef>
+ </IAP>
+ <IAP operation="add">
+ <Name>Incorrect ethernet setup 1</Name>
+ <IAPService>LANService.Ethernet Bad Daemon</IAPService>
+ <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+ <IAPNetwork>Network.mRouter</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Office</LocationRef>
+ </IAP>
+ <IAP operation="add">
+ <Name>Incorrect ethernet setup 2</Name>
+ <IAPService>LANService.Ethernet Static IP</IAPService>
+ <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+ <IAPNetwork>Network.mRouter</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Office</LocationRef>
+ </IAP>
+ <IAP operation="add">
+ <Name>Ethernet with Daemon Static IP</Name>
+ <IAPService>LANService.Ethernet Static IP</IAPService>
+ <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+ <IAPNetwork>Network.Intranet</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Office</LocationRef>
+ </IAP>
+ <IAP operation="add">
+ <Name>Incorrect ethernet setup 3</Name>
+ <IAPService>LANService.Ethernet</IAPService>
+ <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+ <IAPNetwork>Network.mRouter</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Office</LocationRef>
+ </IAP>
+ <IAP operation="add">
+ <Name>Ethernet with Daemon Dynamic IP</Name>
+ <IAPService>LANService.Ethernet</IAPService>
+ <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+ <IAPNetwork>Network.Intranet</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Office</LocationRef>
+ </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+ <ModemBearer operation="template">
+ <Name>Default Modem</Name>
+ <Agent>CSD.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>0</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>Null Modem 115200bps</Name>
+ <Agent>CSD.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>4</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>US Robotics Sportster</Name>
+ <Agent>CSD.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>57600</Rate>
+ <Handshaking>244</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT&F1</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT&d2</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>Dacom Surfer</Name>
+ <Agent>CSD.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>57600</Rate>
+ <Handshaking>244</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT&F</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT&d2</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>GSM Mobile Phone via Infrared</Name>
+ <Agent>CSD.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>IRCOMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>IRCOMM</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>196</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>17</XonChar>
+ <XoffChar>19</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>ATZ</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>GSM Mobile Phone via Serial</Name>
+ <Agent>CSD.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>19200</Rate>
+ <Handshaking>196</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>17</XonChar>
+ <XoffChar>19</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>ATZ</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>GPRS Ericsson R520m via IR</Name>
+ <Agent>PSD.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>IRCOMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>IRCOMM</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>4</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>17</XonChar>
+ <XoffChar>19</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>ATZ</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>GPRS Ericsson R520m/T68i via Serial</Name>
+ <Agent>PSD.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>19200</Rate>
+ <Handshaking>4</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>17</XonChar>
+ <XoffChar>19</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>ATZ</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <IspInitString>*99***1#</IspInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>GPRS Motorola Mobile Phone via Serial</Name>
+ <Agent>PSD.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>57600</Rate>
+ <Handshaking>4</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>17</XonChar>
+ <XoffChar>19</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>ATZ</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>WinTunnel Modem</Name>
+ <Agent>null.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>COMM::6</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>4</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>mRouterWinsBearer</Name>
+ <Agent>mRouterAgent.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>WINS::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>WINSCSY</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>4</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>mRouterRs232Bearer</Name>
+ <Agent>mRouterAgent.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>COMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECUART</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>4</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>mRouterIrBearer</Name>
+ <Agent>mRouterAgent.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>IRCOMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>IRCOMM</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>4</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>mRouterBtBearer</Name>
+ <Agent>mRouterAgent.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>BTCOMM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>BTCOMM</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>4</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+ <ModemBearer operation="add">
+ <Name>mRouterUsbBearer</Name>
+ <Agent>mRouterAgent.agt</Agent>
+ <IfName>PPP</IfName>
+ <PortName>ACM::0</PortName>
+ <TSYName>MM</TSYName>
+ <CSYName>ECACM</CSYName>
+ <DataBits>8</DataBits>
+ <StopBits>1</StopBits>
+ <Parity>NONE</Parity>
+ <Rate>115200</Rate>
+ <Handshaking>4</Handshaking>
+ <SpecialRate>0</SpecialRate>
+ <XonChar>0</XonChar>
+ <XoffChar>0</XoffChar>
+ <FaxClassPref>AUTO</FaxClassPref>
+ <SpeakerPref>NEVER</SpeakerPref>
+ <SpeakerVolPref>QUIET</SpeakerVolPref>
+ <ModemInitString>AT</ModemInitString>
+ <DataInitString>AT</DataInitString>
+ <FaxInitString>AT</FaxInitString>
+ <DialPauseLength>S8=</DialPauseLength>
+ <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+ <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+ <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+ <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+ <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+ <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+ <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+ <DialToneWaitModifier>W</DialToneWaitModifier>
+ <CallProgress1>X1</CallProgress1>
+ <CallProgress2>X2</CallProgress2>
+ <CallProgress3>X3</CallProgress3>
+ <CallProgress4>X4</CallProgress4>
+ <EchoOff>E0</EchoOff>
+ <VerboseText>V1</VerboseText>
+ <QuietOff>Q0</QuietOff>
+ <QuietOn>Q1</QuietOn>
+ <DialCommandStateModifier>;</DialCommandStateModifier>
+ <OnLine>O</OnLine>
+ <ResetConfiguration>Z</ResetConfiguration>
+ <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
+ <DCDOnDuringLink>&C1</DCDOnDuringLink>
+ <DTRHangUp>&D2</DTRHangUp>
+ <DSRAlwaysOn>&S0</DSRAlwaysOn>
+ <RTSCTSHandshake>&K3</RTSCTSHandshake>
+ <XonXoffHandshake>&K4</XonXoffHandshake>
+ <EscapeCharacter>+</EscapeCharacter>
+ <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+ <NoDialTone>NO DIAL TONE</NoDialTone>
+ <Busy>BUSY</Busy>
+ <NoAnswer>NO ANSWER</NoAnswer>
+ <Carrier>CARRIER</Carrier>
+ <Connect>CONNECT</Connect>
+ <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+ <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+ <CompressionNone>COMPRESSION:NONE</CompressionNone>
+ <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+ <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+ <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+ <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+ <MessageCentreNumber>+00000000000</MessageCentreNumber>
+ <MessageValidityPeriod>1440</MessageValidityPeriod>
+ <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+ <MinimumSignalLevel>9905</MinimumSignalLevel>
+ <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+ <SIRSettings>0</SIRSettings>
+ <CommRole>0</CommRole>
+ </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+ <LANBearer operation="add">
+ <Name>EKA1 Target Ethernet</Name>
+ <Agent>nullagt.agt</Agent>
+ <IfName>ethint</IfName>
+ <LDDFilename>ethercard</LDDFilename>
+ <LDDName>EtherCard</LDDName>
+ <PDDFilename>EtherSmc</PDDFilename>
+ <PDDName>EtherCard.Smc</PDDName>
+ <PacketDriverName>EtherPkt.drv</PacketDriverName>
+ <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+ </LANBearer>
+
+ <LANBearer operation="add">
+ <Name>EKA2 Target Ethernet</Name>
+ <Agent>nullagt.agt</Agent>
+ <IfName>ethint</IfName>
+ <LDDFilename>enet</LDDFilename>
+ <LDDName>Ethernet</LDDName>
+ <PDDFilename>ethernet</PDDFilename>
+ <PDDName>Ethernet.Assabet</PDDName>
+ <PacketDriverName>EtherPkt.drv</PacketDriverName>
+ <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+ </LANBearer>
+
+ <LANBearer operation="add">
+ <Name>EKA1 Emulator Ethernet</Name>
+ <Agent>nullagt.agt</Agent>
+ <IfName>ethint</IfName>
+ <LDDFilename>ethercard</LDDFilename>
+ <LDDName>Ethercard</LDDName>
+ <PDDFilename>etherwins</PDDFilename>
+ <PDDName>Ethercard.wins</PDDName>
+ <PacketDriverName>EtherPkt.drv</PacketDriverName>
+ <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+ </LANBearer>
+
+ <LANBearer operation="add">
+ <Name>EKA2 Emulator Ethernet</Name>
+ <Agent>nullagt.agt</Agent>
+ <IfName>ethint</IfName>
+ <LDDFilename>enet</LDDFilename>
+ <LDDName>=Ethernet</LDDName>
+ <PDDFilename>ethernet</PDDFilename>
+ <PDDName>Ethernet.Wins</PDDName>
+ <PacketDriverName>EtherPkt.drv</PacketDriverName>
+ <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+ </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+ <LANService operation="add">
+ <Name>Ethernet</Name>
+ <IfNetworks>ip</IfNetworks>
+ <IpNetMask>255.255.255.0</IpNetMask>
+ <IpGateway>10.32.194.254</IpGateway>
+ <IpAddr>10.32.194.251</IpAddr>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <IpNameServer1>194.72.6.51</IpNameServer1>
+ <IpNameServer2>194.72.6.52</IpNameServer2>
+ <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+ <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+ </LANService>
+ <LANService operation="add">
+ <Name>Ethernet Static IP</Name>
+ <IfNetworks>ip</IfNetworks>
+ <IpNetMask>255.255.255.0</IpNetMask>
+ <IpGateway>192.168.20.2</IpGateway>
+ <IpAddr>192.168.20.13</IpAddr>
+ <IpAddrFromServer>FALSE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <IpNameServer1>194.72.6.51</IpNameServer1>
+ <IpNameServer2>194.72.6.52</IpNameServer2>
+ <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+ <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+ </LANService>
+ <LANService operation="add">
+ <Name>Ethernet Bad Daemon</Name>
+ <IfNetworks>ip</IfNetworks>
+ <IpNetMask>255.255.255.0</IpNetMask>
+ <IpGateway>10.32.194.254</IpGateway>
+ <IpAddr>10.32.194.251</IpAddr>
+ <IpAddrFromServer>FALSE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <IpNameServer1>194.72.6.51</IpNameServer1>
+ <IpNameServer2>194.72.6.52</IpNameServer2>
+ <ConfigDaemonManagerName>NonExistingServ</ConfigDaemonManagerName>
+ <ConfigDaemonName>NonExistingServ</ConfigDaemonName>
+ </LANService>
+ <LANService operation="add">
+ <Name>Ethernet No Daemon</Name>
+ <IfNetworks>ip</IfNetworks>
+ <IpNetMask>255.255.255.0</IpNetMask>
+ <IpGateway>10.32.194.254</IpGateway>
+ <IpAddr>10.32.194.251</IpAddr>
+ <IpAddrFromServer>FALSE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <IpNameServer1>194.72.6.51</IpNameServer1>
+ <IpNameServer2>194.72.6.52</IpNameServer2>
+ </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+ <DialInISP operation="template">
+ <Name>Default Dial In ISP</Name>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Description>Default Dial In ISP</Description>
+ <IpAddr>TRUE</IpAddr>
+ <IpNetMask>TRUE</IpNetMask>
+ <IpGateway>TRUE</IpGateway>
+ <IpNameServer1>TRUE</IpNameServer1>
+ <IpNameServer2>TRUE</IpNameServer2>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <UseEdge>FALSE</UseEdge>
+ </DialInISP>
+ <DialInISP operation="add">
+ <Name>Dial In ISP01</Name>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Description>Dial In ISP01</Description>
+ <IpAddr>TRUE</IpAddr>
+ <IpNetMask>TRUE</IpNetMask>
+ <IpGateway>TRUE</IpGateway>
+ <IpNameServer1>TRUE</IpNameServer1>
+ <IpNameServer2>TRUE</IpNameServer2>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <UseEdge>FALSE</UseEdge>
+ </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+ <DialOutISP operation="template">
+ <Name>Default Dial Out ISP</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <PromptForLogin>TRUE</PromptForLogin>
+ <IfPromptForAuth>TRUE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Description>Default Dial Out ISP</Description>
+ <DefaultTelNum>Default Dial Out ISP</DefaultTelNum>
+ <LoginName>TRUE</LoginName>
+ <LoginPass>TRUE</LoginPass>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfParams>FALSE</IfParams>
+ <IfNetworks>FALSE</IfNetworks>
+ <IfAuthName>TRUE</IfAuthName>
+ <IfAuthPass>TRUE</IfAuthPass>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <CallbackTimeout>0</CallbackTimeout>
+ <IpAddr>TRUE</IpAddr>
+ <IpNetMask>TRUE</IpNetMask>
+ <IpGateway>TRUE</IpGateway>
+ <IpNameServer1>TRUE</IpNameServer1>
+ <IpNameServer2>TRUE</IpNameServer2>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerProtocol>UNSPECIFIED</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+ <DialOutISP operation="add">
+ <Name>NT RAS</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>TRUE</UseLoginScript>
+ <PromptForLogin>FALSE</PromptForLogin>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Description>Test</Description>
+ <Type>INTERNETONLY</Type>
+ <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+ <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
+ <LoginName>FALSE</LoginName>
+ <LoginPass>FALSE</LoginPass>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfParams>FALSE</IfParams>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>RasUser</IfAuthName>
+ <IfAuthPass>pass</IfAuthPass>
+ <AuthRetries>0</AuthRetries>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <CallbackTimeout>0</CallbackTimeout>
+ <IpAddr>TRUE</IpAddr>
+ <IpNetMask>TRUE</IpNetMask>
+ <IpGateway>TRUE</IpGateway>
+ <IpNameServer1>TRUE</IpNameServer1>
+ <IpNameServer2>TRUE</IpNameServer2>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerProtocol>UNSPECIFIED</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+ <DialOutISP operation="add">
+ <Name>ISP01</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <PromptForLogin>FALSE</PromptForLogin>
+ <IfPromptForAuth>TRUE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Description>PlaceHolder for ISP01</Description>
+ <Type>INTERNETONLY</Type>
+ <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+ <LoginName>FALSE</LoginName>
+ <LoginPass>FALSE</LoginPass>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfParams>FALSE</IfParams>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>xxx</IfAuthName>
+ <IfAuthPass>yyy</IfAuthPass>
+ <AuthRetries>0</AuthRetries>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <CallbackTimeout>0</CallbackTimeout>
+ <IpAddr>TRUE</IpAddr>
+ <IpNetMask>TRUE</IpNetMask>
+ <IpGateway>TRUE</IpGateway>
+ <IpNameServer1>TRUE</IpNameServer1>
+ <IpNameServer2>TRUE</IpNameServer2>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerProtocol>UNSPECIFIED</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+ <DialOutISP operation="add">
+ <Name>ISP02</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <PromptForLogin>FALSE</PromptForLogin>
+ <IfPromptForAuth>TRUE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Description>PlaceHolder for ISP02</Description>
+ <Type>INTERNETONLY</Type>
+ <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+ <LoginName>FALSE</LoginName>
+ <LoginPass>FALSE</LoginPass>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfParams>FALSE</IfParams>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>xxx</IfAuthName>
+ <IfAuthPass>yyy</IfAuthPass>
+ <AuthRetries>0</AuthRetries>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <CallbackTimeout>0</CallbackTimeout>
+ <IpAddr>TRUE</IpAddr>
+ <IpNetMask>TRUE</IpNetMask>
+ <IpGateway>TRUE</IpGateway>
+ <IpNameServer1>TRUE</IpNameServer1>
+ <IpNameServer2>TRUE</IpNameServer2>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerProtocol>UNSPECIFIED</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+ <DialOutISP operation="add">
+ <Name>ISP03</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <PromptForLogin>FALSE</PromptForLogin>
+ <IfPromptForAuth>TRUE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Description>PlaceHolder for ISP03</Description>
+ <Type>INTERNETONLY</Type>
+ <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+ <LoginName>FALSE</LoginName>
+ <LoginPass>FALSE</LoginPass>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfParams>FALSE</IfParams>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>xxx</IfAuthName>
+ <IfAuthPass>yyy</IfAuthPass>
+ <AuthRetries>0</AuthRetries>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <CallbackTimeout>0</CallbackTimeout>
+ <IpAddr>TRUE</IpAddr>
+ <IpNetMask>TRUE</IpNetMask>
+ <IpGateway>TRUE</IpGateway>
+ <IpNameServer1>TRUE</IpNameServer1>
+ <IpNameServer2>TRUE</IpNameServer2>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerProtocol>UNSPECIFIED</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+ <DialOutISP operation="add">
+ <Name>ISP04</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <PromptForLogin>FALSE</PromptForLogin>
+ <IfPromptForAuth>TRUE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Description>PlaceHolder for ISP04</Description>
+ <Type>INTERNETONLY</Type>
+ <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+ <LoginName>FALSE</LoginName>
+ <LoginPass>FALSE</LoginPass>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfParams>FALSE</IfParams>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>xxx</IfAuthName>
+ <IfAuthPass>yyy</IfAuthPass>
+ <AuthRetries>0</AuthRetries>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <CallbackTimeout>0</CallbackTimeout>
+ <IpAddr>TRUE</IpAddr>
+ <IpNetMask>TRUE</IpNetMask>
+ <IpGateway>TRUE</IpGateway>
+ <IpNameServer1>TRUE</IpNameServer1>
+ <IpNameServer2>TRUE</IpNameServer2>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerProtocol>UNSPECIFIED</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+ <DialOutISP operation="add">
+ <Name>ISP05</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <PromptForLogin>FALSE</PromptForLogin>
+ <IfPromptForAuth>TRUE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Description>PlaceHolder for ISP05</Description>
+ <Type>INTERNETONLY</Type>
+ <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+ <LoginName>FALSE</LoginName>
+ <LoginPass>FALSE</LoginPass>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfParams>FALSE</IfParams>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>xxx</IfAuthName>
+ <IfAuthPass>yyy</IfAuthPass>
+ <AuthRetries>0</AuthRetries>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <CallbackTimeout>0</CallbackTimeout>
+ <IpAddr>TRUE</IpAddr>
+ <IpNetMask>TRUE</IpNetMask>
+ <IpGateway>TRUE</IpGateway>
+ <IpNameServer1>TRUE</IpNameServer1>
+ <IpNameServer2>TRUE</IpNameServer2>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerProtocol>UNSPECIFIED</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+ <DialOutISP operation="add">
+ <Name>mRouterDialOutIsp</Name>
+ <DialResolution>TRUE</DialResolution>
+ <UseLoginScript>FALSE</UseLoginScript>
+ <PromptForLogin>FALSE</PromptForLogin>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <Description>mRouterDialOutIsp</Description>
+ <Type>INTERNETONLY</Type>
+ <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+ <LoginName>FALSE</LoginName>
+ <LoginPass>FALSE</LoginPass>
+ <DisplayPCT>FALSE</DisplayPCT>
+ <IfParams>FALSE</IfParams>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>IfAuthPass=</IfAuthName>
+ <IfAuthPass>AuthRetries=0</IfAuthPass>
+ <AuthRetries>0</AuthRetries>
+ <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+ <CallbackTimeout>0</CallbackTimeout>
+ <IpAddr>TRUE</IpAddr>
+ <IpNetMask>TRUE</IpNetMask>
+ <IpGateway>TRUE</IpGateway>
+ <IpNameServer1>TRUE</IpNameServer1>
+ <IpNameServer2>TRUE</IpNameServer2>
+ <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <EnableSWComp>FALSE</EnableSWComp>
+ <BearerService>0</BearerService>
+ <BearerProtocol>UNSPECIFIED</BearerProtocol>
+ <RlpVersion>0</RlpVersion>
+ <IwfToMs>0</IwfToMs>
+ <MsToIwf>0</MsToIwf>
+ <AckTimer>0</AckTimer>
+ <RetransmissionAttempts>0</RetransmissionAttempts>
+ <ResequencePeriod>0</ResequencePeriod>
+ <V42Compression>0</V42Compression>
+ <V42Codewords>0</V42Codewords>
+ <V42MaxLength>0</V42MaxLength>
+ <Asymmetry>0</Asymmetry>
+ <UserInitUpgrade>FALSE</UserInitUpgrade>
+ <UseEdge>FALSE</UseEdge>
+ </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+ <CDMA2000PacketService operation="add">
+ <Name>test name cdma2000</Name>
+ <IwfName>Test2000</IwfName>
+ <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+ <PdpType>IPV4</PdpType>
+ <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+ <ReqRevPriority>PRIORITY04</ReqRevPriority>
+ <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+ <ReqRevBitrate>32KBPS</ReqRevBitrate>
+ <ReqFwdLoss>LOSS1</ReqFwdLoss>
+ <ReqRevLoss>LOSS1</ReqRevLoss>
+ <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+ <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+ <MinFwdBitrate>32KBPS</MinFwdBitrate>
+ <MinRevBitrate>32KBPS</MinRevBitrate>
+ <AccptFwdLoss>LOSS2</AccptFwdLoss>
+ <AccptRevLoss>LOSS2</AccptRevLoss>
+ <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+ <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+ <DataCompression>FALSE</DataCompression>
+ <HeaderCompression>FALSE</HeaderCompression>
+ <AnonymousAccess>FALSE</AnonymousAccess>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>RasUser</IfAuthName>
+ <IfAuthPass>pass</IfAuthPass>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <AuthRetries>1</AuthRetries>
+ <IpNetMask>0.255.255.255</IpNetMask>
+ <IpGateway>10.0.0.1</IpGateway>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <EnableLCPExtension>TRUE</EnableLCPExtension>
+ <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+ <ApType>2</ApType>
+ <QosWarningTimeout>1000000</QosWarningTimeout>
+ <RlpMode>TRANSPARENT</RlpMode>
+ <CDMAMobileIP>FALSE</CDMAMobileIP>
+ <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
+ </CDMA2000PacketService>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+ <Chargecard operation="add">
+ <Name>Dummy BT Chargecard</Name>
+ <AccountNumber>144,12345678</AccountNumber>
+ <Pin>0000</Pin>
+ <LocalRule>HG</LocalRule>
+ <NatRule>HFG</NatRule>
+ <IntlRule>HEFG</IntlRule>
+ </Chargecard>
+ <Chargecard operation="add">
+ <Name>Dummy Mercury Chargecard</Name>
+ <AccountNumber>0500800800,,12345678</AccountNumber>
+ <Pin>****</Pin>
+ <LocalRule>HG</LocalRule>
+ <NatRule>J,K,0FG</NatRule>
+ <IntlRule>HEFG</IntlRule>
+ </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+ <ConnectionPreferences operation="add">
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>0</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>LAN</BearerSet>
+ <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
+ </ConnectionPreferences>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+ <GlobalSettings operation="add">
+ <Name>GlobalSettingsTable1</Name>
+ <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
+ <RedialAttempts>3</RedialAttempts>
+ <SmsBearer>2</SmsBearer>
+ <SmsReceiveMode>2</SmsReceiveMode>
+ <GPRSAttachMode>1</GPRSAttachMode>
+ <AcceptIncomingGprs>1</AcceptIncomingGprs>
+ <ConnectionAttempts>2</ConnectionAttempts>
+ <ModemForDataAndFax>2</ModemForDataAndFax>
+ <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+ <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
+ <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
+ <GPRSClassCBearer>GSM</GPRSClassCBearer>
+ <DefaultNetwork>Network.Intranet</DefaultNetwork>
+ <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+ </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+ <IncomingGPRS operation="add">
+ <Name>Incoming GPRS Settings PlaceHolder</Name>
+ <APN>Test</APN>
+ <PDPType>IPV4</PDPType>
+ <PDPAddress>0.0.0.0</PDPAddress>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <ReqPrecedence>1</ReqPrecedence>
+ <ReqDelay>1</ReqDelay>
+ <ReqReliability>1</ReqReliability>
+ <ReqPeakThroughput>1</ReqPeakThroughput>
+ <ReqMeanThroughput>1</ReqMeanThroughput>
+ <MinPrecedence>1</MinPrecedence>
+ <MinDelay>1</MinDelay>
+ <MinReliability>1</MinReliability>
+ <MinPeakThroughput>1</MinPeakThroughput>
+ <MinMeanThroughput>1</MinMeanThroughput>
+ <DataCompression>FALSE</DataCompression>
+ <HeaderCompression>FALSE</HeaderCompression>
+ <AnonymousAccess>FALSE</AnonymousAccess>
+ <IfNetworks>ip</IfNetworks>
+ <IfAuthName>RasUser</IfAuthName>
+ <IfAuthPass>pass</IfAuthPass>
+ <AuthRetries>1</AuthRetries>
+ <IpNameServer1>0.0.0.0</IpNameServer1>
+ <IpNameServer2>0.0.0.0</IpNameServer2>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <GprsUseEdge>FALSE</GprsUseEdge>
+ </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+ <OutgoingGPRS operation="add">
+ <Name>GPRS01</Name>
+ <APN>gprs01APNPlaceHolder</APN>
+ <PDPType>IPV4</PDPType>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+ <ReqPrecedence>0</ReqPrecedence>
+ <ReqDelay>0</ReqDelay>
+ <ReqReliability>0</ReqReliability>
+ <ReqPeakThroughput>0</ReqPeakThroughput>
+ <ReqMeanThroughput>0</ReqMeanThroughput>
+ <MinPrecedence>0</MinPrecedence>
+ <MinDelay>0</MinDelay>
+ <MinReliability>0</MinReliability>
+ <MinPeakThroughput>0</MinPeakThroughput>
+ <MinMeanThroughput>0</MinMeanThroughput>
+ <DataCompression>FALSE</DataCompression>
+ <HeaderCompression>FALSE</HeaderCompression>
+ <AnonymousAccess>FALSE</AnonymousAccess>
+ <IfNetworks>ip</IfNetworks>
+ <AuthRetries>1</AuthRetries>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <GprsUseEdge>FALSE</GprsUseEdge>
+ <GprsAccessPointType>0</GprsAccessPointType>
+ <QosWarningTimeout>0</QosWarningTimeout>
+ </OutgoingGPRS>
+ <OutgoingGPRS operation="add">
+ <Name>GPRS02</Name>
+ <APN>gprs02APNPlaceHolder</APN>
+ <PDPType>IPV4</PDPType>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+ <ReqPrecedence>0</ReqPrecedence>
+ <ReqDelay>0</ReqDelay>
+ <ReqReliability>0</ReqReliability>
+ <ReqPeakThroughput>0</ReqPeakThroughput>
+ <ReqMeanThroughput>0</ReqMeanThroughput>
+ <MinPrecedence>0</MinPrecedence>
+ <MinDelay>0</MinDelay>
+ <MinReliability>0</MinReliability>
+ <MinPeakThroughput>0</MinPeakThroughput>
+ <MinMeanThroughput>0</MinMeanThroughput>
+ <DataCompression>FALSE</DataCompression>
+ <HeaderCompression>FALSE</HeaderCompression>
+ <AnonymousAccess>FALSE</AnonymousAccess>
+ <IfNetworks>ip</IfNetworks>
+ <AuthRetries>1</AuthRetries>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <GprsUseEdge>FALSE</GprsUseEdge>
+ <GprsAccessPointType>0</GprsAccessPointType>
+ <QosWarningTimeout>0</QosWarningTimeout>
+ </OutgoingGPRS>
+ <OutgoingGPRS operation="add">
+ <Name>GPRS03</Name>
+ <APN>gprs03APNPlaceHolder</APN>
+ <PDPType>IPV4</PDPType>
+ <IfPromptForAuth>FALSE</IfPromptForAuth>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+ <ReqPrecedence>0</ReqPrecedence>
+ <ReqDelay>0</ReqDelay>
+ <ReqReliability>0</ReqReliability>
+ <ReqPeakThroughput>0</ReqPeakThroughput>
+ <ReqMeanThroughput>0</ReqMeanThroughput>
+ <MinPrecedence>0</MinPrecedence>
+ <MinDelay>0</MinDelay>
+ <MinReliability>0</MinReliability>
+ <MinPeakThroughput>0</MinPeakThroughput>
+ <MinMeanThroughput>0</MinMeanThroughput>
+ <DataCompression>FALSE</DataCompression>
+ <HeaderCompression>FALSE</HeaderCompression>
+ <AnonymousAccess>FALSE</AnonymousAccess>
+ <IfNetworks>ip</IfNetworks>
+ <AuthRetries>1</AuthRetries>
+ <EnableLCPExtension>FALSE</EnableLCPExtension>
+ <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+ <GprsUseEdge>FALSE</GprsUseEdge>
+ <GprsAccessPointType>0</GprsAccessPointType>
+ <QosWarningTimeout>0</QosWarningTimeout>
+ </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+ <DefaultGPRS operation="add">
+ <Name>Dummy Default GPRS Settings</Name>
+ <APN>Access point name</APN>
+ <PDPType>IPV6</PDPType>
+ <PDPAddress>www.symbianfoundation.org</PDPAddress>
+ <Usage>1</Usage>
+ <Precedence>1</Precedence>
+ <Delay>1</Delay>
+ <Reliability>1</Reliability>
+ <PeakThroughput>1</PeakThroughput>
+ <MeanThroughput>1</MeanThroughput>
+ <MinPrecedence>1</MinPrecedence>
+ <MinDelay>1</MinDelay>
+ <MinReliability>1</MinReliability>
+ <MinPeakThroughput>1</MinPeakThroughput>
+ <MinMeanThroughput>1</MinMeanThroughput>
+ <DataCompression>TRUE</DataCompression>
+ <HeaderCompression>TRUE</HeaderCompression>
+ <GprsUseEdge>FALSE</GprsUseEdge>
+ <AnonymousAccess>TRUE</AnonymousAccess>
+ </DefaultGPRS>
+</DefaultGPRSTable>
+
+<ProxyTable>
+ <Proxy operation="add">
+ <Name>ProxyTable1</Name>
+ <ISPRef>DialOutISP.NT RAS</ISPRef>
+ <UseProxyServer>TRUE</UseProxyServer>
+ <ProtocolName>http</ProtocolName>
+ <ProxyServerName>www.symbianfoundation.org</ProxyServerName>
+ <PortNumber>80</PortNumber>
+ <Exceptions>www.symbianfoundation.org</Exceptions>
+ </Proxy>
+</ProxyTable>
+
+<LocationTable>
+ <Location operation="template">
+ <Name>Default Location</Name>
+ <Mobile>TRUE</Mobile>
+ <UsePulseDial>FALSE</UsePulseDial>
+ <WaitForDialTone>FALSE</WaitForDialTone>
+ <PauseAfterDialout>0</PauseAfterDialout>
+ <IntlPrefixCode>+</IntlPrefixCode>
+ <NatPrefixCode>0</NatPrefixCode>
+ <NatCode>44</NatCode>
+ <AreaCode>44</AreaCode>
+ <DialOutCode>44</DialOutCode>
+ <DisableCallWaitingCode>44</DisableCallWaitingCode>
+ </Location>
+ <Location operation="add">
+ <Name>Office</Name>
+ <Mobile>FALSE</Mobile>
+ <UsePulseDial>FALSE</UsePulseDial>
+ <WaitForDialTone>FALSE</WaitForDialTone>
+ <PauseAfterDialout>0</PauseAfterDialout>
+ <IntlPrefixCode>00</IntlPrefixCode>
+ <NatPrefixCode>0</NatPrefixCode>
+ <NatCode>44</NatCode>
+ <AreaCode>171</AreaCode>
+ <DialOutCode>9,</DialOutCode>
+ <DisableCallWaitingCode>9,</DisableCallWaitingCode>
+ </Location>
+ <Location operation="add">
+ <Name>Office Direct Dial</Name>
+ <Mobile>FALSE</Mobile>
+ <UsePulseDial>FALSE</UsePulseDial>
+ <WaitForDialTone>FALSE</WaitForDialTone>
+ <PauseAfterDialout>0</PauseAfterDialout>
+ <IntlPrefixCode>00</IntlPrefixCode>
+ <NatPrefixCode>0</NatPrefixCode>
+ <NatCode>44</NatCode>
+ <AreaCode>171</AreaCode>
+ <DialOutCode>171</DialOutCode>
+ <DisableCallWaitingCode>171</DisableCallWaitingCode>
+ </Location>
+ <Location operation="add">
+ <Name>Mobile</Name>
+ <Mobile>TRUE</Mobile>
+ <UsePulseDial>FALSE</UsePulseDial>
+ <WaitForDialTone>FALSE</WaitForDialTone>
+ <PauseAfterDialout>0</PauseAfterDialout>
+ <IntlPrefixCode>+</IntlPrefixCode>
+ <NatPrefixCode>0</NatPrefixCode>
+ <NatCode>44</NatCode>
+ <AreaCode>44</AreaCode>
+ <DialOutCode>44</DialOutCode>
+ <DisableCallWaitingCode>44</DisableCallWaitingCode>
+ </Location>
+ <Location operation="add">
+ <Name>Home</Name>
+ <Mobile>FALSE</Mobile>
+ <UsePulseDial>TRUE</UsePulseDial>
+ <WaitForDialTone>TRUE</WaitForDialTone>
+ <PauseAfterDialout>0</PauseAfterDialout>
+ <IntlPrefixCode>00</IntlPrefixCode>
+ <NatPrefixCode>0</NatPrefixCode>
+ <NatCode>44</NatCode>
+ <AreaCode>181</AreaCode>
+ <DialOutCode>181</DialOutCode>
+ <DisableCallWaitingCode>181</DisableCallWaitingCode>
+ </Location>
+</LocationTable>
+
+<SecureSocketTable>
+ <SecureSocket operation="add">
+ <Name>SecureSocketTable1</Name>
+ <ProtocolName>ssl3.0</ProtocolName>
+ <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+ </SecureSocket>
+ <SecureSocket operation="add">
+ <Name>SecureSocketTable2</Name>
+ <ProtocolName>tls1.0</ProtocolName>
+ <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+ </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+ <WAPAccessPoint operation="template">
+ <Name>Default Dial In ISP</Name>
+ <CurrentBearer>WAPIPBearer</CurrentBearer>
+ </WAPAccessPoint>
+ <WAPAccessPoint operation="add">
+ <Name>Dummy WAP Settings</Name>
+ <CurrentBearer>WAPIPBearer</CurrentBearer>
+ <StartPage>www.symbianfoundation.org</StartPage>
+ </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+ <WAPIPBearer operation="template">
+ <Name>WAPIPBearerTable1</Name>
+ <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+ <GatewayAddress>0</GatewayAddress>
+ <WSPOption>CONNECTIONLESS</WSPOption>
+ <Security>FALSE</Security>
+ <IAPRef>IAP.-1</IAPRef>
+ <ProxyPortNumber>0</ProxyPortNumber>
+ <ProxyLogin>0</ProxyLogin>
+ <ProxyPassword>0</ProxyPassword>
+ </WAPIPBearer>
+ <WAPIPBearer operation="add">
+ <Name>WAPIPBearerTable2</Name>
+ <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+ <GatewayAddress>www.symbianfoundation.org</GatewayAddress>
+ <WSPOption>CONNECTIONORIENTED</WSPOption>
+ <Security>FALSE</Security>
+ <IAPRef>IAP.CSD IAP PlaceHolder01</IAPRef>
+ <ProxyPortNumber>1</ProxyPortNumber>
+ <ProxyLogin>1</ProxyLogin>
+ <ProxyPassword>1</ProxyPassword>
+ </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+ <WAPSMSBearer operation="template">
+ <Name>WAPSMSBearerTable1</Name>
+ <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+ <GatewayAddress>0</GatewayAddress>
+ <WSPOption>CONNECTIONLESS</WSPOption>
+ <Security>FALSE</Security>
+ <ServiceCentreAddress>0</ServiceCentreAddress>
+ </WAPSMSBearer>
+ <WAPSMSBearer operation="add">
+ <Name>WAPSMSBearerTable2</Name>
+ <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+ <GatewayAddress>+0000000000000</GatewayAddress>
+ <WSPOption>CONNECTIONORIENTED</WSPOption>
+ <Security>FALSE</Security>
+ <ServiceCentreAddress>+000000000000</ServiceCentreAddress>
+ </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/Tls_ntras_wlan.cfg Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,2137 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommDB 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
+
+
+############################################################
+## ModemBearer
+##
+[ModemBearer]
+ADD_TEMPLATE
+ Name=Default Modem
+ Agent=CSD.agt
+ IfName=PPP
+ PortName=COMM::0
+ TSYName=MM
+ CSYName=ECUART
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=180
+ LastSessionClosedTimeout=30
+ LastSocketClosedTimeout=60
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=Null Modem 115200bps
+ Agent=CSD.agt
+ IfName=PPP
+ PortName=COMM::0
+ TSYName=MM
+ CSYName=ECUART
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=115200
+ Handshaking=4
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=210
+ LastSessionClosedTimeout=60
+ LastSocketClosedTimeout=90
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=US Robotics Sportster
+ Agent=CSD.agt
+ IfName=PPP
+ PortName=COMM::0
+ TSYName=MM
+ CSYName=ECUART
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=57600
+ Handshaking=244
+ SpecialRate=0
+ XonChar=0
+ XoffChar=0
+ FaxClassPref=AUTO
+ SpeakerPref=AFTERDIALUNTILANSWER
+ SpeakerVolPref=QUIET
+ ModemInitString=AT&F1
+ DataInitString=AT
+ FaxInitString=AT&d2
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=180
+ LastSessionClosedTimeout=30
+ LastSocketClosedTimeout=60
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=Dacom Surfer
+ Agent=CSD.agt
+ IfName=PPP
+ PortName=COMM::0
+ TSYName=MM
+ CSYName=ECUART
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=57600
+ Handshaking=244
+ SpecialRate=0
+ XonChar=0
+ XoffChar=0
+ FaxClassPref=AUTO
+ SpeakerPref=AFTERDIALUNTILANSWER
+ SpeakerVolPref=QUIET
+ ModemInitString=AT&F
+ DataInitString=AT
+ FaxInitString=AT&d2
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=180
+ LastSessionClosedTimeout=30
+ LastSocketClosedTimeout=60
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=GSM Mobile Phone via Infrared
+ Agent=CSD.agt
+ IfName=PPP
+ PortName=IRCOMM::0
+ TSYName=MM
+ CSYName=IRCOMM
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=115200
+ Handshaking=196
+ SpecialRate=0
+ XonChar=17
+ XoffChar=19
+ FaxClassPref=AUTO
+ SpeakerPref=NEVER
+ SpeakerVolPref=QUIET
+ ModemInitString=ATZ
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=180
+ LastSessionClosedTimeout=30
+ LastSocketClosedTimeout=60
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Name=GSM Mobile Phone via Serial
+ Agent=CSD.agt
+ IfName=PPP
+ PortName=COMM::0
+ TSYName=MM
+ CSYName=ECUART
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=19200
+ Handshaking=196
+ SpecialRate=0
+ XonChar=17
+ XoffChar=19
+ FaxClassPref=AUTO
+ SpeakerPref=NEVER
+ SpeakerVolPref=QUIET
+ ModemInitString=ATZ
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=180
+ LastSessionClosedTimeout=30
+ LastSocketClosedTimeout=60
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=GPRS Ericsson R520m via IR
+ Agent=PSD.agt
+ IfName=PPP
+ PortName=IRCOMM::0
+ TSYName=MM
+ CSYName=IRCOMM
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=115200
+ Handshaking=4
+ SpecialRate=0
+ XonChar=17
+ XoffChar=19
+ FaxClassPref=AUTO
+ SpeakerPref=NEVER
+ SpeakerVolPref=QUIET
+ ModemInitString=ATZ
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=180
+ LastSessionClosedTimeout=30
+ LastSocketClosedTimeout=60
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Name=GPRS Ericsson R520m/T68i via Serial
+ Agent=PSD.agt
+ IfName=PPP
+ PortName=COMM::0
+ TSYName=MM
+ CSYName=ECUART
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=19200
+ Handshaking=4
+ SpecialRate=0
+ XonChar=17
+ XoffChar=19
+ FaxClassPref=AUTO
+ SpeakerPref=NEVER
+ SpeakerVolPref=QUIET
+ ModemInitString=ATZ
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=180
+ LastSessionClosedTimeout=30
+ LastSocketClosedTimeout=60
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=70
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+ Name=GPRS Motorola Mobile Phone via Serial
+ Agent=PSD.agt
+ IfName=PPP
+ PortName=COMM::0
+ TSYName=MM
+ CSYName=ECUART
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=57600
+ Handshaking=4
+ SpecialRate=0
+ XonChar=17
+ XoffChar=19
+ FaxClassPref=AUTO
+ SpeakerPref=NEVER
+ SpeakerVolPref=QUIET
+ ModemInitString=ATZ
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=180
+ LastSessionClosedTimeout=30
+ LastSocketClosedTimeout=60
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+ Name=WinTunnel Modem
+ Agent=null.agt
+ IfName=PPP
+ PortName=COMM::6
+ TSYName=MM
+ CSYName=ECUART
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=115200
+ Handshaking=4
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=180
+ LastSessionClosedTimeout=30
+ LastSocketClosedTimeout=60
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+ Name=mRouterWinsBearer
+ Agent=mRouterAgent.agt
+ IfName=PPP
+ PortName=WINS::0
+ TSYName=MM
+ CSYName=WINSCSY
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=115200
+ Handshaking=4
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=9999
+ LastSessionClosedTimeout=180
+ LastSocketClosedTimeout=30
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+ Name=mRouterRs232Bearer
+ Agent=mRouterAgent.agt
+ IfName=PPP
+ PortName=COMM::0
+ TSYName=MM
+ CSYName=ECUART
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=115200
+ Handshaking=4
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=9999
+ LastSessionClosedTimeout=180
+ LastSocketClosedTimeout=30
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+ Name=mRouterIrBearer
+ Agent=mRouterAgent.agt
+ IfName=PPP
+ PortName=IRCOMM::0
+ TSYName=MM
+ CSYName=IRCOMM
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=115200
+ Handshaking=4
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=9999
+ LastSessionClosedTimeout=180
+ LastSocketClosedTimeout=30
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+ Name=mRouterBtBearer
+ Agent=mRouterAgent.agt
+ IfName=PPP
+ PortName=BTCOMM::0
+ TSYName=MM
+ CSYName=BTCOMM
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=115200
+ Handshaking=4
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=9999
+ LastSessionClosedTimeout=180
+ LastSocketClosedTimeout=30
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+ Name=mRouterUsbBearer
+ Agent=mRouterAgent.agt
+ IfName=PPP
+ PortName=ACM::0
+ TSYName=MM
+ CSYName=ECACM
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=115200
+ Handshaking=4
+ 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
+ QuietOn=Q1
+ QuietOff=Q0
+ 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=+00000000000
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ LastSocketActivityTimeout=9999
+ LastSessionClosedTimeout=180
+ LastSocketClosedTimeout=30
+ SIRSettings=0
+ CommRole=0
+ FIELD_COUNT=69
+END_ADD
+
+
+############################################################
+## LANBearer
+##
+[LANBearer]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=Assabet on-board Ethernet
+ Agent=nullagt.agt
+ IfName=ethint
+ LDDName=not used
+ PDDName=not used
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=-1
+ LastSocketClosedTimeout=-1
+ FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## Location
+##
+[Location]
+ADD_TEMPLATE
+ Name=Default Location
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+ FIELD_COUNT=8
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=Office
+ IntlPrefixCode=00
+ NatPrefixCode=0
+ NatCode=44
+ AreaCode=171
+ DialOutCode=9,
+ Mobile=FALSE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+ FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=Office Direct Dial
+ IntlPrefixCode=00
+ NatPrefixCode=0
+ NatCode=44
+ AreaCode=171
+ Mobile=FALSE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+ FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=Home
+ IntlPrefixCode=00
+ NatPrefixCode=0
+ NatCode=44
+ AreaCode=181
+ Mobile=FALSE
+ UsePulseDial=TRUE
+ WaitForDialTone=TRUE
+ PauseAfterDialout=0
+ FIELD_COUNT=9
+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
+
+
+############################################################
+## GlobalSettings
+##
+[GlobalSettings]
+ADD_SECTION
+ WAPAccessPoint=1
+ RedialAttempts=3
+ SmsBearer=1
+ SmsReceiveMode=2
+ GPRSAttachMode=1
+ AcceptIncomingGprs=1
+ GPRSClassCBearer=GSM
+ ConnectionAttempts=2
+ ModemForDataAndFax=2
+ ModemForPhoneServicesAndSMS=2
+ LocationForDataAndFax=2
+ LocationForPhoneServicesAndSMS=2
+ DefaultNetwork=1
+ BearerAvailabilityCheckTSY=mm
+ FIELD_COUNT=14
+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=0
+ 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=NT RAS
+ Description=Test
+ 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
+ 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
+ BearerService=0
+ BearerProtocol=0
+ 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=35
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=ISP01
+ Description=PlaceHolder for ISP01
+ Type=INTERNETONLY
+ DialResolution=TRUE
+ UseLoginScript=FALSE
+ PromptForLogin=FALSE
+ DisplayPCT=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=TRUE
+ IfAuthName=xxx
+ IfAuthPass=yyy
+ AuthRetries=0
+ IfCallbackEnabled=FALSE
+ CallbackTimeout=0
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ EnableIPHeaderComp=FALSE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ EnableSWComp=FALSE
+ BearerService=0
+ BearerProtocol=0
+ 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=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=ISP02
+ Description=PlaceHolder for ISP02
+ Type=INTERNETONLY
+ DialResolution=TRUE
+ UseLoginScript=FALSE
+ PromptForLogin=FALSE
+ DisplayPCT=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=TRUE
+ IfAuthName=xxx
+ IfAuthPass=yyy
+ AuthRetries=0
+ IfCallbackEnabled=FALSE
+ CallbackTimeout=0
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ EnableIPHeaderComp=FALSE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ EnableSWComp=FALSE
+ BearerService=0
+ BearerProtocol=0
+ 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=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=ISP03
+ Description=PlaceHolder for ISP03
+ Type=INTERNETONLY
+ DialResolution=TRUE
+ UseLoginScript=FALSE
+ PromptForLogin=FALSE
+ DisplayPCT=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=TRUE
+ IfAuthName=xxx
+ IfAuthPass=yyy
+ AuthRetries=0
+ IfCallbackEnabled=FALSE
+ CallbackTimeout=0
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ EnableIPHeaderComp=FALSE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ EnableSWComp=FALSE
+ BearerService=0
+ BearerProtocol=0
+ 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=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Name=ISP04
+ Description=PlaceHolder for ISP04
+ Type=INTERNETONLY
+ DialResolution=TRUE
+ UseLoginScript=FALSE
+ PromptForLogin=FALSE
+ DisplayPCT=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=TRUE
+ IfAuthName=xxx
+ IfAuthPass=yyy
+ AuthRetries=0
+ IfCallbackEnabled=FALSE
+ CallbackTimeout=0
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ EnableIPHeaderComp=FALSE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ EnableSWComp=FALSE
+ BearerService=0
+ BearerProtocol=0
+ 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=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=ISP05
+ Description=PlaceHolder for ISP05
+ Type=INTERNETONLY
+ DialResolution=TRUE
+ UseLoginScript=FALSE
+ PromptForLogin=FALSE
+ DisplayPCT=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=TRUE
+ IfAuthName=xxx
+ IfAuthPass=yyy
+ AuthRetries=0
+ IfCallbackEnabled=FALSE
+ CallbackTimeout=0
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ EnableIPHeaderComp=FALSE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ EnableSWComp=FALSE
+ BearerService=0
+ BearerProtocol=0
+ 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=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Name=mRouterDialOutIsp
+ Description=mRouterDialOutIsp
+ Type=INTERNETONLY
+ DialResolution=TRUE
+ UseLoginScript=FALSE
+ PromptForLogin=FALSE
+ DisplayPCT=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ IfAuthName=IfAuthPass=
+ IfAuthPass=AuthRetries=0
+ AuthRetries=0
+ IfCallbackEnabled=FALSE
+ CallbackTimeout=0
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ EnableIPHeaderComp=FALSE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ EnableSWComp=FALSE
+ BearerService=0
+ BearerProtocol=0
+ 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=34
+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
+ UseLoginScript=FALSE
+ IpAddrFromServer=TRUE
+ IpDNSAddrFromServer=TRUE
+ EnableIPHeaderComp=FALSE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ EnableSWComp=FALSE
+ UseEdge=FALSE
+ FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+##
+[OutgoingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=GPRS01
+ APN=gprs01APNPlaceHolder
+ 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
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ AuthRetries=1
+ IpDNSAddrFromServer=FALSE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ IpAddrFromServer=TRUE
+ GprsAccessPointType=0
+ QosWarningTimeout=0
+ FIELD_COUNT=26
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=GPRS02
+ APN=gprs02APNPlaceHolder
+ 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
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ AuthRetries=1
+ IpDNSAddrFromServer=FALSE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ IpAddrFromServer=TRUE
+ GprsAccessPointType=0
+ QosWarningTimeout=0
+ FIELD_COUNT=26
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=GPRS03
+ APN=gprs03APNPlaceHolder
+ 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
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ AuthRetries=1
+ IpDNSAddrFromServer=FALSE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ IpAddrFromServer=TRUE
+ GprsAccessPointType=0
+ QosWarningTimeout=0
+ FIELD_COUNT=26
+END_ADD
+
+
+############################################################
+## IncomingGPRS
+##
+[IncomingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=Incoming GPRS Settings PlaceHolder
+ APN=Test
+ PDPType=IPV4
+ 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
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=0.0.0.0
+ IpNameServer2=0.0.0.0
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=FALSE
+ PDPAddress=0.0.0.0
+ IpAddrFromServer=TRUE
+ 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.symbianfoundation.org
+ Precedence=1
+ Delay=1
+ Reliability=1
+ PeakThroughput=1
+ MeanThroughput=1
+ MinPrecedence=1
+ MinDelay=1
+ MinReliability=1
+ MinPeakThroughput=1
+ MinMeanThroughput=1
+ DataCompression=TRUE
+ HeaderCompression=TRUE
+ GprsUseEdge=FALSE
+ AnonymousAccess=TRUE
+ FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## CDMA2000PacketServiceTable
+##
+[CDMA2000PacketServiceTable]
+ADD_SECTION
+# COMMDB_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=32KBPS
+ MinRevBitrate=32KBPS
+ 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
+ QosWarningTimeout=1000000
+ RlpMode=TRANSPARENT
+ CDMAMobileIP=FALSE
+ CDMAMobileIPTimeout=10000000
+ FIELD_COUNT=36
+END_ADD
+
+
+############################################################
+## DefaultCDMA2000SettingsTable
+##
+[DefaultCDMA2000SettingsTable]
+
+############################################################
+## LANService
+##
+[LANService]
+ADD_SECTION
+# COMMDB_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=9
+END_ADD
+
+
+############################################################
+## IAP
+##
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+ Name=NT RAS with Null Modem
+ IAPService=2
+ IAPServiceType=DialOutISP
+ IAPBearer=2
+ IAPBearerType=ModemBearer
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=2
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=CSD IAP PlaceHolder01
+ IAPService=3
+ IAPServiceType=DialOutISP
+ IAPBearer=2
+ IAPBearerType=ModemBearer
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=2
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Name=CSD IAP PlaceHolder02
+ IAPService=4
+ IAPServiceType=DialOutISP
+ IAPBearer=2
+ IAPBearerType=ModemBearer
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=2
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+ Name=GPRS IAP PlaceHolder01
+ IAPService=1
+ IAPServiceType=OutgoingGPRS
+ IAPBearer=8
+ IAPBearerType=ModemBearer
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+ Name=GPRS IAP PlaceHolder02
+ IAPService=2
+ IAPServiceType=OutgoingGPRS
+ IAPBearer=8
+ IAPBearerType=ModemBearer
+ IAPNetwork=1
+ IAPNetworkWeighting=0
+ Location=4
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+ Name=mRouter Rs232
+ IAPService=8
+ IAPServiceType=DialOutISP
+ IAPBearer=12
+ IAPBearerType=ModemBearer
+ IAPNetwork=2
+ IAPNetworkWeighting=0
+ Location=2
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+ Name=mRouter Ir
+ IAPService=8
+ IAPServiceType=DialOutISP
+ IAPBearer=13
+ IAPBearerType=ModemBearer
+ IAPNetwork=2
+ IAPNetworkWeighting=0
+ Location=2
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+ Name=mRouter BT
+ IAPService=8
+ IAPServiceType=DialOutISP
+ IAPBearer=14
+ IAPBearerType=ModemBearer
+ IAPNetwork=2
+ IAPNetworkWeighting=0
+ Location=2
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+ Name=mRouter USB
+ IAPService=8
+ IAPServiceType=DialOutISP
+ IAPBearer=15
+ IAPBearerType=ModemBearer
+ IAPNetwork=2
+ IAPNetworkWeighting=0
+ Location=2
+ FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+ Name=mRouter Wins
+ IAPService=8
+ IAPServiceType=DialOutISP
+ IAPBearer=11
+ IAPBearerType=ModemBearer
+ IAPNetwork=2
+ IAPNetworkWeighting=0
+ Location=2
+ FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+##
+[ConnectionPreferences]
+ADD_SECTION
+ Ranking=0
+ Direction=OUTGOING
+ DialogPref=DONOTPROMPT
+ BearerSet=CSD
+ IAP=1
+ FIELD_COUNT=5
+END_ADD
+
+############################################################
+## BTDeviceTable
+##
+[BTDeviceTable]
+
+############################################################
+## BTSecurityTable
+##
+[BTSecurityTable]
+
+############################################################
+## BTDefaultTable
+##
+[BTDefaultTable]
+
+############################################################
+## Proxies
+##
+[Proxies]
+ADD_SECTION
+# COMMDB_ID = 1
+ ISP=2
+ ProxyServiceType=DialOutISP
+ UseProxyServer=TRUE
+ ProxyServerName=www.symbianfoundation.org
+ ProtocolName=http
+ PortNumber=80
+ Exceptions=www.symbianfoundation.org
+ FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## AgentLookup
+##
+[AgentLookup]
+
+############################################################
+## WAPAccessPoint
+##
+[WAPAccessPoint]
+ADD_TEMPLATE
+ Name=Default Dial In ISP
+ CurrentBearer=WAPIPBearer
+ FIELD_COUNT=2
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Name=Dummy WAP Settings
+ CurrentBearer=WAPIPBearer
+ StartPage=www.symbianfoundation.org
+ FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## WAPIPBearer
+##
+[WAPIPBearer]
+ADD_TEMPLATE
+ AccessPointId=0
+ IAP=0
+ WSPOption=CONNECTIONLESS
+ Security=FALSE
+ ProxyPortNumber=0
+ FIELD_COUNT=5
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ AccessPointId=2
+ GatewayAddress=www.symbianfoundation.org
+ IAP=2
+ WSPOption=CONNECTIONORIENTED
+ Security=FALSE
+ ProxyPortNumber=1
+ FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## WAPSMSBearer
+##
+[WAPSMSBearer]
+ADD_TEMPLATE
+ AccessPointId=0
+ WSPOption=CONNECTIONLESS
+ Security=FALSE
+ FIELD_COUNT=3
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ AccessPointId=2
+ GatewayAddress=+0000000000000
+ ServiceCentreAddress=+000000000000
+ WSPOption=CONNECTIONORIENTED
+ Security=FALSE
+ FIELD_COUNT=5
+END_ADD
+
+
+############################################################
+## SecureSocketTable
+##
+[SecureSocketTable]
+ADD_SECTION
+# COMMDB_ID = 1
+ ProtocolName=ssl3.0
+ ProtoLibrary=ssladaptor.dll
+ FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+ ProtocolName=tls1.0
+ ProtoLibrary=ssladaptor.dll
+ FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## BTPersistTable
+##
+[BTPersistTable]
+
+############################################################
+## AccessTypeTable
+##
+[AccessTypeTable]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/connectionpref_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of "Eclipse Public License v1.0"
+ 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:
+ CommDB Settings File
+ All Rights Reserved
+
+-->
+
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences operation="add">
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/connectionpref_wlan1.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of "Eclipse Public License v1.0"
+ 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:
+ CommDB Settings File
+ All Rights Reserved
+
+-->
+
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences operation="add">
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_3DES_EDE_CBC_SHA_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,25 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+
+//TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=008b
+ExpectedFinalCipherSuit=008b
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,25 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+
+//TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=008c
+ExpectedFinalCipherSuit=0035
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+ExpectedSetCipherError=-5
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,25 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+
+//TLS_PSK_WITH_AES_128_CBC_SHA.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=008c
+ExpectedFinalCipherSuit=008c
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_256_CBC_SHA_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,25 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+
+//TLS_PSK_WITH_AES_256_CBC_SHA.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=008d
+ExpectedFinalCipherSuit=008d
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_RC4_128_SHA_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,25 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+
+//TLS_PSK_WITH_RC4_128_SHA.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=008a
+ExpectedFinalCipherSuit=008a
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_MD5_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,27 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+
+//TLS_RSA_WITH_NULL_MD5.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=0001
+ExpectedFinalCipherSuit=0001
+UseNullCipher=True
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
+UseNullCipher=True
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_SHA_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,26 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+
+//TLS_RSA_WITH_NULL_SHA.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=0002
+ExpectedFinalCipherSuit=0002
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=True
+UseNullCipher=True
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_SNE_MULTIPLE_SERVER_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,31 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+
+//TLS_SNE_MULTIPLE_SERVER.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=002f
+ExpectedFinalCipherSuit=002f
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+NumServerNames=3
+ServerName1=www.something.org
+ServerName2=www.something.com
+ServerName3=www.something.es
+
+ExpectedHandshakeError=-7550
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER_NEG_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+
+//TLS_SNE_SINGLE_SERVER_NEG.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=0002
+ExpectedFinalCipherSuit=0002
+
+UseNullCipher=True
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+ExpectedHandshakeError=-7550
+
+NumServerNames=3
+ServerName1=www.badservername.org
+ServerName2=www.badservername.uk
+ServerName3=www.badservername.es
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,30 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+
+//TLS_SNE_SINGLE_SERVER.ini
+
+[Tlstest]
+NumCipherSuites=0
+ExpectedFinalCipherSuit=008D
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=True
+UseNullCipher=True
+
+ExpectedSetCipherError=-5
+
+NumServerNames=1
+ServerName1=www.something.org
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls11_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS11
+//DSA sign client authentication
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+DNSName=TLS11
+Protocol=tls1.0
+IPPort=646
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=17
+CipherSuites=17
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls12_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS12
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+DNSName=TLS12
+Protocol=tls1.0
+IPPort=644
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=18
+CipherSuites=18
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls13_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// 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:
+/////////////////////////////////////////////
+
+TLS13
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+DNSName=TLS13
+Protocol=tls1.0
+IPPort=644
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=19
+CipherSuites=19
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls14_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS14
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS14
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=20
+CipherSuites=20
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls16_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS16
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS16
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=22
+CipherSuites=22
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls19_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS19
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL19
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=3
+CipherSuites=03
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls20_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS20
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL20
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=4
+CipherSuites=04
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls21_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS21
+//SSL 3.0 client authentication
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL21
+IPPort=545
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=8
+CipherSuites=08
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls22_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS22
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL22
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=9
+CipherSuites=09
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls23_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS23
+//DSA sign client authentication
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL23
+IPPort=546
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=17
+CipherSuites=17
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls24_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS24
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL24
+IPPort=544
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=18
+CipherSuites=18
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls25_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS25
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL25
+IPPort=544
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=19
+CipherSuites=19
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls26_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS26
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL26
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=20
+CipherSuites=20
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls28_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS28
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL28
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=22
+CipherSuites=22
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls36_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS36
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL28
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=22
+CipherSuites=22
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=true
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls38_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS38
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL28
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=22
+CipherSuites=22
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=true
+EAPKeyDerivation=true
--- a/networksecurity/tls/ts_tls/scripts/Tls39.ini Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-/////////////////////////////////////////////
-
-TLS39
-
-[Tlstest]
-/////////////////////////////////////////////
-IPAddress=192.168.10.11
-Protocol=tls1.0
-P_rotocol=ssl3.0
-DNSName=TLS39
-IPPort=543
-TLSMaxVersion=3.1
-TLSMinVersion=3.0
-Cipher=1
-CipherSuites=01
-Page=/index.html
-SimpleGet=0
-TestEndDelay=0
-UseGenericSocket=false
-EAPKeyDerivation=false
-SSLDialogMode=true
-SSLDialogModeValue=0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls3_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,63 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+// T_AUTOSSL config file. This file should be placed in /epoc32/wins/c/system/data/t_autossl.ini
+//
+// The following fields must be present for each site that is to be tested.
+// The field names ARE case sensitive, and MUST be followed imediately by a `:`, and then a space
+// before the field data.
+//
+// IPAddress The address to connect to (can be www.site.com)
+// DNSName The domain name which is checked against cert
+// IPPort The port to connect to
+// TLSMaxVersion Highest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// TLSMinVersion Lowest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// Cipher Cipher suite that server is expected to use (decimal), compared with
+// actual cipher for pass/fail. If this field is 0, no comparisons with
+// the actual cipher suite used will be made.
+// CipherSuites Cipher suites that client will tell server it supports (decimal)
+// Should be in decimal, with 2 characters, ie for suites 3,7,8,9-
+// this field would be - 03070809
+// By entering a single `0` for this field, the SSL default cipher suites
+// will be passed.
+// Page The page that should be retrieved from the web server.
+// The leading `/` should be included, ie /webpage.html
+// SimpleGet If a 1, the page request will be a simple "GET [Page]", if 0
+// a HTTP get request will be constructed.
+// For testing against OpenSSL servers, this field should be 0,
+// while most "real" web servers prefer the simple request, the
+// LLoydsTSB login page being an example.
+//
+
+
+/////////////////////////////////////////////
+
+
+// test 3 -> TLS -> SSL fallback
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS3
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=3
+CipherSuites=03
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- a/networksecurity/tls/ts_tls/scripts/Tls40.ini Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-/////////////////////////////////////////////
-
-TLS40
-
-[Tlstest]
-/////////////////////////////////////////////
-IPAddress=192.168.10.11
-Protocol=tls1.0
-P_rotocol=ssl3.0
-DNSName=TLS40
-IPPort=543
-TLSMaxVersion=3.1
-TLSMinVersion=3.0
-Cipher=1
-CipherSuites=01
-Page=/index.html
-SimpleGet=0
-TestEndDelay=0
-UseGenericSocket=false
-EAPKeyDerivation=false
-SSLDialogMode=true
-SSLDialogModeValue=1
-ExpectedErrorCode=-7548
-
--- a/networksecurity/tls/ts_tls/scripts/Tls41.ini Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-/////////////////////////////////////////////
-
-TLS41
-
-[Tlstest]
-/////////////////////////////////////////////
-IPAddress=192.168.10.11
-Protocol=tls1.0
-P_rotocol=ssl3.0
-DNSName=TLS41
-IPPort=543
-TLSMaxVersion=3.1
-TLSMinVersion=3.0
-Cipher=1
-CipherSuites=01
-Page=/index.html
-SimpleGet=0
-TestEndDelay=0
-UseGenericSocket=false
-EAPKeyDerivation=false
-SSLDialogMode=true
-SSLDialogModeValue=2
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls4_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,38 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////
+
+//test 4
+//client authentication
+//////////////////////////////////////////
+
+[Tlstest]
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS4
+IPPort=645
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=4
+CipherSuites=04
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
+
+
+// invalid cipher suite
+[FailSuiteSelection]
+CipherSuites=42
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls5_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+///////////////////////////////////////////
+
+//TLS5
+
+[Tlstest]
+///////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS5
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=5
+CipherSuites=05
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls5b_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLS5B
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL5
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=5
+CipherSuites=05
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls8_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+///////////////////////////////////////////
+
+//TLS8
+[Tlstest]
+///////////////////////////////////////////
+
+IPAddress=192.168.40.50
+DNSName=TLS8
+Protocol=tls1.0
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=8
+CipherSuites=08
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls9_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+///////////////////////////////////////////
+
+//TLS9
+
+[Tlstest]
+///////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS9
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=9
+CipherSuites=09
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TlsA_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+TLSA
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=SSLA
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=10
+CipherSuites=10
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tlssa_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+SSLA
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+DNSName=SSLA
+Protocol=ssl3.0
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=10
+CipherSuites=10
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
Binary file networksecurity/tls/ts_tls/scripts/cccccc00_ssl_30.cre has changed
Binary file networksecurity/tls/ts_tls/scripts/cccccc00_tls_psk.cre has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/connectionpref1_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of "Eclipse Public License v1.0"
+ which accompanies this distribution, and is available
+ at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+ Initial Contributors:
+ Nokia Corporation - initial contribution.
+
+ Contributors:
+
+ Description:
+ CommDB Settings File
+ All Rights Reserved
+
+-->
+
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences operation="add">
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.WlanWithDaemonDynamicIP</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/connectionpref_wlan.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of "Eclipse Public License v1.0"
+ which accompanies this distribution, and is available
+ at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+ Initial Contributors:
+ Nokia Corporation - initial contribution.
+
+ Contributors:
+
+ Description:
+ CommDB Settings File
+ All Rights Reserved
+
+-->
+
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences operation="add">
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.WLANwithNullModem</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
Binary file networksecurity/tls/ts_tls/scripts/ssl_30_wlan.xml has changed
--- a/networksecurity/tls/ts_tls/scripts/ssl_ntras_30.script Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tls/ts_tls/scripts/ssl_ntras_30.script Tue Aug 31 16:45:15 2010 +0300
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -127,22 +127,6 @@
TEST_COMPLETE TLS_test_38
RUN_UTILS Delete c:\t_secdlg_out.dat
-RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls39.ini
-TEST_COMPLETE TLS_test_39
-
-RUN_UTILS Delete c:\t_secdlg_out.dat
-RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls40.ini
-TEST_COMPLETE TLS_test_40
-
-RUN_UTILS Delete c:\t_secdlg_out.dat
-RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls41.ini
-TEST_COMPLETE TLS_test_41
-
-RUN_UTILS Delete c:\t_secdlg_out.dat
-RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls42.ini
-TEST_COMPLETE TLS_test_42
-
-RUN_UTILS Delete c:\t_secdlg_out.dat
RUN_SCRIPT Z:\TestData\Scripts\esock_test_stopallinterfaces.script
RUN_SCRIPT Z:\TestData\scripts\esock_test_unloadesockForced.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/ssl_ntras_30_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,138 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT TLS tests
+PRINT using a serial NT Ras connection
+
+
+LOAD_SUITE TS_tls.dll
+
+PAUSE_AT_END
+// set up commdb for a serial NT ras connection
+// which will work with WinTunnel
+RUN_SCRIPT z:\TestData\scripts\esock_test_unloadesockForced.script
+//ced z:\testdata\configs\Tls_ntras.cfg ced.log
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_ssl_30.cre c:\private\10202be9\persists\cccccc00.cre
+RUN_SCRIPT z:\TestData\scripts\esock_test_loadesock.script
+
+//run_utils copy z:\testdata\configs\ssl\*.* c:\system\data\
+
+print Note the following ciphers suites are supported by TLS
+print 4, 5, 10, 22, 19, 18, 9, 17, 20, 8, 3
+print The following are weak crypto only 9,17,20
+print The following are AES cipher suites: 0x2F (47), 0x35 (53)
+print These tests require strong crypto
+
+// so some of the following list of test have been disabled tests 1,2,15,17,18,27
+// tests 9,11,14 should work with weak crypto
+// also tests 480 and 580 are disabled as there is no server on the test network
+
+print These tests use the SSL servers on ports 543,544,643 an 644
+
+RUN_UTILS CopyFile z:\TestData\Configs\tls_t_secdlg_in.dat c:\t_secdlg_in.dat
+RUN_UTILS MakeReadWrite c:\t_secdlg_in.dat
+
+// dialog mode test
+RUN_TEST_STEP 100000, TS_TLS, t_tls_DialogMode
+TEST_COMPLETE TLS_test_19
+
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls19.ini
+TEST_COMPLETE TLS_test_19
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls20.ini
+TEST_COMPLETE TLS_test_20
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls5b.ini
+TEST_COMPLETE TLS_test_5b
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls21.ini
+TEST_COMPLETE TLS_test_21
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls22.ini
+TEST_COMPLETE TLS_test_22
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tlssa.ini
+TEST_COMPLETE TLS_test_SSLA
+
+# weak crypto
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls23.ini
+TEST_COMPLETE TLS_test_23
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls24.ini
+TEST_COMPLETE TLS_test_24
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls25.ini
+TEST_COMPLETE TLS_test_25
+
+# weak crypto
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls26.ini
+TEST_COMPLETE TLS_test_26
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls28.ini
+TEST_COMPLETE TLS_test_28
+
+// Following Test fails as CSecureSocketLibraryLoader::OpenWithIdL ignores the Commsdat field
+//RUN_UTILS Delete c:\t_secdlg_out.dat
+//RUN_TEST_STEP 100000, TS_TLS, tls_TestSection2_1
+//TEST_COMPLETE tls_TestSection2_1
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, tls_TestSection3_1
+TEST_COMPLETE tls_TestSection3_1
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, OpenConnection, z:\testdata\configs\Tls28.ini
+RUN_TEST_STEP 100000, TS_TLS, oldgetOpts, z:\testdata\configs\Tls28.ini
+RUN_TEST_STEP 100000, TS_TLS, CloseConnection, z:\testdata\configs\Tls28.ini
+TEST_COMPLETE oldgetOpts
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, renegotiate, z:\testdata\configs\Tls28.ini
+TEST_COMPLETE RenegotiateTest
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, CancelRecv, z:\testdata\configs\Tls28.ini
+TEST_COMPLETE CancelRecvTest
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls36.ini
+TEST_COMPLETE TLS_test_36
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls38.ini
+TEST_COMPLETE TLS_test_38
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_SCRIPT Z:\TestData\Scripts\esock_test_stopallinterfaces.script
+RUN_SCRIPT Z:\TestData\scripts\esock_test_unloadesockForced.script
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/ssl_ntras_31_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,128 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT TLS tests
+PRINT using a serial NT Ras connection
+
+
+LOAD_SUITE TS_tls.dll
+
+PAUSE_AT_END
+// set up commdb for a serial NT ras connection
+// which will work with WinTunnel
+RUN_SCRIPT z:\TestData\scripts\esock_test_unloadesockForced.script
+//ced z:\testdata\configs\Tls_ntras.cfg ced.log
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_ssl_30.cre c:\private\10202be9\persists\cccccc00.cre
+RUN_SCRIPT z:\TestData\scripts\esock_test_loadesock.script
+
+//run_utils copy z:\testdata\configs\ssl\*.* c:\system\data\
+
+print Note the following ciphers suites are supported by TLS
+print 4, 5, 10, 22, 19, 18, 9, 17, 20, 8, 3 , 2 , 1
+print The following are NULL ciphers 1,2
+print The following are weak crypto only 9,17,20
+print The following are AES cipher suites: 0x2F (47), 0x35 (53)
+print These tests require strong crypto
+
+// so some of the following list of test have been disabled tests 1,2,15,17,18,27
+// tests 9,11,14 should work with weak crypto
+// also tests 480 and 580 are disabled as there is no server on the test network
+
+print These tests use the SSL servers on ports 543,544,643 an 644
+
+RUN_UTILS CopyFile z:\TestData\Configs\tls_t_secdlg_in.dat c:\t_secdlg_in.dat
+RUN_UTILS MakeReadWrite c:\t_secdlg_in.dat
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls3.ini
+TEST_COMPLETE TLS_test_3
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls4.ini
+TEST_COMPLETE TLS_test_4
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls5.ini
+TEST_COMPLETE TLS_test_5
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls8.ini
+TEST_COMPLETE TLS_test_8
+
+# weak crypto
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls9.ini
+TEST_COMPLETE TLS_test_9
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\TlsA.ini
+TEST_COMPLETE TLS_test_A
+
+# weak crypto
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls11.ini
+TEST_COMPLETE TLS_test_11
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls12.ini
+TEST_COMPLETE TLS_test_12
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls13.ini
+TEST_COMPLETE TLS_test_13
+
+# weak crypto
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls14.ini
+TEST_COMPLETE TLS_test_14
+
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls16.ini
+TEST_COMPLETE TLS_test_16
+
+#AES
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls2f.ini
+TEST_COMPLETE TLS_test_2f
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls35.ini
+TEST_COMPLETE TLS_test_35
+
+// tls test code for DEF022091
+// check correct error code when cipher suite id not available
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, FailSuiteSelection, z:\testdata\configs\tls4.ini
+TEST_COMPLETE FailSuiteSelection
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls37.ini
+TEST_COMPLETE TLS_test_37
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls37.ini
+TEST_COMPLETE TLS_test_37
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_SCRIPT Z:\TestData\Scripts\esock_test_stopallinterfaces.script
+RUN_SCRIPT Z:\TestData\scripts\esock_test_unloadesockForced.script
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls1_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,64 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+// T_AUTOSSL config file. This file should be placed in /epoc32/wins/c/system/data/t_autossl.ini
+//
+// The following fields must be present for each site that is to be tested.
+// The field names ARE case sensitive, and MUST be followed imediately by a `:`, and then a space
+// before the field data.
+//
+// IPAddress The address to connect to (can be www.site.com)
+// DNSName The domain name which is checked against cert
+// IPPort The port to connect to
+// TLSMaxVersion Highest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// TLSMinVersion Lowest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// Cipher Cipher suite that server is expected to use (decimal), compared with
+// actual cipher for pass/fail. If this field is 0, no comparisons with
+// the actual cipher suite used will be made.
+// CipherSuites Cipher suites that client will tell server it supports (decimal)
+// Should be in decimal, with 2 characters, ie for suites 3,7,8,9-
+// this field would be - 03070809
+// By entering a single `0` for this field, the SSL default cipher suites
+// will be passed.
+// Page The page that should be retrieved from the web server.
+// The leading `/` should be included, ie /webpage.html
+// SimpleGet If a 1, the page request will be a simple "GET [Page]", if 0
+// a HTTP get request will be constructed.
+// For testing against OpenSSL servers, this field should be 0,
+// while most "real" web servers prefer the simple request, the
+// LLoydsTSB login page being an example.
+//
+
+
+/////////////////////////////////////////////
+
+
+// test NULL ciphers
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+P_rotocol=ssl3.0
+DNSName=TLS1
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=1
+CipherSuites=01
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls2_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,64 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+// T_AUTOSSL config file. This file should be placed in /epoc32/wins/c/system/data/t_autossl.ini
+//
+// The following fields must be present for each site that is to be tested.
+// The field names ARE case sensitive, and MUST be followed imediately by a `:`, and then a space
+// before the field data.
+//
+// IPAddress The address to connect to (can be www.site.com)
+// DNSName The domain name which is checked against cert
+// IPPort The port to connect to
+// TLSMaxVersion Highest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// TLSMinVersion Lowest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// Cipher Cipher suite that server is expected to use (decimal), compared with
+// actual cipher for pass/fail. If this field is 0, no comparisons with
+// the actual cipher suite used will be made.
+// CipherSuites Cipher suites that client will tell server it supports (decimal)
+// Should be in decimal, with 2 characters, ie for suites 3,7,8,9-
+// this field would be - 03070809
+// By entering a single `0` for this field, the SSL default cipher suites
+// will be passed.
+// Page The page that should be retrieved from the web server.
+// The leading `/` should be included, ie /webpage.html
+// SimpleGet If a 1, the page request will be a simple "GET [Page]", if 0
+// a HTTP get request will be constructed.
+// For testing against OpenSSL servers, this field should be 0,
+// while most "real" web servers prefer the simple request, the
+// LLoydsTSB login page being an example.
+//
+
+
+/////////////////////////////////////////////
+
+
+// test NULL ciphers
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+P_rotocol=ssl3.0
+DNSName=TLS1
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=2
+CipherSuites=02
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls2f_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,64 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+// T_AUTOSSL config file. This file should be placed in /epoc32/wins/c/system/data/t_autossl.ini
+//
+// The following fields must be present for each site that is to be tested.
+// The field names ARE case sensitive, and MUST be followed imediately by a `:`, and then a space
+// before the field data.
+//
+// IPAddress The address to connect to (can be www.site.com)
+// DNSName The domain name which is checked against cert
+// IPPort The port to connect to
+// TLSMaxVersion Highest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// TLSMinVersion Lowest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// Cipher Cipher suite that server is expected to use (decimal), compared with
+// actual cipher for pass/fail. If this field is 0, no comparisons with
+// the actual cipher suite used will be made.
+// CipherSuites Cipher suites that client will tell server it supports (decimal)
+// Should be in decimal, with 2 characters, ie for suites 3,7,8,9-
+// this field would be - 03070809
+// By entering a single `0` for this field, the SSL default cipher suites
+// will be passed.
+// Page The page that should be retrieved from the web server.
+// The leading `/` should be included, ie /webpage.html
+// SimpleGet If a 1, the page request will be a simple "GET [Page]", if 0
+// a HTTP get request will be constructed.
+// For testing against OpenSSL servers, this field should be 0,
+// while most "real" web servers prefer the simple request, the
+// LLoydsTSB login page being an example.
+//
+
+
+/////////////////////////////////////////////
+
+
+// test AES
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+P_rotocol=ssl3.0
+DNSName=TLS2f
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=47
+CipherSuites=47
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls35_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,38 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////
+
+test AES
+
+//////////////////////////////////////////
+
+[Tlstest]
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS35
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=53
+CipherSuites=53
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
+
+
+// invalid cipher suite
+[FailSuiteSelection]
+CipherSuites=42
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls37_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////
+
+test37
+
+//////////////////////////////////////////
+
+[Tlstest]
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS35
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=22
+CipherSuites=22
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=true
+EAPKeyDerivation=false
--- a/networksecurity/tls/ts_tls/scripts/tls42.ini Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-/////////////////////////////////////////////
-
-TLS42
-
-[Tlstest]
-/////////////////////////////////////////////
-IPAddress=192.168.10.11
-Protocol=tls1.0
-P_rotocol=ssl3.0
-DNSName=TLS40
-IPPort=543
-TLSMaxVersion=3.1
-TLSMinVersion=3.0
-Cipher=1
-CipherSuites=01
-Page=/index.html
-SimpleGet=0
-TestEndDelay=0
-UseGenericSocket=false
-EAPKeyDerivation=false
-SSLDialogMode=true
-SSLDialogModeValue=5
-ExpectedErrorCode=-6
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls_oom_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,45 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+/////////////////////////////////////////////
+
+#TLS Out of memory test
+
+/////////////////////////////////////////////
+[Tlstest]
+
+# READ ME!
+#
+### This is the range of values for __UHEAP_FAILNEXT that are tested.
+### TLS currently requires 846 heap allocations to make a connection.
+### If the test has not passed by MaxFailureThreshold then it fails.
+### This is to prevent the test running forever if the network or server is down.
+#
+# The above comment is outdated - in 8.0 it passes on the first iteration with 840.
+# The Comms Framework submission increases the threshold dramatically (as can be seen
+# below); this is at least substantially due to the new RFileLogger interface since
+# every single static logging call now makes an allocation (and the TLS client-side
+# has its own logging subsystem, hence a ten row hexdump becomes ten separate RFileLogger
+# calls).
+# Of course to be a strong OOM test the loop should start at one anyway, otherwise there
+# are many states we're not probing. It is suspected that the reason this is not done is two-
+# fold: firstly it would take a long time and so mightn't be suitable for routine run and
+# secondly and importantly the OpenSSL server currently used on the test network does not
+# handle spontaneous socket disconnection and so would need restarting after many of these
+# failures. Once a more robust test server is in place this part of the testing needs to be
+# revisited.
+
+FailureThreshold=1
+MaxThreshold=3200
+IPAddress=192.168.40.50
+IPPort=543
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls_oom_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,51 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT TLS Out of memory tests
+PRINT
+
+LOAD_SUITE TS_tls.dll
+
+// set up commdb for a gsm dialup connection
+// to demon using a serial connection
+RUN_SCRIPT z:\TestData\scripts\esock_test_unloadesockForced.script
+//ced z:\testdata\configs\Tls_ntras.cfg ced.log
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_ssl_30.cre c:\private\10202be9\persists\cccccc00.cre
+RUN_SCRIPT z:\TestData\scripts\esock_test_loadesock.script
+
+//run_utils copy z:\testdata\configs\ssl\*.* c:\system\data\
+
+RUN_UTILS CopyFile z:\TestData\Configs\tls_t_secdlg_in.dat c:\t_secdlg_in.dat
+RUN_UTILS MakeReadWrite c:\t_secdlg_in.dat
+RUN_UTILS Delete c:\t_secdlg_out.dat
+
+# out of memory test
+RUN_TEST_STEP 100000, TS_TLS, tls_oom, z:\testdata\configs\Tls_Oom.ini
+
+TEST_COMPLETE TLS_oomtest
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_SCRIPT Z:\TestData\Scripts\esock_test_stopallinterfaces.script
+RUN_SCRIPT Z:\TestData\scripts\esock_test_unloadesockForced.script
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls_psk_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,189 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT TLS PSK tests
+
+LOAD_SUITE TS_tls.dll
+
+PAUSE_AT_END
+RUN_SCRIPT z:\TestData\scripts\esock_test_unloadesockForced.script
+//ced z:\testdata\configs\Tls_ethernet.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_tls_psk.cre c:\private\10202be9\persists\cccccc00.cre
+RUN_SCRIPT z:\TestData\scripts\esock_test_loadesock.script
+RUN_UTILS CopyFile z:\TestData\Configs\tls_t_secdlg_in.dat c:\t_secdlg_in.dat
+RUN_UTILS MakeReadWrite c:\t_secdlg_in.dat
+RUN_TEST_STEP 100000, TS_TLS, t_tls_DialogMode
+TEST_COMPLETE TLS_test_1
+
+RUN_UTILS MkDir c:\Private\101f72a6\
+RUN_UTILS Delete c:\Private\101f72a6\cacerts.dat
+RUN_UTILS Delete c:\Private\101f72a6\certclients.dat
+RUN_UTILS Delete c:\Private\101f72a6\keys.dat
+RUN_UTILS CopyFile z:\testdata\configs\cacerts_psk.dat c:\private\101f72a6\cacerts.dat
+RUN_UTILS CopyFile z:\testdata\configs\certclients_psk.dat c:\private\101f72a6\certclients.dat
+RUN_UTILS CopyFile z:\testdata\configs\keys_psk.dat c:\private\101f72a6\keys.dat
+
+
+
+
+
+// TLS handshake with TLS_PSK_WITH_AES_128_CBC_SHA cipher suit
+// Preconditions:
+// There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+// Test Actions:
+// Repeat sequence below including and not including identity hint in server hello message.
+// Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+// Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+// Instruct test client to connect to TLS test server.
+// Set test environment in a way that TLS_PSK_WITH_AES_128_CBC_SHA is set in “ServerHello” message.
+// Check that instance CSecureSocket was able to execute complete success handshake with test server
+// using the cipher suit specified.
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_PSK_WITH_AES_128_CBC_SHA
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA.ini
+TEST_COMPLETE TLS_PSK_test_2
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_PSK_WITH_AES_128_CBC_SHA NoCallBack
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini
+TEST_COMPLETE TLS_PSK_test_3
+
+
+
+
+
+
+// TLS handshake with TLS_PSK_WITH_3DES_EDE_CBC_SHA cipher suit
+// Preconditions:
+// There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+// Test Actions:
+// Repeat sequence below including and not including identity hint in server hello message.
+// Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+// Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+// Instruct test client to connect to TLS test server.
+// Set test environment in a way that TLS_PSK_WITH_3DES_EDE_CBC_SHA is set in “ServerHello” message.
+// Check that instance CSecureSocket was able to execute complete success handshake with test server
+// using the cipher suit specified.
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_PSK_WITH_3DES_EDE_CBC_SHA
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini
+TEST_COMPLETE TLS_PSK_test_4
+
+
+
+
+
+// TLS handshake with TLS_PSK_WITH_RC4_128_SHA cipher suit
+// Preconditions:
+// There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+// Test Actions:
+// Repeat sequence below including and not including identity hint in server hello message.
+// Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+// Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+// Instruct test client to connect to TLS test server.
+// Set test environment in a way that TLS_PSK_WITH_RC4_128_SHA is set in “ServerHello” message.
+// Check that instance CSecureSocket was able to execute complete success handshake with test server
+// using the cipher suit specified.
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_PSK_WITH_RC4_128_SHA
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_PSK_WITH_RC4_128_SHA.ini
+TEST_COMPLETE TLS_PSK_test_5
+
+
+
+
+
+// TLS handshake with TLS_PSK_WITH_AES_256_CBC_SHA cipher suit
+// Preconditions:
+// There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+// Test Actions:
+// Repeat sequence below including and not including identity hint in server hello message.
+// Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+// Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+// Instruct test client to connect to TLS test server.
+// Set test environment in a way that TLS_PSK_WITH_AES_256_CBC_SHA is set in “ServerHello” message.
+// Check that instance CSecureSocket was able to execute complete success handshake with test server
+// using the cipher suit specified.
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_PSK_WITH_AES_256_CBC_SHA
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_PSK_WITH_AES_256_CBC_SHA.ini
+TEST_COMPLETE TLS_PSK_test_6
+
+
+
+
+
+// TLS handshake with Null cipher suites
+// Preconditions:
+// There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+// Test Actions:
+// Repeat sequence below including and not including identity hint in server hello message.
+// Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+// Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+// Instruct test client to connect to TLS test server.
+// Set test environment in a way that TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_MD5 is set in “ServerHello” message.
+// Check that instance CSecureSocket was able to execute complete success handshake with test server
+// using the cipher suit specified.
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_RSA_WITH_NULL_MD5
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_RSA_WITH_NULL_MD5.ini
+TEST_COMPLETE TLS_PSK_test_7
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_RSA_WITH_NULL_SHA
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_RSA_WITH_NULL_SHA.ini
+TEST_COMPLETE TLS_PSK_test_8
+
+
+
+
+// To ensure that TLS provider can send server name extensions in TLS handshake.
+// Preconditions:
+// There is a TLS test server that can perform TLS handshakes using server name extensions.
+// Test Actions:
+// Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with
+// TLS test server.
+// Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+// Instruct test client to connect to TLS test server.
+// Set test environment in a way that server name extensions is set in “ServerHello” message.
+// Check that instance CSecureSocket was able to execute complete success handshake with test
+//server using the cipher suit specified.
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_SNE_SINGLE_SERVER.ini
+TEST_COMPLETE TLS_PSK_test_9
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_SNE_MULTIPLE_SERVER.ini
+TEST_COMPLETE TLS_PSK_test_10
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_SNE_SINGLE_SERVER_NEG.ini
+TEST_COMPLETE TLS_PSK_test_11
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_UTILS Delete c:\private\101f72a6\cacerts.dat
+RUN_UTILS Delete c:\private\101f72a6\certclients.dat
+RUN_UTILS Delete c:\private\101f72a6\keys.dat
+
+RUN_SCRIPT Z:\TestData\Scripts\esock_test_stopallinterfaces.script
+RUN_SCRIPT Z:\TestData\scripts\esock_test_unloadesockForced.script
\ No newline at end of file
Binary file networksecurity/tls/ts_tls/scripts/tls_psk_wlan.xml has changed
Binary file networksecurity/tls/ts_tls/ssl_30_wlan.xml has changed
Binary file networksecurity/tls/ts_tls/tls_psk_wlan.xml has changed
--- a/networksecurity/tlsprovider/Test/group/TlsProvtestServer.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tlsprovider/Test/group/TlsProvtestServer.iby Tue Aug 31 16:45:15 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"
@@ -47,8 +47,15 @@
data=\epoc32\release\winscw\udeb\z\testdata\scripts\te_tlsprov.ini TestData\scripts\te_tlsprov.ini
data=\epoc32\release\winscw\udeb\z\tlstest2\scripts\tlstest2.script tlstest2\scripts\tlstest2.script
data=\epoc32\release\winscw\udeb\z\tlstest2\scripts\tlstest2.ini tlstest2\scripts\tlstest2.ini
+
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\release\winscw\udeb\z\tlstest2\scripts\tls_smoke_wlan.script tlstest2\scripts\tls_smoke.script
+data=\epoc32\release\winscw\udeb\z\tlstest2\scripts\tls_smoke_wlan.ini tlstest2\scripts\tls_smoke.ini
+#else
data=\epoc32\release\winscw\udeb\z\tlstest2\scripts\tls_smoke.script tlstest2\scripts\tls_smoke.script
data=\epoc32\release\winscw\udeb\z\tlstest2\scripts\tls_smoke.ini tlstest2\scripts\tls_smoke.ini
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
+
data=\epoc32\winscw\z\testdata\configs\tlsprovtestdata\tlsprov_ethernetced.xml testdata\configs\tlsprovtestdata\tlsprov_ethernetced.xml
data=\epoc32\release\winscw\udeb\z\testdata\configs\tlsprovtestdata\KeyAndCertStore\keys.dat TestData\configs\tlsprovtestdata\KeyAndCertStore\keys.dat
--- a/networksecurity/tlsprovider/Test/group/TlsProvtestServer.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tlsprovider/Test/group/TlsProvtestServer.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -47,6 +47,7 @@
SYSTEMINCLUDE /epoc32/include/mw
#endif
+
LIBRARY euser.lib
LIBRARY testexecuteutils.lib
LIBRARY efsrv.lib
--- a/networksecurity/tlsprovider/Test/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tlsprovider/Test/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -351,11 +351,19 @@
../tlstest2/data/tlsclientauthrsachain/server.rnd /epoc32/release/winscw/urel/z/tlstest2/data/tlsclientauthrsachain/server.rnd
// Script files
+#ifdef SIROCCO_CODE_MIGRATION
+../tlstest2/scripts/tls_smoke_wlan.ini /epoc32/release/winscw/urel/z/tlstest2/scripts/tls_smoke_wlan.ini
+../tlstest2/scripts/tls_smoke_wlan.ini /epoc32/release/winscw/udeb/z/tlstest2/scripts/tls_smoke_wlan.ini
+
+../tlstest2/scripts/tls_smoke_wlan.script /epoc32/release/winscw/urel/z/tlstest2/scripts/tls_smoke_wlan.script
+../tlstest2/scripts/tls_smoke_wlan.script /epoc32/release/winscw/udeb/z/tlstest2/scripts/tls_smoke_wlan.script
+#else
../tlstest2/scripts/tls_smoke.ini /epoc32/release/winscw/urel/z/tlstest2/scripts/tls_smoke.ini
../tlstest2/scripts/tls_smoke.ini /epoc32/release/winscw/udeb/z/tlstest2/scripts/tls_smoke.ini
../tlstest2/scripts/tls_smoke.script /epoc32/release/winscw/urel/z/tlstest2/scripts/tls_smoke.script
../tlstest2/scripts/tls_smoke.script /epoc32/release/winscw/udeb/z/tlstest2/scripts/tls_smoke.script
+#endif //SIROCCO_CODE_MIGRATION
../tlstest2/scripts/tlstest2.ini /epoc32/release/winscw/urel/z/tlstest2/scripts/tlstest2.ini
../tlstest2/scripts/tlstest2.ini /epoc32/release/winscw/udeb/z/tlstest2/scripts/tlstest2.ini
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tlsprovider/Test/tlstest2/scripts/tls_smoke_wlan.ini Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,317 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+// SEC-TLS-SMOKE-0001
+[TLS_PSK_WITH_AES_128_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=008c
+ExpectedFinalCipherSuit=008c
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
+
+
+[TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK]
+NumCipherSuites=1
+CipherSuite1=008c
+ExpectedFinalCipherSuit=0035
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+ExpectedSetCipherError=-5
+
+
+
+// SEC-TLS-SMOKE-0002
+[TLS_PSK_WITH_3DES_EDE_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=008b
+ExpectedFinalCipherSuit=008b
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
+
+// SEC-TLS-SMOKE-0003
+[TLS_PSK_WITH_RC4_128_SHA]
+NumCipherSuites=1
+CipherSuite1=008a
+ExpectedFinalCipherSuit=008a
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
+
+// SEC-TLS-SMOKE-0004
+[TLS_PSK_WITH_AES_256_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=008d
+ExpectedFinalCipherSuit=008d
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
+
+
+// SEC-TLS-SMOKE-0005
+[TLS_RSA_EXPORT_WITH_RC4_40_MD5]
+NumCipherSuites=1
+CipherSuite1=0003
+ExpectedFinalCipherSuit=0003
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0006
+[TLS_RSA_WITH_RC4_128_MD5]
+NumCipherSuites=1
+CipherSuite1=0004
+ExpectedFinalCipherSuit=0004
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+// SEC-TLS-SMOKE-0007
+[TLS_RSA_WITH_RC4_128_SHA]
+NumCipherSuites=1
+CipherSuite1=0005
+ExpectedFinalCipherSuit=0005
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0008
+[TLS_RSA_EXPORT_WITH_DES40_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0008
+ExpectedFinalCipherSuit=0008
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+// SEC-TLS-SMOKE-0009
+[TLS_RSA_WITH_DES_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0009
+ExpectedFinalCipherSuit=0009
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0010
+[TLS_RSA_WITH_3DES_EDE_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=000a
+ExpectedFinalCipherSuit=000a
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+// SEC-TLS-SMOKE-0011
+[TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0011
+ExpectedFinalCipherSuit=0011
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+// SEC-TLS-SMOKE-0012
+[TLS_DHE_DSS_WITH_DES_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0012
+ExpectedFinalCipherSuit=0012
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0013
+[TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0013
+ExpectedFinalCipherSuit=0013
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+// SEC-TLS-SMOKE-0014
+[TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0014
+ExpectedFinalCipherSuit=0014
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0015
+[TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0016
+ExpectedFinalCipherSuit=0016
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0016
+[TLS_RSA_WITH_AES_128_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=002f
+ExpectedFinalCipherSuit=002f
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0017
+[TLS_RSA_WITH_AES_256_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0035
+ExpectedFinalCipherSuit=0035
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+
+// SEC-TLS-SMOKE-0018
+[single_server_name]
+
+NumCipherSuites=0
+ExpectedFinalCipherSuit=008D
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=True
+UseNullCipher=True
+
+ExpectedSetCipherError=-5
+
+NumServerNames=1
+ServerName1=www.symbianfoundation.org
+
+
+[multiple_server_name]
+NumCipherSuites=1
+CipherSuite1=002f
+ExpectedFinalCipherSuit=002f
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+NumServerNames=3
+ServerName1=www.something.org
+ServerName2=www.something.com
+ServerName3=www.something.es
+
+ExpectedHandshakeError=-7550
+
+[server_name_negative]
+
+NumCipherSuites=1
+CipherSuite1=0002
+ExpectedFinalCipherSuit=0002
+
+UseNullCipher=True
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+ExpectedHandshakeError=-7550
+
+NumServerNames=3
+ServerName1=www.badservername.org
+ServerName2=www.badservername.uk
+ServerName3=www.badservername.es
+
+
+// new smoke tests for Null cipher suites added.
+
+[TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_MD5]
+NumCipherSuites=1
+CipherSuite1=0001
+ExpectedFinalCipherSuit=0001
+UseNullCipher=True
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
+UseNullCipher=True
+
+[TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_SHA]
+NumCipherSuites=1
+CipherSuite1=0002
+ExpectedFinalCipherSuit=0002
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=True
+UseNullCipher=True
+
+[TLS_NO_VALID_CIPHERSUITES]
+NumCipherSuites=3
+CipherSuite1=0002
+CipherSuite2=0006
+CipherSuite3=0007
+ExpectedSetCipherError=-5
+
+ExpectedFinalCipherSuit=0035
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+
+[TLS_NULL_SET_SUITES_ERROR]
+NumCipherSuites=1
+CipherSuite1=0002
+ExpectedFinalCipherSuit=0035
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+ExpectedSetCipherError=-5
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tlsprovider/Test/tlstest2/scripts/tls_smoke_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,647 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+LOAD_SUITE tlstest2
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+//ced z:\testdata\configs\Tls_ethernet.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_tls_psk.cre c:\private\10202be9\persists\cccccc00.cre
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+RUN_UTILS MkDir c:\private\101f72a6
+RUN_UTILS DeleteFile c:\private\101f72a6\CACerts.dat
+RUN_UTILS MakeReadWrite c:\private\101f72a6\certclients.dat
+RUN_UTILS DeleteFile c:\private\101f72a6\certclients.dat
+RUN_UTILS MakeReadWrite c:\private\101f72a6\keys.dat
+RUN_UTILS DeleteFile c:\private\101f72a6\keys.dat
+RUN_UTILS CopyFile z:\testdata\configs\tlsprovtestdata\KeyAndCertStore\cacerts.dat c:\private\101f72a6\CACerts.dat
+RUN_UTILS CopyFile z:\testdata\configs\tlsprovtestdata\KeyAndCertStore\certclients.dat c:\private\101f72a6\certclients.dat
+RUN_UTILS CopyFile z:\testdata\configs\tlsprovtestdata\KeyAndCertStore\keys.dat c:\private\101f72a6\keys.dat
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0021
+//! @SYMTestCaseDesc StartupComms
+
+START_TESTCASE SEC-TLSP-SMOKE-0021
+RUN_TEST_STEP 100 tlstest2 StartupCommsStep
+END_TESTCASE SEC-TLSP-SMOKE-0021
+
+
+//********************** SEC-TLS-SMOKE : Full TLS handshake tests **********************
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0001
+//! @SYMTestCaseDesc TLS handshake with TLS_PSK_WITH_AES_128_CBC_SHA cipher suit
+//! (TLS_PSK_WITH_AES_128_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_PSK_WITH_AES_128_CBC_SHA cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8632, REQ8637, REQ8638, REQ8639
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_PSK_WITH_AES_128_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0001
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_PSK_WITH_AES_128_CBC_SHA
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK
+END_TESTCASE SEC-TLSP-SMOKE-0001
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0002
+//! @SYMTestCaseDesc TLS handshake with TLS_PSK_WITH_3DES_EDE_CBC_SHA cipher suit
+//! (TLS_PSK_WITH_3DES_EDE_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_PSK_WITH_3DES_EDE_CBC_SHA suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8632, REQ8637, REQ8638, REQ8639
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_PSK_WITH_3DES_EDE_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0002
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_PSK_WITH_3DES_EDE_CBC_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0002
+
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0003
+//! @SYMTestCaseDesc TLS handshake with TLS_PSK_WITH_RC4_128_SHA cipher suit
+//! (TLS_PSK_WITH_RC4_128_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_PSK_WITH_RC4_128_SHA suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8632, REQ8637, REQ8638, REQ8639, REQ8640
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_PSK_WITH_RC4_128_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0003
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_PSK_WITH_RC4_128_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0003
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0004
+//! @SYMTestCaseDesc TLS handshake with TLS_PSK_WITH_AES_256_CBC_SHA cipher suit
+//! (TLS_PSK_WITH_AES_256_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_PSK_WITH_AES_256_CBC_SHA suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8632, REQ8637, REQ8638, REQ8639, REQ8640
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_PSK_WITH_AES_256_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0004
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_PSK_WITH_AES_256_CBC_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0004
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0005
+//! @SYMTestCaseDesc TLS handshake with TLS_RSA_EXPORT_WITH_RC4_40_MD5 cipher suit
+//! (TLS_RSA_EXPORT_WITH_RC4_40_MD5)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_RSA_EXPORT_WITH_RC4_40_MD5 cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_RSA_EXPORT_WITH_RC4_40_MD5 is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0005
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_EXPORT_WITH_RC4_40_MD5
+END_TESTCASE SEC-TLSP-SMOKE-0005
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0006
+//! @SYMTestCaseDesc TLS handshake with TLS_RSA_WITH_RC4_128_MD5 cipher suit
+//! (TLS_RSA_WITH_RC4_128_MD5)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_RSA_WITH_RC4_128_MD5 cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_RSA_WITH_RC4_128_MD5 is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0006
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_WITH_RC4_128_MD5
+END_TESTCASE SEC-TLSP-SMOKE-0006
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0007
+//! @SYMTestCaseDesc TLS handshake with TLS_RSA_WITH_RC4_128_SHA cipher suit
+//! (TLS_RSA_WITH_RC4_128_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_RSA_WITH_RC4_128_SHA cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_RSA_WITH_RC4_128_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0007
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_WITH_RC4_128_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0007
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0008
+//! @SYMTestCaseDesc TLS handshake with TLS_RSA_EXPORT_WITH_DES40_CBC_SHA cipher suit
+//! (TLS_RSA_EXPORT_WITH_DES40_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_RSA_EXPORT_WITH_DES40_CBC_SHA cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_RSA_EXPORT_WITH_DES40_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0008
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0008
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0009
+//! @SYMTestCaseDesc TLS handshake with TLS_RSA_WITH_DES_CBC_SHA cipher suit
+//! (TLS_RSA_WITH_DES_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_RSA_WITH_DES_CBC_SHA cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_RSA_WITH_DES_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0009
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_WITH_DES_CBC_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0009
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0010
+//! @SYMTestCaseDesc TLS handshake with TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher suit
+//! (TLS_RSA_WITH_3DES_EDE_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_RSA_WITH_3DES_EDE_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0010
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_WITH_3DES_EDE_CBC_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0010
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0011
+//! @SYMTestCaseDesc TLS handshake with TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA cipher suit
+//! (TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0011
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0011
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0012
+//! @SYMTestCaseDesc TLS handshake with TLS_DHE_DSS_WITH_DES_CBC_SHA cipher suit
+//! (TLS_DHE_DSS_WITH_DES_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_DHE_DSS_WITH_DES_CBC_SHA cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_DHE_DSS_WITH_DES_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0012
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_DHE_DSS_WITH_DES_CBC_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0012
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0013
+//! @SYMTestCaseDesc TLS handshake with TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA cipher suit
+//! (TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0013
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0013
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0014
+//! @SYMTestCaseDesc TLS handshake with TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA cipher suit
+//! (TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0014
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0014
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0015
+//! @SYMTestCaseDesc TLS handshake with TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA cipher suit
+//! (TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0015
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0015
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0016
+//! @SYMTestCaseDesc TLS handshake with TLS_RSA_WITH_AES_128_CBC_SHA cipher suit
+//! (TLS_RSA_WITH_AES_128_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_RSA_WITH_AES_128_CBC_SHA cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_RSA_WITH_AES_128_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0016
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_WITH_AES_128_CBC_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0016
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0017
+//! @SYMTestCaseDesc TLS handshake with TLS_RSA_WITH_AES_256_CBC_SHA cipher suit
+//! (TLS_RSA_WITH_AES_256_CBC_SHA)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_RSA_WITH_AES_256_CBC_SHA cipher suit.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_RSA_WITH_AES_256_CBC_SHA is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0017
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_WITH_AES_256_CBC_SHA
+END_TESTCASE SEC-TLSP-SMOKE-0017
+
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0018
+//! @SYMTestCaseDesc Usage of RFC3546 server name extension
+//! (SERVER_NAME_EXTENSION)
+//! @SYMScriptPurpose To ensure that TLS provider can send server name extensions in TLS handshake.
+//!
+//! @SYMPREQ PREQ1294
+//! @SYMREQ REQ8631
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using server name extensions.
+//! Test Actions:
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with
+//! TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that server name extensions is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test
+//! server using the cipher suit specified.
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0018
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini single_server_name
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini multiple_server_name
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini server_name_negative
+END_TESTCASE SEC-TLSP-SMOKE-0018
+
+
+
+
+
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0019
+//! @SYMTestCaseDesc TLS handshake with Null cipher suites
+//! (TLS_NULL_CIPHER_SMOKE_DEFECT)
+//! @SYMScriptPurpose To ensure that TLS provider can execute a TLS handshake using a
+//! TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_MD5 or TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_SHA cipher suites.
+//!
+//! @SYMDEF DEF114941
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestActions Preconditions:
+//! • There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.
+//! Test Actions:
+//! • Repeat sequence below including and not including identity hint in server hello message.
+//! • Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server.
+//! • Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//! • Instruct test client to connect to TLS test server.
+//! • Set test environment in a way that TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_MD5 is set in “ServerHello” message.
+//! • Check that instance CSecureSocket was able to execute complete success handshake with test server
+//! using the cipher suit specified.
+//! • Repeat test sequence using TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_SHA
+//!
+//! @SYMTestExpectedResults • TLS handshake was complete and successful.
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0019
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_MD5
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_SHA
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_NULL_SET_SUITES_ERROR
+END_TESTCASE SEC-TLSP-SMOKE-0019
+
+//! @SYMTestCaseID SEC-TLSP-SMOKE-0020
+//! @SYMTestCaseDesc TLS handshake with no valid ciphersuites
+//! (TLS_NO_VALID_CIPHERSUITES)
+//! @SYMScriptPurpose To ensure that SetAvailableCiphersuites fails with the correct code if all supplied ciphersuites are invalid.
+//!
+//! @SYMDEF DEF116261
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestExpectedResults KErrNotSupported
+//!
+//! @SYMTestType CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0020
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_NO_VALID_CIPHERSUITES
+END_TESTCASE SEC-TLSP-SMOKE-0020
+
+RUN_UTILS DeleteFile c:\tlsprov_ethernetced.xml
+
+
+
+
+
--- a/networksecurity/tlsprovider/Test/tlstest2/startupcommsstep.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tlsprovider/Test/tlstest2/startupcommsstep.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -37,6 +37,7 @@
{
SetTestStepResult(EFail);
+#ifndef SIROCCO_CODE_MIGRATION
TInt ret = User::LoadPhysicalDevice(PDD_NAME);
User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret);
@@ -50,7 +51,7 @@
User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret);
ret = StartC32();
User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret);
+#endif //SIROCCO_CODE_MIGRATION
SetTestStepResult(EPass);
-
return TestStepResult();
}
--- a/networksecurity/tlsprovider/group/swtlstokentypeplugin.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tlsprovider/group/swtlstokentypeplugin.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -33,7 +33,6 @@
SOURCE swtlstokenprovider.cpp swtlssessioncache.cpp swtlstoken_log.cpp
USERINCLUDE ../inc
-
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/networksecurity/tlsprovider/group/tlsprovider.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tlsprovider/group/tlsprovider.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -33,7 +33,6 @@
SOURCE tlsprovider_log.cpp tlsproviderpolicy.cpp
USERINCLUDE ../inc
-
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib pkixcert.lib
@@ -42,8 +41,7 @@
LIBRARY crypto.lib
LIBRARY ctframework.lib
LIBRARY certstore.lib
-LIBRARY asn1.lib
-//LIBRARY estor.lib x500.lib
+//LIBRARY estor.lib x500.lib asn1.lib
//LIBRARY bigint.lib
LIBRARY hash.lib
LIBRARY random.lib
@@ -53,7 +51,6 @@
LIBRARY ctfinder.lib
LIBRARY tlscacheclient.lib
LIBRARY bafl.lib
-LIBRARY featdiscovery.lib
DEBUGLIBRARY flogger.lib
deffile tlsprovider.def
--- a/networksecurity/tlsprovider/inc/tlsprovider.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tlsprovider/inc/tlsprovider.h Tue Aug 31 16:45:15 2010 +0300
@@ -430,7 +430,6 @@
void ShowUntrustedDialogL(const TValidationStatus aResult);
void HandleBadCertificateL(const TValidationStatus aResult);
TBool CheckExtendedKeyUsageL(const CX509Certificate& aSource);
- HBufC* ExtractCertFieldL(const TDesC& aFieldName, const CX500DistinguishedName& aDistinguishedName);
//Active Handlers
void OnEGetSession();
--- a/networksecurity/tlsprovider/inc/tlstypedef.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tlsprovider/inc/tlstypedef.h Tue Aug 31 16:45:15 2010 +0300
@@ -1,5 +1,5 @@
/**
-* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
@@ -115,11 +115,6 @@
*/
enum TTLSCompressionMethod { ENullCompression };
-/**
- * @internalAll
- */
-enum TTLSDialogMode { ETTLSDialogModeAttended, ETTLSDialogModeUnattended, ETTLSDialogModeAllowAutomatic };
-
class CSubjectPublicKeyInfo;
class CMessageDigest;
class TTLSCipherSuiteMapping;
--- a/networksecurity/tlsprovider/inc/tlstypedef_internal.h Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tlsprovider/inc/tlstypedef_internal.h Tue Aug 31 16:45:15 2010 +0300
@@ -1,5 +1,5 @@
/**
-* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
@@ -127,8 +127,8 @@
TBool iClientAuthenticate;
TBool iDialogNonAttendedMode;
TTLSSignatureAlgorithm isignatureAlgorithm;
- TBuf8<256> idomainName;
- TTLSDialogMode iDialogMode;
+ TBuf8<256> idomainName;
+
TBool iAllowNullCipherSuites;
TBool iPskConfigured;
--- a/networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -18,15 +18,11 @@
#include <ecom/ecom.h>
#include <securitydefsconst.h>
#include <x520ava.h>
-#include <asn1dec.h>
-#include <featdiscovery.h>
-#include <featureuids.h>
#include "tlsprovider.h"
#include "cryptostrength.h"
-
//
// CTlsProviderImpl
//
@@ -484,44 +480,6 @@
return;
}
-// This patch is to fix-up the Common Name component of the Subject field.
-// This is due to a bug in TASN1DecBMPString::DecodeContentsL which is incorrectly decoding the BMP String contents.
-// Since fixing TASN1DecBMPString would cause a major break in public API, this fix-up is being done here locally.
-// This patch is active only if the encoding is in BMP String. If TASN1DecBMPString::DecodeContentsL is ever fixed (which
-// means CX500DistinguishedName::DisplayNameL is also automatically fixed) then this patch MUST to be removed.
-
-HBufC* CTlsProviderImpl::ExtractCertFieldL(const TDesC& aFieldName, const CX500DistinguishedName& aDistinguishedName)
- {
- TInt count = aDistinguishedName.Count();
- for (TInt i = 0; i < count; i++)
- {
- const CX520AttributeTypeAndValue& ava = aDistinguishedName.Element(i);
- if (ava.Type() == aFieldName)
- {
- HBufC* res = ava.ValueL();
- CleanupStack::PushL(res);
- TPtr pRes = res->Des();
- TUint8* data = const_cast<TUint8 *>(reinterpret_cast<const TUint8 *>(res->Ptr()));
- TUint len = pRes.Length()*2;
- TASN1DecGeneric gen(ava.EncodedValue());
- gen.InitL();
- if (gen.Tag() == EASN1BMPString)
- {
- // Bmp String internally store them as little endian, as a string we want it big
- // endian interchange least and most significent byte
- for(TUint i=0; i<len; i+=2)
- {
- TUint8 temp = data[i];
- data[i] = data[i+1];
- data[i+1] = temp;
- }
- }
- CleanupStack::Pop();
- return res;
- }
- }
- return NULL;
- }
TBool CTlsProviderImpl::VerifySignatureL(
@@ -1077,15 +1035,7 @@
}
else
{
- TBool allowUntrustedCertificates = EFalse;
- allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates);
-
- if ( allowUntrustedCertificates && iTlsCryptoAttributes && ETTLSDialogModeAllowAutomatic == iTlsCryptoAttributes->iDialogMode )
- {
- iCurrentState = iOriginalState = ENullState;
- User::RequestComplete(iOriginalRequestStatus,KErrNone);
- }
- else if((allowUntrustedCertificates && iTlsCryptoAttributes && ETTLSDialogModeUnattended == iTlsCryptoAttributes->iDialogMode ) || (iTlsCryptoAttributes && iTlsCryptoAttributes->iDialogNonAttendedMode))
+ if(iTlsCryptoAttributes && iTlsCryptoAttributes->iDialogNonAttendedMode)
{
TLSPROV_LOG(_L("Server Certificate validation failed but in DialogNonAttended mode"))
TInt err(0);
@@ -1576,8 +1526,7 @@
if(!hasAltNameExt)
{
// no name yet lets try common name from Subject
- //HBufC* commonName = aSource.SubjectName().ExtractFieldL(KX520CommonName);
- HBufC* commonName = ExtractCertFieldL(KX520CommonName, aSource.SubjectName());
+ HBufC* commonName = aSource.SubjectName().ExtractFieldL(KX520CommonName);
if(commonName)
{
CleanupStack::PushL(commonName);
--- a/networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -16,8 +16,6 @@
#include "Tlsprovinterface.h"
#include "tlsprovider.h"
#include <badesca.h>
-#include <featdiscovery.h>
-#include <featureuids.h>
//
// CTlsProvider
@@ -284,9 +282,6 @@
((TlsSessionPtr()->Attributes())->iMasterSecretInput).iClientRandom = (Attributes()->iMasterSecretInput).iClientRandom;
}
- TBool allowUntrustedCertificates = EFalse;
- allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates);
-
// Save old implementation object
CTlsProviderImpl *oldTlsProviderImpl = iTlsProviderImpl;
iTlsProviderImpl = NULL;
@@ -304,16 +299,7 @@
Attributes()->iProposedProtocol = oldAttr->iProposedProtocol;
Attributes()->iProposedCiphers = oldAttr->iProposedCiphers;
-
- if( allowUntrustedCertificates )
- {
- Attributes()->iDialogMode = oldAttr->iDialogMode;
- }
- else
- {
- Attributes()->iDialogNonAttendedMode = oldAttr->iDialogNonAttendedMode;
- }
-
+ Attributes()->iDialogNonAttendedMode = oldAttr->iDialogNonAttendedMode;
Attributes()->idomainName = oldAttr->idomainName;
// Copy NULL ciphersuite setting
@@ -352,15 +338,7 @@
(Attributes()->iMasterSecretInput).iClientRandom = ((TlsSessionPtr()->Attributes())->iMasterSecretInput).iClientRandom;
Attributes()->iProposedProtocol = (TlsSessionPtr()->Attributes())->iProposedProtocol;
Attributes()->iNegotiatedProtocol = (TlsSessionPtr()->Attributes())->iNegotiatedProtocol;
- if( allowUntrustedCertificates )
- {
- Attributes()->iDialogMode = (TlsSessionPtr()->Attributes())->iDialogMode;
- }
- else
- {
- Attributes()->iDialogNonAttendedMode = (TlsSessionPtr()->Attributes())->iDialogNonAttendedMode;
- }
-
+ Attributes()->iDialogNonAttendedMode = (TlsSessionPtr()->Attributes())->iDialogNonAttendedMode;
Attributes()->iSessionNameAndID.iServerName = (TlsSessionPtr()->Attributes())->iSessionNameAndID.iServerName;
Attributes()->iSessionNameAndID.iSessionId = (TlsSessionPtr()->Attributes())->iSessionNameAndID.iSessionId;
--- a/tcpiputils/dhcp/group/DHCPServ.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/group/DHCPServ.iby Tue Aug 31 16:45:15 2010 +0300
@@ -17,7 +17,7 @@
#ifndef __DHCP_SERVER_IBY__
#define __DHCP_SERVER_IBY__
-#ifdef SYMBIAN_EXCLUDE_DHCP
+#ifndef __DHCP
REM Feature DHCP is not included in this ROM
#else
REM Static Dependencies
@@ -31,7 +31,6 @@
#include <netmsg.iby>
#include <netsm.iby>
-data=EPOCROOT##epoc32\data\z\private\101fd9c5\dhcp.ini private\101fd9c5\dhcp.ini
file=ABI_DIR\DEBUG_DIR\DhcpServ.exe system\programs\DhcpServ.exe
#ifdef SYMBIAN_DNS_PROXY
--- a/tcpiputils/dhcp/group/DHCPServ.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/group/DHCPServ.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -78,4 +78,3 @@
CAPABILITY ProtServ NetworkServices NetworkControl ReadDeviceData WriteDeviceData
SMPSAFE
-
--- a/tcpiputils/dhcp/group/NetCfgExtnDhcp.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/group/NetCfgExtnDhcp.iby Tue Aug 31 16:45:15 2010 +0300
@@ -18,7 +18,7 @@
#ifndef GUARD_INCLUDE_NETCFGEXTNDHCP_IBY
#define GUARD_INCLUDE_NETCFGEXTNDHCP_IBY
-#ifdef SYMBIAN_EXCLUDE_DHCP
+#ifndef __DHCP
REM Feature DHCP is not included in this ROM
#else
#include <netstsrv.iby>
--- a/tcpiputils/dhcp/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -30,15 +30,6 @@
../include/DHCPConfig.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/dhcpconfig.h)
#endif // SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
-#ifdef __SECURE_DATA__
-dhcp.ini /epoc32/data/z/private/101fd9c5/dhcp.ini
-dhcp.ini /epoc32/winscw/c/private/101fd9c5/dhcp.ini
-#else
-dhcp.ini /epoc32/data/z/system/data/dhcp.ini
-dhcp.ini /epoc32/wins/c/system/data/dhcp.ini
-dhcp.ini /epoc32/winscw/c/system/data/dhcp.ini
-#endif
-
PRJ_MMPFILES
DHCPServ.mmp
--- a/tcpiputils/dhcp/group/dhcp.ini Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Portions Copyright (c) 2003-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:
-//
-
-[DHCP]
-#ExtraDhcpOptions - for setting opcode requests for server
-#Note: Value string for ExtraDhcpOptions should end with ','
-ExtraDhcpOptions= 119,
--- a/tcpiputils/dhcp/include/DHCPIP4Msg.h Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCPIP4Msg.h Tue Aug 31 16:45:15 2010 +0300
@@ -114,7 +114,6 @@
EDHCPClientID = 61,
EDHCPDNSUpdate = 81,
EDHCPAuthentication = 90,
- EDHCPDomainSearch = 119,
EDHCPSIPServers = 120,
#ifdef SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
EDHCPOptionOverload = 52,
@@ -252,8 +251,6 @@
#endif // SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
protected:
TUint32 GetValueBigEndian(TUint8 aOpCode) const;
-public:
- TInt CopyDomainSearchL(HBufC8*& aBuf8) const; //For retreiving option data value for DHCP option 119 from server's offer packet
};
inline COptionList::COptionList(CItemBase* aNext) : CListItem(aNext, 0)
--- a/tcpiputils/dhcp/include/DHCPIP4StateMachine.h Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCPIP4StateMachine.h Tue Aug 31 16:45:15 2010 +0300
@@ -190,9 +190,6 @@
TInetAddr iDHCPServerID;
TInetAddr iBroadcastAddress;
TInetAddr iSubnetMask;
-private:
- void AppendMultipleExtraOptionsParamL(); // Retrieve extra options for dhcp server request from dhcp.ini
- void SplitDomainSearchBufferL(HBufC8* aDomainSearchBuf); // Decryption of option data for dhcp option 119
};
#ifdef SYMBIAN_NETWORKING_DHCPSERVER
--- a/tcpiputils/dhcp/include/DHCPStateMachine.h Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCPStateMachine.h Tue Aug 31 16:45:15 2010 +0300
@@ -24,7 +24,6 @@
#include <e32base.h>
#include <comms-infras/statemachine.h>
-#include <es_ini.h>
#include "MsgSender.h"
#include "DHCP_Std.h"
@@ -197,7 +196,7 @@
virtual void AssembleClientIDsL() = 0;
void FetchHWAddress();
- void ConfigureInterfaceL( const TSoInetInterfaceInfoExtnDnsSuffix& aInterfaceInfo );
+ void ConfigureInterfaceL( const TSoInet6InterfaceInfo& aInterfaceInfo );
virtual void PrepareToSendL(CDHCPStateMachine::EAddressType aEAddressType) = 0;
#ifdef SYMBIAN_NETWORKING_DHCPSERVER
virtual void PrepareToSendServerMsgL(CDHCPStateMachine::EAddressType aEAddressType) = 0;
@@ -275,7 +274,7 @@
//DNS client names
HBufC8* iHostName;
HBufC8* iDomainName;
-
+
TUint32 iRenewalTimeT1; // number of seconds after iStartedAquisitionAt when we send a renew request
TUint32 iRebindTimeT2; // number of seconds after iStartedAquisitionAt when we send a rebind request (only if any renew fails)
TUint32 iLeaseTime; // number of seconds after iStartedAquisitionAt when the lease expires
@@ -300,15 +299,7 @@
public:
TBool iDhcpInformAckPending;
RBuf8 iSavedExtraParameters;
-#endif //SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
-protected:
- RInetSuffixList iSuffixList; // Structure to read domain search list from option data returned by dhcp server
- CESockIniData *iConfig; // Buffer for dhcp.ini content - part of esock framework for ini file parsing
-private:
- TBool LoadConfigurationFile(); // Load dhcp.ini file to a buffer
- void UnloadConfigurationFile(); // Destruct allocated space for dhcp ini content
-protected:
- TInt IniRead(const TDesC& aOptionName, TDes8& aOptionValue); // Ini parser
+#endif //SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
};
#ifdef SYMBIAN_NETWORKING_DHCPSERVER
--- a/tcpiputils/dhcp/include/DHCP_Std.h Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCP_Std.h Tue Aug 31 16:45:15 2010 +0300
@@ -40,9 +40,6 @@
IMPORT_C TInt E32Main();
-// DHCP ini file used for configuring extra options and additions configurability
-_LIT(DHCP_INI_DATA,"dhcp.ini");
-
#ifdef EKA2
_LIT(KDHCPServerName,"!DHCPServ");
#else
@@ -162,9 +159,7 @@
// specific numbers must have KConnWriteUserDataBit/KConnReadUserDataBit set as appropriate
const TUint KDhcpInterfaceDbgIoctl = 0x2000;
-_LIT(KDhcpExtraOptions, "ExtraDhcpOptions");
-_LIT(KDhcpSection, "DHCP");
-const TInt KOpCodeOutOfBounds = 0x100;
+
--- a/tcpiputils/dhcp/src/DHCPIP4Msg.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP4Msg.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -368,22 +368,6 @@
return pNode != NULL;
}
-TBool COptionList::CopyDomainSearchL(HBufC8*& aBuf8) const
-/**
- * Return a copy of the domain search list given in the message
- *
- * @param aBuf8 A descriptor for the domain search list to be written into
- * @return TBool If the copy was successful or not
- */
- {
- COptionNode* pNode = FindOption(EDHCPDomainSearch);
- if (pNode)
- {
- pNode->CopyBodyToL(aBuf8);
- }
- return pNode != NULL;
- }
-
CDHCPMessageHeaderIP4::CDHCPMessageHeaderIP4(HBufC8*& aMsg) :
CDHCPMessageHeader(&iXid, 4, aMsg), //| op (1) | htype (1) | hlen (1) | hops (1) |
iXid(&iSecs, 4), iSecs(&iFlags, 2), iFlags(&iCiaddr, 2),
--- a/tcpiputils/dhcp/src/DHCPIP4StateMachine.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP4StateMachine.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -82,13 +82,7 @@
CDHCPStateMachine::ConstructL();
__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPIP4StateMachine::ConstructL")));
- if (iConfig)
- {
- // Parse dhcp.ini for additional options to be requested with server
- // and append the option codes to the parameter request list
- TRAP_IGNORE(AppendMultipleExtraOptionsParamL());
- }
-
+
ReAllocL(KDhcpMaxMsgSizeIP4);
iDhcpMessage = new(ELeave)CDHCPMessageHeaderIP4(iFragment);
iMessageSender = new(ELeave)CMessageSender(this,iSocket,&iTaskStartedAt,KAfInet);
@@ -482,9 +476,7 @@
else
{
#endif // SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
- // From tb92 and later, including iSavedExtraParameters for FinishL()
- // as SYMBIAN_NETWORKING_DHCP_MSG_HEADERS is expected to be always ON
- DhcpMessage()->FinishL(iClientId,&iSavedExtraParameters);
+ DhcpMessage()->FinishL(iClientId);
#ifdef SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
}
#endif // SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
@@ -1514,24 +1506,10 @@
__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPIP4StateMachine::ConfigureInterfaceL - KSoNoSourceAddressSelect")));
User::LeaveIfError(iSocket.SetOpt(KSoNoSourceAddressSelect, KSolInetIp, 0));
- // Using the new structure derived from TSoInet6InterfaceInfo
- // to be able to set domain search list for the interface
- TSoInetInterfaceInfoExtnDnsSuffix interfaceInfo;
+ TSoInet6InterfaceInfo interfaceInfo;
CDHCPMessageHeaderIP4* v4Msg = DhcpMessage();
-
- // Read the optiond data buffer for option 119 and decrypt it
- HBufC8* domainSearchBuf(NULL);
- v4Msg->iOptions.CopyDomainSearchL(domainSearchBuf);
- if (domainSearchBuf)
- {
- // Perform decryption only if option data has been returned by dhcp server
- SplitDomainSearchBufferL(domainSearchBuf);
- delete domainSearchBuf;
- domainSearchBuf = NULL;
- }
-
if (!IsUsingStaticAddress())
{
iCurrentAddress.SetAddress(v4Msg->GetYIAddr());
@@ -1603,24 +1581,8 @@
interfaceInfo.iDoState = ETrue;
interfaceInfo.iDoAnycast = EFalse;
interfaceInfo.iDoProxy = EFalse;
-
- // Depending on number of domain suffix(es) received from the DHCP server,
- // we have to call CDHCPStateMachine::ConfigureInterfaceL multiple times
- TUint suffixCount = iSuffixList.Count();
-
- if (suffixCount > 0)
- interfaceInfo.iDomainSuffix.Copy(iSuffixList[0]);
- // If there is no domain suffix available for updating the interface,
- // we end up calling ConfigureInterfaceL once
CDHCPStateMachine::ConfigureInterfaceL( interfaceInfo );
-
- // Repeat ConfigureInterface call for each domain suffix returned from the server
- for (TUint index = 1; index < suffixCount; index++)
- {
- interfaceInfo.iDomainSuffix.Copy(iSuffixList[index]);
- CDHCPStateMachine::ConfigureInterfaceL( interfaceInfo );
- }
}
void CDHCPIP4StateMachine::CreateFqdnUpdateRequestL()
@@ -1913,175 +1875,4 @@
return EFalse;
}
#endif //SYMBIAN_NETWORKING_ADDRESS_PROVISION
-
-/**
- * @name AppendMultipleExtraOptionsParam
- * Parses dhcp.ini for extra dhcp options and adds them to
- * the dhcp server's parameter request list
- *
- * @internalTechnology
- */
-void CDHCPIP4StateMachine::AppendMultipleExtraOptionsParamL()
- {
- TBuf8<KOpCodeOutOfBounds> iniValue;
- User::LeaveIfError(IniRead(KDhcpExtraOptions, iniValue));
-
- TLex8 iniLex(iniValue);
- TChar ch;
-
- while((ch = iniLex.Get()) != 0)
- {
- TUint8 opCode(ch);
- TPtr8 opCodePtr(&opCode,1,1);
-
- if (!iSavedExtraParameters.Length())
- {
- iSavedExtraParameters.CreateL(opCodePtr);
- }
- else
- {
- iSavedExtraParameters.ReAllocL(iSavedExtraParameters.Length()+opCodePtr.Length());
- iSavedExtraParameters.Append(opCodePtr);
- }
- }
- }
-
-/**
- * @name SplitDomainSearchBufferL
- * Decrypt dhcp server option data response for option code 119
- * and retrieve the domain search list for configuring the interface
- *
- * @internalTechnology
- */
-void CDHCPIP4StateMachine::SplitDomainSearchBufferL(HBufC8* aDomainSearchBuf)
- {
- typedef TBuf8<KMaxDomainSuffixLength> THostName8;
- const TInt KMaxDomainSearchBufferLength = 4096;
-
- // Retrieve the total length of the option data content
- TPtr8 ptr(aDomainSearchBuf->Des());
- TInt totalLength = 0;
- totalLength = aDomainSearchBuf->Length();
-
- // Create a buffer of a length capable
- // to hold domain search list from the option data
- TLex8 primaryLex;
- RBuf8 suffixList;
- suffixList.CreateL(KMaxDomainSearchBufferLength);
-
- // To overcome specific limitations of TLex
- // Converting all '0's to '@'s in the option data buffer
- TInt offset = 0;
- THostName8 tmpBuf;
- while((offset = ptr.Locate(0)) != KErrNotFound)
- {
- tmpBuf.Append(ptr.MidTPtr(0, offset));
- tmpBuf.Append('@');
- if (ptr.Length() > (offset +1))
- ptr.Set(ptr.MidTPtr((offset+1)));
- else
- ptr.SetLength(0);
- }
- ptr.Set(tmpBuf.MidTPtr(0));
- primaryLex.Assign(ptr.Ptr());
-
-
- // Creating temporary objects for parsing the buffer
- THostName8 domainName;
- domainName.SetLength(0);
- TInt noOfDomainNames = 0;
- TChar ch;
-
- /* Start of decryption algorithm implementation for the option data buffer
- * Synopsis
- * Option data contains domain suffixes seaparated by either a '@' or a two-octet compression pointer i.e. C004 (hex)
- * which points to offset 4 in the complete aggregated block of Domain Search Option data
- * where another validly encoded domain name can be found to complete the name
- * Each sub-domain in a domain name is defined by a digit representing number of characters following this digit
- */
- for (TInt i=0; i<totalLength; i++)
- {
- ch = primaryLex.Peek();
- if (ch == 64) // if the character is a '@'
- {
- // Marks end of a domain name in the list
- // add the domainName constructed to a array and initialise it for next domain name parsing
- // Inc a counter to keep track of number of domain names retrieved
- // Maintain a continous list of the domain name as well for lookup during use of compression pointer
- suffixList.Append(ch);
- TBuf<KMaxDomainSuffixLength> domainName16;
- domainName16.Copy(domainName);
- iSuffixList.AppendL(domainName16);
- domainName.FillZ();
- domainName.SetLength(0);
- primaryLex.Inc();
- noOfDomainNames++;
- }
- else if (ch < 48) // if the character is a digit
- {
- // Marks '.' completing a sub-domain and defines the length
- // of the next sub-domain in the option data buffer
- if (domainName.Length() != 0)
- {
- suffixList.Append('.');
- domainName.Append('.');
- }
- TInt domainPartLength(ch);
- suffixList.Append(ptr.Mid(i+1,ch));
- domainName.Append(ptr.Mid(i+1,ch));
-
- TInt inc = (TInt)ch + 1;
- i+=(TInt)ch;
- primaryLex.Inc(inc);
- }
- else if (ch == 192) // if the character is a hex 0xC0
- {
- // Marks start of compression pointer
- // Looks up to the suffixList buffer created earlier that holds
- // the domain names read until now in contigous sequence
- // for extracting the remainder of the sub-domains to complete the domain name
- if (domainName.Length() != 0)
- {
- suffixList.Append('.');
- domainName.Append('.');
- }
- i++;
- primaryLex.Inc();
- ch = primaryLex.Peek();
- TInt refOffset(ch), actOffset=0;
- THostName compressedDomain;
- TPtr8 tmpPtr(suffixList.MidTPtr(0));
- TLex8 tmpLex(tmpPtr);
- TInt ind=0;
- for (; ind < tmpPtr.Length() && actOffset < refOffset; ind++)
- {
- TChar ch1 = tmpLex.Peek();
- if (ch1 != 46 && ch1 != 64)
- actOffset++;
- tmpLex.Inc();
- }
- tmpPtr.Set(tmpPtr.MidTPtr(ind-1));
- tmpPtr.Set(tmpPtr.MidTPtr(0,tmpPtr.Locate('@')));
- suffixList.Append(tmpPtr);
- domainName.Append(tmpPtr);
- suffixList.Append('@');
- TBuf<KMaxDomainSuffixLength> domainName16;
- domainName16.Copy(domainName);
- iSuffixList.AppendL(domainName16);
- domainName.FillZ();
- domainName.SetLength(0);
- primaryLex.Inc();
- noOfDomainNames++;
- }
- else
- {
- // Marks completion of the option data buffer
- // Free up memory allocated on the heap
- suffixList.Close();
- return;
- }
- }
- // End of decryption algorithm implementation for the option data buffer
- }
-
#endif // SYMBIAN_NETWORKING_DHCPSERVER
--- a/tcpiputils/dhcp/src/DHCPIP6StateMachine.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP6StateMachine.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -931,7 +931,7 @@
User::Leave( KErrNotFound );
}
- TSoInetInterfaceInfoExtnDnsSuffix interfaceInfo;
+ TSoInet6InterfaceInfo interfaceInfo;
//fill interfaceInfo current address is iCurrentAddress
interfaceInfo.iHwAddr = iHardwareAddr;
interfaceInfo.iAddress = iCurrentAddress;
--- a/tcpiputils/dhcp/src/DHCPStateMachine.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPStateMachine.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -40,7 +40,6 @@
{
__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPStateMachine::~CDHCPStateMachine")));
Cancel();
- UnloadConfigurationFile();
delete iDhcpMessage;
delete iMessageSender;
delete iTimer;
@@ -67,7 +66,7 @@
*/
{
__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPStateMachine::ConstructL")));
- LoadConfigurationFile();
+
#ifdef _DEBUG
// let's set debug properties to something
// so they can be read immediately..
@@ -423,30 +422,30 @@
iSocket.Close();
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
- error = iSocket.SetOpt(KSoKeepInterfaceUp, KSolInetIp, 0);
- if(error != KErrNone)
- {
- __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L("CDHCPStateMachine::RemoveConfiguredAddress, SetOpt Failed to set KSolInetIp")));
- }
- }
- else
- {
- __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L("CDHCPStateMachine::RemoveConfiguredAddress,SetOpt Failed to set KsolInetIfCtrl")));
- }
- }
+ 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 %d"),error));
- }
+ {
+ __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L("CDHCPStateMachine::RemoveConfiguredAddress, Socket Open Failed: Due to KErrNotReady")));
+ }
}
-void CDHCPStateMachine::ConfigureInterfaceL( const TSoInetInterfaceInfoExtnDnsSuffix& aInterfaceInfo )
+void CDHCPStateMachine::ConfigureInterfaceL( const TSoInet6InterfaceInfo& aInterfaceInfo )
/**
* Set the interface IP address and other params
* into the TCP/IP6 stack.
@@ -466,7 +465,7 @@
*/
{
- TPckgBuf<TSoInetInterfaceInfoExtnDnsSuffix> configInfo(aInterfaceInfo);
+ TPckgBuf<TSoInet6InterfaceInfo> configInfo(aInterfaceInfo);
__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPStateMachine::ConfigureInterfaceL - KSoInetConfigInterface")));
@@ -713,77 +712,7 @@
}
-/**
- * @name LoadConfigurationFile
- * Opens up the dhcp.ini file and reads the content on to a heap buffer
- * @return - ETrue if the dhcp.ini is successfully parsed to the buffer, EFalse otherwise
- *
- * @internalTechnology
- */
-TBool CDHCPStateMachine::LoadConfigurationFile()
- {
- TRAP_IGNORE(iConfig = CESockIniData::NewL(DHCP_INI_DATA));
- return (iConfig != NULL);
- }
-/**
- * @name UnloadConfigurationFile
- * Frees up memory allocated for reading dhcp.ini file
- *
- * @internalTechnology
- */
-void CDHCPStateMachine::UnloadConfigurationFile()
- {
- if (iConfig)
- {
- delete iConfig;
- iConfig = NULL;
- }
- }
-
-/**
- * @name IniRead
- * General ini file read utility. Makes use of CESockIniData object for parsing
- *
- * @param aOptionName Key name within ini file whose value need to be parsed
- * @param aOptionValue Buffer reference to store the parsed output
- *
- * @return TInt error values as approriate from the ini parsing framework
- *
- * @internalTechnology
- */
-TInt CDHCPStateMachine::IniRead(const TDesC& aOptionName, TDes8& aOptionValue)
- {
- TPtrC iniValue;
- TBool iniParsed = iConfig->FindVar(KDhcpSection, aOptionName, iniValue);
- if (!iniParsed)
- return KErrNotFound;
-
- if(aOptionName.CompareF(KDhcpExtraOptions) == KErrNone)
- {
- TLex iniLex(iniValue);
- TChar ch;
-
- while((ch = iniLex.Get()) != 0)
- {
- while ((ch = iniLex.Peek()) != ',')
- iniLex.Inc();
- TLex token(iniLex.MarkedToken());
-
- TUint8 opCode(0);
- token.Val(opCode,EDecimal);
-
- if ( (opCode > 0) && (opCode < KOpCodeOutOfBounds) )
- aOptionValue.Append(opCode);
-
- iniLex.Inc();
- iniLex.Mark();
- }
- return KErrNone;
- }
- else
- return KErrNotFound;
- }
TDhcpRnd::TDhcpRnd():iXid(0)
/**
--- a/tcpiputils/dhcp/te_dhcp/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/te_dhcp/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -27,19 +27,36 @@
//-- ip4 specific
+#ifdef SIROCCO_CODE_MIGRATION
+../te_dhcp/config/scripts/cccccc00_dhcptest_ip6.cre z:/TestData/configs/dhcp/cccccc00_dhcptest_ip6.cre
+../te_dhcp/config/scripts/cccccc00_dhcptest_ip4.cre z:/TestData/configs/dhcp/cccccc00_dhcptest_ip4.cre
+../te_dhcp/config/scripts/DHCP_OOM6_ip4_wlan.script z:/testdata/scripts/dhcp/dhcp_oom6_ip4_wlan.script
+../te_dhcp/config/scripts/te_dhcptest_ip4_wlan.script z:/testdata/scripts/dhcp/te_dhcptest_ip4_wlan.script
+../te_dhcp/config/scripts/DHCP_OOM6_ip6_wlan.script z:/testdata/scripts/dhcp/dhcp_oom6_ip6_wlan.script
+../te_dhcp/config/scripts/TE_SIPServer_DHCP_hwonly_ip4_wlan.script z:/testdata/scripts/dhcp/te_sipserver_dhcp_hwonly_ip4_wlan.script
+#else
../te_dhcp/config/scripts/te_dhcptest_ip4.script z:/testdata/scripts/dhcp/te_dhcptest_ip4.script
+../te_dhcp/config/scripts/DHCP_OOM6_ip4.script z:/testdata/scripts/dhcp/dhcp_oom6_ip4.script
+../te_dhcp/config/scripts/DHCP_OOM6_ip6.script z:/testdata/scripts/dhcp/dhcp_oom6_ip6.script
+../te_dhcp/config/scripts/TE_SIPServer_DHCP_hwonly_ip4.script z:/testdata/scripts/dhcp/te_sipserver_dhcp_hwonly_ip4.script
+#endif //SIROCCO_CODE_MIGRATION
../te_dhcp/config/scripts/DHCPBasicInteractions1_ip4.script z:/testdata/scripts/dhcp/dhcpbasicinteractions1_ip4.script
../te_dhcp/config/scripts/DHCPConfiguration2_ip4.script z:/testdata/scripts/dhcp/dhcpconfiguration2_ip4.script
../te_dhcp/config/scripts/DHCPRenewAndRelease3_ip4.script z:/testdata/scripts/dhcp/dhcprenewandrelease3_ip4.script
../te_dhcp/config/scripts/DHCPDynamicInteraction4_ip4.script z:/testdata/scripts/dhcp/dhcpdynamicinteraction4_ip4.script
../te_dhcp/config/scripts/DHCPManualtests5_ip4.script z:/testdata/scripts/dhcp/dhcpmanualtests5_ip4.script
-../te_dhcp/config/scripts/DHCP_OOM6_ip4.script z:/testdata/scripts/dhcp/dhcp_oom6_ip4.script
+
+
//-- ip6 specific
#ifdef SYMBIAN_TCPIPDHCP_UPDATE
../te_dhcp/config/scripts/te_dhcptest_ip6_PREQ1898.script z:/testdata/scripts/dhcp/te_dhcptest_ip6.script
#else
+#ifdef SIROCCO_CODE_MIGRATION
+../te_dhcp/config/scripts/te_dhcptest_ip6_wlan.script z:/testdata/scripts/dhcp/te_dhcptest_ip6_wlan.script
+#else
../te_dhcp/config/scripts/te_dhcptest_ip6.script z:/testdata/scripts/dhcp/te_dhcptest_ip6.script
+#endif //SIROCCO_CODE_MIGRATION
#endif // SYMBIAN_TCPIPDHCP_UPDATE
../te_dhcp/config/scripts/DHCPBasicInteractions1_ip6.script z:/testdata/scripts/dhcp/dhcpbasicinteractions1_ip6.script
../te_dhcp/config/scripts/DHCPConfiguration2_ip6.script z:/testdata/scripts/dhcp/dhcpconfiguration2_ip6.script
@@ -47,7 +64,7 @@
../te_dhcp/config/scripts/DHCPDynamicInteraction4_ip6.script z:/testdata/scripts/dhcp/dhcpdynamicinteraction4_ip6.script
../te_dhcp/config/scripts/DHCPManualtests5_ip6.script z:/testdata/scripts/dhcp/dhcpmanualtests5_ip6.script
../te_dhcp/config/scripts/dhcpmanualTests2_ip6.script z:/testdata/scripts/dhcp/dhcpmanualtests2_ip6.script
-../te_dhcp/config/scripts/DHCP_OOM6_ip6.script z:/testdata/scripts/dhcp/dhcp_oom6_ip6.script
+
../te_dhcp/config/scripts/DHCPBasicInteractions1-inform_ip6.script z:/testdata/scripts/dhcp/dhcpbasicinteractions1-inform_ip6.script
../te_dhcp/config/scripts/DHCPConfiguration2-inform_ip6.script z:/testdata/scripts/dhcp/dhcpconfiguration2-inform_ip6.script
../te_dhcp/config/scripts/DHCPRenewAndRelease3-inform_ip6.script z:/testdata/scripts/dhcp/dhcprenewandrelease3-inform_ip6.script
@@ -56,7 +73,6 @@
../te_dhcp/config/scripts/DHCPPREQ1898_Ipv6.script z:/testdata/scripts/dhcp/dhcppreq1898_ipv6.script
#endif //SYMBIAN_TCPIPDHCP_UPDATE
//SIP server
-../te_dhcp/config/scripts/TE_SIPServer_DHCP_hwonly_ip4.script z:/testdata/scripts/dhcp/te_sipserver_dhcp_hwonly_ip4.script
../te_dhcp/config/scripts/SipServer_setup.script z:/testdata/scripts/sipserver_setup.script
../te_dhcp/config/scripts/TE_SIPServerTesting.script z:/testdata/scripts/te_sipservertesting.script
../te_dhcp/config/scripts/SipServer.xml z:/testdata/configs/sipserver.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/DHCP_OOM6_ip4_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,51 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+#
+# OOM test for DHCPv4. Here we use CommsDB with ipv4 settings
+#
+# ORDER IS IMPORTANT! SetIAPToUse and SetAddressMode lines affect the operation of the subsequent commands
+
+# Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+# Configure commdb
+# This config file has explicit settings for IPv4
+
+//ced -i z:\TestData\configs\DHCP\DHCPced_ip4.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\dhcp\cccccc00_dhcptest_ip4.cre c:\private\10202be9\persists\cccccc00.cre
+
+load_suite DhcpTestServer
+
+# Load esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE NET-Dhcp-1701
+//! @SYMTestCaseID NET-Dhcp-1701
+run_test_step 5 DhcpTestServer SetAddressMode z:\TestData\configs\DHCP\dhcptest.ini IPv4
+run_test_step 5 DhcpTestServer SetIAPToUse z:\TestData\configs\DHCP\dhcptest.ini EtherWithDaemonNet1
+run_test_step 1200 DhcpTestServer OOM_1 z:\TestData\configs\DHCP\dhcptest.ini
+END_TESTCASE NET-Dhcp-1701
+
+# Stop all interfaces
+RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
+
+# Unload esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/DHCP_OOM6_ip6_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,51 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+#
+# OOM test for DHCPv6. Here we use CommsDB with ipv6 settings
+#
+# ORDER IS IMPORTANT! SetIAPToUse and SetAddressMode lines affect the operation of the subsequent commands
+
+# Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+# Configure commdb
+# This config file has explicit settings for IPv6
+
+//ced -i z:\TestData\configs\DHCP\DHCPced_ip6.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\dhcp\cccccc00_dhcptest_ip6.cre c:\private\10202be9\persists\cccccc00.cre
+
+load_suite DhcpTestServer
+
+# Load esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE NET-Dhcp-1801
+//! @SYMTestCaseID NET-Dhcp-1801
+run_test_step 5 DhcpTestServer SetAddressMode z:\TestData\configs\DHCP\dhcptest.ini IPv6
+run_test_step 5 DhcpTestServer SetIAPToUse z:\TestData\configs\DHCP\dhcptest.ini EtherWithDaemonNet1
+run_test_step 1200 DhcpTestServer OOM_1 z:\TestData\configs\DHCP\dhcptest.ini
+END_TESTCASE NET-Dhcp-1801
+
+# Stop all interfaces
+RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
+
+# Unload esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/TE_SIPServer_DHCP_hwonly_ip4_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,129 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+#
+# Script file for DHCP testing on IPv4
+#
+# ORDER IS IMPORTANT! SetIAPToUse and SetAddressMode lines affect the operation of the subsequent commands
+
+RUN_UTILS MkDir c:\simtsy\
+RUN_UTILS MkDir c:\private\
+RUN_UTILS MkDir c:\private\101F7989\
+RUN_UTILS MkDir c:\private\101F7989\esock\
+RUN_UTILS MakeReadWrite c:\config.txt
+RUN_UTILS MakeReadWrite c:\loopback.ini
+RUN_UTILS MakeReadWrite c:\qospolicies.ini
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
+RUN_UTILS DeleteFile c:\simtsy\config.txt
+RUN_UTILS DeleteFile c:\config.txt
+RUN_UTILS DeleteFile c:\loopback.ini
+RUN_UTILS DeleteFile c:\qospolicies.ini
+RUN_UTILS DeleteFile c:\private\101F7989\esock\qospolicies.ini
+RUN_UTILS CopyFile z:\TestData\Configs\SIP_Server_simtsy_config.txt c:\config.txt
+RUN_UTILS CopyFile z:\TestData\Configs\te_sipservertesting_loopback.ini c:\loopback.ini
+RUN_UTILS CopyFile z:\TestData\Configs\te_sipservertesting_qospolicies.ini c:\qospolicies.ini
+RUN_UTILS CopyFile z:\TestData\Configs\te_sipservertesting_qospolicies.ini c:\private\101F7989\esock\qospolicies.ini
+RUN_UTILS MakeReadWrite c:\simtsy\config.txt
+RUN_UTILS MakeReadWrite c:\config.txt
+
+# Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+# Configure commdb
+# This config file has explicit settings for IPv4
+
+//ced -i z:\TestData\configs\DHCP\DHCPced_ip4.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\dhcp\cccccc00_dhcptest_ip4.cre c:\private\10202be9\persists\cccccc00.cre
+
+# Load esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+load_suite DhcpTestServer
+
+# Load esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE NET-Dhcp-2201
+//! @SYMTestCaseID NET-Dhcp-2201
+run_test_step 5 DhcpTestServer SetAddressMode z:\TestData\configs\DHCP\dhcptest.ini IPv4
+END_TESTCASE NET-Dhcp-2201
+
+START_TESTCASE NET-Dhcp-2202
+//! @SYMTestCaseID NET-Dhcp-2202
+////////////////////////
+// SET IAP TO DYNAMIC //
+run_test_step 5 DhcpTestServer SetIAPToUse z:\TestData\configs\DHCP\dhcptest.ini EtherWithDaemonNet1
+////////////////////////
+END_TESTCASE NET-Dhcp-2202
+
+// Test 2_13 - for receiving SIP address option via DHCP
+START_TESTCASE NET-Dhcp-2203
+//! @SYMTestCaseID NET-Dhcp-2203
+run_test_step 50 DhcpTestServer 2_GetSIPAddrViaDHCP z:\TestData\configs\DHCP\dhcptest.ini ExpectDHCPResponseBeforeCompletion
+END_TESTCASE NET-Dhcp-2203
+
+// Test 2_14 - for receiving SIP domain option via DHCP
+START_TESTCASE NET-Dhcp-2204
+//! @SYMTestCaseID NET-Dhcp-2204
+run_test_step 50 DhcpTestServer 2_GetSIPDomain z:\TestData\configs\DHCP\dhcptest.ini ExpectDHCPResponseBeforeCompletion
+END_TESTCASE NET-Dhcp-2204
+
+START_TESTCASE NET-Dhcp-2205
+//! @SYMTestCaseID NET-Dhcp-2205
+///////////////////////////////////////////////////////
+// SET IAP TO STATIC IP STATIC DNS (DHCP STILL RUNS) //
+run_test_step 5 DhcpTestServer SetIAPToUse z:\TestData\configs\DHCP\dhcptest.ini EtherWithDaemon_StaticAddr_StaticDNS
+///////////////////////////////////////////////////////
+END_TESTCASE NET-Dhcp-2205
+
+// Test 2_16 - after defect 69825 (INFORM mode must return immediately when IP address and DNS address are static)
+START_TESTCASE NET-Dhcp-2206
+//! @SYMTestCaseID NET-Dhcp-2206
+run_test_step 50 DhcpTestServer 2_GetRaw z:\TestData\configs\DHCP\dhcptest.ini ExpectImmediateCompletion
+END_TESTCASE NET-Dhcp-2206
+
+// Test 2_17 - INFORM Test for receiving SIP address option via DHCP
+START_TESTCASE NET-Dhcp-2207
+//! @SYMTestCaseID NET-Dhcp-2207
+run_test_step 50 DhcpTestServer 2_GetSIPAddrViaDHCP z:\TestData\configs\DHCP\dhcptest.ini ExpectImmediateCompletion
+END_TESTCASE NET-Dhcp-2207
+
+// Test 2_18 - INFORM Test for receiving SIP domain option
+START_TESTCASE NET-Dhcp-2208
+//! @SYMTestCaseID NET-Dhcp-2208
+run_test_step 50 DhcpTestServer 2_GetSIPDomain z:\TestData\configs\DHCP\dhcptest.ini ExpectImmediateCompletion
+END_TESTCASE NET-Dhcp-2208
+
+# Stop all interfaces
+RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
+
+# Unload esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+// Cleanup
+RUN_UTILS MakeReadWrite c:\config.txt
+RUN_UTILS MakeReadWrite c:\loopback.ini
+RUN_UTILS MakeReadWrite c:\qospolicies.ini
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
+RUN_UTILS DeleteFile c:\simtsy\config.txt
+RUN_UTILS DeleteFile c:\config.txt
+RUN_UTILS DeleteFile c:\loopback.ini
+RUN_UTILS DeleteFile c:\qospolicies.ini
+RUN_UTILS DeleteFile c:\private\101F7989\esock\qospolicies.ini
+
Binary file tcpiputils/dhcp/te_dhcp/config/scripts/cccccc00_dhcptest_ip4.cre has changed
Binary file tcpiputils/dhcp/te_dhcp/config/scripts/cccccc00_dhcptest_ip6.cre has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/dhcptest_ip4_wlan.cfg Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,1109 @@
+//
+// Name : aino_gprs.cfg
+// Part of : Aino STIF test module
+// Description : Aino WLAN config
+//
+// Author : $Author: jojokine $
+// Revision : $Revision: 19100 $
+// Date : $Date: 2010-01-13 11:45:03 +0200 (Wed, 13 Jan 2010) $
+//
+// Copyright (C) 2010 Nokia Corporation.
+// This material, including documentation and any related
+// computer programs, is protected by copyright controlled by
+// Nokia Corporation. All rights are reserved. Copying,
+// including reproducing, storing, adapting or translating, any
+// or all of this material requires the prior written consent of
+// Nokia Corporation. This material also contains confidential
+// information which may not be disclosed to others without the
+// prior written consent of Nokia Corporation.
+//
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPNoMask
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPNoMask
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANStaticIPNoMask
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANStaticIPNoMask
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANStaticIPNoMask
+ IfNetworks=ip
+ IpNetMask=0.0.0.0
+ IpGateway=192.168.0.2
+ IpAddrFromServer=FALSE
+ IpAddr=192.168.0.8
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANStaticIPNoMask
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANStaticIPNoMask
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPNoGateway
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPNoGateway
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANStaticIPNoGateway
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANStaticIPNoGateway
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANStaticIPNoGateway
+ IfNetworks=ip
+ IpNetMask=255.255.255.0
+ IpGateway=0.0.0.0
+ IpAddrFromServer=TRUE
+ IpAddr=192.168.0.8
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=FALSE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANStaticIPNoGateway
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANStaticIPNoGateway
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPNoDNSservers
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPNoDNSservers
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANStaticIPNoDNSservers
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANStaticIPNoDNSservers
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANStaticIPNoDNSservers
+ IfNetworks=ip
+ IpNetMask=255.255.255.0
+ IpGateway=192.168.0.2
+ IpAddrFromServer=FALSE
+ IpAddr=192.168.0.8
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=0.0.0.0
+ IpNameServer2=0.0.0.0
+ Ip6DnsAddrFromServer=TRUE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANStaticIPNoDNSservers
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANStaticIPNoDNSservers
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - placeholder4
+//-------------------------------------------------------
+[Configuration]
+Name=placeholder4
+AllowDuplicates=FALSE
+
+[Network]
+ Name=placeholder4
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=placeholder4
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=placeholder4
+ IfNetworks=ip
+ IpNetMask=255.255.255.0
+ IpGateway=10.32.194.254
+ IpAddrFromServer=TRUE
+ IpAddr=10.32.194.251
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=placeholder4
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=placeholder4
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - placeholder5
+//-------------------------------------------------------
+[Configuration]
+Name=placeholder5
+AllowDuplicates=FALSE
+
+[Network]
+ Name=placeholder5
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=placeholder5
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=placeholder5
+ IfNetworks=ip
+ IpNetMask=255.255.255.0
+ IpGateway=10.32.194.254
+ IpAddrFromServer=TRUE
+ IpAddr=10.32.194.251
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=placeholder5
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=placeholder5
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPNoDaemon
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPNoDaemon
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANIAPNoDaemon
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANIAPNoDaemon
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANIAPNoDaemon
+ IfNetworks=ip
+ IpNetMask=255.255.255.0
+ IpGateway=10.32.194.254
+ IpAddrFromServer=FALSE
+ IpAddr=10.32.194.251
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+[EndLanService]
+
+[WapAp]
+ Name=LANIAPNoDaemon
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANIAPNoDaemon
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPBadDaemon
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPBadDaemon
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANIAPBadDaemon
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANIAPBadDaemon
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANIAPBadDaemon
+ IfNetworks=ip
+ IpNetMask=255.255.255.0
+ IpGateway=10.32.194.254
+ IpAddrFromServer=FALSE
+ IpAddr=10.32.194.251
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NonExistingServ
+ ConfigDaemonName=NonExistingServ
+[EndLanService]
+
+[WapAp]
+ Name=LANIAPBadDaemon
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANIAPBadDaemon
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPStaticIP1
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPStaticIP1
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANIAPStaticIP1
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANIAPStaticIP1
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANIAPStaticIP1
+ IfNetworks=ip
+ IpNetMask=255.255.255.0
+ IpGateway=192.168.0.2
+ IpAddrFromServer=FALSE
+ IpAddr=192.168.0.8
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANIAPStaticIP1
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANIAPStaticIP1
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPStaticIP2
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPStaticIP2
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANIAPStaticIP2
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANIAPStaticIP2
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANIAPStaticIP2
+ IfNetworks=ip
+ IpNetMask=255.255.255.0
+ IpGateway=192.168.0.2
+ IpAddrFromServer=FALSE
+ IpAddr=192.168.0.8
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANIAPStaticIP2
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANIAPStaticIP2
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAP1
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAP1
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANIAP1
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANIAP1
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANIAP1
+ IfNetworks=ip
+ IpNetMask=255.255.255.0
+ IpGateway=10.32.194.254
+ IpAddrFromServer=TRUE
+ IpAddr=10.32.194.251
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANIAP1
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANIAP1
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAP2
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAP2
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANIAP2
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANIAP2
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANIAP2
+ IfNetworks=ip
+ IpNetMask=255.255.255.0
+ IpGateway=10.32.194.254
+ IpAddrFromServer=TRUE
+ IpAddr=10.32.194.251
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANIAP2
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANIAP2
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPStaticDNS
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPStaticDNS
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANStaticIPStaticDNS
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANStaticIPStaticDNS
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANStaticIPStaticDNS
+ IfNetworks=ip
+ IpNetMask=255.255.255.0
+ IpGateway=192.168.0.2
+ IpAddrFromServer=FALSE
+ IpAddr=192.168.0.8
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANStaticIPStaticDNS
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANStaticIPStaticDNS
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/dhcptest_ip6_wlan.cfg Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,1093 @@
+//
+// Name : aino_gprs.cfg
+// Part of : Aino STIF test module
+// Description : Aino WLAN config
+//
+// Author : $Author: jojokine $
+// Revision : $Revision: 19100 $
+// Date : $Date: 2010-01-13 11:45:03 +0200 (Wed, 13 Jan 2010) $
+//
+// Copyright (C) 2010 Nokia Corporation.
+// This material, including documentation and any related
+// computer programs, is protected by copyright controlled by
+// Nokia Corporation. All rights are reserved. Copying,
+// including reproducing, storing, adapting or translating, any
+// or all of this material requires the prior written consent of
+// Nokia Corporation. This material also contains confidential
+// information which may not be disclosed to others without the
+// prior written consent of Nokia Corporation.
+//
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPNoMask
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPNoMask
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANStaticIPNoMask
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANStaticIPNoMask
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANStaticIPNoMask
+ IfNetworks=ip6,ip
+ IpNetMask=0.0.0.0
+ IpGateway=192.168.0.2
+ IpAddrFromServer=FALSE
+ IpAddr=192.168.0.8
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=FALSE
+ Ip6NameServer1=2001::dd
+ Ip6NameServer2=2001::ee
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANStaticIPNoMask
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANStaticIPNoMask
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPNoGateway
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPNoGateway
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANStaticIPNoGateway
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANStaticIPNoGateway
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANStaticIPNoGateway
+ IfNetworks=ip6,ip
+ IpNetMask=255.255.255.0
+ IpGateway=0.0.0.0
+ IpAddrFromServer=FALSE
+ IpAddr=192.168.0.8
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=FALSE
+ Ip6NameServer1=2001::dd
+ Ip6NameServer2=2001::ee
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANStaticIPNoGateway
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANStaticIPNoGateway
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPNoDNSservers
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPNoDNSservers
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANStaticIPNoDNSservers
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANStaticIPNoDNSservers
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANStaticIPNoDNSservers
+ IfNetworks=ip6,ip
+ IpNetMask=255.255.255.0
+ IpGateway=192.168.0.2
+ IpAddrFromServer=FALSE
+ IpAddr=192.168.0.8
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=0.0.0.0
+ IpNameServer2=0.0.0.0
+ Ip6DnsAddrFromServer=FALSE
+ Ip6NameServer1=0:0:0:0:0:0:0:0
+ Ip6NameServer2=0:0:0:0:0:0:0:0
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANStaticIPNoDNSservers
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANStaticIPNoDNSservers
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - placeholder4
+//-------------------------------------------------------
+[Configuration]
+Name=placeholder4
+AllowDuplicates=FALSE
+
+[Network]
+ Name=placeholder4
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=placeholder4
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=placeholder4
+ IfNetworks=ip6,ip
+ IpNetMask=255.255.255.0
+ IpGateway=10.32.194.254
+ IpAddrFromServer=TRUE
+ IpAddr=10.32.194.251
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=placeholder4
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=placeholder4
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - placeholder5
+//-------------------------------------------------------
+[Configuration]
+Name=placeholder5
+AllowDuplicates=FALSE
+
+[Network]
+ Name=placeholder5
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=placeholder5
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=placeholder5
+ IfNetworks=ip6,ip
+ IpNetMask=255.255.255.0
+ IpGateway=10.32.194.254
+ IpAddrFromServer=TRUE
+ IpAddr=10.32.194.251
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=placeholder5
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=placeholder5
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPNoDaemon
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPNoDaemon
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANIAPNoDaemon
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANIAPNoDaemon
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANIAPNoDaemon
+ IfNetworks=ip6,ip
+ IpNetMask=255.255.255.0
+ IpGateway=10.32.194.254
+ IpAddrFromServer=FALSE
+ IpAddr=10.32.194.251
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ IpAddrLeaseValidFrom=0
+[EndLanService]
+
+[WapAp]
+ Name=LANIAPNoDaemon
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANIAPNoDaemon
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPBadDaemon
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPBadDaemon
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANIAPBadDaemon
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANIAPBadDaemon
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANIAPBadDaemon
+ IfNetworks=ip6,ip
+ IpNetMask=255.255.255.0
+ IpGateway=10.32.194.254
+ IpAddrFromServer=FALSE
+ IpAddr=10.32.194.251
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NonExistingServ
+ ConfigDaemonName=NonExistingServ
+[EndLanService]
+
+[WapAp]
+ Name=LANIAPBadDaemon
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANIAPBadDaemon
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPStaticIP1
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPStaticIP1
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANIAPStaticIP1
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANIAPStaticIP1
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANIAPStaticIP1
+ IfNetworks=ip6,ip
+ IpNetMask=0.0.0.0
+ IpGateway=0.0.0.0
+ IpAddrFromServer=FALSE
+ IpAddr=0.0.0.0
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANIAPStaticIP1
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANIAPStaticIP1
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPStaticIP2
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPStaticIP2
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANIAPStaticIP2
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANIAPStaticIP2
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANIAPStaticIP2
+ IfNetworks=ip6,ip
+ IpNetMask=0.0.0.0
+ IpGateway=0.0.0.0
+ IpAddrFromServer=FALSE
+ IpAddr=0.0.0.0
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANIAPStaticIP2
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANIAPStaticIP2
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAP1
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAP1
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANIAP1
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANIAP1
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANIAP1
+ IfNetworks=ip6,ip
+ IpNetMask=255.255.255.0
+ IpGateway=10.32.194.254
+ IpAddrFromServer=TRUE
+ IpAddr=10.32.194.251
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANIAP1
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANIAP1
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAP2
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAP2
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANIAP2
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANIAP2
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANIAP2
+ IfNetworks=ip6,ip
+ IpNetMask=255.255.255.0
+ IpGateway=10.32.194.254
+ IpAddrFromServer=TRUE
+ IpAddr=10.32.194.251
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=TRUE
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANIAP2
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANIAP2
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPStaticDNS
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPStaticDNS
+AllowDuplicates=FALSE
+
+[Network]
+ Name=LANStaticIPStaticDNS
+[EndNetwork]
+
+[Location]
+ UseDefault=TRUE
+ Name=Mobile
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+ Name=LANStaticIPStaticDNS
+ IAPServiceType=LANService
+ IAPBearerType=LANBearer
+ IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+ UseDefault=TRUE
+ Name=WLANBearer
+ IfName=wlannif
+ LDDName=
+ PDDName=
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+ Name=LANStaticIPStaticDNS
+ IfNetworks=ip6,ip
+ IpNetMask=0.0.0.0
+ IpGateway=0.0.0.0
+ IpAddrFromServer=FALSE
+ IpAddr=0.0.0.0
+ IpDNSAddrFromServer=FALSE
+ IpNameServer1=194.72.6.51
+ IpNameServer2=194.72.6.52
+ Ip6DnsAddrFromServer=FALSE
+ Ip6NameServer1=2001::dd
+ Ip6NameServer2=2001::ee
+ IpAddrLeaseValidFrom=0
+ ConfigDaemonManagerName=NetCfgExtnDhcp
+ ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+ Name=LANStaticIPStaticDNS
+ CurrentBearer=WAPIPBearer
+[EndWapAp]
+
+
+[WapIpBearer]
+ Name=LANStaticIPStaticDNS
+ GatewayAddress=0.0.0.0
+ WSPOption=1
+ Security=FALSE
+ ProxyPortNumber=0
+[EndWapIpBearer]
+
+[WlanService]
+ WlanConnMode=1
+ WlanSSID=AP#3
+ WlanWepKey1=
+ WlanWepKey2=
+ WlanWepKey3=
+ WlanWepKey4=
+ WlanWepIndex=0
+ WlanSecMode=1
+ WlanAuthMode=0
+ WlanEnableWpaPsk=FALSE
+ WlanWpaPreSharedKey=
+ WlanScanSSID=FALSE
+ WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/te_dhcptest_ip4_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,103 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//!//////////////////////////////////////////////////////////////////
+//! @file
+//! @SYMTestSuiteName NET-DHCP-CIT
+//! @SYMScriptTestEnvironment TestExecuteFramework (TEF).
+//! @SYMScriptPurpose Script file for DHCP testing on IPv4.
+//! @SYMScriptInfo 1.Here we use CommsDB with ipv4 settings.
+//!//////////////////////////////////////////////////////////////////
+
+//Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+//Configure commdb.This config file has explicit settings for IPv4
+//ced -i z:\TestData\configs\DHCP\DHCPced_ip4.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\dhcp\cccccc00_dhcptest_ip4.cre c:\private\10202be9\persists\cccccc00.cre
+
+//Load the Server
+LOAD_SUITE DhcpTestServer
+
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\101f7989
+RUN_UTILS MkDir c:\private\101f7989\esock
+RUN_UTILS MakeReadWrite c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS DeleteFile c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS CopyFile z:\private\101f7989\esock\tcpip.ini c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS MakeReadWrite c:\private\101f7989\esock\tcpip.ini
+
+# Test the IPv4 DHCP client using the disabled linklocal option.
+run_test_step 1 DhcpTestServer SetIPv4LinkLocal z:\TestData\configs\DHCP\dhcptest.ini IPv4LinkLocalDisabled
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPBasicInteractions1_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPConfiguration2_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPPREQ1647_48_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPRenewAndRelease3_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPDynamicInteraction4_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\dhcpmanualtests5_ip4.script
+
+# Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+//Load the Server
+LOAD_SUITE DhcpTestServer
+
+# Test the IPv4 DHCP client using the always linklocal option.
+run_test_step 1 DhcpTestServer SetIPv4LinkLocal z:\TestData\configs\DHCP\dhcptest.ini IPv4LinkLocalAlways
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPBasicInteractions1_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPConfiguration2_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPPREQ1647_48_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPRenewAndRelease3_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPDynamicInteraction4_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\dhcpmanualtests5_ip4.script
+
+# Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+//Load the Server
+LOAD_SUITE DhcpTestServer
+
+# Test the IPv4 DHCP client using the conditional linklocal option.
+run_test_step 1 DhcpTestServer SetIPv4LinkLocal z:\TestData\configs\DHCP\dhcptest.ini IPv4LinkLocalConditional
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPBasicInteractions1_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPConfiguration2_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPPREQ1647_48_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPRenewAndRelease3_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPDynamicInteraction4_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\dhcpmanualtests5_ip4.script
+
+# Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+//Load the Server
+LOAD_SUITE DhcpTestServer
+
+# Test the IPv4 DHCP client using the config daemon controlled linklocal option.
+run_test_step 1 DhcpTestServer SetIPv4LinkLocal z:\TestData\configs\DHCP\dhcptest.ini IPv4LinkLocalConfigDaemonControlled
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPBasicInteractions1_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPConfiguration2_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPPREQ1647_48_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPRenewAndRelease3_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPDynamicInteraction4_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\dhcpmanualtests5_ip4.script
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/te_dhcptest_ip6_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,65 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//!//////////////////////////////////////////////////////////////////
+//! @file
+//! @SYMTestSuiteName NET-DHCP-CIT
+//! @SYMScriptTestEnvironment TestExecuteFramework (TEF).
+//! @SYMScriptPurpose Script file for DHCP testing on IPv4.
+//! @SYMScriptInfo 1.Here we use CommsDB with ipv6 settings.
+//!//////////////////////////////////////////////////////////////////
+
+//IPv6 DHCP tests
+
+//Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+//Configure commdb.This config file has explicit settings for IPv6
+//ced -i z:\TestData\configs\DHCP\DHCPced_ip6.xml
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\dhcp\cccccc00_dhcptest_ip6.cre c:\private\10202be9\persists\cccccc00.cre
+
+LOAD_SUITE DhcpTestServer
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPBasicInteractions1_ip6.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPConfiguration2_ip6.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPRenewAndRelease3_ip6.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPDynamicInteraction4_ip6.script
+RUN_UTILS DeleteFile c:\private\101F7989\esock\ip.ramod.esk
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPManualtests5_ip6.script
+RUN_UTILS DeleteFile c:\private\101F7989\esock\ip.ramod.esk
+RUN_SCRIPT z:\TestData\scripts\DHCP\dhcpmanualTests2_ip6.script
+
+//INFORM TESTS - add esk file to modify RA packet
+
+RUN_UTILS MkDir c:\private\
+RUN_UTILS MkDir c:\private\101f7989\
+RUN_UTILS MkDir c:\private\101f7989\ESock\
+RUN_UTILS CopyFile z:\testdata\configs\dhcp\TestDHCPv6Config1\ip.ramod.esk c:\private\101F7989\esock\ip.ramod.esk
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\ip.ramod.esk
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPBasicInteractions1-inform_ip6.script
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPConfiguration2-inform_ip6.script
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPRenewAndRelease3-inform_ip6.script
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPDynamicInteraction4-inform_ip6.script
+
+//remove esk file
+RUN_UTILS DeleteFile c:\private\101F7989\esock\ip.ramod.esk
\ No newline at end of file
--- a/tcpiputils/dhcp/te_dhcp/src/te_dhcpTestServer.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/te_dhcp/src/te_dhcpTestServer.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -142,7 +142,7 @@
#if (defined __WINS__ && !defined EKA2)
TInt ThreadFunc (TAny* /*aParam*/) // define the ordinal 1 on eka1
#else
-GLDEF_C TInt E32Main() // define 32main if eka2...
+EXPORT_C GLDEF_C TInt E32Main() // define 32main if eka2...
#endif
/**
* @return - Standard Epoc error code on exit
--- a/tcpiputils/dhcp/te_dhcp/te_dhcpTestServer.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/te_dhcp/te_dhcpTestServer.iby Tue Aug 31 16:45:15 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"
@@ -25,7 +25,6 @@
#ifdef SYMBIAN_EXCLUDE_DHCP
REM Feature DHCP is not included in this ROM
data=\epoc32\data\z\testdata\scripts\DHCP\te_dhcpremovedtest_ip4.script TestData\scripts\DHCP\te_dhcpremovedtest_ip4.script
-
data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip4.xml.omapxxx TestData\configs\DHCP\DHCPced_ip4.xml
data=\epoc32\data\z\TestData\configs\DHCP\dhcptest.ini TestData\configs\DHCP\dhcptest.ini
@@ -34,8 +33,13 @@
//##################### script files
//-- ip4 specific
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\testdata\scripts\DHCP\DHCP_OOM6_ip4_wlan.script TestData\scripts\DHCP\DHCP_OOM6_ip4.script
+data=\epoc32\data\z\testdata\scripts\DHCP\te_DHCPTest_ip4_wlan.script TestData\scripts\DHCP\te_DHCPTest_ip4.script
+#else
data=\epoc32\data\z\testdata\scripts\DHCP\DHCP_OOM6_ip4.script TestData\scripts\DHCP\DHCP_OOM6_ip4.script
data=\epoc32\data\z\testdata\scripts\DHCP\te_DHCPTest_ip4.script TestData\scripts\DHCP\te_DHCPTest_ip4.script
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
data=\epoc32\data\z\testdata\scripts\DHCP\DHCPBasicInteractions1_ip4.script TestData\scripts\DHCP\DHCPBasicInteractions1_ip4.script
data=\epoc32\data\z\testdata\scripts\DHCP\DHCPConfiguration2_ip4.script TestData\scripts\DHCP\DHCPConfiguration2_ip4.script
data=\epoc32\data\z\testdata\scripts\DHCP\DHCPRenewAndRelease3_ip4.script TestData\scripts\DHCP\DHCPRenewAndRelease3_ip4.script
@@ -46,8 +50,13 @@
file=ABI_DIR\DEBUG_DIR\ramod1.prt SYSTEM_BINDIR\ramod1.prt
file=ABI_DIR\DEBUG_DIR\ramod2.prt SYSTEM_BINDIR\ramod2.prt
file=ABI_DIR\DEBUG_DIR\ramod3.prt SYSTEM_BINDIR\ramod3.prt
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\testdata\scripts\DHCP\DHCP_OOM6_ip6_wlan.script TestData\scripts\DHCP\DHCP_OOM6_ip6.script
+data=\epoc32\data\z\testdata\scripts\DHCP\te_DHCPTest_ip6_wlan.script TestData\scripts\DHCP\te_DHCPTest_ip6.script
+#else
data=\epoc32\data\z\testdata\scripts\DHCP\DHCP_OOM6_ip6.script TestData\scripts\DHCP\DHCP_OOM6_ip6.script
data=\epoc32\data\z\testdata\scripts\DHCP\te_DHCPTest_ip6.script TestData\scripts\DHCP\te_DHCPTest_ip6.script
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
data=\epoc32\data\z\testdata\scripts\DHCP\DHCPBasicInteractions1_ip6.script TestData\scripts\DHCP\DHCPBasicInteractions1_ip6.script
data=\epoc32\data\z\testdata\scripts\DHCP\DHCPConfiguration2_ip6.script TestData\scripts\DHCP\DHCPConfiguration2_ip6.script
data=\epoc32\data\z\testdata\scripts\DHCP\DHCPRenewAndRelease3_ip6.script TestData\scripts\DHCP\DHCPRenewAndRelease3_ip6.script
@@ -67,7 +76,11 @@
data=\epoc32\data\z\testdata\configs\DHCP\TestDHCPv6Config3\ip.ramod.esk TestData\configs\DHCP\TestDHCPv6Config3\ip.ramod.esk
//SIP server
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\testdata\scripts\DHCP\TE_SIPServer_DHCP_hwonly_ip4_wlan.script TestData\scripts\DHCP\TE_SIPServer_DHCP_hwonly_ip4.script
+#else
data=\epoc32\data\z\testdata\scripts\DHCP\TE_SIPServer_DHCP_hwonly_ip4.script TestData\scripts\DHCP\TE_SIPServer_DHCP_hwonly_ip4.script
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
data=\epoc32\data\z\testdata\scripts\SipServer_setup.script TestData\scripts\SipServer_setup.script
data=\epoc32\data\z\testdata\scripts\TE_SIPServerTesting.script TestData\scripts\TE_SIPServerTesting.script
data=\epoc32\data\z\testdata\configs\SipServer.xml TestData\configs\SipServer.xml
@@ -81,7 +94,11 @@
#ifdef OMAP16XX
data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip4.xml.omapxxx TestData\configs\DHCP\DHCPced_ip4.xml
#else
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\TestData\configs\DHCP\cccccc00_dhcptest_ip4.cre TestData\configs\DHCP\cccccc00_dhcptest_ip4.cre
+#else
data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip4.xml.lubbock TestData\configs\DHCP\DHCPced_ip4.xml
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
#endif
@@ -89,7 +106,11 @@
#ifdef OMAP16XX
data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip6.xml.omapxxx TestData\configs\DHCP\DHCPced_ip6.xml
#else
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\TestData\configs\DHCP\cccccc00_dhcptest_ip6.cre TestData\configs\DHCP\cccccc00_dhcptest_ip6.cre
+#else
data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip6.xml.lubbock TestData\configs\DHCP\DHCPced_ip6.xml
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
#endif
--- a/tcpiputils/dhcp/te_unittest/dhcpservtest.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/te_unittest/dhcpservtest.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -198,7 +198,7 @@
* @internalTechnology
* @return - Returns 0.
*/
-GLDEF_C TInt E32Main()
+EXPORT_C GLDEF_C TInt E32Main()
{
__UHEAP_MARK;
CTrapCleanup * trap = CTrapCleanup::New();
--- a/tcpiputils/dhcp/te_unittest/dhcpservtest.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dhcp/te_unittest/dhcpservtest.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -23,7 +23,7 @@
SOURCE dhcpservtest.cpp
USERINCLUDE ../include
#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE \epoc32\include \epoc32\include\Networking
+SYSTEMINCLUDE /epoc32/include /epoc32/include/networking
#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SYSTEMINCLUDE /epoc32/include/platform/networking
--- a/tcpiputils/dnd/Test/Group/BLD.INF Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/Test/Group/BLD.INF Tue Aug 31 16:45:15 2010 +0300
@@ -14,6 +14,5 @@
//
-#include"../TE_LLMNR/group/BLD.INF"
-#include"../te_dndunittest/group/bld.inf"
-#include "../te_dnssuffix/group/bld.inf"
+#include"../TE_LLMNR/group/bld.inf"
+#include"../te_dndunittest/group/bld.inf"
\ No newline at end of file
Binary file tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffix.ini has changed
--- a/tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixced.xml Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of the License "Symbian Foundation License v1.0"
- which accompanies this distribution, and is available
- at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-
- Initial Contributors:
- Nokia Corporation - initial contribution.
-
- Contributors:
-
- Description:
- CommDB Settings File
- All Rights Reserved
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
- xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
- <Network operation="add">
- <Name>Intranet</Name>
- </Network>
- <Network operation="add">
- <Name>mRouter</Name>
- </Network>
- <Network operation="add">
- <Name>VPN</Name>
- </Network>
-</NetworkTable>
-
-<IAPTable>
- <IAP operation="add">
- <Name>NT RAS with Null Modem</Name>
- <IAPService>DialOutISP.NT RAS</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>CSD IAP PlaceHolder01</Name>
- <IAPService>DialOutISP.ISP01</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>CSD IAP PlaceHolder02</Name>
- <IAPService>DialOutISP.ISP02</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>GPRS IAP PlaceHolder01</Name>
- <IAPService>OutgoingGPRS.GPRS01</IAPService>
- <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Mobile</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>GPRS IAP PlaceHolder02</Name>
- <IAPService>OutgoingGPRS.GPRS02</IAPService>
- <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Mobile</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet No Daemon Static IP</Name>
- <IAPService>LANService.Ethernet No Daemon</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Incorrect ethernet setup 1</Name>
- <IAPService>LANService.Ethernet Bad Daemon</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.mRouter</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Incorrect ethernet setup 2</Name>
- <IAPService>LANService.Ethernet Static IP</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.mRouter</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet with Daemon Static IP</Name>
- <IAPService>LANService.Ethernet Static IP</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Incorrect ethernet setup 3</Name>
- <IAPService>LANService.Ethernet</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.mRouter</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet with Daemon Dynamic IP</Name>
- <IAPService>LANService.Ethernet</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>SSL VPN IP</Name>
- <IAPService>VpnService.VPN Tunnel Service</IAPService>
- <IAPBearer>VirtualBearer.VPN Test Bearer</IAPBearer>
- <IAPNetwork>Network.VPN</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>VPN Test IAP</Name>
- <IAPService>VpnService.VPN Test Service</IAPService>
- <IAPBearer>VirtualBearer.VPN Test Bearer</IAPBearer>
- <IAPNetwork>Network.VPN</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Virtual Tunnel with Static IP</Name>
- <IAPService>LANService.VirtualInterface</IAPService>
- <IAPBearer>VirtualBearer.EKA2 Emulator Virtual Interface</IAPBearer>
- <IAPNetwork>Network.VPN</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
-</IAPTable>
-
-<ModemBearerTable>
- <ModemBearer operation="template">
- <Name>Default Modem</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Null Modem 115200bps</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>US Robotics Sportster</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>57600</Rate>
- <Handshaking>244</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT&F1</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT&d2</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Dacom Surfer</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>57600</Rate>
- <Handshaking>244</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT&F</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT&d2</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GSM Mobile Phone via Infrared</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>IRCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>IRCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>196</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GSM Mobile Phone via Serial</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>19200</Rate>
- <Handshaking>196</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GPRS Ericsson R520m via IR</Name>
- <Agent>PSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>IRCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>IRCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GPRS Ericsson R520m/T68i via Serial</Name>
- <Agent>PSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>19200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <IspInitString>*99***1#</IspInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GPRS Motorola Mobile Phone via Serial</Name>
- <Agent>PSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>57600</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>WinTunnel Modem</Name>
- <Agent>null.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::6</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterWinsBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>WINS::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>WINSCSY</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterRs232Bearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterIrBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>IRCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>IRCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterBtBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>BTCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>BTCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterUsbBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>ACM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECACM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
- <LANBearer operation="add">
- <Name>EKA1 Target Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>ethercard</LDDFilename>
- <LDDName>EtherCard</LDDName>
- <PDDFilename>EtherSmc</PDDFilename>
- <PDDName>EtherCard.Smc</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-
- <LANBearer operation="add">
- <Name>EKA2 Target Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>enet</LDDFilename>
- <LDDName>Ethernet</LDDName>
- <PDDFilename>ethernet</PDDFilename>
- <PDDName>Ethernet.Assabet</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-
- <LANBearer operation="add">
- <Name>EKA1 Emulator Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>ethercard</LDDFilename>
- <LDDName>Ethercard</LDDName>
- <PDDFilename>etherwins</PDDFilename>
- <PDDName>Ethercard.wins</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-
- <LANBearer operation="add">
- <Name>EKA2 Emulator Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>enet</LDDFilename>
- <LDDName>=Ethernet</LDDName>
- <PDDFilename>ethernet</PDDFilename>
- <PDDName>Ethernet.Wins</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
- <LANService operation="add">
- <Name>Ethernet</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.225.164.1</IpGateway>
- <IpAddr>10.225.165.7</IpAddr>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>10.225.166.20</IpNameServer1>
- <IpNameServer2>147.253.195.7</IpNameServer2>
- <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
- <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>Ethernet Static IP</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.225.162.1</IpGateway>
- <IpAddr>10.225.162.111</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>10.225.166.20</IpNameServer1>
- <IpNameServer2>147.253.195.7</IpNameServer2>
- <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
- <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>Ethernet Bad Daemon</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.32.194.254</IpGateway>
- <IpAddr>10.32.194.251</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.52</IpNameServer2>
- <ConfigDaemonManagerName>NonExistingServ</ConfigDaemonManagerName>
- <ConfigDaemonName>NonExistingServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>Ethernet No Daemon</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.32.194.254</IpGateway>
- <IpAddr>10.32.194.251</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.52</IpNameServer2>
- </LANService>
- <LANService operation="add">
- <Name>VirtualInterface</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.225.162.1</IpGateway>
- <IpAddr>10.1.1.10</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <IpNameServer1>10.225.166.20</IpNameServer1>
- <IpNameServer2>147.253.195.7</IpNameServer2>
- </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
- <DialInISP operation="template">
- <Name>Default Dial In ISP</Name>
- <UseLoginScript>FALSE</UseLoginScript>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Default Dial In ISP</Description>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <UseEdge>FALSE</UseEdge>
- </DialInISP>
- <DialInISP operation="add">
- <Name>Dial In ISP01</Name>
- <UseLoginScript>FALSE</UseLoginScript>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Dial In ISP01</Description>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <UseEdge>FALSE</UseEdge>
- </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
- <DialOutISP operation="template">
- <Name>Default Dial Out ISP</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>TRUE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Default Dial Out ISP</Description>
- <DefaultTelNum>Default Dial Out ISP</DefaultTelNum>
- <LoginName>TRUE</LoginName>
- <LoginPass>TRUE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>FALSE</IfNetworks>
- <IfAuthName>TRUE</IfAuthName>
- <IfAuthPass>TRUE</IfAuthPass>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>NT RAS</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>TRUE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Test</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP01</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP01</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP02</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP02</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP03</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP03</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP04</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP04</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP05</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP05</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>mRouterDialOutIsp</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>mRouterDialOutIsp</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>IfAuthPass=</IfAuthName>
- <IfAuthPass>AuthRetries=0</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
- <CDMA2000PacketService operation="add">
- <Name>test name cdma2000</Name>
- <IwfName>Test2000</IwfName>
- <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
- <PdpType>IPV4</PdpType>
- <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
- <ReqRevPriority>PRIORITY04</ReqRevPriority>
- <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
- <ReqRevBitrate>32KBPS</ReqRevBitrate>
- <ReqFwdLoss>LOSS1</ReqFwdLoss>
- <ReqRevLoss>LOSS1</ReqRevLoss>
- <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
- <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
- <MinFwdBitrate>32KBPS</MinFwdBitrate>
- <MinRevBitrate>32KBPS</MinRevBitrate>
- <AccptFwdLoss>LOSS2</AccptFwdLoss>
- <AccptRevLoss>LOSS2</AccptRevLoss>
- <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
- <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <AuthRetries>1</AuthRetries>
- <IpNetMask>0.255.255.255</IpNetMask>
- <IpGateway>10.0.0.1</IpGateway>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <EnableLCPExtension>TRUE</EnableLCPExtension>
- <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
- <ApType>2</ApType>
- <QosWarningTimeout>1000000</QosWarningTimeout>
- <RlpMode>TRANSPARENT</RlpMode>
- <CDMAMobileIP>FALSE</CDMAMobileIP>
- <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
- </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
- <Chargecard operation="add">
- <Name>Dummy BT Chargecard</Name>
- <AccountNumber>144,12345678</AccountNumber>
- <Pin>0000</Pin>
- <LocalRule>HG</LocalRule>
- <NatRule>HFG</NatRule>
- <IntlRule>HEFG</IntlRule>
- </Chargecard>
- <Chargecard operation="add">
- <Name>Dummy Mercury Chargecard</Name>
- <AccountNumber>0500800800,,12345678</AccountNumber>
- <Pin>****</Pin>
- <LocalRule>HG</LocalRule>
- <NatRule>J,K,0FG</NatRule>
- <IntlRule>HEFG</IntlRule>
- </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
- <ConnectionPreferences operation="add">
- <Name>ConnectionPreferencesTable3</Name>
- <Ranking>1</Ranking>
- <Direction>OUTGOING</Direction>
- <DialogPref>DONOTPROMPT</DialogPref>
- <BearerSet>Virtual</BearerSet>
- <IAPRef>IAP.Virtual Tunnel with Static IP</IAPRef>
- </ConnectionPreferences>
- <ConnectionPreferences operation="add">
- <Name>ConnectionPreferencesTable1</Name>
- <Ranking>2</Ranking>
- <Direction>OUTGOING</Direction>
- <DialogPref>DONOTPROMPT</DialogPref>
- <BearerSet>LAN</BearerSet>
- <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
- </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
- <GlobalSettings operation="add">
- <Name>GlobalSettingsTable1</Name>
- <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
- <RedialAttempts>3</RedialAttempts>
- <SmsBearer>2</SmsBearer>
- <SmsReceiveMode>2</SmsReceiveMode>
- <GPRSAttachMode>1</GPRSAttachMode>
- <AcceptIncomingGprs>1</AcceptIncomingGprs>
- <ConnectionAttempts>2</ConnectionAttempts>
- <ModemForDataAndFax>2</ModemForDataAndFax>
- <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
- <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
- <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
- <GPRSClassCBearer>GSM</GPRSClassCBearer>
- <DefaultNetwork>Network.Intranet</DefaultNetwork>
- <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
- </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
- <IncomingGPRS operation="add">
- <Name>Incoming GPRS Settings PlaceHolder</Name>
- <APN>Test</APN>
- <PDPType>IPV4</PDPType>
- <PDPAddress>0.0.0.0</PDPAddress>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <ReqPrecedence>1</ReqPrecedence>
- <ReqDelay>1</ReqDelay>
- <ReqReliability>1</ReqReliability>
- <ReqPeakThroughput>1</ReqPeakThroughput>
- <ReqMeanThroughput>1</ReqMeanThroughput>
- <MinPrecedence>1</MinPrecedence>
- <MinDelay>1</MinDelay>
- <MinReliability>1</MinReliability>
- <MinPeakThroughput>1</MinPeakThroughput>
- <MinMeanThroughput>1</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>1</AuthRetries>
- <IpNameServer1>0.0.0.0</IpNameServer1>
- <IpNameServer2>0.0.0.0</IpNameServer2>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
- <OutgoingGPRS operation="add">
- <Name>GPRS01</Name>
- <APN>gprs01APNPlaceHolder</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>0</ReqPrecedence>
- <ReqDelay>0</ReqDelay>
- <ReqReliability>0</ReqReliability>
- <ReqPeakThroughput>0</ReqPeakThroughput>
- <ReqMeanThroughput>0</ReqMeanThroughput>
- <MinPrecedence>0</MinPrecedence>
- <MinDelay>0</MinDelay>
- <MinReliability>0</MinReliability>
- <MinPeakThroughput>0</MinPeakThroughput>
- <MinMeanThroughput>0</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <AuthRetries>1</AuthRetries>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <GprsAccessPointType>0</GprsAccessPointType>
- <QosWarningTimeout>0</QosWarningTimeout>
- </OutgoingGPRS>
- <OutgoingGPRS operation="add">
- <Name>GPRS02</Name>
- <APN>gprs02APNPlaceHolder</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>0</ReqPrecedence>
- <ReqDelay>0</ReqDelay>
- <ReqReliability>0</ReqReliability>
- <ReqPeakThroughput>0</ReqPeakThroughput>
- <ReqMeanThroughput>0</ReqMeanThroughput>
- <MinPrecedence>0</MinPrecedence>
- <MinDelay>0</MinDelay>
- <MinReliability>0</MinReliability>
- <MinPeakThroughput>0</MinPeakThroughput>
- <MinMeanThroughput>0</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <AuthRetries>1</AuthRetries>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <GprsAccessPointType>0</GprsAccessPointType>
- <QosWarningTimeout>0</QosWarningTimeout>
- </OutgoingGPRS>
- <OutgoingGPRS operation="add">
- <Name>GPRS03</Name>
- <APN>gprs03APNPlaceHolder</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>0</ReqPrecedence>
- <ReqDelay>0</ReqDelay>
- <ReqReliability>0</ReqReliability>
- <ReqPeakThroughput>0</ReqPeakThroughput>
- <ReqMeanThroughput>0</ReqMeanThroughput>
- <MinPrecedence>0</MinPrecedence>
- <MinDelay>0</MinDelay>
- <MinReliability>0</MinReliability>
- <MinPeakThroughput>0</MinPeakThroughput>
- <MinMeanThroughput>0</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <AuthRetries>1</AuthRetries>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <GprsAccessPointType>0</GprsAccessPointType>
- <QosWarningTimeout>0</QosWarningTimeout>
- </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
- <DefaultGPRS operation="add">
- <Name>Dummy Default GPRS Settings</Name>
- <APN>Access point name</APN>
- <PDPType>IPV6</PDPType>
- <PDPAddress>www.wid.com</PDPAddress>
- <Usage>1</Usage>
- <Precedence>1</Precedence>
- <Delay>1</Delay>
- <Reliability>1</Reliability>
- <PeakThroughput>1</PeakThroughput>
- <MeanThroughput>1</MeanThroughput>
- <MinPrecedence>1</MinPrecedence>
- <MinDelay>1</MinDelay>
- <MinReliability>1</MinReliability>
- <MinPeakThroughput>1</MinPeakThroughput>
- <MinMeanThroughput>1</MinMeanThroughput>
- <DataCompression>TRUE</DataCompression>
- <HeaderCompression>TRUE</HeaderCompression>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <AnonymousAccess>TRUE</AnonymousAccess>
- </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
- <Proxy operation="add">
- <Name>ProxyTable1</Name>
- <ISPRef>DialOutISP.NT RAS</ISPRef>
- <UseProxyServer>TRUE</UseProxyServer>
- <ProtocolName>http</ProtocolName>
- <ProxyServerName>www.dummyproxy.com</ProxyServerName>
- <PortNumber>80</PortNumber>
- <Exceptions>www.dummyproxy.com/exception</Exceptions>
- </Proxy>
-</ProxyTable>
-
-<LocationTable>
- <Location operation="template">
- <Name>Default Location</Name>
- <Mobile>TRUE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>+</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>44</AreaCode>
- <DialOutCode>44</DialOutCode>
- <DisableCallWaitingCode>44</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Office</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>171</AreaCode>
- <DialOutCode>9,</DialOutCode>
- <DisableCallWaitingCode>9,</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Office Direct Dial</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>171</AreaCode>
- <DialOutCode>171</DialOutCode>
- <DisableCallWaitingCode>171</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Mobile</Name>
- <Mobile>TRUE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>+</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>44</AreaCode>
- <DialOutCode>44</DialOutCode>
- <DisableCallWaitingCode>44</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Home</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>TRUE</UsePulseDial>
- <WaitForDialTone>TRUE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>181</AreaCode>
- <DialOutCode>181</DialOutCode>
- <DisableCallWaitingCode>181</DisableCallWaitingCode>
- </Location>
-</LocationTable>
-
-<SecureSocketTable>
- <SecureSocket operation="add">
- <Name>SecureSocketTable1</Name>
- <ProtocolName>ssl3.0</ProtocolName>
- <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
- </SecureSocket>
- <SecureSocket operation="add">
- <Name>SecureSocketTable2</Name>
- <ProtocolName>tls1.0</ProtocolName>
- <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
- </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
- <WAPAccessPoint operation="template">
- <Name>Default Dial In ISP</Name>
- <CurrentBearer>WAPIPBearer</CurrentBearer>
- </WAPAccessPoint>
- <WAPAccessPoint operation="add">
- <Name>Dummy WAP Settings</Name>
- <CurrentBearer>WAPIPBearer</CurrentBearer>
- <StartPage>www.wapstart.com</StartPage>
- </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
- <WAPIPBearer operation="template">
- <Name>WAPIPBearerTable1</Name>
- <AccessPoint>WAPAccessPoint.-1</AccessPoint>
- <GatewayAddress>0</GatewayAddress>
- <WSPOption>CONNECTIONLESS</WSPOption>
- <Security>FALSE</Security>
- <IAPRef>IAP.-1</IAPRef>
- <ProxyPortNumber>0</ProxyPortNumber>
- <ProxyLogin>0</ProxyLogin>
- <ProxyPassword>0</ProxyPassword>
- </WAPIPBearer>
- <WAPIPBearer operation="add">
- <Name>WAPIPBearerTable2</Name>
- <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
- <GatewayAddress>www.wapgateway.com</GatewayAddress>
- <WSPOption>CONNECTIONORIENTED</WSPOption>
- <Security>FALSE</Security>
- <IAPRef>IAP.CSD IAP PlaceHolder01</IAPRef>
- <ProxyPortNumber>1</ProxyPortNumber>
- <ProxyLogin>1</ProxyLogin>
- <ProxyPassword>1</ProxyPassword>
- </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
- <WAPSMSBearer operation="template">
- <Name>WAPSMSBearerTable1</Name>
- <AccessPoint>WAPAccessPoint.-1</AccessPoint>
- <GatewayAddress>0</GatewayAddress>
- <WSPOption>CONNECTIONLESS</WSPOption>
- <Security>FALSE</Security>
- <ServiceCentreAddress>0</ServiceCentreAddress>
- </WAPSMSBearer>
- <WAPSMSBearer operation="add">
- <Name>WAPSMSBearerTable2</Name>
- <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
- <GatewayAddress>+4412345678901</GatewayAddress>
- <WSPOption>CONNECTIONORIENTED</WSPOption>
- <Security>FALSE</Security>
- <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
- </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
- <VirtualBearer operation="add">
- <Name>VPN Test Bearer</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>tundriver</IfName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </VirtualBearer>
- <VirtualBearer operation="add">
- <Name>EKA2 Emulator Virtual Interface</Name>
- <Agent>tundriveragt.agt</Agent>
- <IfName>tundriver</IfName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </VirtualBearer>
-</VirtualBearerTable>
-
-<VpnServiceTable>
- <VpnService operation="add">
- <Name>VPN Tunnel Service</Name>
- <HomeIAP>IAP.Virtual Tunnel with Static IP</HomeIAP>
- <HomeNetwork>Network.Intranet</HomeNetwork>
- </VpnService>
- <VpnService operation="add">
- <Name>VPN Test Service</Name>
- <HomeIAP>IAP.Ethernet with Daemon Dynamic IP</HomeIAP>
- <HomeNetwork>Network.Intranet</HomeNetwork>
- </VpnService>
-</VpnServiceTable>
-
-</CommDB:Config>
--- a/tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixced_basic.xml Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
- All Rights Reserved
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
- xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
- <Network operation="add">
- <Name>Intranet</Name>
- </Network>
- <Network operation="add">
- <Name>mRouter</Name>
- </Network>
-</NetworkTable>
-
-<IAPTable>
- <IAP operation="add">
- <Name>NT RAS with Null Modem</Name>
- <IAPService>DialOutISP.NT RAS</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>CSD IAP PlaceHolder01</Name>
- <IAPService>DialOutISP.ISP01</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>CSD IAP PlaceHolder02</Name>
- <IAPService>DialOutISP.ISP02</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>GPRS IAP PlaceHolder01</Name>
- <IAPService>OutgoingGPRS.GPRS01</IAPService>
- <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Mobile</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>GPRS IAP PlaceHolder02</Name>
- <IAPService>OutgoingGPRS.GPRS02</IAPService>
- <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Mobile</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet No Daemon Static IP</Name>
- <IAPService>LANService.Ethernet No Daemon</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Incorrect ethernet setup 1</Name>
- <IAPService>LANService.Ethernet Bad Daemon</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.mRouter</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Incorrect ethernet setup 2</Name>
- <IAPService>LANService.Ethernet Static IP</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.mRouter</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet with Daemon Static IP</Name>
- <IAPService>LANService.Ethernet Static IP</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Incorrect ethernet setup 3</Name>
- <IAPService>LANService.Ethernet</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.mRouter</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet with Daemon Dynamic IP</Name>
- <IAPService>LANService.Ethernet</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
-</IAPTable>
-
-<ModemBearerTable>
- <ModemBearer operation="template">
- <Name>Default Modem</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Null Modem 115200bps</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>US Robotics Sportster</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>57600</Rate>
- <Handshaking>244</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT&F1</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT&d2</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Dacom Surfer</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>57600</Rate>
- <Handshaking>244</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT&F</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT&d2</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GSM Mobile Phone via Infrared</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>IRCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>IRCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>196</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GSM Mobile Phone via Serial</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>19200</Rate>
- <Handshaking>196</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GPRS Ericsson R520m via IR</Name>
- <Agent>PSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>IRCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>IRCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GPRS Ericsson R520m/T68i via Serial</Name>
- <Agent>PSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>19200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <IspInitString>*99***1#</IspInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GPRS Motorola Mobile Phone via Serial</Name>
- <Agent>PSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>57600</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>WinTunnel Modem</Name>
- <Agent>null.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::6</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterWinsBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>WINS::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>WINSCSY</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterRs232Bearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterIrBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>IRCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>IRCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterBtBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>BTCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>BTCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterUsbBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>ACM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECACM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
- <LANBearer operation="add">
- <Name>EKA1 Target Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>ethercard</LDDFilename>
- <LDDName>EtherCard</LDDName>
- <PDDFilename>EtherSmc</PDDFilename>
- <PDDName>EtherCard.Smc</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-
- <LANBearer operation="add">
- <Name>EKA2 Target Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>enet</LDDFilename>
- <LDDName>Ethernet</LDDName>
- <PDDFilename>ethernet</PDDFilename>
- <PDDName>Ethernet.Assabet</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-
- <LANBearer operation="add">
- <Name>EKA1 Emulator Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>ethercard</LDDFilename>
- <LDDName>Ethercard</LDDName>
- <PDDFilename>etherwins</PDDFilename>
- <PDDName>Ethercard.wins</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-
- <LANBearer operation="add">
- <Name>EKA2 Emulator Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>enet</LDDFilename>
- <LDDName>=Ethernet</LDDName>
- <PDDFilename>ethernet</PDDFilename>
- <PDDName>Ethernet.Wins</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
- <LANService operation="add">
- <Name>Ethernet</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.32.194.254</IpGateway>
- <IpAddr>10.32.194.251</IpAddr>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.52</IpNameServer2>
- <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
- <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>Ethernet Static IP</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>192.168.20.2</IpGateway>
- <IpAddr>192.168.20.13</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.52</IpNameServer2>
- <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
- <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>Ethernet Bad Daemon</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.32.194.254</IpGateway>
- <IpAddr>10.32.194.251</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.52</IpNameServer2>
- <ConfigDaemonManagerName>NonExistingServ</ConfigDaemonManagerName>
- <ConfigDaemonName>NonExistingServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>Ethernet No Daemon</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.32.194.254</IpGateway>
- <IpAddr>10.32.194.251</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.52</IpNameServer2>
- </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
- <DialInISP operation="template">
- <Name>Default Dial In ISP</Name>
- <UseLoginScript>FALSE</UseLoginScript>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Default Dial In ISP</Description>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <UseEdge>FALSE</UseEdge>
- </DialInISP>
- <DialInISP operation="add">
- <Name>Dial In ISP01</Name>
- <UseLoginScript>FALSE</UseLoginScript>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Dial In ISP01</Description>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <UseEdge>FALSE</UseEdge>
- </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
- <DialOutISP operation="template">
- <Name>Default Dial Out ISP</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>TRUE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Default Dial Out ISP</Description>
- <DefaultTelNum>Default Dial Out ISP</DefaultTelNum>
- <LoginName>TRUE</LoginName>
- <LoginPass>TRUE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>FALSE</IfNetworks>
- <IfAuthName>TRUE</IfAuthName>
- <IfAuthPass>TRUE</IfAuthPass>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>NT RAS</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>TRUE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Test</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP01</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP01</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP02</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP02</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP03</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP03</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP04</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP04</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP05</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP05</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>mRouterDialOutIsp</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>mRouterDialOutIsp</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>IfAuthPass=</IfAuthName>
- <IfAuthPass>AuthRetries=0</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
- <CDMA2000PacketService operation="add">
- <Name>test name cdma2000</Name>
- <IwfName>Test2000</IwfName>
- <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
- <PdpType>IPV4</PdpType>
- <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
- <ReqRevPriority>PRIORITY04</ReqRevPriority>
- <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
- <ReqRevBitrate>32KBPS</ReqRevBitrate>
- <ReqFwdLoss>LOSS1</ReqFwdLoss>
- <ReqRevLoss>LOSS1</ReqRevLoss>
- <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
- <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
- <MinFwdBitrate>32KBPS</MinFwdBitrate>
- <MinRevBitrate>32KBPS</MinRevBitrate>
- <AccptFwdLoss>LOSS2</AccptFwdLoss>
- <AccptRevLoss>LOSS2</AccptRevLoss>
- <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
- <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <AuthRetries>1</AuthRetries>
- <IpNetMask>0.255.255.255</IpNetMask>
- <IpGateway>10.0.0.1</IpGateway>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <EnableLCPExtension>TRUE</EnableLCPExtension>
- <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
- <ApType>2</ApType>
- <QosWarningTimeout>1000000</QosWarningTimeout>
- <RlpMode>TRANSPARENT</RlpMode>
- <CDMAMobileIP>FALSE</CDMAMobileIP>
- <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
- </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
- <Chargecard operation="add">
- <Name>Dummy BT Chargecard</Name>
- <AccountNumber>144,12345678</AccountNumber>
- <Pin>0000</Pin>
- <LocalRule>HG</LocalRule>
- <NatRule>HFG</NatRule>
- <IntlRule>HEFG</IntlRule>
- </Chargecard>
- <Chargecard operation="add">
- <Name>Dummy Mercury Chargecard</Name>
- <AccountNumber>0500800800,,12345678</AccountNumber>
- <Pin>****</Pin>
- <LocalRule>HG</LocalRule>
- <NatRule>J,K,0FG</NatRule>
- <IntlRule>HEFG</IntlRule>
- </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
- <ConnectionPreferences operation="add">
- <Name>ConnectionPreferencesTable1</Name>
- <Ranking>0</Ranking>
- <Direction>OUTGOING</Direction>
- <DialogPref>DONOTPROMPT</DialogPref>
- <BearerSet>LAN</BearerSet>
- <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
- </ConnectionPreferences>
- <ConnectionPreferences operation="add">
- <Name>ConnectionPreferencesTable2</Name>
- <Ranking>1</Ranking>
- <Direction>OUTGOING</Direction>
- <DialogPref>DONOTPROMPT</DialogPref>
- <BearerSet>LAN</BearerSet>
- <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
- </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
- <GlobalSettings operation="add">
- <Name>GlobalSettingsTable1</Name>
- <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
- <RedialAttempts>3</RedialAttempts>
- <SmsBearer>2</SmsBearer>
- <SmsReceiveMode>2</SmsReceiveMode>
- <GPRSAttachMode>1</GPRSAttachMode>
- <AcceptIncomingGprs>1</AcceptIncomingGprs>
- <ConnectionAttempts>2</ConnectionAttempts>
- <ModemForDataAndFax>2</ModemForDataAndFax>
- <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
- <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
- <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
- <GPRSClassCBearer>GSM</GPRSClassCBearer>
- <DefaultNetwork>Network.Intranet</DefaultNetwork>
- <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
- </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
- <IncomingGPRS operation="add">
- <Name>Incoming GPRS Settings PlaceHolder</Name>
- <APN>Test</APN>
- <PDPType>IPV4</PDPType>
- <PDPAddress>0.0.0.0</PDPAddress>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <ReqPrecedence>1</ReqPrecedence>
- <ReqDelay>1</ReqDelay>
- <ReqReliability>1</ReqReliability>
- <ReqPeakThroughput>1</ReqPeakThroughput>
- <ReqMeanThroughput>1</ReqMeanThroughput>
- <MinPrecedence>1</MinPrecedence>
- <MinDelay>1</MinDelay>
- <MinReliability>1</MinReliability>
- <MinPeakThroughput>1</MinPeakThroughput>
- <MinMeanThroughput>1</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>1</AuthRetries>
- <IpNameServer1>0.0.0.0</IpNameServer1>
- <IpNameServer2>0.0.0.0</IpNameServer2>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
- <OutgoingGPRS operation="add">
- <Name>GPRS01</Name>
- <APN>gprs01APNPlaceHolder</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>0</ReqPrecedence>
- <ReqDelay>0</ReqDelay>
- <ReqReliability>0</ReqReliability>
- <ReqPeakThroughput>0</ReqPeakThroughput>
- <ReqMeanThroughput>0</ReqMeanThroughput>
- <MinPrecedence>0</MinPrecedence>
- <MinDelay>0</MinDelay>
- <MinReliability>0</MinReliability>
- <MinPeakThroughput>0</MinPeakThroughput>
- <MinMeanThroughput>0</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <AuthRetries>1</AuthRetries>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <GprsAccessPointType>0</GprsAccessPointType>
- <QosWarningTimeout>0</QosWarningTimeout>
- </OutgoingGPRS>
- <OutgoingGPRS operation="add">
- <Name>GPRS02</Name>
- <APN>gprs02APNPlaceHolder</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>0</ReqPrecedence>
- <ReqDelay>0</ReqDelay>
- <ReqReliability>0</ReqReliability>
- <ReqPeakThroughput>0</ReqPeakThroughput>
- <ReqMeanThroughput>0</ReqMeanThroughput>
- <MinPrecedence>0</MinPrecedence>
- <MinDelay>0</MinDelay>
- <MinReliability>0</MinReliability>
- <MinPeakThroughput>0</MinPeakThroughput>
- <MinMeanThroughput>0</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <AuthRetries>1</AuthRetries>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <GprsAccessPointType>0</GprsAccessPointType>
- <QosWarningTimeout>0</QosWarningTimeout>
- </OutgoingGPRS>
- <OutgoingGPRS operation="add">
- <Name>GPRS03</Name>
- <APN>gprs03APNPlaceHolder</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>0</ReqPrecedence>
- <ReqDelay>0</ReqDelay>
- <ReqReliability>0</ReqReliability>
- <ReqPeakThroughput>0</ReqPeakThroughput>
- <ReqMeanThroughput>0</ReqMeanThroughput>
- <MinPrecedence>0</MinPrecedence>
- <MinDelay>0</MinDelay>
- <MinReliability>0</MinReliability>
- <MinPeakThroughput>0</MinPeakThroughput>
- <MinMeanThroughput>0</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <AuthRetries>1</AuthRetries>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <GprsAccessPointType>0</GprsAccessPointType>
- <QosWarningTimeout>0</QosWarningTimeout>
- </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
- <DefaultGPRS operation="add">
- <Name>Dummy Default GPRS Settings</Name>
- <APN>Access point name</APN>
- <PDPType>IPV6</PDPType>
- <PDPAddress>www.wid.com</PDPAddress>
- <Usage>1</Usage>
- <Precedence>1</Precedence>
- <Delay>1</Delay>
- <Reliability>1</Reliability>
- <PeakThroughput>1</PeakThroughput>
- <MeanThroughput>1</MeanThroughput>
- <MinPrecedence>1</MinPrecedence>
- <MinDelay>1</MinDelay>
- <MinReliability>1</MinReliability>
- <MinPeakThroughput>1</MinPeakThroughput>
- <MinMeanThroughput>1</MinMeanThroughput>
- <DataCompression>TRUE</DataCompression>
- <HeaderCompression>TRUE</HeaderCompression>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <AnonymousAccess>TRUE</AnonymousAccess>
- </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
- <Proxy operation="add">
- <Name>ProxyTable1</Name>
- <ISPRef>DialOutISP.NT RAS</ISPRef>
- <UseProxyServer>TRUE</UseProxyServer>
- <ProtocolName>http</ProtocolName>
- <ProxyServerName>www.dummyproxy.com</ProxyServerName>
- <PortNumber>80</PortNumber>
- <Exceptions>www.dummyproxy.com/exception</Exceptions>
- </Proxy>
-</ProxyTable>
-
-<LocationTable>
- <Location operation="template">
- <Name>Default Location</Name>
- <Mobile>TRUE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>+</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>44</AreaCode>
- <DialOutCode>44</DialOutCode>
- <DisableCallWaitingCode>44</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Office</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>171</AreaCode>
- <DialOutCode>9,</DialOutCode>
- <DisableCallWaitingCode>9,</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Office Direct Dial</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>171</AreaCode>
- <DialOutCode>171</DialOutCode>
- <DisableCallWaitingCode>171</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Mobile</Name>
- <Mobile>TRUE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>+</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>44</AreaCode>
- <DialOutCode>44</DialOutCode>
- <DisableCallWaitingCode>44</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Home</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>TRUE</UsePulseDial>
- <WaitForDialTone>TRUE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>181</AreaCode>
- <DialOutCode>181</DialOutCode>
- <DisableCallWaitingCode>181</DisableCallWaitingCode>
- </Location>
-</LocationTable>
-
-<SecureSocketTable>
- <SecureSocket operation="add">
- <Name>SecureSocketTable1</Name>
- <ProtocolName>ssl3.0</ProtocolName>
- <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
- </SecureSocket>
- <SecureSocket operation="add">
- <Name>SecureSocketTable2</Name>
- <ProtocolName>tls1.0</ProtocolName>
- <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
- </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
- <WAPAccessPoint operation="template">
- <Name>Default Dial In ISP</Name>
- <CurrentBearer>WAPIPBearer</CurrentBearer>
- </WAPAccessPoint>
- <WAPAccessPoint operation="add">
- <Name>Dummy WAP Settings</Name>
- <CurrentBearer>WAPIPBearer</CurrentBearer>
- <StartPage>www.wapstart.com</StartPage>
- </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
- <WAPIPBearer operation="template">
- <Name>WAPIPBearerTable1</Name>
- <AccessPoint>WAPAccessPoint.-1</AccessPoint>
- <GatewayAddress>0</GatewayAddress>
- <WSPOption>CONNECTIONLESS</WSPOption>
- <Security>FALSE</Security>
- <IAPRef>IAP.-1</IAPRef>
- <ProxyPortNumber>0</ProxyPortNumber>
- <ProxyLogin>0</ProxyLogin>
- <ProxyPassword>0</ProxyPassword>
- </WAPIPBearer>
- <WAPIPBearer operation="add">
- <Name>WAPIPBearerTable2</Name>
- <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
- <GatewayAddress>www.wapgateway.com</GatewayAddress>
- <WSPOption>CONNECTIONORIENTED</WSPOption>
- <Security>FALSE</Security>
- <IAPRef>IAP.CSD IAP PlaceHolder01</IAPRef>
- <ProxyPortNumber>1</ProxyPortNumber>
- <ProxyLogin>1</ProxyLogin>
- <ProxyPassword>1</ProxyPassword>
- </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
- <WAPSMSBearer operation="template">
- <Name>WAPSMSBearerTable1</Name>
- <AccessPoint>WAPAccessPoint.-1</AccessPoint>
- <GatewayAddress>0</GatewayAddress>
- <WSPOption>CONNECTIONLESS</WSPOption>
- <Security>FALSE</Security>
- <ServiceCentreAddress>0</ServiceCentreAddress>
- </WAPSMSBearer>
- <WAPSMSBearer operation="add">
- <Name>WAPSMSBearerTable2</Name>
- <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
- <GatewayAddress>+4412345678901</GatewayAddress>
- <WSPOption>CONNECTIONORIENTED</WSPOption>
- <Security>FALSE</Security>
- <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
- </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixcedv2.xml Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of the License "Symbian Foundation License v1.0"
- which accompanies this distribution, and is available
- at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-
- Initial Contributors:
- Nokia Corporation - initial contribution.
-
- Contributors:
-
- Description:
- CommDB Settings File
- All Rights Reserved
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
- xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
- <Network operation="add">
- <Name>Intranet</Name>
- </Network>
- <Network operation="add">
- <Name>mRouter</Name>
- </Network>
- <Network operation="add">
- <Name>VPN</Name>
- </Network>
-</NetworkTable>
-
-<IAPTable>
- <IAP operation="add">
- <Name>NT RAS with Null Modem</Name>
- <IAPService>DialOutISP.NT RAS</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>CSD IAP PlaceHolder01</Name>
- <IAPService>DialOutISP.ISP01</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>CSD IAP PlaceHolder02</Name>
- <IAPService>DialOutISP.ISP02</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>GPRS IAP PlaceHolder01</Name>
- <IAPService>OutgoingGPRS.GPRS01</IAPService>
- <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Mobile</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>GPRS IAP PlaceHolder02</Name>
- <IAPService>OutgoingGPRS.GPRS02</IAPService>
- <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Mobile</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet No Daemon Static IP</Name>
- <IAPService>LANService.Ethernet No Daemon</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Incorrect ethernet setup 1</Name>
- <IAPService>LANService.Ethernet Bad Daemon</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.mRouter</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Incorrect ethernet setup 2</Name>
- <IAPService>LANService.Ethernet Static IP</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.mRouter</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet with Daemon Static IP</Name>
- <IAPService>LANService.Ethernet Static IP</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Incorrect ethernet setup 3</Name>
- <IAPService>LANService.Ethernet</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.mRouter</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Ethernet with Daemon Dynamic IP</Name>
- <IAPService>LANService.Ethernet</IAPService>
- <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
- <IAPNetwork>Network.Intranet</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>SSL VPN IP</Name>
- <IAPService>VpnService.VPN Tunnel Service</IAPService>
- <IAPBearer>VirtualBearer.VPN Test Bearer</IAPBearer>
- <IAPNetwork>Network.VPN</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>VPN Test IAP</Name>
- <IAPService>VpnService.VPN Test Service</IAPService>
- <IAPBearer>VirtualBearer.VPN Test Bearer</IAPBearer>
- <IAPNetwork>Network.VPN</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
- <IAP operation="add">
- <Name>Virtual Tunnel with Static IP</Name>
- <IAPService>LANService.VirtualInterface</IAPService>
- <IAPBearer>VirtualBearer.EKA2 Emulator Virtual Interface</IAPBearer>
- <IAPNetwork>Network.VPN</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
-</IAPTable>
-
-<ModemBearerTable>
- <ModemBearer operation="template">
- <Name>Default Modem</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>0</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Null Modem 115200bps</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>US Robotics Sportster</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>57600</Rate>
- <Handshaking>244</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT&F1</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT&d2</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>Dacom Surfer</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>57600</Rate>
- <Handshaking>244</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT&F</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT&d2</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GSM Mobile Phone via Infrared</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>IRCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>IRCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>196</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GSM Mobile Phone via Serial</Name>
- <Agent>CSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>19200</Rate>
- <Handshaking>196</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GPRS Ericsson R520m via IR</Name>
- <Agent>PSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>IRCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>IRCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GPRS Ericsson R520m/T68i via Serial</Name>
- <Agent>PSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>19200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <IspInitString>*99***1#</IspInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>GPRS Motorola Mobile Phone via Serial</Name>
- <Agent>PSD.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>57600</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>17</XonChar>
- <XoffChar>19</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>ATZ</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>WinTunnel Modem</Name>
- <Agent>null.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::6</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterWinsBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>WINS::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>WINSCSY</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterRs232Bearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>COMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECUART</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterIrBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>IRCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>IRCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterBtBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>BTCOMM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>BTCOMM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
- <ModemBearer operation="add">
- <Name>mRouterUsbBearer</Name>
- <Agent>mRouterAgent.agt</Agent>
- <IfName>PPP</IfName>
- <PortName>ACM::0</PortName>
- <TSYName>MM</TSYName>
- <CSYName>ECACM</CSYName>
- <DataBits>8</DataBits>
- <StopBits>1</StopBits>
- <Parity>NONE</Parity>
- <Rate>115200</Rate>
- <Handshaking>4</Handshaking>
- <SpecialRate>0</SpecialRate>
- <XonChar>0</XonChar>
- <XoffChar>0</XoffChar>
- <FaxClassPref>AUTO</FaxClassPref>
- <SpeakerPref>NEVER</SpeakerPref>
- <SpeakerVolPref>QUIET</SpeakerVolPref>
- <ModemInitString>AT</ModemInitString>
- <DataInitString>AT</DataInitString>
- <FaxInitString>AT</FaxInitString>
- <DialPauseLength>S8=</DialPauseLength>
- <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
- <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
- <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
- <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
- <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
- <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
- <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
- <DialToneWaitModifier>W</DialToneWaitModifier>
- <CallProgress1>X1</CallProgress1>
- <CallProgress2>X2</CallProgress2>
- <CallProgress3>X3</CallProgress3>
- <CallProgress4>X4</CallProgress4>
- <EchoOff>E0</EchoOff>
- <VerboseText>V1</VerboseText>
- <QuietOff>Q0</QuietOff>
- <QuietOn>Q1</QuietOn>
- <DialCommandStateModifier>;</DialCommandStateModifier>
- <OnLine>O</OnLine>
- <ResetConfiguration>Z</ResetConfiguration>
- <ReturnToFactoryDefs>&F</ReturnToFactoryDefs>
- <DCDOnDuringLink>&C1</DCDOnDuringLink>
- <DTRHangUp>&D2</DTRHangUp>
- <DSRAlwaysOn>&S0</DSRAlwaysOn>
- <RTSCTSHandshake>&K3</RTSCTSHandshake>
- <XonXoffHandshake>&K4</XonXoffHandshake>
- <EscapeCharacter>+</EscapeCharacter>
- <EscapeGuardPeriod>S12</EscapeGuardPeriod>
- <NoDialTone>NO DIAL TONE</NoDialTone>
- <Busy>BUSY</Busy>
- <NoAnswer>NO ANSWER</NoAnswer>
- <Carrier>CARRIER</Carrier>
- <Connect>CONNECT</Connect>
- <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
- <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
- <CompressionNone>COMPRESSION:NONE</CompressionNone>
- <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
- <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
- <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
- <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
- <MessageCentreNumber>+44123456789</MessageCentreNumber>
- <MessageValidityPeriod>1440</MessageValidityPeriod>
- <MessageDeliveryReport>FALSE</MessageDeliveryReport>
- <MinimumSignalLevel>9905</MinimumSignalLevel>
- <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
- <SIRSettings>0</SIRSettings>
- <CommRole>0</CommRole>
- </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
- <LANBearer operation="add">
- <Name>EKA1 Target Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>ethercard</LDDFilename>
- <LDDName>EtherCard</LDDName>
- <PDDFilename>EtherSmc</PDDFilename>
- <PDDName>EtherCard.Smc</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-
- <LANBearer operation="add">
- <Name>EKA2 Target Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>enet</LDDFilename>
- <LDDName>Ethernet</LDDName>
- <PDDFilename>ethernet</PDDFilename>
- <PDDName>Ethernet.Assabet</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-
- <LANBearer operation="add">
- <Name>EKA1 Emulator Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>ethercard</LDDFilename>
- <LDDName>Ethercard</LDDName>
- <PDDFilename>etherwins</PDDFilename>
- <PDDName>Ethercard.wins</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-
- <LANBearer operation="add">
- <Name>EKA2 Emulator Ethernet</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>ethint</IfName>
- <LDDFilename>enet</LDDFilename>
- <LDDName>=Ethernet</LDDName>
- <PDDFilename>ethernet</PDDFilename>
- <PDDName>Ethernet.Wins</PDDName>
- <PacketDriverName>EtherPkt.drv</PacketDriverName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
- <LANService operation="add">
- <Name>Ethernet</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.225.164.1</IpGateway>
- <IpAddr>10.225.165.7</IpAddr>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>10.225.166.20</IpNameServer1>
- <IpNameServer2>147.253.195.7</IpNameServer2>
- <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
- <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>Ethernet Static IP</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.225.162.1</IpGateway>
- <IpAddr>10.225.162.111</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>10.225.166.20</IpNameServer1>
- <IpNameServer2>147.253.195.7</IpNameServer2>
- <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
- <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>Ethernet Bad Daemon</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.32.194.254</IpGateway>
- <IpAddr>10.32.194.251</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.52</IpNameServer2>
- <ConfigDaemonManagerName>NonExistingServ</ConfigDaemonManagerName>
- <ConfigDaemonName>NonExistingServ</ConfigDaemonName>
- </LANService>
- <LANService operation="add">
- <Name>Ethernet No Daemon</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.32.194.254</IpGateway>
- <IpAddr>10.32.194.251</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <IpNameServer1>194.72.6.51</IpNameServer1>
- <IpNameServer2>194.72.6.52</IpNameServer2>
- </LANService>
- <LANService operation="add">
- <Name>VirtualInterface</Name>
- <IfNetworks>ip</IfNetworks>
- <IpNetMask>255.255.255.0</IpNetMask>
- <IpGateway>10.225.162.1</IpGateway>
- <IpAddr>10.1.1.10</IpAddr>
- <IpAddrFromServer>FALSE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <IpNameServer1>10.225.166.20</IpNameServer1>
- <IpNameServer2>147.253.195.7</IpNameServer2>
- </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
- <DialInISP operation="template">
- <Name>Default Dial In ISP</Name>
- <UseLoginScript>FALSE</UseLoginScript>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Default Dial In ISP</Description>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <UseEdge>FALSE</UseEdge>
- </DialInISP>
- <DialInISP operation="add">
- <Name>Dial In ISP01</Name>
- <UseLoginScript>FALSE</UseLoginScript>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Dial In ISP01</Description>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <UseEdge>FALSE</UseEdge>
- </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
- <DialOutISP operation="template">
- <Name>Default Dial Out ISP</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>TRUE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Default Dial Out ISP</Description>
- <DefaultTelNum>Default Dial Out ISP</DefaultTelNum>
- <LoginName>TRUE</LoginName>
- <LoginPass>TRUE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>FALSE</IfNetworks>
- <IfAuthName>TRUE</IfAuthName>
- <IfAuthPass>TRUE</IfAuthPass>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>NT RAS</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>TRUE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>Test</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP01</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP01</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP02</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP02</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP03</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP03</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP04</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP04</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>ISP05</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>TRUE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>PlaceHolder for ISP05</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>xxx</IfAuthName>
- <IfAuthPass>yyy</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
- <DialOutISP operation="add">
- <Name>mRouterDialOutIsp</Name>
- <DialResolution>TRUE</DialResolution>
- <UseLoginScript>FALSE</UseLoginScript>
- <PromptForLogin>FALSE</PromptForLogin>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <Description>mRouterDialOutIsp</Description>
- <Type>INTERNETONLY</Type>
- <DefaultTelNum>INTERNETONLY</DefaultTelNum>
- <LoginName>FALSE</LoginName>
- <LoginPass>FALSE</LoginPass>
- <DisplayPCT>FALSE</DisplayPCT>
- <IfParams>FALSE</IfParams>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>IfAuthPass=</IfAuthName>
- <IfAuthPass>AuthRetries=0</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpAddr>TRUE</IpAddr>
- <IpNetMask>TRUE</IpNetMask>
- <IpGateway>TRUE</IpGateway>
- <IpNameServer1>TRUE</IpNameServer1>
- <IpNameServer2>TRUE</IpNameServer2>
- <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <EnableSWComp>FALSE</EnableSWComp>
- <BearerService>0</BearerService>
- <BearerProtocol>UNSPECIFIED</BearerProtocol>
- <RlpVersion>0</RlpVersion>
- <IwfToMs>0</IwfToMs>
- <MsToIwf>0</MsToIwf>
- <AckTimer>0</AckTimer>
- <RetransmissionAttempts>0</RetransmissionAttempts>
- <ResequencePeriod>0</ResequencePeriod>
- <V42Compression>0</V42Compression>
- <V42Codewords>0</V42Codewords>
- <V42MaxLength>0</V42MaxLength>
- <Asymmetry>0</Asymmetry>
- <UserInitUpgrade>FALSE</UserInitUpgrade>
- <UseEdge>FALSE</UseEdge>
- </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
- <CDMA2000PacketService operation="add">
- <Name>test name cdma2000</Name>
- <IwfName>Test2000</IwfName>
- <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
- <PdpType>IPV4</PdpType>
- <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
- <ReqRevPriority>PRIORITY04</ReqRevPriority>
- <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
- <ReqRevBitrate>32KBPS</ReqRevBitrate>
- <ReqFwdLoss>LOSS1</ReqFwdLoss>
- <ReqRevLoss>LOSS1</ReqRevLoss>
- <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
- <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
- <MinFwdBitrate>32KBPS</MinFwdBitrate>
- <MinRevBitrate>32KBPS</MinRevBitrate>
- <AccptFwdLoss>LOSS2</AccptFwdLoss>
- <AccptRevLoss>LOSS2</AccptRevLoss>
- <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
- <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <AuthRetries>1</AuthRetries>
- <IpNetMask>0.255.255.255</IpNetMask>
- <IpGateway>10.0.0.1</IpGateway>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <EnableLCPExtension>TRUE</EnableLCPExtension>
- <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
- <ApType>2</ApType>
- <QosWarningTimeout>1000000</QosWarningTimeout>
- <RlpMode>TRANSPARENT</RlpMode>
- <CDMAMobileIP>FALSE</CDMAMobileIP>
- <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
- </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
- <Chargecard operation="add">
- <Name>Dummy BT Chargecard</Name>
- <AccountNumber>144,12345678</AccountNumber>
- <Pin>0000</Pin>
- <LocalRule>HG</LocalRule>
- <NatRule>HFG</NatRule>
- <IntlRule>HEFG</IntlRule>
- </Chargecard>
- <Chargecard operation="add">
- <Name>Dummy Mercury Chargecard</Name>
- <AccountNumber>0500800800,,12345678</AccountNumber>
- <Pin>****</Pin>
- <LocalRule>HG</LocalRule>
- <NatRule>J,K,0FG</NatRule>
- <IntlRule>HEFG</IntlRule>
- </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
- <ConnectionPreferences operation="add">
- <Name>ConnectionPreferencesTable3</Name>
- <Ranking>0</Ranking>
- <Direction>OUTGOING</Direction>
- <DialogPref>DONOTPROMPT</DialogPref>
- <BearerSet>Virtual</BearerSet>
- <IAPRef>IAP.Virtual Tunnel with Static IP</IAPRef>
- </ConnectionPreferences>
- <ConnectionPreferences operation="add">
- <Name>ConnectionPreferencesTable1</Name>
- <Ranking>1</Ranking>
- <Direction>OUTGOING</Direction>
- <DialogPref>DONOTPROMPT</DialogPref>
- <BearerSet>LAN</BearerSet>
- <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
- </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
- <GlobalSettings operation="add">
- <Name>GlobalSettingsTable1</Name>
- <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
- <RedialAttempts>3</RedialAttempts>
- <SmsBearer>2</SmsBearer>
- <SmsReceiveMode>2</SmsReceiveMode>
- <GPRSAttachMode>1</GPRSAttachMode>
- <AcceptIncomingGprs>1</AcceptIncomingGprs>
- <ConnectionAttempts>2</ConnectionAttempts>
- <ModemForDataAndFax>2</ModemForDataAndFax>
- <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
- <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
- <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
- <GPRSClassCBearer>GSM</GPRSClassCBearer>
- <DefaultNetwork>Network.Intranet</DefaultNetwork>
- <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
- </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
- <IncomingGPRS operation="add">
- <Name>Incoming GPRS Settings PlaceHolder</Name>
- <APN>Test</APN>
- <PDPType>IPV4</PDPType>
- <PDPAddress>0.0.0.0</PDPAddress>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
- <ReqPrecedence>1</ReqPrecedence>
- <ReqDelay>1</ReqDelay>
- <ReqReliability>1</ReqReliability>
- <ReqPeakThroughput>1</ReqPeakThroughput>
- <ReqMeanThroughput>1</ReqMeanThroughput>
- <MinPrecedence>1</MinPrecedence>
- <MinDelay>1</MinDelay>
- <MinReliability>1</MinReliability>
- <MinPeakThroughput>1</MinPeakThroughput>
- <MinMeanThroughput>1</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <IfAuthName>RasUser</IfAuthName>
- <IfAuthPass>pass</IfAuthPass>
- <AuthRetries>1</AuthRetries>
- <IpNameServer1>0.0.0.0</IpNameServer1>
- <IpNameServer2>0.0.0.0</IpNameServer2>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
- <OutgoingGPRS operation="add">
- <Name>GPRS01</Name>
- <APN>gprs01APNPlaceHolder</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>0</ReqPrecedence>
- <ReqDelay>0</ReqDelay>
- <ReqReliability>0</ReqReliability>
- <ReqPeakThroughput>0</ReqPeakThroughput>
- <ReqMeanThroughput>0</ReqMeanThroughput>
- <MinPrecedence>0</MinPrecedence>
- <MinDelay>0</MinDelay>
- <MinReliability>0</MinReliability>
- <MinPeakThroughput>0</MinPeakThroughput>
- <MinMeanThroughput>0</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <AuthRetries>1</AuthRetries>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <GprsAccessPointType>0</GprsAccessPointType>
- <QosWarningTimeout>0</QosWarningTimeout>
- </OutgoingGPRS>
- <OutgoingGPRS operation="add">
- <Name>GPRS02</Name>
- <APN>gprs02APNPlaceHolder</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>0</ReqPrecedence>
- <ReqDelay>0</ReqDelay>
- <ReqReliability>0</ReqReliability>
- <ReqPeakThroughput>0</ReqPeakThroughput>
- <ReqMeanThroughput>0</ReqMeanThroughput>
- <MinPrecedence>0</MinPrecedence>
- <MinDelay>0</MinDelay>
- <MinReliability>0</MinReliability>
- <MinPeakThroughput>0</MinPeakThroughput>
- <MinMeanThroughput>0</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <AuthRetries>1</AuthRetries>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <GprsAccessPointType>0</GprsAccessPointType>
- <QosWarningTimeout>0</QosWarningTimeout>
- </OutgoingGPRS>
- <OutgoingGPRS operation="add">
- <Name>GPRS03</Name>
- <APN>gprs03APNPlaceHolder</APN>
- <PDPType>IPV4</PDPType>
- <IfPromptForAuth>FALSE</IfPromptForAuth>
- <IpAddrFromServer>TRUE</IpAddrFromServer>
- <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
- <ReqPrecedence>0</ReqPrecedence>
- <ReqDelay>0</ReqDelay>
- <ReqReliability>0</ReqReliability>
- <ReqPeakThroughput>0</ReqPeakThroughput>
- <ReqMeanThroughput>0</ReqMeanThroughput>
- <MinPrecedence>0</MinPrecedence>
- <MinDelay>0</MinDelay>
- <MinReliability>0</MinReliability>
- <MinPeakThroughput>0</MinPeakThroughput>
- <MinMeanThroughput>0</MinMeanThroughput>
- <DataCompression>FALSE</DataCompression>
- <HeaderCompression>FALSE</HeaderCompression>
- <AnonymousAccess>FALSE</AnonymousAccess>
- <IfNetworks>ip</IfNetworks>
- <AuthRetries>1</AuthRetries>
- <EnableLCPExtension>FALSE</EnableLCPExtension>
- <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <GprsAccessPointType>0</GprsAccessPointType>
- <QosWarningTimeout>0</QosWarningTimeout>
- </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
- <DefaultGPRS operation="add">
- <Name>Dummy Default GPRS Settings</Name>
- <APN>Access point name</APN>
- <PDPType>IPV6</PDPType>
- <PDPAddress>www.wid.com</PDPAddress>
- <Usage>1</Usage>
- <Precedence>1</Precedence>
- <Delay>1</Delay>
- <Reliability>1</Reliability>
- <PeakThroughput>1</PeakThroughput>
- <MeanThroughput>1</MeanThroughput>
- <MinPrecedence>1</MinPrecedence>
- <MinDelay>1</MinDelay>
- <MinReliability>1</MinReliability>
- <MinPeakThroughput>1</MinPeakThroughput>
- <MinMeanThroughput>1</MinMeanThroughput>
- <DataCompression>TRUE</DataCompression>
- <HeaderCompression>TRUE</HeaderCompression>
- <GprsUseEdge>FALSE</GprsUseEdge>
- <AnonymousAccess>TRUE</AnonymousAccess>
- </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
- <Proxy operation="add">
- <Name>ProxyTable1</Name>
- <ISPRef>DialOutISP.NT RAS</ISPRef>
- <UseProxyServer>TRUE</UseProxyServer>
- <ProtocolName>http</ProtocolName>
- <ProxyServerName>www.dummyproxy.com</ProxyServerName>
- <PortNumber>80</PortNumber>
- <Exceptions>www.dummyproxy.com/exception</Exceptions>
- </Proxy>
-</ProxyTable>
-
-<LocationTable>
- <Location operation="template">
- <Name>Default Location</Name>
- <Mobile>TRUE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>+</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>44</AreaCode>
- <DialOutCode>44</DialOutCode>
- <DisableCallWaitingCode>44</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Office</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>171</AreaCode>
- <DialOutCode>9,</DialOutCode>
- <DisableCallWaitingCode>9,</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Office Direct Dial</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>171</AreaCode>
- <DialOutCode>171</DialOutCode>
- <DisableCallWaitingCode>171</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Mobile</Name>
- <Mobile>TRUE</Mobile>
- <UsePulseDial>FALSE</UsePulseDial>
- <WaitForDialTone>FALSE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>+</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>44</AreaCode>
- <DialOutCode>44</DialOutCode>
- <DisableCallWaitingCode>44</DisableCallWaitingCode>
- </Location>
- <Location operation="add">
- <Name>Home</Name>
- <Mobile>FALSE</Mobile>
- <UsePulseDial>TRUE</UsePulseDial>
- <WaitForDialTone>TRUE</WaitForDialTone>
- <PauseAfterDialout>0</PauseAfterDialout>
- <IntlPrefixCode>00</IntlPrefixCode>
- <NatPrefixCode>0</NatPrefixCode>
- <NatCode>44</NatCode>
- <AreaCode>181</AreaCode>
- <DialOutCode>181</DialOutCode>
- <DisableCallWaitingCode>181</DisableCallWaitingCode>
- </Location>
-</LocationTable>
-
-<SecureSocketTable>
- <SecureSocket operation="add">
- <Name>SecureSocketTable1</Name>
- <ProtocolName>ssl3.0</ProtocolName>
- <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
- </SecureSocket>
- <SecureSocket operation="add">
- <Name>SecureSocketTable2</Name>
- <ProtocolName>tls1.0</ProtocolName>
- <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
- </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
- <WAPAccessPoint operation="template">
- <Name>Default Dial In ISP</Name>
- <CurrentBearer>WAPIPBearer</CurrentBearer>
- </WAPAccessPoint>
- <WAPAccessPoint operation="add">
- <Name>Dummy WAP Settings</Name>
- <CurrentBearer>WAPIPBearer</CurrentBearer>
- <StartPage>www.wapstart.com</StartPage>
- </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
- <WAPIPBearer operation="template">
- <Name>WAPIPBearerTable1</Name>
- <AccessPoint>WAPAccessPoint.-1</AccessPoint>
- <GatewayAddress>0</GatewayAddress>
- <WSPOption>CONNECTIONLESS</WSPOption>
- <Security>FALSE</Security>
- <IAPRef>IAP.-1</IAPRef>
- <ProxyPortNumber>0</ProxyPortNumber>
- <ProxyLogin>0</ProxyLogin>
- <ProxyPassword>0</ProxyPassword>
- </WAPIPBearer>
- <WAPIPBearer operation="add">
- <Name>WAPIPBearerTable2</Name>
- <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
- <GatewayAddress>www.wapgateway.com</GatewayAddress>
- <WSPOption>CONNECTIONORIENTED</WSPOption>
- <Security>FALSE</Security>
- <IAPRef>IAP.CSD IAP PlaceHolder01</IAPRef>
- <ProxyPortNumber>1</ProxyPortNumber>
- <ProxyLogin>1</ProxyLogin>
- <ProxyPassword>1</ProxyPassword>
- </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
- <WAPSMSBearer operation="template">
- <Name>WAPSMSBearerTable1</Name>
- <AccessPoint>WAPAccessPoint.-1</AccessPoint>
- <GatewayAddress>0</GatewayAddress>
- <WSPOption>CONNECTIONLESS</WSPOption>
- <Security>FALSE</Security>
- <ServiceCentreAddress>0</ServiceCentreAddress>
- </WAPSMSBearer>
- <WAPSMSBearer operation="add">
- <Name>WAPSMSBearerTable2</Name>
- <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
- <GatewayAddress>+4412345678901</GatewayAddress>
- <WSPOption>CONNECTIONORIENTED</WSPOption>
- <Security>FALSE</Security>
- <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
- </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
- <VirtualBearer operation="add">
- <Name>VPN Test Bearer</Name>
- <Agent>nullagt.agt</Agent>
- <IfName>tundriver</IfName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </VirtualBearer>
- <VirtualBearer operation="add">
- <Name>EKA2 Emulator Virtual Interface</Name>
- <Agent>tundriveragt.agt</Agent>
- <IfName>tundriver</IfName>
- <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
- <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
- <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
- </VirtualBearer>
-</VirtualBearerTable>
-
-<VpnServiceTable>
- <VpnService operation="add">
- <Name>VPN Tunnel Service</Name>
- <HomeIAP>IAP.Virtual Tunnel with Static IP</HomeIAP>
- <HomeNetwork>Network.Intranet</HomeNetwork>
- </VpnService>
- <VpnService operation="add">
- <Name>VPN Test Service</Name>
- <HomeIAP>IAP.Ethernet with Daemon Dynamic IP</HomeIAP>
- <HomeNetwork>Network.Intranet</HomeNetwork>
- </VpnService>
-</VpnServiceTable>
-
-</CommDB:Config>
--- a/tcpiputils/dnd/Test/te_dnssuffix/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-PRJ_TESTEXPORTS
-
-te_dnssuffix.iby /epoc32/rom/include/te_dnssuffix.iby
-../configs/te_dnssuffixced.xml z:/testdata/configs/te_dnssuffixced.xml
-../configs/te_dnssuffixcedv2.xml z:/testdata/configs/te_dnssuffixcedv2.xml
-../configs/te_dnssuffix.ini z:/testdata/configs/te_dnssuffix.ini
-../scripts/te_dnssuffixsuite.script z:/testdata/scripts/te_dnssuffixsuite.script
-../configs/te_dnssuffixced_basic.xml z:/testdata/configs/te_dnssuffixced_basic.xml
-
-PRJ_TESTMMPFILES
-te_dnssuffix.mmp
-
-PRJ_MMPFILES
-
--- a/tcpiputils/dnd/Test/te_dnssuffix/group/te_dnssuffix.iby Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __TE_DNSSUFFIX_IBY__
-#define __TE_DNSSUFFIX_IBY__
-
-#include <testexecute.iby>
-
-file=ABI_DIR\BUILD_DIR\te_dnssuffix.exe System\Programs\te_dnssuffix.exe
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_dnssuffixsuite.script testdata\scripts\te_dnssuffixsuite.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_dnssuffixced.xml testdata\configs\te_dnssuffixced.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_dnssuffixcedv2.xml testdata\configs\te_dnssuffixcedv2.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_dnssuffix.ini testdata\configs\te_dnssuffix.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_dnssuffixced_basic.xml testdata\configs\te_dnssuffixced_basic.xml
-
-#endif //__TE_DNSSUFFIX_IBY__
--- a/tcpiputils/dnd/Test/te_dnssuffix/group/te_dnssuffix.mmp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// te_virtualtunnel.mmp for Testing the Virtual tunnel functionality for SSL VPN.
-//
-
-
-
-/**
- @file
-*/
-
-TARGET te_dnssuffix.exe
-TARGETTYPE exe
-
-SOURCEPATH ../src
-SOURCE te_dnssuffixtestblock.cpp
-SOURCE te_dnssuffixtestwrapper.cpp
-SOURCE te_dnssuffixtestserver.cpp
-SOURCE DNSSuffixHostResolver.cpp
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/test
-#else
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE /epoc32/include/platform/test
-#endif
-
-USERINCLUDE ../inc
-
-
-LIBRARY euser.lib
-LIBRARY esock.lib
-LIBRARY insock.lib
-LIBRARY commdb.lib
-LIBRARY efsrv.lib
-LIBRARY commsdat.lib
-LIBRARY testexecuteutils.lib
-LIBRARY testexecutelogclient.lib
-LIBRARY charconv.lib
-LIBRARY ecom.lib
-LIBRARY c32root.lib
-LIBRARY netmeta.lib
-LIBRARY esocksvr.lib bafl.lib
-
-
-VENDORID 0x70000001
-
-UID 0x1000028d 0x2009D48D
-CAPABILITY All -TCB
-
-UNPAGED
-
-SMPSAFE
-
--- a/tcpiputils/dnd/Test/te_dnssuffix/inc/CallBackHandler.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-/*
- * CallBackHandler.h
- *
- * Created on: Apr 15, 2010
- * Author: sakpatil
- */
-
-#ifndef CALLBACKHANDLER_H_
-#define CALLBACKHANDLER_H_
-
-class MCallBackHandler
- {
-public:
- virtual void HandleCallBackL(TInt aError) = 0;
- };
-
-#endif /* CALLBACKHANDLER_H_ */
--- a/tcpiputils/dnd/Test/te_dnssuffix/inc/DNSSuffixHostResolver.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-// 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 DNSSUFFIXHOSTRESOLVER_H
-#define DNSSUFFIXHOSTRESOLVER_H
-
-#include <e32base.h>
-#include <e32std.h>
-#include <es_sock.h>
-
-#include "CallBackHandler.h"
-
-// Forwared declarations
-
-
-class CDNSSuffixHostResolver : public CActive
- {
-public:
- // Cancel and destroy
- ~CDNSSuffixHostResolver();
-
- // Two-phased constructor.
- static CDNSSuffixHostResolver* NewL(MCallBackHandler& aCallback,RSocketServ& aSockServ,RConnection& aConn);
-
- // Two-phased constructor.
- static CDNSSuffixHostResolver* NewLC(MCallBackHandler& aCallback,RSocketServ& aSockServ,RConnection& aConn);
-
-public:
- // New functions
- // Function for making the initial request
- TInt ResolveL(const TDesC& aHostName);
-
-private:
- // C++ constructor
- CDNSSuffixHostResolver(MCallBackHandler& aCallback,RSocketServ& aSockServ,RConnection& aConn);
-
- // Second-phase constructor
- void ConstructL();
-
-private:
- // From CActive
- // Handle completion
- void RunL();
-
- // How to cancel me
- void DoCancel();
-
- // Override to handle leaves from RunL(). Default implementation causes
- // the active scheduler to panic.
- TInt RunError(TInt aError);
-
-private:
- MCallBackHandler& iCallBack;
- RSocketServ& iSockServ;
- RConnection& iConn;
- RHostResolver iResolver;
- TNameEntry iEntry;
- };
-
-#endif // DNSSUFFIXHOSTRESOLVER_H
--- a/tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestblock.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// 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:
-//
-
-
-
-/**
- @file
- @internalTechnology
-*/
-
-#ifndef __TE_DNSSUFFIXTESTBLOCK_H__
-#define __TE_DNSSUFFIXTESTBLOCK_H__
-
-#include <test/testblockcontroller.h>
-#include "te_dnssuffixtestblock.h"
-
-/**
-Wrapper name
-*/
-_LIT(KDNSSuffixTestWrapper, "DNSSuffixTestWrapper");
-
-/**
-Class implements the TEF3.0 specific test block controller.
-*/
-class CVirtualTunnelTestBlock : public CTestBlockController
- {
-public:
- CVirtualTunnelTestBlock() : CTestBlockController() {}
- ~CVirtualTunnelTestBlock() {}
- CDataWrapper* CreateDataL(const TDesC& aData);
- };
-
-#endif //__TE_DNSSUFFIXTESTBLOCK_H__
--- a/tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestserver.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// 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:
-//
-
-
-
-/**
- @file
- @internalTechnology
-*/
-
-#ifndef __TE_DNSSUFFIXTESTSERVER_H__
-#define __TE_DNSSUFFIXTESTSERVER_H__
-
-#include <test/testserver2.h>
-#include "te_dnssuffixtestblock.h"
-
-/**
-Class implements the TEF3.0 specific test server
-*/
-class CDNSSuffixTestServer : public CTestServer2
- {
-public:
- CDNSSuffixTestServer() {}
- ~CDNSSuffixTestServer() {}
- CTestBlockController* CreateTestBlock();
- CTestBlockController* CreateTestBlockL();
- static CDNSSuffixTestServer* NewL();
- };
-
-#endif // __TE_DNSSUFFIXTESTSERVER_H__
--- a/tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestwrapper.h Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-
-/**
- @file
- @internalTechnology
-*/
-
-#ifndef __TE_DNSSUFFIXTESTWRAPPER_H__
-#define __TE_DNSSUFFIXTESTWRAPPER_H__
-
-
-#include <test/datawrapper.h>
-#include <e32base.h>
-#include <es_sock.h>
-#include <in_sock.h>
-#include <nifman.h>
-#include <commdbconnpref.h>
-#include <badesca.h> // MDesCArray and CDesCArray
-
-#include "CallBackHandler.h"
-
-/**
-Forward declaration
-*/
-
-
-/**
-Class implements the CDataWrapper base class and provides the commands used by the scripts file
-*/
-class CDNSSuffixTestWrapper : public CDataWrapper,
- public MCallBackHandler
-
- {
-public:
- CDNSSuffixTestWrapper();
- ~CDNSSuffixTestWrapper();
-
- static CDNSSuffixTestWrapper* NewL();
- //This function is not used currently
- virtual TAny* GetObject() { return this; }
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
-
-protected:
- void ConstructL();
-
-public: // from MCallBackHandler
- void HandleCallBackL(TInt aError);
-
-private:
-
- // Initial configuration
- void DoInitTestingL();
-
- // Enumeration
- void DoEnumerateInterfacesL();
- void GetAvaiableInterfacesL(MDesCArray* aInterfaceNamesArray);
-
- // Setting/Getting suffix list on/from interface.
- void DoSetAndGetSuffixListL();
- TInt SetDNSSuffixListOnInterface(RSocketServ& aServ,RConnection& aConn,const TDesC& aInterfaceName,RInetSuffixList& aData);
-
- TInt GetDNSSuffixList(RSocketServ& aServ,const TDesC& aInterfaceName,RInetSuffixList& aData);
-
-
- // Host resolve
-
- void DoResolveL();
- void DoResolveHostWithoutDomainWithSuffixListSetL();
- void DoResolveHostWithoutDomainWithoutSuffixListL();
-
- void DNSSuffixSupportTC005L();
- void DNSSuffixSupportTC006L();
- void DNSSuffixSupportTC007L();
- void DNSSuffixSupportTC008L();
- void DNSSuffixSupportTC009L();
- void DNSSuffixSupportTC010L();
- void DNSSuffixSupportTC011L();
-
-
-private: // utility or helper functions
-
- TInt StartConnections(RSocketServ& aSockServ, RConnection& aConn1, RConnection& aConn2);
- TInt StartConnection(RSocketServ& aSockServ, RConnection& aConn, TUint aIapId);
- void GetConnPrefL(TUint aIapId,TCommDbConnPref& aPref);
-
- TInt32 GetFirstIapId();
- TInt32 GetSecondIapId();
-
- TInt GetFirstInterfaceNameL(TDes& aIfaceName);
- TInt GetSecondInterfaceNameL(TDes& aIfaceName);
- TInt GetInterfaceNameL(const TDesC& aCriteria,TDes& aIfaceName);
-
- TInt FillSuffixList(RInetSuffixList& aSuffixList,TDesC& aData);
- void CloseSocketSrv();
- TInt IsSuffixListEqual(const RInetSuffixList& aSuffixList1, const RInetSuffixList& aSuffixList2);
-
-private:
- RSocketServ iSocketServ;
- CActiveSchedulerWait iWait;
- RInetSuffixList iSuffixList;
- RInetSuffixList iSuffixList2;
- };
-
-
-#endif //__TE_DNSSUFFIXTESTWRAPPER_H__
--- a/tcpiputils/dnd/Test/te_dnssuffix/scripts/te_dnssuffixsuite.script Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,342 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors: Santosh K Patil
-//
-// Description:
-//
-//! @file
-//! @SYMTestSuiteName
-//! @SYMScriptTestEnvironment TestExecuteFramework
-//
-
-
-//Unload esock forcefully
-//RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
-
-//Configure commdb.
-//ced -i z:\testdata\configs\te_dnssuffixced.xml
-ced -i z:\testdata\configs\te_dnssuffixced_basic.xml
-
-RUN_SCRIPT z:\testdata\scripts\te_esock_test_loadesock.script
-
-//Load the Server
-LOAD_SERVER te_dnssuffix
-
-
-START_TESTCASE DNS-dnssuffix-test0a
-//! @SYMTestCaseID DNS-dnssuffix_test0a
-//! @SYMTestCaseDesc REQ No.
-//! Initialize the environment.
-//! Required to configure the name servers on at lease one interface.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Load te_dnssuffix test server
-//! Do ced
-//! Start RConnection and close.
-//! @SYMTestExpectedResults Connection started and stopped successfully.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test000a
- COMMAND dnssuffix_test000a InitDNSSuffixTesting dnssuffix_first_interface
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test0a
-
-
-START_TESTCASE DNS-dnssuffix-test0b
-//! @SYMTestCaseID DNS-dnssuffix_test0b
-//! @SYMTestCaseDesc REQ No.
-//! Open socket and close.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Load te_dnssuffix test server
-//! Open the socket and enumerate the available interfaces.
-//! @SYMTestExpectedResults Socket opened successfully
-//! Shows the list of available interfaces.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test000b
- COMMAND dnssuffix_test000b EnumerateInterface
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test0b
-
-
-START_TESTCASE DNS-dnssuffix-test1
-//! @SYMTestCaseID DNS-dnssuffix_test1
-//! @SYMTestCaseDesc REQ No.
-//! Open socket and close.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Load te_dnssuffix test server
-//! Open the socket and enumerate the available interfaces.
-//! Set the suffix list on the inteface which has the corresponding name server.
-//! Get the suffix list of each interfaces.
-//! @SYMTestExpectedResults Setting and getting suffix list successfully.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test001
- COMMAND dnssuffix_test001 SetAndGetSuffixList
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test1
-
-
-START_TESTCASE DNS-dnssuffix-test2
-//! @SYMTestCaseID DNS-dnssuffix_test2
-//! @SYMTestCaseDesc REQ No.
-//! Open socket and close.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Load te_dnssuffix test server
-//! Open the socket and enumerate the available interfaces.
-//! Set the suffix list on the inteface which has the corresponding name server.
-//! Get the suffix list of each interfaces.
-//! @SYMTestExpectedResults Setting and getting suffix list successfully.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test002
- COMMAND dnssuffix_test002 DoResolve
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test2
-
-
-START_TESTCASE DNS-dnssuffix-test3
-//! @SYMTestCaseID DNS-dnssuffix_test3
-//! @SYMTestCaseDesc REQ No.
-//! Open socket and close.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Load te_dnssuffix test server
-//! Open the socket and enumerate the available interfaces.
-//! Set the suffix list on the inteface which has the corresponding name server.
-//! Get the suffix list of each interfaces.
-//! @SYMTestExpectedResults Setting and getting suffix list successfully.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test003
- COMMAND dnssuffix_test003 DoResolveHostWithoutDomainWithSuffix
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test3
-
-
-START_TESTCASE DNS-dnssuffix-test4
-//! @SYMTestCaseID DNS-dnssuffix_test4
-//! @SYMTestCaseDesc REQ No.
-//! Open socket and close.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Load te_dnssuffix test server
-//! Open the socket and enumerate the available interfaces.
-//! Set the suffix list on the inteface which has the corresponding name server.
-//! Get the suffix list of each interfaces.
-//! @SYMTestExpectedResults Setting and getting suffix list successfully.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test004
- COMMAND dnssuffix_test004 DoResolveHostWithoutDomainWithoutSuffix
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test4
-
-
-START_TESTCASE DNS-dnssuffix-test5
-//! @SYMTestCaseID DNS-dnssuffix_test5
-//! @SYMTestCaseDesc REQ No.
-//! Open socket and close.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Load te_dnssuffix test server
-//! Open the socket and enumerate the available interfaces.
-//! Set the suffix list on the inteface which has the corresponding name server.
-//! Get the suffix list of each interfaces.
-//! @SYMTestExpectedResults Setting and getting suffix list successfully.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test005
- COMMAND dnssuffix_test005 DNSSuffixSupportTC005
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test5
-
-
-START_TESTCASE DNS-dnssuffix-test6
-//! @SYMTestCaseID DNS-dnssuffix_test6
-//! @SYMTestCaseDesc REQ No.
-//! Open socket and close.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Load te_dnssuffix test server
-//! Open the socket and enumerate the available interfaces.
-//! Set the suffix list on the inteface which has the corresponding name server.
-//! Get the suffix list of each interfaces.
-//! @SYMTestExpectedResults Setting and getting suffix list successfully.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test006
- COMMAND dnssuffix_test006 DNSSuffixSupportTC006
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test6
-
-
-//Configure commdb.
-//ced -i z:\testdata\configs\te_dnssuffixcedv2.xml
-
-START_TESTCASE DNS-dnssuffix-test7
-//! @SYMTestCaseID DNS-dnssuffix_test7
-//! @SYMTestCaseDesc REQ No.
-//! Open socket and close.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Load te_dnssuffix test server
-//! Open the socket and enumerate the available interfaces.
-//! Set the suffix list on the inteface which has the corresponding name server.
-//! Get the suffix list of each interfaces.
-//! @SYMTestExpectedResults Setting and getting suffix list successfully.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test007
- COMMAND dnssuffix_test007 DNSSuffixSupportTC007
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test7
-
-
-START_TESTCASE DNS-dnssuffix-test8
-//! @SYMTestCaseID DNS-dnssuffix_test8
-//! @SYMTestCaseDesc REQ No.
-//! Open socket and close.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Load te_dnssuffix test server
-//! Open the socket and enumerate the available interfaces.
-//! Set the suffix list on the inteface which has the corresponding name server.
-//! Get the suffix list of each interfaces.
-//! @SYMTestExpectedResults Setting and getting suffix list successfully.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test008
- COMMAND dnssuffix_test008 DNSSuffixSupportTC008
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test8
-
-
-START_TESTCASE DNS-dnssuffix-test9
-//! @SYMTestCaseID DNS-dnssuffix_test9
-//! @SYMTestCaseDesc REQ No.
-//! Open socket and close.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Load te_dnssuffix test server
-//! Open the socket and enumerate the available interfaces.
-//! Set the suffix list on the inteface which has the corresponding name server.
-//! Get the suffix list of each interfaces.
-//! @SYMTestExpectedResults Setting and getting suffix list successfully.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test009
- COMMAND dnssuffix_test009 DNSSuffixSupportTC009
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test9
-
-
-START_TESTCASE DNS-dnssuffix-test10
-//! @SYMTestCaseID DNS-dnssuffix_test10
-//! @SYMTestCaseDesc REQ No.
-//! Open socket and close.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Load te_dnssuffix test server
-//! Open the socket and enumerate the available interfaces.
-//! Set the suffix list on the inteface which has the corresponding name server.
-//! Get the suffix list of each interfaces.
-//! @SYMTestExpectedResults Setting and getting suffix list successfully.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test010
- COMMAND dnssuffix_test010 DNSSuffixSupportTC010
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test10
-
-//Configure commdb.
-//ced -i z:\testdata\configs\te_dnssuffixced.xml
-
-START_TESTCASE DNS-dnssuffix-test11
-//! @SYMTestCaseID DNS-dnssuffix_test11
-//! @SYMTestCaseDesc REQ No.
-//! Open socket and close.
-//! @SYMTestPriority Critical
-//! @SYMTestActions Make vTun as default interface
-//! Set suffix on ethernet
-//! Open implicit resolver (assumed that it is opened on vTun)
-//! Request for name resolution (Async one)
-//! Stop the connection and observe the behaviour.
-//!
-//! @SYMTestExpectedResults Host resolution should fail gracefully with appropriate error code.
-//! @SYMTestType CIT
-//! @SYMCreationDate 1/3/2010
-//! @SYMAuthor Santosh K Patil
-//! @SYMTestStatus 3. Released
-
- START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
- CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test011
- COMMAND dnssuffix_test011 DNSSuffixSupportTC011
- END_TEST_BLOCK
-
-END_TESTCASE DNS-dnssuffix-test11
-
-
-//RUN_SCRIPT z:\TestData\scripts\te_esock_test_stopallinterfaces.script
-//RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
-
--- a/tcpiputils/dnd/Test/te_dnssuffix/src/DNSSuffixHostResolver.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-// 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:
-//
-
-
-#include "DNSSuffixHostResolver.h"
-
-
-#include <in_sock.h>
-
-
-CDNSSuffixHostResolver::CDNSSuffixHostResolver(MCallBackHandler& aCallback,RSocketServ& aSockServ,RConnection& aConn) :
- CActive(EPriorityStandard), iCallBack(aCallback),iSockServ(aSockServ), iConn(aConn)
- {
- }
-
-CDNSSuffixHostResolver* CDNSSuffixHostResolver::NewLC(MCallBackHandler& aCallback,RSocketServ& aSockServ,RConnection& aConn)
- {
- CDNSSuffixHostResolver* self = new (ELeave) CDNSSuffixHostResolver(aCallback,aSockServ,aConn);
- CleanupStack::PushL(self);
- self->ConstructL();
- return self;
- }
-
-CDNSSuffixHostResolver* CDNSSuffixHostResolver::NewL(MCallBackHandler& aCallback,RSocketServ& aSockServ,RConnection& aConn)
- {
- CDNSSuffixHostResolver* self = CDNSSuffixHostResolver::NewLC(aCallback,aSockServ,aConn);
- CleanupStack::Pop(); // self;
- return self;
- }
-
-void CDNSSuffixHostResolver::ConstructL()
- {
- CActiveScheduler::Add(this); // Add to scheduler
-
- if (iConn.SubSessionHandle() != 0)
- {
- // Explicit resolver
- iResolver.Open(iSockServ,KAfInet, KProtocolInetUdp, iConn);
- }
- else
- {
- // Implicit resolver
- iResolver.Open(iSockServ,KAfInet, KProtocolInetUdp);
- }
- }
-
-
-CDNSSuffixHostResolver::~CDNSSuffixHostResolver()
- {
- Cancel(); // Cancel any request, if outstanding
-
- if (iResolver.SubSessionHandle())
- iResolver.Close();
- }
-
-void CDNSSuffixHostResolver::DoCancel()
- {
- iResolver.Cancel();
- }
-
-TInt CDNSSuffixHostResolver::ResolveL(const TDesC& aHostName)
- {
- iResolver.GetByName(aHostName,iEntry,iStatus);
- SetActive();
- return KErrNone;
- }
-
-
-void CDNSSuffixHostResolver::RunL()
- {
- if (&iCallBack)
- iCallBack.HandleCallBackL(iStatus.Int());
- }
-
-
-TInt CDNSSuffixHostResolver::RunError(TInt aError)
- {
- return aError;
- }
-
-// End of file
--- a/tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestblock.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// 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:
-// Contains the implementation of TEF3.0 respective test block
-//
-
-
-
-/**
- @file
- @internalTechnology
-*/
-
-#include "te_dnssuffixtestblock.h"
-#include "te_dnssuffixtestwrapper.h"
-/**
-Function to manage the wrapper object instantiation. As part of this test suite,
-only one wrapper is used.
-
-This function is called by the TestEngine while parsing the CREATE_OBJECT command
-in the script file.
-
-@return Returns the wrapper instance pointer
-@param aData Name of the wrapper has to be instantiated.
-*/
-CDataWrapper* CVirtualTunnelTestBlock::CreateDataL(const TDesC& aData)
- {
- CDataWrapper* wrapper = NULL;
- if (KDNSSuffixTestWrapper() == aData)
- {
- wrapper = CDNSSuffixTestWrapper::NewL();
- }
- return wrapper;
- }
--- a/tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestserver.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Contains the implementation of TEF3.0 respective test server
-//
-
-
-
-/**
- @file
- @internalTechnology
-*/
-
-#include "te_dnssuffixtestserver.h"
-
-/**
-Function to instantiate TestServer.
-
-@return Returns the TestServer instance pointer.
-
-@internalTechnology
-*/
-CDNSSuffixTestServer* CDNSSuffixTestServer::NewL()
- {
- CDNSSuffixTestServer* server = new (ELeave) CDNSSuffixTestServer();
- CleanupStack::PushL(server);
- server->ConstructL();
- CleanupStack::Pop(server);
- return server;
- }
-
-/**
-Function to instantiate TestBlock.
-
-This function is invoked by the TestEngine while parsing START_TEST_BLOCK command in the
-script file.
-
-@return Returns the TestBlock instance pointer.
-
-@internalTechnology
-*/
-CTestBlockController* CDNSSuffixTestServer::CreateTestBlock()
- {
- CTestBlockController* testBlockController=NULL;
- TRAPD(err, testBlockController = CreateTestBlockL());
- if(err == KErrNone)
- {
- return testBlockController;
- }
- else
- {
- return NULL;
- }
- }
-
-/**
-Function to instantiate TestBlock.
-
-@internalTechnology
-*/
-CTestBlockController* CDNSSuffixTestServer::CreateTestBlockL()
- {
- return new (ELeave) CVirtualTunnelTestBlock();
- }
-
-/**
-Function to kick start the TestServer.
-
-@internalTechnology
-*/
-LOCAL_C void MainL()
- {
-#if (defined __DATA_CAGING__)
- RProcess().DataCaging(RProcess::EDataCagingOn);
- RProcess().SecureApi(RProcess::ESecureApiOn);
-#endif
- CActiveScheduler* sched=NULL;
- sched=new(ELeave) CActiveScheduler;
- CActiveScheduler::Install(sched);
- CDNSSuffixTestServer* server = NULL;
- TRAPD(err, server = CDNSSuffixTestServer::NewL());
- if(!err)
- {
- RProcess::Rendezvous(KErrNone);
- sched->Start();
- }
- delete server;
- delete sched;
- }
-/**
-TestServer entry point.
-
-@return Returns KErrNone upon successfull completion, KErrNoMemory in low memory conditions.
-
-@internalTechnology
-*/
-GLDEF_C TInt E32Main()
- {
- __UHEAP_MARK;
- CTrapCleanup* cleanup = CTrapCleanup::New();
- if(cleanup == NULL)
- {
- return KErrNoMemory;
- }
- TRAP_IGNORE(MainL());
- delete cleanup;
- __UHEAP_MARKEND;
- return KErrNone;
- }
--- a/tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestwrapper.cpp Thu Aug 19 11:25:30 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2599 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Contains the implementation of all the commands, which is used by the script file.
-//
-
-/**
- @file
- @internalTechnology
- */
-
-#include "te_dnssuffixtestwrapper.h"
-#include "DNSSuffixHostResolver.h"
-
-
-#include <e32base.h>
-#include <in_sock.h>
-#include <es_sock.h>
-#include <commdbconnpref.h>
-#include <commdb.h>
-
-/*
- * TODO: 1. Try to test with end to end real scenario. Means resolving over real tunnel.
- *
- *
- */
-#define KIPAddrLen 39
-
-#define DISABLE_TUNDRIVER
-
-// Used for handle the multiple hosts in same test cases. @See TC006
-#define KMaxHosts 8
-
-// Commands
-_LIT(KInitDNSSuffixTesting, "InitDNSSuffixTesting");
-_LIT(KEnumerateInterface, "EnumerateInterface");
-_LIT(KSetAndGetSuffixList, "SetAndGetSuffixList");
-_LIT(KDoResolve, "DoResolve");
-_LIT(KDoResolveHostWithoutDomainWithSuffix, "DoResolveHostWithoutDomainWithSuffix");
-_LIT(KDoResolveHostWithoutDomainWithoutSuffix, "DoResolveHostWithoutDomainWithoutSuffix");
-
-_LIT(KDNSSuffixSupportTC005, "DNSSuffixSupportTC005");
-_LIT(KDNSSuffixSupportTC006, "DNSSuffixSupportTC006");
-_LIT(KDNSSuffixSupportTC007, "DNSSuffixSupportTC007");
-_LIT(KDNSSuffixSupportTC008, "DNSSuffixSupportTC008");
-_LIT(KDNSSuffixSupportTC009, "DNSSuffixSupportTC009");
-_LIT(KDNSSuffixSupportTC010, "DNSSuffixSupportTC010");
-_LIT(KDNSSuffixSupportTC011, "DNSSuffixSupportTC011");
-
-
-//Test code
-_LIT(KCommand, "aCommand = %S");
-_LIT(KSection, "aSection = %S");
-_LIT(KAsyncErrorIndex, "aAsyncErrorIndex = %D");
-
-_LIT(KKeyDNSSuffixTestSuffixList, "suffixlist");
-_LIT(KKeyDNSSuffixTestSuffixList1, "suffixlist1");
-_LIT(KKeyDNSSuffixTestSuffixList2, "suffixlist2");
-_LIT(KKeyDNSSuffixTestSuffixList3, "suffixlist3");
-
-_LIT(KKeyDNSSuffixTestHostname, "hostname");
-
-_LIT(KSectionDNSSuffixTest001, "dnssuffix_test001");
-_LIT(KSectionDNSSuffixTest002, "dnssuffix_test002");
-_LIT(KSectionDNSSuffixTest003, "dnssuffix_test003");
-_LIT(KSectionDNSSuffixTest004, "dnssuffix_test004");
-_LIT(KSectionDNSSuffixTest005, "dnssuffix_test005");
-
-_LIT(KSectionDNSSuffixTest006, "dnssuffix_test006");
-_LIT(KKeyDNSSuffixTest006NoOfHostname, "noofhosts");
-_LIT(KKeyDNSSuffixTest006Hostname, "hostname%D");
-
-_LIT(KSectionDNSSuffixTest007, "dnssuffix_test007");
-_LIT(KKeyDNSSuffixTest007ValidHostname, "validhostname");
-_LIT(KKeyDNSSuffixTest007InValidHostname, "invalidhostname");
-
-_LIT(KSectionDNSSuffixTest008, "dnssuffix_test008");
-_LIT(KKeyDNSSuffixTestHostname1, "hostname1");
-_LIT(KKeyDNSSuffixTestHostname2, "hostname2");
-
-_LIT(KSectionDNSSuffixTest009, "dnssuffix_test009");
-
-_LIT(KSectionDNSSuffixTest010, "dnssuffix_test010");
-
-_LIT(KSectionDNSSuffixTest011, "dnssuffix_test011");
-
-_LIT(KSectionDNSSuffixFirstInterface, "dnssuffix_first_interface");
-_LIT(KSectionDNSSuffixSecondInterface, "dnssuffix_second_interface");
-_LIT(KKeyDNSSuffixIAPId,"iapid");
-_LIT(KKeyInterfaceName, "interfacename");
-
-/*
- * @author: Santosh K Patil
- * TODO: Needs to verify the interfaces used to resolve the hosts in each test case.
- * It is required to verify wheather test executed as desired or not.
- * In other words to confirm the new solution is working as expected we need to get
- * and verify the inteface name used to resolve the host.
- * @See Test spec for more details.
- *
- * TODO: Check all config sections
- */
-
-
-/**
-Constructor.
-
-@internalTechnology
- */
-CDNSSuffixTestWrapper::CDNSSuffixTestWrapper()
- {
- }
-
-/**
-Destructor.
-
-@internalTechnology
- */
-CDNSSuffixTestWrapper::~CDNSSuffixTestWrapper()
- {
-
- }
-
-/**
-Function to instantiate TestWrapper.
-@return Returns constructed TestWrapper instance pointer
-@internalTechnology
- */
-CDNSSuffixTestWrapper* CDNSSuffixTestWrapper::NewL()
- {
- CDNSSuffixTestWrapper* ret = new (ELeave) CDNSSuffixTestWrapper();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-/**
-Second level constructor, constructs TestWrapper instance.
-@internalTechnology
- */
-void CDNSSuffixTestWrapper::ConstructL()
- {
- }
-
-
-/*
- * @HandleCallBackL Called by the CDNSSuffixHostResolver::RunL
- *
- */
-void CDNSSuffixTestWrapper::HandleCallBackL(TInt aError)
- {
- INFO_PRINTF1(_L("HandleCallBackL - Entry"));
- INFO_PRINTF2(_L("Error code: %D"),aError);
-
- if (KErrNone != aError)
- SetError(KErrNone);
- else
- SetError(KErrGeneral);
-
- if (iWait.IsStarted())
- {
- INFO_PRINTF1(_L("Stoping waiter"));
- iWait.AsyncStop();
- }
- INFO_PRINTF1(_L("HandleCallBackL - Exit"));
- }
-
-/**
-Function to map the input command to respective function.
-
-@return - True Upon successfull command to Function name mapping otherwise False
-@param aCommand Function name has to be called
-@param aSection INI file paramenter section name
-@param aAsyncErrorIndex Error index
-@see Refer the script file COMMAND section.
-
-@internalTechnology
- */
-TBool CDNSSuffixTestWrapper::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex)
- {
- TBool ret = ETrue;
-
- // Print out the parameters for debugging
- INFO_PRINTF2( KCommand, &aCommand );
- INFO_PRINTF2( KSection, &aSection );
- INFO_PRINTF2( KAsyncErrorIndex, aAsyncErrorIndex );
-
- if(KInitDNSSuffixTesting() == aCommand)
- {
- DoInitTestingL();
- }
- else if(KEnumerateInterface() == aCommand)
- {
- DoEnumerateInterfacesL();
- }
- else if (KSetAndGetSuffixList() == aCommand)
- {
- DoSetAndGetSuffixListL();
- }
- else if( KDoResolve() == aCommand)
- {
- DoResolveL();
- }
- else if( KDoResolveHostWithoutDomainWithSuffix() == aCommand)
- {
- DoResolveHostWithoutDomainWithSuffixListSetL();
- }
- else if( KDoResolveHostWithoutDomainWithoutSuffix() == aCommand)
- {
- DoResolveHostWithoutDomainWithoutSuffixListL();
- }
- else if( KDNSSuffixSupportTC005() == aCommand)
- {
- DNSSuffixSupportTC005L();
- }
- else if( KDNSSuffixSupportTC006() == aCommand)
- {
- DNSSuffixSupportTC006L();
- }
- else if( KDNSSuffixSupportTC007() == aCommand)
- {
- DNSSuffixSupportTC007L();
- }
- else if( KDNSSuffixSupportTC008() == aCommand)
- {
- DNSSuffixSupportTC008L();
- }
- else if( KDNSSuffixSupportTC009() == aCommand)
- {
- DNSSuffixSupportTC009L();
- }
- else if( KDNSSuffixSupportTC010() == aCommand)
- {
- DNSSuffixSupportTC010L();
- }
- else if( KDNSSuffixSupportTC011() == aCommand)
- {
- DNSSuffixSupportTC011L();
- }
- else
- {
- ret = EFalse;
- User::LeaveIfError(KErrNone); // just to suppress LeaveScan warning
- }
-
- return ret;
- }
-
-
-TInt CDNSSuffixTestWrapper::StartConnections(RSocketServ& aSockServ, RConnection& aConn1, RConnection& aConn2)
- {
- INFO_PRINTF1(_L("StartConnections - Entry"));
-
- TUint iapId = GetFirstIapId();
-
- if ((TInt)iapId == KErrNotFound)
- return KErrNotFound;
-
- TInt err = StartConnection(aSockServ,aConn1,iapId);
-
- if (err != KErrNone)
- {
- ERR_PRINTF1(_L("Failed to start first connection"));
- SetError(err);
- return err;
- }
-
- INFO_PRINTF2(_L("First connection started successfully - IAP: %D"),iapId);
-
-#ifndef DISABLE_TUNDRIVER
- iapId = GetSecondIapId();
-
- if ((TInt)iapId == KErrNotFound)
- {
- aConn1.Close();
- return KErrNotFound;
- }
-
- err = StartConnection(iSocketServ,aConn2,iapId);
-
- if (err != KErrNone)
- {
- ERR_PRINTF1(_L("Failed to start second connection"));
- aConn1.Close();
- return err;
- }
-
- INFO_PRINTF2(_L("Second connection started successfully - IAP: %D"),iapId);
-#endif
-
- INFO_PRINTF1(_L("StartConnections - Exit"));
- return KErrNone;
- }
-
-
-
-TInt CDNSSuffixTestWrapper::StartConnection(RSocketServ& aSockServ, RConnection& aConn, TUint aIapId)
- {
- INFO_PRINTF1(_L("StartConnection - Entry"));
-
- TInt err(KErrNone);
-
- TCommDbConnPref connPref;
- INFO_PRINTF1(_L("Getting conn preference"));
-
- TRAP(err, GetConnPrefL(aIapId,connPref));
-
- if (KErrNone != err)
- {
- ERR_PRINTF1(_L("Failed to read conn preference"));
- return err;
- }
-
- INFO_PRINTF1(_L("Got conn preference"));
-
- if((err = aConn.Open(aSockServ, KAfInet)) != KErrNone )
- {
- ERR_PRINTF2(_L("Failed to open Connection: %D"),err);
- return err;
- }
-
- INFO_PRINTF1(_L("Connection opened"));
-
- INFO_PRINTF1(_L("Starting Connection"));
- err = aConn.Start(connPref);
-
- if (KErrNone != err)
- {
- ERR_PRINTF2(_L("Failed starting Connection: %D"),err);
- aConn.Close();
- return err;
- }
-
- INFO_PRINTF1(_L("Connection Started"));
-
- INFO_PRINTF1(_L("StartConnection - Exit"));
-
- return KErrNone;
- }
-
-
-
-void CDNSSuffixTestWrapper::GetConnPrefL(TUint aIapId,TCommDbConnPref& aPref)
- {
- INFO_PRINTF1(_L("GetConnPrefL - Entry"));
-
- INFO_PRINTF1(_L("Instantiating CCommsDatabase"));
- CCommsDatabase* commsDb = CCommsDatabase::NewL();
- CleanupStack::PushL(commsDb);
-
- INFO_PRINTF1(_L("Calling OpenConnectionPrefTableLC"));
- CCommsDbConnectionPrefTableView* commsDbView = commsDb->OpenConnectionPrefTableLC();
-
- INFO_PRINTF1(_L("Going to first record"));
- User::LeaveIfError(commsDbView->GotoFirstRecord());
-
- TInt isFound(KErrNotFound);
- do
- {
- CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref;
- INFO_PRINTF1(_L("Reading conn preferecne."));
- commsDbView->ReadConnectionPreferenceL(pref);
-
- if (pref.iBearer.iIapId == aIapId)
- {
- INFO_PRINTF1(_L("Match found"));
- aPref.SetIapId(aIapId);
- aPref.SetBearerSet(pref.iBearer.iBearerSet);
- aPref.SetDirection(pref.iDirection);
- aPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
- isFound = KErrNone;
- break;
- }
- } while(!commsDbView->GotoNextRecord());
-
- INFO_PRINTF1(_L("Cleanup resources"));
- CleanupStack::PopAndDestroy(2, commsDb); // commsDbView, commsDb
-
- User::LeaveIfError(isFound);
-
- INFO_PRINTF1(_L("GetConnPrefL - Exit"));
- }
-
-
-
-TInt32 CDNSSuffixTestWrapper::GetFirstIapId()
- {
- INFO_PRINTF1(_L("GetFirstIapId - Entry"));
-
- TInt iapId(KErrNotFound);
-
- if (!GetIntFromConfig(KSectionDNSSuffixFirstInterface,KKeyDNSSuffixIAPId,iapId))
- {
- ERR_PRINTF1(_L("Failed to read the First IAP id"));
- }
- else
- {
- INFO_PRINTF2(_L("Got the IAP: %D"),iapId);
- }
-
- INFO_PRINTF1(_L("GetFirstIapId - Exit"));
- return iapId;
- }
-
-
-TInt32 CDNSSuffixTestWrapper::GetSecondIapId()
- {
- INFO_PRINTF1(_L("GetSecondIapId - Entry"));
-
- TInt iapId(KErrNotFound);
-
- if (!GetIntFromConfig(KSectionDNSSuffixSecondInterface,KKeyDNSSuffixIAPId,iapId))
- {
- ERR_PRINTF1(_L("Failed to read second IAP id"));
- }
- else
- {
- INFO_PRINTF2(_L("Got the IAP: %D"),iapId);
- }
-
- INFO_PRINTF1(_L("GetSecondIapId - Exit"));
- return iapId;
- }
-
-
-TInt CDNSSuffixTestWrapper::GetFirstInterfaceNameL(TDes& aIfaceName)
- {
- INFO_PRINTF1(_L("GetFirstInterfaceNameL - Entry"));
- TInt err(KErrNone);
-
- TPtrC interfaceName;
- if (!GetStringFromConfig(KSectionDNSSuffixFirstInterface,KKeyInterfaceName,interfaceName))
- {
- ERR_PRINTF1(_L("Failed to read the interface name from config"));
- err = KErrNotFound;
- SetError(err);
- return err;
- }
-
- err = GetInterfaceNameL(interfaceName,aIfaceName);
-
- INFO_PRINTF1(_L("GetFirstInterfaceNameL - Exit"));
- return err;
- }
-
-
-TInt CDNSSuffixTestWrapper::GetSecondInterfaceNameL(TDes& aIfaceName)
- {
- INFO_PRINTF1(_L("GetSecondInterfaceNameL - Entry"));
- TInt err(KErrNone);
-
- TPtrC interfaceName;
- if (!GetStringFromConfig(KSectionDNSSuffixSecondInterface,KKeyInterfaceName,interfaceName))
- {
- ERR_PRINTF1(_L("Failed to read the interface name from config"));
- err = KErrNotFound;
- SetError(err);
- return err;
- }
-
- err = GetInterfaceNameL(interfaceName,aIfaceName);
-
- INFO_PRINTF1(_L("GetSecondInterfaceNameL - Exit"));
- return err;
- }
-
-
-TInt CDNSSuffixTestWrapper::GetInterfaceNameL(const TDesC& aCriteria,TDes& aIfaceName)
- {
- INFO_PRINTF1(_L("GetInterfaceNameL - Entry"));
-
- TInt err = KErrNone;
- CDesCArray* interfaceNameArray = new(ELeave) CDesCArrayFlat(4);
- CleanupStack::PushL(interfaceNameArray);
- TRAP(err,GetAvaiableInterfacesL(interfaceNameArray));
-
- if (KErrNone != err)
- {
- ERR_PRINTF2(_L("Failed to enumeate the interfaces with error: %D"),err);
- return err;
- }
-
- INFO_PRINTF2(_L("No of interfaces: %D"),interfaceNameArray->Count());
-
- if (interfaceNameArray->Count() <= 0)
- {
- INFO_PRINTF1(_L("No interfaces available:"));
- CleanupStack::PopAndDestroy(interfaceNameArray);
- err = KErrNotFound;
- SetError(err);
- return err;
- }
-
- TBool isInterfaceFound(EFalse);
- TInt index = -1;
-
- for (TInt a=0; a<interfaceNameArray->Count();a++)
- {
- HBufC* interfaceNameBuf = (*interfaceNameArray)[a].AllocL();
-
- TInt pos = interfaceNameBuf->FindF(aCriteria);
-
- delete interfaceNameBuf;
-
- if ( KErrNotFound != pos)
- {
- isInterfaceFound = ETrue;
- index = a;
- break;
- }
- }
-
- if (!isInterfaceFound)
- {
- ERR_PRINTF1(_L("Interface not found"));
- CleanupStack::PopAndDestroy(interfaceNameArray);
- err = KErrNotFound;
- SetError(err);
- return err;
- }
-
- aIfaceName.Copy((*interfaceNameArray)[index]);
-
- CleanupStack::PopAndDestroy(interfaceNameArray);
-
- TPtr tempName((TUint16*)aIfaceName.Ptr(),aIfaceName.Length(),aIfaceName.Length());
- INFO_PRINTF2(_L("Found Interface and name is: %S"),&tempName);
-
- INFO_PRINTF1(_L("GetInterfaceNameL - Exit"));
- return KErrNone;
- }
-
-/**
- * DoInitTestingL. Configures the initial connections.
- * Function to start the connection to configure the named server on one interface.
- */
-void CDNSSuffixTestWrapper::DoInitTestingL()
- {
- INFO_PRINTF1(_L("********************************************"));
- INFO_PRINTF1(_L("DoInitTestingL"));
- INFO_PRINTF1(_L("********************************************"));
-
- /*@Note, We need to configure the named servers on vTunnel and ethernet interfaces.
- * So, Configuring them by starting connections on both interfaces.
- *
- */
- TInt err = KErrNone;
-
- if((err = iSocketServ.Connect()) == KErrNone )
- INFO_PRINTF1(_L("Socket Server Opened."));
- else
- {
- ERR_PRINTF2(_L("Error Opening Socket Server: %d"), err);
- SetError(err);
- return;
- }
-
- ERR_PRINTF2(_L("Error Opening Socket Server: %d"), err);
-
- RConnection firstConn;
- RConnection vTunConn; // Usef for virtual Tunnel interface
-
- err = StartConnections(iSocketServ,firstConn, vTunConn);
-
- if (KErrNone != err)
- {
- ERR_PRINTF2(_L("Failed to start the Connections: %D"),err);
- CloseSocketSrv();
- SetError(err);
- return;
- }
- INFO_PRINTF1(_L("Started the connections successfully"));
-
- INFO_PRINTF1(_L("Close the connections"));
-
-#ifndef DISABLE_TUNDRIVER
- if (vTunConn.SubSessionHandle())
- vTunConn.Close();
-#endif
-
- if (firstConn.SubSessionHandle())
- firstConn.Close();
-
- SetError(err);
- CloseSocketSrv();
- }
-
-/**
- * @DoEnumerateInterfacesL. Enumerates the all available interfaces.
- */
-void CDNSSuffixTestWrapper::DoEnumerateInterfacesL()
- {
- INFO_PRINTF1(_L("********************************************"));
- INFO_PRINTF1(_L("DoEnumerateInterfacesL"));
- INFO_PRINTF1(_L("********************************************"));
-
- CDesCArray* interfaceNameArray = new(ELeave) CDesCArrayFlat(4);
- CleanupStack::PushL(interfaceNameArray);
- TRAPD(err,GetAvaiableInterfacesL(interfaceNameArray));
-
- if (KErrNone == err)
- {
- // Print the interface names
- INFO_PRINTF2(_L("Found %D interfaces"),interfaceNameArray->Count());
-
- for(TInt a=0;a<interfaceNameArray->Count();a++)
- {
- TPtrC interfaceName = (*interfaceNameArray)[a];
- INFO_PRINTF2(_L("Interface: %S"),&interfaceName);
- }
- }
- else
- {
- ERR_PRINTF2(_L("Failed to enumeate the interfaces with error: %D"),err);
- }
-
- CleanupStack::PopAndDestroy(interfaceNameArray);
-
- SetError(err);
- }
-
-/*
- * GetAvaiableInterfacesL. Function to get the names of all available names of all interfaces.
- * @arg aInterfaceNamesArray (out param), Array of interface names owned by caller.
- */
-void CDNSSuffixTestWrapper::GetAvaiableInterfacesL(MDesCArray* aInterfaceNamesArray)
- {
- INFO_PRINTF1(_L("GetAvaiableInterfacesL - Entry"));
-
- CDesCArray* interfacesArray = static_cast<CDesCArray*>(aInterfaceNamesArray);
- interfacesArray->Reset();
-
- TInt err = KErrNone;
- RSocketServ socketSrv;
-
- if ( (err = socketSrv.Connect()) != KErrNone)
- {
- ERR_PRINTF2(_L("Failed Connecting to Socet server error: %D"),err);
- SetError(err);
- return;
- }
- INFO_PRINTF1( _L("Connected to Socket server"));
-
- INFO_PRINTF1(_L("Opening socket..."));
-
- RSocket socket;
- err = socket.Open(socketSrv,KAfInet, KSockDatagram, KProtocolInetUdp);
-
- if (KErrNone != err)
- {
- INFO_PRINTF2(_L("Failed Opening socket with error: %D"),err);
- SetError(err);
- socketSrv.Close();
- return;
- }
-
- INFO_PRINTF1(_L("Socket opened"));
-
- err = socket.SetOpt(KSoInetEnumInterfaces,KSolInetIfCtrl);
-
- if (KErrNone != err)
- {
- INFO_PRINTF2(_L("Failed enumerating interfaces with error: %D"),err);
- SetError(err);
- socket.Close();
- socketSrv.Close();
- return;
- }
-
- TSoInetInterfaceInfo info;
- TPckg<TSoInetInterfaceInfo> opt(info);
-
- while(socket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, opt) == KErrNone)
- {
- // INFO_PRINTF2(_L("Interface Name %S"),&opt().iName);
- interfacesArray->AppendL(opt().iName);
- }
-
- INFO_PRINTF1(_L("Finished"));
-
- INFO_PRINTF1(_L("Closing connections"));
- socket.Close();
- socketSrv.Close();
- SetError(KErrNone);
- INFO_PRINTF1(_L("GetAvaiableInterfacesL - Exit"));
- }
-
-
-/**
-Function test the setting of suffix list and getting suffix list on interface.
-*/
-void CDNSSuffixTestWrapper::DoSetAndGetSuffixListL()
- {
- INFO_PRINTF1(_L("************************************************************"));
- INFO_PRINTF1(_L("DoSetAndGetSuffixListL - DNS_Suffix_Support_TC001"));
- INFO_PRINTF1(_L("************************************************************"));
-
- TInt err(KErrNone);
-
- TName interfaceName;
-
- TRAP(err, err = GetFirstInterfaceNameL(interfaceName));
-
- if (err != KErrNone )
- {
- ERR_PRINTF2(_L("Failed to get the interface error: %D"),err);
- SetError(err);
- return;
- }
-
- TPtrC suffixList;
- iSuffixList.Reset();
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest001,KKeyDNSSuffixTestSuffixList,suffixList))
- {
- ERR_PRINTF1(_L("Failed to read suffix lists from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Suffix list: %S"),&suffixList);
- FillSuffixList(iSuffixList,suffixList);
- }
-
- err = iSocketServ.Connect();
-
- if(KErrNone != err)
- {
- ERR_PRINTF1(_L("Failed to connect socket Server"));
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to socket Server"));
-
- TUint iapId = GetFirstIapId();
-
- if (KErrNotFound == (TInt)iapId)
- {
- ERR_PRINTF2(_L("Failed to get the iap id: %D"),err);
- SetError(err);
- CloseSocketSrv();
- return;
- }
-
- RConnection firstConn;
- err = StartConnection(iSocketServ,firstConn,iapId);
-
- if (KErrNone != err)
- {
- ERR_PRINTF2(_L("Failed to start the Connections: %D"),err);
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Started the connections successfully"));
-
-
- err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,interfaceName,iSuffixList);
-
- if (KErrNone != err)
- {
- ERR_PRINTF2(_L("Failed Setting the suffix list with errror : %D"),err);
- SetError(err);
- firstConn.Close();
- CloseSocketSrv();
- return;
- }
-
- INFO_PRINTF1(_L("Getting the suffix list on interface:"));
-
- iSuffixList2.Reset();
-
- err = GetDNSSuffixList(iSocketServ,interfaceName,iSuffixList2);
-
- if (KErrNone != err)
- {
- ERR_PRINTF2(_L("Failed to get the suffix list with errror : %D"),err);
- }
-
-
- if (err == KErrNone)
- {
- if ( (err = IsSuffixListEqual(iSuffixList,iSuffixList2)) == KErrNone)
- {
- INFO_PRINTF1(_L("Suffix list are same and Test is successfull"));
- }
- else
- {
- ERR_PRINTF1(_L("Suffix list are not same and Test failed"));
- }
- }
-
- SetError(err);
-
- firstConn.Close();
- CloseSocketSrv();
-
- INFO_PRINTF1(_L("Set and Get Suffix list Test - Finished"));
- }
-
-
-
-TInt CDNSSuffixTestWrapper::SetDNSSuffixListOnInterface(RSocketServ& aServ,RConnection& /*aConn*/,const TDesC& aInterfaceName,RInetSuffixList& aData)
- {
- INFO_PRINTF1(_L("SetDNSSuffixListOnInterfaceL - Entry"));
-
- INFO_PRINTF1(_L("Opening socket..."));
-
- RSocket socket;
- TInt err = socket.Open(aServ,KAfInet, KSockDatagram, KProtocolInetUdp);
-
- if (KErrNone != err)
- {
- INFO_PRINTF2(_L("Failed Opening socket with error: %D"),err);
- SetError(err);
- return err;
- }
-
- INFO_PRINTF1(_L("Socket opened"));
-
- err = socket.SetOpt(KSoInetEnumInterfaces,KSolInetIfCtrl);
-
- if (KErrNone != err)
- {
- INFO_PRINTF2(_L("Failed enumerating interfaces with error: %D"),err);
- SetError(err);
- socket.Close();
- return err;
- }
-
- TSoInetInterfaceInfo getOpt;
- TPckg<TSoInetInterfaceInfo> opt_out(getOpt);
-
- TBool isSuffixListSet(EFalse);
-
- while(socket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, opt_out)== KErrNone)
- {
-
- INFO_PRINTF2(_L("Interface Name: %S"),&opt_out().iName);
- INFO_PRINTF2(_L("Name Server: %D"),!opt_out().iNameSer1.IsUnspecified());
-
- TBuf<KIPAddrLen> ipBuf;
- opt_out().iAddress.Output(ipBuf);
- INFO_PRINTF2(_L("IP Address: %S"),&ipBuf);
-
- TBuf<KIPAddrLen> nameserBuf;
- opt_out().iNameSer1.Output(nameserBuf);
- INFO_PRINTF2(_L("Name Server IP: %S"),&nameserBuf);
-
- if( (opt_out().iName.Length()>0) /*&& !(opt_out().iNameSer1.IsUnspecified())*/ && (aInterfaceName.CompareF(opt_out().iName)==0) )
- {
- INFO_PRINTF2(_L("Setting suffix list on Interface: %S"),&opt_out().iName);
- INFO_PRINTF2(_L("MTU on the interface is : %d"), opt_out().iMtu);
-
- TSoInetInterfaceInfoExtnDnsSuffix setOpt;
- (TSoInetInterfaceInfo &)setOpt = opt_out();
- TPckg<TSoInetInterfaceInfoExtnDnsSuffix> opt_in(setOpt);
- /*opt_in().iName = opt_out().iName;
- opt_in().iAddress = opt_out().iAddress;
- opt_in().iNetMask = opt_out().iNetMask;*/
- opt_in().iDoId = ETrue;
- opt_in().iDelete = EFalse;
- opt_in().iDomainSuffix.DeleteAll();
-
- err = socket.SetOpt(KSoInetConfigInterface,KSolInetIfCtrl,opt_in);
-
- if (err != KErrNone)
- {
- ERR_PRINTF2(_L("Failed to reset suffix list on the interface: %D"),err);
- break;
- }
- else
- INFO_PRINTF1(_L("Interface domain suffix list reset successful"));
-
- if (aData.Count() == 0) // We plan to set empty record, so only reset is sufficient
- isSuffixListSet = ETrue;
-
- for(TInt a=0;a<aData.Count();a++)
- {
- opt_in().iDomainSuffix.Copy(aData[a]);
- err = socket.SetOpt(KSoInetConfigInterface,KSolInetIfCtrl,opt_in);
- if (err != KErrNone)
- {
- ERR_PRINTF2(_L("Failed to set suffix list: %D"),err);
- break;
- }
- else
- {
- INFO_PRINTF1(_L("Suffix list added successfully"));
- isSuffixListSet = ETrue;
- }
- }
- break;
- }
- }
-
- if (!isSuffixListSet)
- {
- err = KErrNotFound;
- ERR_PRINTF2(_L("Failed to set suffix list with error: %D"),err);
- }
-
- SetError(err);
-
- INFO_PRINTF1(_L("Closing socket"));
-
- socket.Close();
- INFO_PRINTF1(_L("SetDNSSuffixListOnInterfaceL - Exit"));
- return err;
- }
-
-
-
-/**
- * GetDNSSuffixList. Gets the suffix list set on an interface.
- *
- * @arg aServ, session handle to a socket server.
- * @arg aData (in/out param) Data having the suffix list. Packed buffer of type TInetSuffixList
- *
- */
-TInt CDNSSuffixTestWrapper::GetDNSSuffixList(RSocketServ& aServ,const TDesC& aInterfaceName,RInetSuffixList& aData)
- {
- INFO_PRINTF1(_L("GetDNSSuffixList - Entry"));
-
- INFO_PRINTF1(_L("Opening socket..."));
- RSocket socket;
- TInt err = socket.Open(aServ,KAfInet, KSockDatagram, KProtocolInetUdp);
-
- if (KErrNone != err)
- {
- INFO_PRINTF2(_L("Failed Opening socket with error: %D"),err);
- SetError(err);
- return err;
- }
-
- INFO_PRINTF1(_L("Socket opened"));
-
- err = socket.SetOpt(KSoInetEnumInterfaces,KSolInetIfCtrl);
-
- if (KErrNone != err)
- {
- INFO_PRINTF2(_L("Failed enumerating interfaces with error: %D"),err);
- SetError(err);
- socket.Close();
- return err;
- }
-
- TSoInetInterfaceInfo getOpt;
- TPckg<TSoInetInterfaceInfo> opt(getOpt);
-
- while(socket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, opt) == KErrNone)
- {
- if (aInterfaceName.CompareF(opt().iName) == KErrNone)
- {
- INFO_PRINTF2(_L("Reading suffix list from interface: %S"),&opt().iName);
-
- TBuf<KIPAddrLen> tempIp;
- opt().iAddress.Output(tempIp);
- INFO_PRINTF2(_L("IP: %S"),&tempIp);
-
- TInetSuffix domainSuffix;
- TPckg<TInetSuffix> dom_opt(domainSuffix);
- if (err = socket.SetOpt(KSoInetEnumDomainSuffix, KSolInetIfCtrl) != KErrNone)
- return err;
- while( socket.GetOpt(KSoInetNextDomainSuffix, KSolInetIfCtrl, dom_opt) == KErrNone)
- {
- aData.AppendL(dom_opt().iSuffixName);
- }
- break;
- }
- }
-
- INFO_PRINTF1(_L("Closing socket"));
- socket.Close();
-
- INFO_PRINTF1(_L("GetDNSSuffixList - Exit"));
- return KErrNone;
- }
-
-
-
-/**
- * FillSuffixListL, Function to fill the suffix names in the TInetSuffixList object.
- * @arg aSuffixList, out param, on return has the suffix list set in it.
- * @arg aData, has the list of domain suffix names in the form of abc.xyz.com;efg.xyz.com
- */
-TInt CDNSSuffixTestWrapper::FillSuffixList(RInetSuffixList& aSuffixList,TDesC& aData)
- {
- INFO_PRINTF1(_L("FillSuffixList - Entry"));
-
- INFO_PRINTF2(_L("Processing Suffix list: %S"),&aData);
-
- TPtr data((TUint16*)aData.Ptr(),aData.Length(),aData.Length());
- data.TrimAll();
-
- TInt pos = KErrNone;
- while( (pos = data.Find(_L(";"))) != KErrNotFound)
- {
- TPtr suffixItem((TUint16*)data.Left(pos).Ptr(),pos,pos);
- INFO_PRINTF3(_L("Processing %D suffix name: %S"),/*sListBuf()*/iSuffixList.Count()+1,&suffixItem);
-
- TSuffixName tmpBuf;
- tmpBuf.Copy(suffixItem);
- aSuffixList.AppendL(tmpBuf);
- data.Copy(data.Mid(pos+1));
- }
- data.TrimAll();
- INFO_PRINTF3(_L("Processing %D suffix name: %S"),/*sListBuf()*/iSuffixList.Count()+1,&data);
- INFO_PRINTF2(_L("Data Len: %D"),data.Length());
-
- TSuffixName tmpBuf;
- tmpBuf.Copy(data);
- aSuffixList.AppendL(tmpBuf);
-
- INFO_PRINTF1(_L("FillSuffixList - Exit"));
-
- return aSuffixList.Count() == 0 ? KErrNotFound : KErrNone;
- }
-
-
-void CDNSSuffixTestWrapper::CloseSocketSrv()
- {
- INFO_PRINTF1(_L("Closing socket server"));
-
- if (iSocketServ.Handle())
- {
- iSocketServ.Close();
- INFO_PRINTF1(_L("Closed Sock Srv successfully"));
- }
- else
- {
- INFO_PRINTF1(_L("Inavild Sock Srv handle"));
- }
- }
-
-/*
- * IsSuffixListEqual, Utility function, compares the two suffix list structures.
- * @arg aSuffixList1 First structure holding the suffix list
- * @arg aSuffixList2 second structure holding the suffix list
- *
- * @return KErrNone if both suffix list strucures same otherwise KErrArgument.
- *
- */
-TInt CDNSSuffixTestWrapper::IsSuffixListEqual(const RInetSuffixList& aSuffixList1, const RInetSuffixList& aSuffixList2)
- {
- INFO_PRINTF1(_L("IsSuffixListEqual - Entry"));
-
- if (aSuffixList1.Count() != aSuffixList2.Count())
- {
- return KErrArgument;
- }
-
- for (TInt a=0; a<aSuffixList1.Count();a++)
- {
- if (aSuffixList1[a].CompareF(aSuffixList2[a]) != KErrNone)
- {
- return KErrArgument;
- }
- }
- INFO_PRINTF1(_L("IsSuffixListEqual - Exit"));
- return KErrNone;
- }
-
-
-/*
- * Prerequisite: Two interfaces required to be up and running (virtual Tunnel and ethernet).
- *
- * DoResolveL. Resolves the domain name
- *
- *
- */
-void CDNSSuffixTestWrapper::DoResolveL()
- {
- INFO_PRINTF1(_L("********************************************"));
- INFO_PRINTF1(_L("DoResolveL - DNS_Suffix_Support_TC002"));
- INFO_PRINTF1(_L("********************************************"));
-
- TPtrC hostname;
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest002,KKeyDNSSuffixTestHostname,hostname))
- {
- ERR_PRINTF1(_L("Failed to read the host name value"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Host name: %S"),&hostname);
- }
-
- TInt err = KErrNone;
- TName interfaceName;
-
- TRAP(err, err = GetFirstInterfaceNameL(interfaceName));
-
- if (err != KErrNone )
- {
- ERR_PRINTF2(_L("Failed to get the interface error: %D"),err);
- SetError(err);
- return;
- }
-
- TPtrC suffixList;
- iSuffixList.Reset();
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest002,KKeyDNSSuffixTestSuffixList,suffixList))
- {
- ERR_PRINTF1(_L("Failed to read suffix lists from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Suffix list: %S"),&suffixList);
- FillSuffixList(iSuffixList,suffixList);
- }
-
- if ( (err = iSocketServ.Connect()) != KErrNone)
- {
- ERR_PRINTF1(_L("Failed Connecting to socket server"));
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to socket server successfully"));
-
- /*
- * @Note: Start more than one interface.
- * Here starting vitual tunnel nif interface as a default. @see ethernet ced.xml file in which I have made
- * vTun as default in pref table.
- */
- RConnection vTunConn; // used for vTunnel
- RConnection firstConn;
-
- err = StartConnections(iSocketServ,firstConn, vTunConn);
-
- if (err != KErrNone)
- {
- ERR_PRINTF1(_L("Failed to start connections"));
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connections started successfully"));
-
- err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,interfaceName,iSuffixList);
-
- if (KErrNone != err)
- {
- ERR_PRINTF2(_L("Failed Setting the suffix list with errror : %D"),err);
- SetError(err);
- firstConn.Close();
- CloseSocketSrv();
- return;
- }
-
- // Open implicit resolver.
- RHostResolver resolver;
-
- if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp)) != KErrNone)
- {
- ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to Host resolver successfully"));
-
- TNameEntry nameEntry;
-
- INFO_PRINTF2(_L("Requesting to resolve hostname: %S"),&hostname);
-
- if ( (err = resolver.GetByName(hostname,nameEntry)) != KErrNone)
- {
- ERR_PRINTF3(_L("Failed host resolution for %S with error: %D"),&hostname,err);
- }
- else
- {
- TInetAddr& netAddress = TInetAddr::Cast(nameEntry().iAddr);
-
- if (netAddress.IsUnspecified())
- {
- ERR_PRINTF1(_L("Invalid host address"));
- err = KErrArgument;
- }
- else
- {
- TBuf<KIPAddrLen> address;
- netAddress.Output(address);
- INFO_PRINTF1(_L("Got valid IP address:"));
- INFO_PRINTF2(_L("Host name: %S"),&nameEntry().iName);
- INFO_PRINTF2(_L("Host address: %S"),&address);
- }
- }
-
- INFO_PRINTF1(_L("Closing host resolver"));
- resolver.Close();
-
- SetError(err);
-
- INFO_PRINTF1(_L("Closing connections and socket serv session"));
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- }
-
-
-
-void CDNSSuffixTestWrapper::DoResolveHostWithoutDomainWithSuffixListSetL()
- {
- INFO_PRINTF1(_L("******************************************************"));
- INFO_PRINTF1(_L("DoResolveHostWithoutDomainL with Domain suffix Set"));
- INFO_PRINTF1(_L(" - DNS_Suffix_Support_TC003"));
- INFO_PRINTF1(_L("******************************************************"));
-
- TPtrC hostname;
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest003,KKeyDNSSuffixTestHostname,hostname))
- {
- ERR_PRINTF1(_L("Failed to read the host name value"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Host name: %S"),&hostname);
- }
-
- TInt err = KErrNone;
-
- if ( (err = iSocketServ.Connect()) != KErrNone)
- {
- ERR_PRINTF1(_L("Failed Connecting to socket server"));
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to socket server successfully"));
-
- RConnection vTunConn; // used for vTunnel
- RConnection firstConn;
-
- err = StartConnections(iSocketServ,firstConn, vTunConn);
-
- if (err != KErrNone)
- {
- ERR_PRINTF1(_L("Failed to start connections"));
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connections started successfully"));
-
- // Open explicit resolver with ethernet
- RHostResolver resolver;
- if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp,firstConn)) != KErrNone)
- {
- ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to Host resolver successfully"));
-
- TNameEntry nameEntry;
-
- if ( (err = resolver.GetByName(hostname,nameEntry)) != KErrNone)
- {
- ERR_PRINTF3(_L("Failed host resolution for %S with error: %D"),&hostname,err);
- INFO_PRINTF1(_L("Test success"));
- SetError(err);
- }
- else
- {
- TInetAddr address = nameEntry().iAddr;
-
- if (address.IsUnspecified())
- {
- ERR_PRINTF1(_L("Invalid host address"));
- err = KErrArgument;
- }
- else
- {
- TBuf<KIPAddrLen> ipAddr;
- address.Output(ipAddr);
- INFO_PRINTF1(_L("Got valid IP address:"));
- INFO_PRINTF2(_L("Host name: %S"),&nameEntry().iName);
- INFO_PRINTF2(_L("Host address: %S"),&ipAddr);
- }
- SetError(err);
- }
-
- INFO_PRINTF1(_L("Closing host resolver"));
- resolver.Close();
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- }
-
-
-void CDNSSuffixTestWrapper::DoResolveHostWithoutDomainWithoutSuffixListL()
- {
- INFO_PRINTF1(_L("******************************************************"));
- INFO_PRINTF1(_L("DoResolveHostWithoutDomainL With no Suffix list"));
- INFO_PRINTF1(_L("DNS_Suffix_Support_TC004"));
- INFO_PRINTF1(_L("******************************************************"));
-
- TPtrC hostname;
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest004,KKeyDNSSuffixTestHostname,hostname))
- {
- ERR_PRINTF1(_L("Failed to read the host name value"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Host name: %S"),&hostname);
- }
-
- TInt err(KErrNone);
- // Note: Remove the suffix list set on Ethernet interface.
-
- TName interfaceName;
- err = GetFirstInterfaceNameL(interfaceName);
-
- if ( (err = iSocketServ.Connect()) != KErrNone)
- {
- ERR_PRINTF1(_L("Failed Connecting to socket server"));
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to socket server successfully"));
-
- RConnection vTunConn; // used for vTunnel
- RConnection firstConn;
-
- err = StartConnections(iSocketServ,firstConn, vTunConn);
-
- if (err != KErrNone)
- {
- ERR_PRINTF1(_L("Failed to start connections"));
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- /*
- * @Note: Remove the suffix list (which we set in TC001) set on the interface by just setting empty list on it.
- */
- INFO_PRINTF1(_L("Setting empty suffix list on interface:"));
- iSuffixList.Reset();
- err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,interfaceName,iSuffixList);
-
- if (err != KErrNone)
- {
- ERR_PRINTF2(_L("Failed to remove the suffix list set on interface with error: %D"),err);
- SetError(err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- return;
- }
-
- INFO_PRINTF1(_L("Removed suffix list from interface:"));
-
- // Open explicit resolver with ethernet
- RHostResolver resolver;
- if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp,firstConn)) != KErrNone)
- {
- ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to Host resolver successfully"));
-
- TNameEntry nameEntry;
-
- if ( (err = resolver.GetByName(hostname,nameEntry)) != KErrNone)
- {
- ERR_PRINTF3(_L("Failed host resolution for %S with error: %D"),&hostname,err);
- INFO_PRINTF1(_L("Test success"));
- SetError(EPass);
- }
- else
- {
- TInetAddr address = nameEntry().iAddr;
-
- if (address.IsUnspecified())
- {
- ERR_PRINTF1(_L("Invalid host address"));
- err = KErrArgument;
- }
- else
- {
- TBuf<KIPAddrLen> ipAddr;
- address.Output(ipAddr);
- INFO_PRINTF1(_L("Got valid IP address:"));
- INFO_PRINTF2(_L("Host name: %S"),&nameEntry().iName);
- INFO_PRINTF2(_L("Host address: %S"),&ipAddr);
- }
- SetError(EFail);
- }
-
- INFO_PRINTF1(_L("Closing host resolver"));
- resolver.Close();
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- INFO_PRINTF1(_L("DoResolveHostWithoutDomainWithoutSuffixListL - Exit"));
- }
-
-
-
-void CDNSSuffixTestWrapper::DNSSuffixSupportTC005L()
- {
- INFO_PRINTF1(_L("****************************************************"));
- INFO_PRINTF1(_L("DNSSuffixSupportTC005L - DNS_Suffix_Support_TC005"));
- INFO_PRINTF1(_L("****************************************************"));
-
- TPtrC hostname;
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest005,KKeyDNSSuffixTestHostname,hostname))
- {
- ERR_PRINTF1(_L("Failed to read the host name value"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Host name: %S"),&hostname);
- }
-
- TInt err(KErrNone);
-
- TFileName interfaceName;
-
- TRAP(err, err = GetFirstInterfaceNameL(interfaceName));
-
- if (err != KErrNone )
- {
- ERR_PRINTF2(_L("Failed to get the interface error: %D"),err);
- SetError(err);
- return;
- }
-
- TPtrC suffixList;
- iSuffixList.Reset();
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest005,KKeyDNSSuffixTestSuffixList,suffixList))
- {
- ERR_PRINTF1(_L("Failed to read suffix lists from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Suffix list: %S"),&suffixList);
- FillSuffixList(iSuffixList,suffixList);
- }
-
- if ( (err = iSocketServ.Connect()) != KErrNone)
- {
- ERR_PRINTF1(_L("Failed Connecting to socket server"));
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to socket server successfully"));
-
- RConnection vTunConn; // used for vTunnel
- RConnection firstConn;
-
- err = StartConnections(iSocketServ,firstConn, vTunConn);
-
- if (err != KErrNone)
- {
- ERR_PRINTF1(_L("Failed to start connections"));
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connections started successfully"));
-
- INFO_PRINTF2(_L("Setting suffix list on : %S"),&interfaceName);
- err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,interfaceName,iSuffixList);
-
- if (KErrNone != err)
- {
- ERR_PRINTF2(_L("Failed Setting the suffix list with errror : %D"),err);
- SetError(err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- return;
- }
-
- INFO_PRINTF1(_L("Suffix list set successfully"));
-
- INFO_PRINTF1(_L("Creating explicit host resolver"));
-
- // Open explicit resolver
- RHostResolver resolver;
- if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp,firstConn)) != KErrNone)
- {
- ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to Host resolver successfully"));
-
- TNameEntry nameEntry;
-
- if ( (err = resolver.GetByName(hostname,nameEntry)) != KErrNone)
- {
- INFO_PRINTF3(_L("Host resolution for %S with error: %D"),&hostname,err);
- INFO_PRINTF1(_L("Test success"));
- err = KErrNone;
- }
- else
- {
- err = KErrArgument;
- ERR_PRINTF1(_L("Test failed: Expected no resolution, but resolved"));
- }
-
- SetError(err);
- INFO_PRINTF1(_L("Closing host resolver, connections and Sock Srv session"));
- resolver.Close();
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC005L - Exit"));
- }
-
-
-void CDNSSuffixTestWrapper::DNSSuffixSupportTC006L()
- {
- INFO_PRINTF1(_L("****************************************************"));
- INFO_PRINTF1(_L("DNSSuffixSupportTC006L - DNS_Suffix_Support_TC006"));
- INFO_PRINTF1(_L("****************************************************"));
-
- TInt numberOfHosts(0);
-
- if (!GetIntFromConfig(KSectionDNSSuffixTest006,KKeyDNSSuffixTest006NoOfHostname,numberOfHosts))
- {
- ERR_PRINTF1(_L("Failed to read the no of hosts from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("No of hosts: %D"),numberOfHosts);
- }
-
- TPtrC hostnames[KMaxHosts];
-
- for (TInt b=0;b<numberOfHosts;b++)
- {
- TFileName keyName;
- keyName.Format(KKeyDNSSuffixTest006Hostname,b+1);
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest006,keyName,hostnames[b]))
- {
- ERR_PRINTF1(_L("Failed to read the 1st host name value"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF3(_L("Host name%D: %S"),b,&hostnames[b]);
- }
- }
-
- TInt err(KErrNone);
-
- TName interfaceName;
-
- TRAP(err, err = GetFirstInterfaceNameL(interfaceName));
-
- if (err != KErrNone )
- {
- ERR_PRINTF2(_L("Failed to get the interface error: %D"),err);
- SetError(err);
- return;
- }
-
- TPtrC suffixList;
- iSuffixList.Reset();
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest006,KKeyDNSSuffixTestSuffixList,suffixList))
- {
- ERR_PRINTF1(_L("Failed to read suffix lists from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Suffix list: %S"),&suffixList);
- FillSuffixList(iSuffixList,suffixList);
- }
-
- if ( (err = iSocketServ.Connect()) != KErrNone)
- {
- ERR_PRINTF1(_L("Failed Connecting to socket server"));
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to socket server successfully"));
-
- RConnection vTunConn; // used for vTunnel
- RConnection firstConn;
-
- err = StartConnections(iSocketServ,firstConn, vTunConn);
-
- if (err != KErrNone)
- {
- ERR_PRINTF1(_L("Failed to start connections"));
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connections started successfully"));
-
- err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,interfaceName,iSuffixList);
-
- if (KErrNone != err)
- {
- ERR_PRINTF2(_L("Failed Setting the suffix list with errror : %D"),err);
- SetError(err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- return;
- }
-
- INFO_PRINTF1(_L("Set suffix list on interface successfully"));
-
- RHostResolver resolver;
- if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp,firstConn)) != KErrNone)
- {
- ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to Host resolver successfully"));
-
- TNameEntry nameEntry[KMaxHosts];
-
- // Resolve all three hosts
- for (TInt a=0;a<numberOfHosts;a++)
- {
- INFO_PRINTF2(_L("Resolving host: %S"),&hostnames[a]);
-
- if ( (err = resolver.GetByName(hostnames[a],nameEntry[a])) != KErrNone)
- {
- INFO_PRINTF3(_L("Host resolution for %S failed with error: %D"),&hostnames[a],err);
- INFO_PRINTF1(_L("Test Failed"));
- SetError(err);
- break;
- }
- }
-
- if (err == KErrNone)
- {
- for (TInt a=0;a<numberOfHosts;a++)
- {
- TInetAddr address = nameEntry[a]().iAddr;
-
- if (address.IsUnspecified())
- {
- ERR_PRINTF1(_L("Invalid host address"));
- err = KErrArgument;
- }
- else
- {
- TBuf<KIPAddrLen> ipAddr;
- address.Output(ipAddr);
- INFO_PRINTF1(_L("Got valid IP address:"));
- INFO_PRINTF2(_L("Host name: %S"),&nameEntry[a]().iName);
- INFO_PRINTF2(_L("Host address: %S"),&ipAddr);
- }
- }
- }
-
- SetError(err);
- INFO_PRINTF1(_L("Closing host resolver, connections and Sock Srv session"));
- resolver.Close();
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC006L - Exit"));
- }
-
-
-/*
- * TODO: Needs to find the way to change the ranking IAP's programatically.
- * Note: Before running this test case make ethernet iap as default
- * by changing its ranking to one(1).
- * @ See te_dnssuffixcedv2.xml
- * @See te_dnssuffixsuite.script for below line
- * ced -i z:\testdata\configs\te_dnssuffixcedv2.xml
- *
- */
-void CDNSSuffixTestWrapper::DNSSuffixSupportTC007L()
- {
- INFO_PRINTF1(_L("**********************************************************************"));
- INFO_PRINTF1(_L("DNS_Suffix_Test007L - DNS_Suffix_Support_007"));
- INFO_PRINTF1(_L("**********************************************************************"));
-
- TPtrC validHostname;
- TPtrC inValidHostname;
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest007,KKeyDNSSuffixTest007ValidHostname,validHostname))
- {
- ERR_PRINTF1(_L("Failed to read the valid host name from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Valid Host name: %S"),&validHostname);
- }
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest007,KKeyDNSSuffixTest007InValidHostname,inValidHostname))
- {
- ERR_PRINTF1(_L("Failed to read the invalid host name from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Invalid Host name: %S"),&inValidHostname);
- }
-
- // @Santosh K Patil
- // Note: Remove the suffix lists from the interfaces set by previous test cases, if any.
- // Note: start multiple interfaces
-
- TFileName interfaceName;
- TInt err = KErrNone;
- err = GetFirstInterfaceNameL(interfaceName);
-
- /*
- * @Note: Remove the suffix list set on the interface (which we set in earlier test cases)
- * by just setting empty list on it.
- */
- INFO_PRINTF1(_L("Setting empty suffix list on interface:"));
- iSuffixList.Reset();
-
- if ( (err = iSocketServ.Connect()) != KErrNone)
- {
- ERR_PRINTF1(_L("Failed Connecting to socket server"));
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to socket server successfully"));
-
- RConnection vTunConn; // used for vTunnel
- RConnection firstConn;
-
- err = StartConnections(iSocketServ,firstConn, vTunConn);
-
- if (err != KErrNone)
- {
- ERR_PRINTF1(_L("Failed to start connections"));
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connections started successfully"));
-
- err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,interfaceName,iSuffixList);
-
- if (KErrNone != err)
- {
- ERR_PRINTF2(_L("Failed Setting the suffix list with errror : %D"),err);
- SetError(err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- return;
- }
-
- INFO_PRINTF1(_L("Removed suffix list from interface:"));
-
- INFO_PRINTF1(_L("Opening implicit resolver"));
- // Open implicit resolver.
- RHostResolver resolver;
-
- if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp)) != KErrNone)
- {
- ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to Host resolver successfully"));
-
- TNameEntry nameEntry;
-
- INFO_PRINTF2(_L("Requesting to resolve valid hostname: %S"),&validHostname);
-
- if ( (err = resolver.GetByName(validHostname,nameEntry)) != KErrNone)
- {
- ERR_PRINTF3(_L("Host resolution failed for %S with error: %D"),&validHostname,err);
- }
- else
- {
- TInetAddr& netAddress = TInetAddr::Cast(nameEntry().iAddr);
-
- if (netAddress.IsUnspecified())
- {
- ERR_PRINTF1(_L("Invalid host address"));
- err = KErrArgument;
- }
- else
- {
- TBuf<KIPAddrLen> address;
- netAddress.Output(address);
- INFO_PRINTF1(_L("Got valid IP address:"));
- INFO_PRINTF2(_L("Host name: %S"),&nameEntry().iName);
- INFO_PRINTF2(_L("Host address: %S"),&address);
- }
- }
-
- if (err == KErrNone)
- {
- TNameEntry nameEntry2;
-
- INFO_PRINTF2(_L("Requesting to resolve invalid hostname: %S"),&inValidHostname);
-
- if ( (err = resolver.GetByName(inValidHostname,nameEntry2)) != KErrNone)
- {
- INFO_PRINTF3(_L("Host resolution failed for %S with error: %D"),&inValidHostname,err);
- INFO_PRINTF1(_L("Test scenario passed"));
- err = KErrNone;
- }
- else
- {
- err = KErrArgument;
- INFO_PRINTF1(_L("Error: Seems host is resolvable"));
- }
- }
-
- SetError(err);
-
- INFO_PRINTF1(_L("Closing host resolver"));
- resolver.Close();
-
- INFO_PRINTF1(_L("Closing connections and socket serv session"));
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC007L - Exit"));
- }
-
-
-void CDNSSuffixTestWrapper::DNSSuffixSupportTC008L()
- {
- INFO_PRINTF1(_L("**********************************************************************"));
- INFO_PRINTF1(_L("DNS_Suffix_Test008L - DNS_Suffix_Support_008"));
- INFO_PRINTF1(_L("**********************************************************************"));
-
- TPtrC hostname1;
- TPtrC hostname2;
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest008,KKeyDNSSuffixTestHostname1,hostname1))
- {
- ERR_PRINTF1(_L("Failed to read the 1 host name from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Host name1: %S"),&hostname1);
- }
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest008,KKeyDNSSuffixTestHostname2,hostname2))
- {
- ERR_PRINTF1(_L("Failed to read the 2 host name from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Host name2: %S"),&hostname2);
- }
-
- // @Santosh K Patil
- // @note: Set suffix lists on both interfaces (eth and vtun)
- // @note: start multiple interfaces
-
- TName ethernetInterface;
- TName vTunInterface;
- TInt err = KErrNone;
- err = GetFirstInterfaceNameL(ethernetInterface);
-
- if (KErrNone != err)
- {
- ERR_PRINTF1(_L("Failed get the name of the interface (ethernet)"));
- SetError(KErrNotFound);
- return;
- }
-
-#ifndef DISABLE_TUNDRIVER
- err = GetSecondInterfaceNameL(vTunInterface);
-
- if (KErrNone != err)
- {
- ERR_PRINTF1(_L("Failed get the name of the interface (vTun)"));
- SetError(KErrNotFound);
- return;
- }
-#endif
-
- INFO_PRINTF1(_L("Setting suffix list on interface:"));
-
- iSuffixList2.Reset();
-
- TPtrC suffixList;
- if (!GetStringFromConfig(KSectionDNSSuffixTest008,KKeyDNSSuffixTestSuffixList,suffixList))
- {
- ERR_PRINTF1(_L("Failed to read suffix lists from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Suffix list: %S"),&suffixList);
- FillSuffixList(iSuffixList2,suffixList);
- }
-
- if ( (err = iSocketServ.Connect()) != KErrNone)
- {
- ERR_PRINTF1(_L("Failed Connecting to socket server"));
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to socket server successfully"));
-
- RConnection vTunConn; // used for vTunnel
- RConnection firstConn;
-
- err = StartConnections(iSocketServ,firstConn, vTunConn);
-
- if (err != KErrNone)
- {
- ERR_PRINTF1(_L("Failed to start connections"));
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connections started successfully"));
-
- err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,ethernetInterface,iSuffixList2);
-
- if (KErrNone != err)
- {
- ERR_PRINTF3(_L("Failed Setting the suffix list on %S with errror : %D"),ðernetInterface,err);
- SetError(err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- return;
- }
-
- INFO_PRINTF2(_L("Set suffix list on %S successfully"),ðernetInterface);
-
-#ifndef DISABLE_TUNDRIVER
- err = SetDNSSuffixListOnInterface(iSocketServ,vTunConn,vTunInterface,iSuffixList2);
-
- if (KErrNone != err)
- {
- ERR_PRINTF3(_L("Failed Setting the suffix list on %S with errror : %D"),&vTunInterface,err);
- SetError(err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- return;
- }
-
- INFO_PRINTF2(_L("Set suffix list on %S successfully"),&vTunInterface);
-#endif
-
- INFO_PRINTF1(_L("Opening implicit resolver"));
- // Open implicit resolver.
- RHostResolver resolver;
- INFO_PRINTF1(_L("Creating implicit resolver"));
- if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp)) != KErrNone)
- {
- ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to implicit Host resolver successfully"));
-
- TNameEntry nameEntry;
-
- INFO_PRINTF2(_L("Requesting to resolve hostname: %S"),&hostname1);
-
- if ( (err = resolver.GetByName(hostname1,nameEntry)) != KErrNone)
- {
- ERR_PRINTF3(_L("Failed to resolve the host %S with error: %D"),&hostname1,err);
- }
- else
- {
- TInetAddr& netAddress = TInetAddr::Cast(nameEntry().iAddr);
-
- if (netAddress.IsUnspecified())
- {
- ERR_PRINTF1(_L("Invalid host address"));
- err = KErrArgument;
- }
- else
- {
- TBuf<KIPAddrLen> address;
- netAddress.Output(address);
- INFO_PRINTF1(_L("Got valid IP address:"));
- INFO_PRINTF2(_L("Host name: %S"),&nameEntry().iName);
- INFO_PRINTF2(_L("Host address: %S"),&address);
- }
- }
-
- INFO_PRINTF1(_L("Closing implicit host resolver"));
- resolver.Close();
-
-#ifndef DISABLE_TUNDRIVER
- if (err == KErrNone)
- {
- // Open explicit resolver.
- RHostResolver resolver2;
- INFO_PRINTF1(_L("Creating explicit resolver"));
- if ( (err = resolver2.Open(iSocketServ,KAfInet,KProtocolInetUdp,vTunConn)) != KErrNone)
- {
- ERR_PRINTF2(_L("Failed Connecting to explicit Host resolver with error: %D"),err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to explicit Host resolver successfully"));
-
-
- TNameEntry nameEntry2;
- INFO_PRINTF2(_L("Requesting to resolve hostname: %S"),&hostname2);
-
- if ( (err = resolver2.GetByName(hostname2,nameEntry2)) != KErrNone)
- {
- INFO_PRINTF3(_L("Host resolution failed for %S with error: %D"),&hostname2,err);
- INFO_PRINTF1(_L("Test scenario passed"));
- err = KErrNone;
- }
- else
- {
- err = KErrArgument;
- INFO_PRINTF1(_L("Error: Seems host is resolvable"));
- }
-
- INFO_PRINTF1(_L("Closing explicit host resolver"));
- resolver2.Close();
- }
-#endif
-
- SetError(err);
-
- INFO_PRINTF1(_L("Closing connections and socket serv session"));
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC008L - Exit"));
- }
-
-
-// TODO: Cross check the correct ness of the implementation.
-void CDNSSuffixTestWrapper::DNSSuffixSupportTC009L()
- {
- INFO_PRINTF1(_L("**********************************************************************"));
- INFO_PRINTF1(_L("DNSSuffixSupportTC009L - DNS_Suffix_Support_009"));
- INFO_PRINTF1(_L("**********************************************************************"));
-
- TPtrC hostname1;
- TPtrC hostname2;
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest009,KKeyDNSSuffixTestHostname1,hostname1))
- {
- ERR_PRINTF1(_L("Failed to read the 1 host name from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Host name1: %S"),&hostname1);
- }
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest009,KKeyDNSSuffixTestHostname2,hostname2))
- {
- ERR_PRINTF1(_L("Failed to read the 2 host name from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Host name2: %S"),&hostname2);
- }
-
- /*
- * @Santosh K Patil
- * @note: start multiple interfaces
- * Set suffix lists on vTunnel interface
- * Open explicit connection on other interface
- */
- TInt err = KErrNone;
-#ifndef DISABLE_TUNDRIVER
- TFileName vTunInterface;
- err = GetSecondInterfaceNameL(vTunInterface);
-
- if (KErrNone != err)
- {
- ERR_PRINTF1(_L("Failed get the name of the interface (vTun)"));
- SetError(KErrNotFound);
- return;
- }
-
- INFO_PRINTF1(_L("Setting suffix list on vTun interface:"));
-
- iSuffixList.Reset();
-
- TPtrC suffixList;
- if (!GetStringFromConfig(KSectionDNSSuffixTest009,KKeyDNSSuffixTestSuffixList,suffixList))
- {
- ERR_PRINTF1(_L("Failed to read suffix lists from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Suffix list: %S"),&suffixList);
- FillSuffixList(iSuffixList,suffixList);
- }
-#endif
-
- if ( (err = iSocketServ.Connect()) != KErrNone)
- {
- ERR_PRINTF1(_L("Failed Connecting to socket server"));
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to socket server successfully"));
-
- RConnection vTunConn; // used for vTunnel
- RConnection firstConn;
-
- err = StartConnections(iSocketServ,firstConn, vTunConn);
-
- if (err != KErrNone)
- {
- ERR_PRINTF1(_L("Failed to start connections"));
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connections started successfully"));
-
-#ifndef DISABLE_TUNDRIVER
- err = SetDNSSuffixListOnInterface(iSocketServ,vTunConn,vTunInterface,iSuffixList);
-
- if (KErrNone != err)
- {
- ERR_PRINTF3(_L("Failed Setting the suffix list on %S with errror : %D"),&vTunInterface,err);
- SetError(err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- return;
- }
-
- INFO_PRINTF2(_L("Set suffix list on %S successfully"),&vTunInterface);
-#endif
-
- INFO_PRINTF1(_L("Opening explicit resolver"));
- // Open implicit resolver.
- RHostResolver resolver;
- INFO_PRINTF1(_L("Creating explicit resolver"));
- if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp,firstConn)) != KErrNone)
- {
- ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to explicit Host resolver successfully"));
-
- TNameEntry nameEntry;
-
- INFO_PRINTF2(_L("Requesting to resolve hostname: %S"),&hostname1);
-
- if ( (err = resolver.GetByName(hostname1,nameEntry)) != KErrNone)
- {
- ERR_PRINTF3(_L("Failed to resolve the host %S with error: %D"),&hostname1,err);
- }
- else
- {
- TInetAddr& netAddress = TInetAddr::Cast(nameEntry().iAddr);
-
- if (netAddress.IsUnspecified())
- {
- ERR_PRINTF1(_L("Invalid host address"));
- err = KErrArgument;
- }
- else
- {
- TBuf<KIPAddrLen> address;
- netAddress.Output(address);
- INFO_PRINTF1(_L("Got valid IP address:"));
- INFO_PRINTF2(_L("Host name: %S"),&nameEntry().iName);
- INFO_PRINTF2(_L("Host address: %S"),&address);
- }
- }
-
- if (err == KErrNone)
- {
- TNameEntry nameEntry2;
- INFO_PRINTF2(_L("Requesting to resolve hostname: %S"),&hostname2);
-
- if ( (err = resolver.GetByName(hostname2,nameEntry2)) != KErrNone)
- {
- INFO_PRINTF3(_L("Host resolution failed for %S with error: %D"),&hostname2,err);
- INFO_PRINTF1(_L("Test scenario passed"));
- err = KErrNone;
- }
- else
- {
- // TODO: We have to change this once we come up with end to end setup for VTun err = KErrArgument;
- INFO_PRINTF1(_L("We assumed that host is resolved through explicit connection and hence test is pass."));
- INFO_PRINTF1(_L("We have to change this once we come up with end to end setup for VTun."));
- err = KErrNone;
- // INFO_PRINTF1(_L("Error: Seems host is resolvable"));
- }
- }
-
- SetError(err);
-
- INFO_PRINTF1(_L("Closing host resolver"));
- resolver.Close();
-
- INFO_PRINTF1(_L("Closing connections and socket serv session"));
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC009L - Exit"));
- }
-
-
-// TODO: If I set suffix list name of length with max size then client panic's.
-void CDNSSuffixTestWrapper::DNSSuffixSupportTC010L()
- {
- INFO_PRINTF1(_L("**********************************************************************"));
- INFO_PRINTF1(_L("DNSSuffixSupportTC010L - DNS_Suffix_Support_010"));
- INFO_PRINTF1(_L("**********************************************************************"));
-
- TPtrC hostname;
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest010,KKeyDNSSuffixTestHostname,hostname))
- {
- ERR_PRINTF1(_L("Failed to read the host name from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Host name1: %S"),&hostname);
- }
-
- // @Santosh K Patil
- // @note: start multiple interfaces
- // @note: Set long suffix lists on both interface
- // @note: Create explicit resolver and set the suffixlist with max size.
-
- TFileName ethernetInterface;
- TInt err = KErrNone;
- err = GetFirstInterfaceNameL(ethernetInterface);
-
- if (KErrNone != err)
- {
- ERR_PRINTF1(_L("Failed get the name of the interface (ethernet)"));
- SetError(KErrNotFound);
- return;
- }
-
- INFO_PRINTF1(_L("Setting suffix list on interface:"));
- iSuffixList.Reset();
-
-
- // @Ganesh - Constructing suffix list for FillSuffixList with 3 separate suffix name entries in ini
- // @Ganesh - as the names are too long for the parser to parse and add it in one GetStringFromConfig call
- TPtrC suffixName;
- TBuf<1024> suffixList;
- if (!GetStringFromConfig(KSectionDNSSuffixTest010,KKeyDNSSuffixTestSuffixList1,suffixName))
- {
- ERR_PRINTF1(_L("Failed to read suffix lists from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF1(_L("Suffix name:"));
- INFO_PRINTF2(_L("%S"),&suffixName);
- suffixList.Append(suffixName);
- suffixList.Append(_L(";"));
- }
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest010,KKeyDNSSuffixTestSuffixList2,suffixName))
- {
- ERR_PRINTF1(_L("Failed to read suffix lists from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF1(_L("Suffix name:"));
- INFO_PRINTF2(_L("%S"),&suffixName);
- suffixList.Append(suffixName);
- suffixList.Append(_L(";"));
- }
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest010,KKeyDNSSuffixTestSuffixList3,suffixName))
- {
- ERR_PRINTF1(_L("Failed to read suffix lists from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF1(_L("Suffix name:"));
- INFO_PRINTF2(_L("%S"),&suffixName);
- suffixList.Append(suffixName);
- }
- FillSuffixList(iSuffixList,suffixList);
-
- if ( (err = iSocketServ.Connect()) != KErrNone)
- {
- ERR_PRINTF1(_L("Failed Connecting to socket server"));
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to socket server successfully"));
-
- RConnection vTunConn; // used for vTunnel
- RConnection firstConn;
-
- err = StartConnections(iSocketServ,firstConn, vTunConn);
-
- if (err != KErrNone)
- {
- ERR_PRINTF1(_L("Failed to start connections"));
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connections started successfully"));
-
- err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,ethernetInterface,iSuffixList);
-
- if (KErrNone != err)
- {
- ERR_PRINTF3(_L("Failed Setting the suffix list on %S with errror : %D"),ðernetInterface,err);
- SetError(err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- return;
- }
-
- INFO_PRINTF2(_L("Set suffix list on %S successfully"),ðernetInterface);
-
- INFO_PRINTF1(_L("Opening explicit resolver"));
-
- RHostResolver resolver;
- INFO_PRINTF1(_L("Creating explicit resolver"));
- if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp,firstConn)) != KErrNone)
- {
- ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to explicit Host resolver successfully"));
-
- TNameEntry nameEntry;
-
- INFO_PRINTF2(_L("Requesting to resolve hostname: %S"),&hostname);
-
- if ( (err = resolver.GetByName(hostname,nameEntry)) != KErrNone)
- {
- INFO_PRINTF3(_L("Failed to resolve the host %S with error: %D"),&hostname,err);
- INFO_PRINTF1(_L("Test Pass"));
- err = KErrNone;
- }
- else
- {
- err = KErrArgument;
- INFO_PRINTF1(_L("Host seems to be resolvable"));
- }
-
- SetError(err);
-
- INFO_PRINTF1(_L("Closing host resolver"));
- resolver.Close();
-
- INFO_PRINTF1(_L("Closing connections and socket serv session"));
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC010L - Exit"));
- }
-
-
-/*
- * @Test: Connection dissconnection test
- *
- * Make vTun as default interface
- * Set suffix on ethernet
- * Open implicit resolver (assumed that it is opened on vTun)
- * Request for name resolution (Async one)
- * Stop the connection and observe the behaviour.(Expected, resolution should fail gracefully)
- * With appropriate error code.
- *
- */
-void CDNSSuffixTestWrapper::DNSSuffixSupportTC011L()
- {
- INFO_PRINTF1(_L("**********************************************************************"));
- INFO_PRINTF1(_L("DNSSuffixSupportTC011L - DNS_Suffix_Support_011"));
- INFO_PRINTF1(_L("**********************************************************************"));
-
- TPtrC hostname;
-
- if (!GetStringFromConfig(KSectionDNSSuffixTest011,KKeyDNSSuffixTestHostname,hostname))
- {
- ERR_PRINTF1(_L("Failed to read the host name from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF2(_L("Host name1: %S"),&hostname);
- }
-
- TFileName ethernetInterface;
- TInt err = KErrNone;
- err = GetFirstInterfaceNameL(ethernetInterface);
-
- if (KErrNone != err)
- {
- ERR_PRINTF1(_L("Failed get the name of the interface (ethernet)"));
- SetError(KErrNotFound);
- return;
- }
-
- INFO_PRINTF1(_L("Setting suffix list on interface:"));
- iSuffixList.Reset();
-
-
- TPtrC suffixList;
- if (!GetStringFromConfig(KSectionDNSSuffixTest011,KKeyDNSSuffixTestSuffixList,suffixList))
- {
- ERR_PRINTF1(_L("Failed to read suffix lists from config"));
- SetError(KErrNotFound);
- return;
- }
- else
- {
- INFO_PRINTF1(_L("Suffix list:"));
- INFO_PRINTF2(_L("%S"),&suffixList);
- FillSuffixList(iSuffixList,suffixList);
- }
-
- if ( (err = iSocketServ.Connect()) != KErrNone)
- {
- ERR_PRINTF1(_L("Failed Connecting to socket server"));
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connected to socket server successfully"));
-
- RConnection vTunConn; // used for vTunnel
- RConnection firstConn;
-
- err = StartConnections(iSocketServ,firstConn, vTunConn);
-
- if (err != KErrNone)
- {
- ERR_PRINTF1(_L("Failed to start connections"));
- CloseSocketSrv();
- SetError(err);
- return;
- }
-
- INFO_PRINTF1(_L("Connections started successfully"));
-
- err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,ethernetInterface,iSuffixList);
-
- if (KErrNone != err)
- {
- ERR_PRINTF3(_L("Failed Setting the suffix list on %S with errror : %D"),ðernetInterface,err);
- SetError(err);
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- return;
- }
-
- INFO_PRINTF2(_L("Set suffix list on %S successfully"),ðernetInterface);
-
-
- // Open explcit resolver. using CDNSSuffixHostResolver
- CDNSSuffixHostResolver* resolver = CDNSSuffixHostResolver::NewLC(*this,iSocketServ,firstConn);
-
- INFO_PRINTF2(_L("Request to resolve host(async): %S"),&hostname);
- err = resolver->ResolveL(hostname);
-
- INFO_PRINTF1(_L("Stoping the connection"));
-
- err = firstConn.Stop();
-
- // Note: we have to stop the wait loop in HandleCallBackL
- iWait.Start();
-
- CleanupStack::PopAndDestroy();
-
- INFO_PRINTF1(_L("Closing connections and socket serv session"));
- firstConn.Close();
- vTunConn.Close();
- CloseSocketSrv();
- INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC011L - Exit"));
- }
-
-
-// End of file
--- a/tcpiputils/dnd/data/resolver.ini Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/data/resolver.ini Tue Aug 31 16:45:15 2010 +0300
@@ -17,7 +17,6 @@
hostname= localhost
[resolver]
-enablesuffixsupport= 1
retries= 3
mintime= 1
maxtime= 30
--- a/tcpiputils/dnd/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -65,5 +65,3 @@
// or "support" is specified.
// dndapp.mmp
-
-#include "../Test/Group/BLD.INF"
--- a/tcpiputils/dnd/inc/dnd_ini.h Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/inc/dnd_ini.h Tue Aug 31 16:45:15 2010 +0300
@@ -112,6 +112,4 @@
_LIT(KLlmnrIni_Ipv4Addr, "224.0.0.251");
_LIT(KLlmnrIni_Ipv6Addr, "ff02::fb");
#endif
-_LIT(DND_INI_SUFFIXSUPPORT, "enablesuffixsupport"); //< enabler for new suffix support
-
#endif
--- a/tcpiputils/dnd/inc/dns.h Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/inc/dns.h Tue Aug 31 16:45:15 2010 +0300
@@ -51,7 +51,7 @@
//
// MDnsSession API (methods callable by resolver)
// (documented in the mixin class)
- virtual TInt NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags, TBool aSuffixSupportEnabled);
+ virtual TInt NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags);
virtual void CancelQuery();
virtual TInt DoQueryL(const TTime &aRequestTime, const EDnsQType aQType);
virtual TInt DoNext(TDnsMessageBuf &aReply, TInt aNext) const;
@@ -118,14 +118,7 @@
// "Owner" source
CDndDnsclient *iOwner; //< Actual owner of the request data
- TUint iNetworkId; //< NetworkId from the request message.
- RInetSuffixList iSuffixList; //< Container to store the domain search list on the interface where the query is sent
- TBool iIsIncompleteHostName; //< Flag sent on the query to identify queries that need to retried on suffixes
- TBool iCanResolveIncompleteName; //< Flag to confirm incomplete name without domain suffix tried for resolution as it is
- THostName iActualQueryName; //< To store actual query name while domain suffixes are being applied
- TBool iPendingSuffixExist; //< Flag set when suffixes are exhausted
- TInt iFlowReqType; //< Differentiates IMPLICIT/EXPLICIT
- TBool iSuffixSupportEnabled; //< Flag to switch ON/OFF the suffix support
+ TUint iNetworkId; //< NetworkId from the request message.
};
class TInetAddressInfo;
--- a/tcpiputils/dnd/inc/dns_sock.h Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/inc/dns_sock.h Tue Aug 31 16:45:15 2010 +0300
@@ -117,13 +117,9 @@
If the request is not already queued, action defaults to
normal Queue().
- Exceptionally, the request assigns new ID when an incomplete query name
- is iterated to apply multiple domain suffices on the interface being used for sending requests
-
@param aRequest to be queued
- @param aRetryWithSuffix flag set to identify retry requests on incomplete query names. Defaulted to FALSE
*/
- void ReSend(TDnsRequest &aRequest, TBool aRetryWithSuffix = EFalse);
+ void ReSend(TDnsRequest &aRequest);
/**
Received a Query or unmatched Reply packet
--- a/tcpiputils/dnd/inc/engine.h Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/inc/engine.h Tue Aug 31 16:45:15 2010 +0300
@@ -59,7 +59,6 @@
TIp6Addr iLlmnrIpv6; //< The IPv6 multicast address
#endif
TUint iEDNS0; //< Enable EDNS0, if >= KDnsMaxMessage, value is receive payload size.
- TBool iSuffixSupportEnabled; //< Flag to switch ON/OFF the domain suffix based name resolution
};
class MTimeoutManager;
--- a/tcpiputils/dnd/inc/listener.h Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/inc/listener.h Tue Aug 31 16:45:15 2010 +0300
@@ -414,14 +414,12 @@
// are going to be used.
// @param aFlags
// modify the query operation. See KDnsModifier_* symbols.
- // @aSuffixSupportEnabled
- // switch on/off the domain suffix based name resolution support
//
// @returns
// @li < 0, if load failed (bad query information)
// @li = 0, if query initialized (KErrNone)
*/
- virtual TInt NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags, TBool aSuffixSupportEnabled) = 0;
+ virtual TInt NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags) = 0;
/**
// Cancel query activity
//
--- a/tcpiputils/dnd/inc/servers.h Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/inc/servers.h Tue Aug 31 16:45:15 2010 +0300
@@ -59,7 +59,6 @@
TUint32 iLockId; //< Eligible severs must be from "locked" scope
TUint8 iLockType; //< Locked scope level [1,,16]
TDnsServerScope iServerScope:8; //< Server scope and type
- THostName iDomainName; //< Domain name of the query for interface selection
};
class MDnsServerListNotify
@@ -174,19 +173,6 @@
// @param aFilter the server filter to modify
*/
virtual void LockByAddress(const TInetAddr &aAddr, TUint32 aNid, TDnsServerFilter &aFilter) = 0;
-
- /**
- // @brief Retrieves the domain suffix list set on the interface associated with the connection
- // @param aServerId The id of the server associated with the connection
- // @param aSuffixList reference to array for reading the interface specific domain suffices
- */
- virtual void InterfaceSuffixList(TInt aServerId, RInetSuffixList& aSuffixList) = 0;
- /**
- // @brief Modifies the outbound query properties so that the interface associated
- // with the query supports the domain name of the query
- // @param aFilter Reference to server properties associated with the query
- */
- virtual void UpdateDomain(TDnsServerFilter &aFilter) const = 0;
};
class CDndEngine;
--- a/tcpiputils/dnd/src/dns.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/src/dns.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -285,19 +285,7 @@
TBool ret = FALSE;
if (iCurrentServer == 0)
- {
ret = iOwner->iServerManager.OpenList(iFilter, this) > 0;
- // if suffix support is enabled in the resolver.ini
- // and query request had been initiated from a implicitly connected host resolver
- // Perform checks to find appropriate interface that can support the domain name
- // and update the server filter for the network id it should forward its request to
- if (iSuffixSupportEnabled && iFlowReqType == 0)
- iOwner->iServerManager.UpdateDomain(iFilter);
-#ifdef _LOG
- if (iNetworkId != iFilter.iLockId)
- Log::Printf(_L("\t\tDNS session [%u] domain suffix match resulted in change of net id from %d to %d"), (TInt)this, iNetworkId, iFilter.iLockId);
-#endif
- }
iOwner->iCache->GetServerAddress(iOwner->iServerManager.NameSpace(iFilter, iCurrentServer), tmp);
iFilter.iServerId = iOwner->iServerManager.ServerId(tmp);
iCurrentServer = iOwner->iServerManager.Next(iFilter, 0);
@@ -422,7 +410,7 @@
// TDndReqData::NewQuery
// ***********************
-TInt TDndReqData::NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags, TBool aSuffixSupportEnabled)
+TInt TDndReqData::NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags)
{
iIsReqPending = FALSE;
iIsNewQuery = TRUE;
@@ -431,14 +419,7 @@
iFlags = aFlags;
iFilter.iServerScope = aServerScope;
iFilter.iServerId = 0;
- iNetworkId = aQuery.iId; // Get the networkId information from the Query.
- iFlowReqType = aQuery.iFlowRequestType; // Get the IMPLICIT/EXPLICIT differentiation from the Query
- iSuffixSupportEnabled = aSuffixSupportEnabled; // Whether suffix support enabled in the resolver.ini
- iIsIncompleteHostName = FALSE; // Whether the query name is not fully qualified name
- iCanResolveIncompleteName = TRUE; // Flag to confirm incomplete name without domain suffix tried for resolution as it is
- iPendingSuffixExist = FALSE; // Identifies whether all of the available suffixes has been tried out
- iFilter.iDomainName.FillZ();
- iFilter.iDomainName.SetLength(0);
+ iNetworkId = aQuery.iId; // Get the networkId information from the Query.
#ifdef SYMBIAN_DNS_PUNYCODE
if( (aQuery.iScope & 0x80) == 0x80 )
@@ -462,28 +443,16 @@
if (aQuery.iType == KDnsRequestType_GetByName)
{
- THostName queryName(query.iName);
-
- // if the query is a qualified name, pick the domain name from the query
- // and update the server filter for the performing interface selection
- TInt posOfDomainNameStart = queryName.Locate('.');
- if (posOfDomainNameStart != KErrNotFound)
- {
- iFilter.iDomainName = queryName.Mid(posOfDomainNameStart+1);
- }
-
iFilter.iLockId = aQuery.iId;
iFilter.iLockType = KIp6AddrScopeNetwork;
#ifdef SYMBIAN_DNS_PUNYCODE
- TInt err = iQuestion.SetName(queryName);
+ TInt err = iQuestion.SetName(query.iName);
if( err != KErrNone)
{
return err;
}
- iActualQueryName.Copy(queryName);
#else
- iQuestion.SetName(queryName);
- iActualQueryName.Copy(queryName);
+ iQuestion.SetName(query.iName);
#endif // SYMBIAN_DNS_PUNYCODE
}
else
@@ -687,10 +656,6 @@
iQuestion.SetQType(aQType);
// -- only IN class queries are supported
iQuestion.SetQClass(EDnsQClass_IN);
- // Possible that the there is a different interface (other than the default)
- // that can resolve the domain name we are interested at.
- // By this time, we would have updated the netid in the filter, if at all
- iNetworkId = iFilter.iLockId;
if (iRecord)
{
@@ -722,22 +687,7 @@
SendResponse(KErrDndServerUnusable);
return 0;
}
-
-
- // Check to see if the query is not fully qualified
- THostName queryName;
- iQuestion.GetName(queryName);
- if (queryName.Locate('.') == KErrNotFound)
- {
- // If query is not fully qualified, set flags to mark this for further processing
- iIsIncompleteHostName = TRUE;
- // Pick the domain suffix list on the interface
- iOwner->iServerManager.InterfaceSuffixList(iCurrentServer, iSuffixList);
- // If count of suffices is 0, mark this, so that we do not have to perform any special processing
- if (iSuffixList.Count() > 0)
- iPendingSuffixExist = TRUE;
- }
-
+
// Check in the cache first. If the record does not exist
// in the cache, it will be created now (empty with KErrNotFound).
iRecord = iOwner->iCache->FindL(
@@ -984,10 +934,7 @@
case EDnsRcode_FORMAT_ERROR:
return KErrDndFormat;
case EDnsRcode_SERVER_FAILURE:
- /*
- In case the server returns the server failure, we just ignore the error code and treat it as server unusable. so that the query is sent to the other available servers for resolution. Need more reasonable solution ???--
- return KErrDndServerFailure; */
- return KErrDndServerUnusable;
+ return KErrDndServerFailure;
case EDnsRcode_NAME_ERROR:
return KErrDndBadName;
case EDnsRcode_NOT_IMPLEMENTED:
@@ -1117,90 +1064,6 @@
return 0;
ASSERT(aServer.Port() != 0);
- // If the query us incomplete and we have pending domain suffix that can be applied
- // lets try to update the query name and forward it to the next level
- if ( iIsIncompleteHostName )
- {
- if ( iPendingSuffixExist )
- {
- THostName queryName;
- iQuestion.GetName(queryName);
-
- if ( queryName.Locate('.') == KErrNotFound )
- {
- // If the query does not have a '.', we understand that the query has not tried
- // any of the suffixes. So, lets apply the first domain suffix from the interface
- TInt newLength = queryName.Length() + iSuffixList[0].Length();
- THostName qName(queryName);
- qName.Append(_L("."));
-
- // If the query name + suffix name exceeds allowed limit for length (256)
- // truncate the suffix name while appending to the min possible length
- // this automagically skips from getting resolved as the buffer does not have
- // enough space to append configuration msg along with it
- if (newLength < KMaxHostNameLength)
- qName.Append(iSuffixList[0]);
- else
- qName.Append(iSuffixList[0].Mid(0, KMaxHostNameLength - qName.Length()));
-
- iQuestion.SetName(qName);
-
- if ( iSuffixList.Count() == 1 )
- iPendingSuffixExist = FALSE;
-
- LOG(Log::Printf(_L("\t\t Query name after appending suffix = %S"), &qName));
- }
- else
- {
- // As we dont have a '.', we understand that there is some domain suffix already tried
- // and we have reached here because, we were not able to resolve with that domain suffix
- // Now, lets figure out in sequence, as to which one was applied previously
- // so that we shall apply the next one in the list and forward it for resolution
- for (TInt index=0; /*iPendingSuffixExist*/ ; index++ )
- {
- // Crop the leadng query name and '.' from the previous query and check to see
- // which suffix in the list was earlier applied
-
- TSuffixName queryNameSuffix( queryName.Mid( iActualQueryName.Length()+1 ) );
- TSuffixName domainSuffix(iSuffixList[index]);
- TInt suffixLength = domainSuffix.Length();
- TInt completeLength = suffixLength + iActualQueryName.Length() + 1;
-
- if (completeLength > KMaxHostNameLength)
- suffixLength = KMaxHostNameLength - (iActualQueryName.Length() + 1);
-
- if ( queryNameSuffix.Compare( domainSuffix.Mid( 0, suffixLength ) ) != KErrNone )
- continue;
-
- index++;
- TInt newLength = iActualQueryName.Length() + iSuffixList[index].Length();
- THostName qName(iActualQueryName);
- qName.Append(_L("."));
-
- if (newLength < KMaxHostNameLength)
- qName.Append(iSuffixList[index]);
- else
- qName.Append(iSuffixList[index].Mid(0, KMaxHostNameLength - qName.Length()));
-
- iQuestion.SetName(qName);
-
- if ( iSuffixList.Count() == index+1 )
- iPendingSuffixExist = FALSE;
-
- LOG(Log::Printf(_L("\t\t Query name after appending suffix = %S"), &qName));
- break;
- }
- }
- }
- else /* if ( iCanResolveIncompleteName )*/
- {
- iQuestion.SetName(iActualQueryName);
- LOG(Log::Printf(_L("\t\t Query name after appending suffix = %S"), &iActualQueryName));
- iCanResolveIncompleteName = FALSE;
- }
- }
-
-
aMsg.SetLength(sizeof(TDndHeader));
TDndHeader &hdr = (TDndHeader &)aMsg.Header();
if (aServer.IsMulticast())
@@ -1312,17 +1175,6 @@
// If cannot use the TCP, then just use the trunctated
// answer as is...
}
-
- // If a incomplete query has failed to resolve after application of a domain suffix
- // and we know that we still have some pending suffix that can be applied
- // let us retry with the available suffices
- LOG(Log::Printf(_L("Error from name resolution is %d"),err));
- if( err == KErrDndBadName && iIsIncompleteHostName && (iPendingSuffixExist || iCanResolveIncompleteName))
- {
- iOwner->ReSend(*this, ETrue); // Set the retryWithSuffix flag to TRUE so that a new request ID is assigned
- return 1;
- }
-
//
// UpdateCacheData updates data in cache only, if err is KErrNone, or
// updates error status for some specific err codes,
--- a/tcpiputils/dnd/src/dns_sock.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/src/dns_sock.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1248,17 +1248,11 @@
// If a request is not currently queued, this does an implicit
// Queue. (a new id is generated).
//
-// Exceptionally, the request assigns new ID when an incomplete query name
-// is iterated to apply multiple domain suffices on
-// the interface being used for sending requests
-//
// @param aRequest the request to be resent.
-// @param aRetryWithSuffix flag set to identify retry requests
-// on incomplete query names. Defaulted to FALSE
*/
-void CDnsSocket::ReSend(TDnsRequest &aRequest, TBool aRetryWithSuffix)
+void CDnsSocket::ReSend(TDnsRequest &aRequest)
{
- Queue(aRequest, (!aRetryWithSuffix && aRequest.IsQueued()) ? aRequest.Id() : -1);
+ Queue(aRequest, aRequest.IsQueued() ? aRequest.Id() : -1);
}
/**
--- a/tcpiputils/dnd/src/engine.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/src/engine.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -146,8 +146,6 @@
//
// Setup Configuration Parameters
//
- if (!FindVar(DND_INI_RESOLVER, DND_INI_SUFFIXSUPPORT, iParams.iSuffixSupportEnabled))
- iParams.iSuffixSupportEnabled = TRUE;
iParams.iRetries = GetIniValue(DND_INI_RESOLVER, DND_INI_RETRIES, KDndIni_Retries, 1, 255);
iParams.iMinTime = GetIniValue(DND_INI_RESOLVER, DND_INI_MINTIME, KDndIni_MinTime, 1, KMaxTInt);
iParams.iMaxTime = GetIniValue(DND_INI_RESOLVER, DND_INI_MAXTIME, KDndIni_MaxTime, 1, KMaxTInt);
--- a/tcpiputils/dnd/src/resolver.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/src/resolver.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -328,7 +328,6 @@
TUint8 iQueryStepRetries; //< Additional retries after the primary attempt
TInt iSourceCount; //< Remaining number of sources.
TInt iNext; //< Non-zero, if executing Next operation
- TBool iSuffixSupportEnabled; //< Flag to switch on/off the domain suffix list support in name resolution
// Specify Current Query state
@@ -842,7 +841,7 @@
iId, (TInt)iCurrentQuery().iSession, (TInt)iProbe.iQType, &iProbe.iName, (TInt)iProbe.iSession->Instance()));
// Use the current query as a probe starting point
//(void)iProbe.iSession->NewQuery(*iSession[0].iSession);
- (void)iProbe.iSession->NewQuery(iCurrentQuery(),iSourceNow,iQueryFlags | KDnsModifier_PQ, iSuffixSupportEnabled);
+ (void)iProbe.iSession->NewQuery(iCurrentQuery(),iSourceNow,iQueryFlags | KDnsModifier_PQ);
// initialize server (which is not tried)
(void)iProbe.iSession->PickDefaultServer();
@@ -1112,7 +1111,6 @@
ASSERT(iQueryDoneWait == 0);
iBuffer = aMsg;
- iSuffixSupportEnabled = cf.iSuffixSupportEnabled;
//
// A new command/query from the application
//
@@ -1383,7 +1381,7 @@
iResolver->iId, iResolver->iCurrentQuery().iSession, (TInt)iQType, &iName, (TInt)iSession->Instance()));
// ..if NewQuery returns an error, it will be the result of the query. Otherwise
// use the KErrEof as initial value.
- iStatus = iSession->NewQuery(iResolver->iCurrentQuery(), iResolver->iSourceNow, iResolver->iQueryFlags, iResolver->iSuffixSupportEnabled);
+ iStatus = iSession->NewQuery(iResolver->iCurrentQuery(), iResolver->iSourceNow, iResolver->iQueryFlags);
if (iStatus == KErrNone)
iStatus = KErrEof; // No content yet.
#ifdef SYMBIAN_DNS_PUNYCODE
@@ -1630,7 +1628,7 @@
// queries if the filter iLockId cannot be determined due to
// missing interfaces. And only happens if query address was
// without scope id.
- (void)iSession->NewQuery(iResolver->iCurrentQuery(), iResolver->iSourceNow, iResolver->iQueryFlags, iResolver->iSuffixSupportEnabled);
+ (void)iSession->NewQuery(iResolver->iCurrentQuery(), iResolver->iSourceNow, iResolver->iQueryFlags);
SendDnsQuery();
return;
}
--- a/tcpiputils/dnd/src/servers.cpp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/dnd/src/servers.cpp Tue Aug 31 16:45:15 2010 +0300
@@ -1,3 +1,4 @@
+// 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"
@@ -35,7 +36,6 @@
public:
TName iName; //< Name of the interface
TUint32 iScope[16]; //< The scope vector
- RInetSuffixList iSuffixList;//< Structure to hold the interface specific domain search list
};
// Item of the configured servers list
@@ -70,10 +70,6 @@
TInt BuildServerList();
void AddServerAddress(const TName &aInterface, const TInetAddr &aAddr);
void LockByAddress(const TInetAddr &aAddr, TUint32 aNid, TDnsServerFilter &aFilter);
- // Retrieves the domain search list configured on the interface associated with the nominated name server
- void InterfaceSuffixList(TInt aServerId, RInetSuffixList& aSuffixList);
- // Performs the network id selection for the query based on the domain name on the query
- void UpdateDomain(TDnsServerFilter &aFilter) const;
private:
// Build and add interface entry to the list (basic operation)
@@ -97,9 +93,6 @@
CArrayFixFlat<TDnsServerData> *iServerList; //< Current list of servers
CArrayFixFlat<TDnsInterfaceData> *iInterfaceList; //< Current list of interfaces
CArrayFixFlat<TDnsConfiguredServer> *iConfiguredList; //< Current list of configured servers
-
-private:
- TInt AddInterfaceEntry(const TSoInetIfQuery &aInfo, RSocket& aSocket);
};
@@ -147,44 +140,18 @@
delete iConfiguredList;
}
-// CDnsServerManager::AddInterfaceEntry
-TInt CDnsServerManager::AddInterfaceEntry(const TSoInetIfQuery &aInfo, RSocket& aSocket)
+// CDnsServerManager::AddInterfaceData
+TInt CDnsServerManager::AddInterfaceEntry(const TSoInetIfQuery &aInfo)
{
- TRAPD(err,
- TDnsInterfaceData &ifd = iInterfaceList->ExtendL();
-
- ifd.iName = aInfo.iName;
- for (TInt i = sizeof(ifd.iScope) / sizeof(ifd.iScope[0]); --i >= 0; )
- ifd.iScope[i] = aInfo.iZone[i];
-
- if (aSocket.SetOpt(KSoInetEnumDomainSuffix, KSolInetIfCtrl) == KErrNone)
- {
- ifd.iSuffixList.Reset();
- TInetSuffix data;
- TPckg<TInetSuffix> opt(data);
- while (aSocket.GetOpt(KSoInetNextDomainSuffix, KSolInetIfCtrl, opt) == KErrNone)
- {
- TSuffixName tmpBuf;
- tmpBuf.Copy(opt().iSuffixName);
- ifd.iSuffixList.AppendL(tmpBuf);
- }
- }
+ TRAPD(err,
+ TDnsInterfaceData &ifd = iInterfaceList->ExtendL();
+ ifd.iName = aInfo.iName;
+ for (TInt i = sizeof(ifd.iScope) / sizeof(ifd.iScope[0]); --i >= 0; )
+ ifd.iScope[i] = aInfo.iZone[i];
);
-
return err < 0 ? err : iInterfaceList->Count() - 1;
}
-TInt CDnsServerManager::AddInterfaceEntry(const TSoInetIfQuery &aInfo)
- {
- TRAPD(err,
- TDnsInterfaceData &ifd = iInterfaceList->ExtendL();
- ifd.iName = aInfo.iName;
- for (TInt i = sizeof(ifd.iScope) / sizeof(ifd.iScope[0]); --i >= 0; )
- ifd.iScope[i] = aInfo.iZone[i];
- );
- return err < 0 ? err : iInterfaceList->Count() - 1;
- }
-
// CDnsServerManager::AddToInterfaceList
// *************************************
/**
@@ -211,14 +178,13 @@
if (data.iName.Compare(aInfo.iName) == 0)
return i; // Interface already present in the list
}
-
//
// A new interface, get the scope vector
//
TPckgBuf<TSoInetIfQuery> opt;
opt().iName = aInfo.iName;
const TInt err = aSocket.GetOpt(KSoInetIfQueryByName, KSolInetIfQuery, opt);
- return err < 0 ? err : AddInterfaceEntry(opt(), aSocket);
+ return err < 0 ? err : AddInterfaceEntry(opt());
}
// CDnsServerManager::FindInterface
@@ -479,32 +445,6 @@
return TRUE;
}
-/**
-// @name UpdateDomain
-// @param aFilter the server filter
-// @param aServer to be tested against the filter
-*/
-void CDnsServerManager::UpdateDomain(TDnsServerFilter &aFilter) const
- {
- LOG(Log::Printf(_L("CDnsServerManager -- RHostResolver opened on implicit connection")));
- if ( aFilter.iDomainName.Length() )
- {
- TBool updatedDomain(FALSE);
- for (TInt i = iInterfaceList->Count(); --i >= 0 && !updatedDomain; )
- {
- TDnsInterfaceData &id = iInterfaceList->At(i);
- for (TInt i=0; i<id.iSuffixList.Count();i++)
- {
- if (aFilter.iDomainName.Find(id.iSuffixList[i]) != KErrNotFound)
- {
- aFilter.iLockId = id.iScope[aFilter.iLockType-1];
- updatedDomain = TRUE;
- break;
- }
- }
- }
- }
- }
//
// MDnsServerManager API
@@ -741,22 +681,3 @@
}
}
}
-
-/**
-// @name InterfaceSuffixList
-// @param aServerId Id of the server used for name resolution
-// @param aSuffixList reference to array for reading the interface specific domain suffices
-*/
-void CDnsServerManager::InterfaceSuffixList(TInt aServerId, RInetSuffixList& aSuffixList)
- {
- const TInt N = iServerList->Count();
- for (TInt i = 0; i < N; ++i)
- {
- const TDnsServerData &server = iServerList->At(i);
- if (server.iServerId == aServerId)
- {
- aSuffixList = iInterfaceList->At(server.iInterface).iSuffixList;
- break;
- }
- }
- }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/configs/S-ced-hw-empty.cfg Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,557 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## ModemBearer
+##
+[ModemBearer]
+ADD_TEMPLATE
+ Id=0
+ Name=Default Modem
+ IfName=PPP
+ PortName=COMM::0
+ TSYName=MM
+ CSYName=ECUART
+ LastSocketActivityTimeout=30
+ LastSessionClosedTimeout=180
+ LastSocketClosedTimeout=30
+ 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
+ MessageCentreNumber=+44123456789
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ CommRole=0
+ SIRSettings=0
+ Agent=CSD.agt
+ FIELD_COUNT=70
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Id=2
+ Name=GPRS Modem
+ IfName=spud-rawip
+ PortName=DATAPORT::0
+ TSYName=PHONETSY
+ CSYName=DATAPORT
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ DataBits=5
+ 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
+ MessageCentreNumber=+44123456789
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=0
+ CommRole=0
+ SIRSettings=0
+ Agent=gprsumtsagent.agt
+ BCAStack=BcaToIsc
+ FIELD_COUNT=71
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Id=3
+ Name=CSD Modem
+ IfName=PPP
+ PortName=DATAPORT::0
+ TSYName=PHONETSY
+ CSYName=DATAPORT
+ LastSocketActivityTimeout=300
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=300
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=19200
+ Handshaking=196
+ SpecialRate=0
+ XonChar=17
+ XoffChar=19
+ FaxClassPref=AUTO
+ SpeakerPref=NEVER
+ SpeakerVolPref=QUIET
+ ModemInitString=ATZ
+ 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
+ MessageCentreNumber=+358508771010
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=0
+ CommRole=0
+ SIRSettings=0
+ Agent=csd.agt
+ FIELD_COUNT=70
+END_ADD
+
+
+############################################################
+## Location
+##
+[Location]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=Default Location
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+ FIELD_COUNT=9
+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
+
+
+############################################################
+## 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
+
+
+############################################################
+## GlobalSettings
+##
+[GlobalSettings]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=DefaultRecordName-1
+ WAPAccessPoint=1
+ ConnectionAttempts=1
+ RedialAttempts=0
+ SmsBearer=3
+ SmsReceiveMode=2
+ GPRSAttachMode=1
+ AcceptIncomingGprs=1
+ GPRSClassCBearer=GSM
+ ModemForDataAndFax=3
+ ModemForPhoneServicesAndSMS=3
+ LocationForDataAndFax=1
+ LocationForPhoneServicesAndSMS=1
+ MaxMBufHeap=1
+ DefaultNetwork=1
+ BearerAvailabilityCheckTSY=PHONETSY
+ FIELD_COUNT=17
+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
+ 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=29
+END_TEMPLATE
+
+
+############################################################
+## 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
+
+
+############################################################
+## OutgoingGPRS
+##
+[OutgoingGPRS]
+ADD_TEMPLATE
+ Id=0
+ Name=template
+ 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=TRUE
+ AnonymousAccess=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ AuthRetries=0
+ IpGateway=0.0.0.0
+ IpAddrFromServer=TRUE
+ IpAddr=0.0.0.0
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=0.0.0.0
+ IpNameServer2=0.0.0.0
+ Ip6DNSAddrFromServer=TRUE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=TRUE
+ GprsAccessPointType=2
+ QosWarningTimeout=-1
+ UmtsR99QoSAndOn=1
+ FIELD_COUNT=32
+END_TEMPLATE
+
+
+############################################################
+## DefaultGPRS
+##
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=Dummy Default GPRS Settings
+ Usage=1
+ PDPType=IPV6
+ PDPAddress=www.wid.com
+ Precedence=1
+ Delay=1
+ Reliability=1
+ PeakThroughput=1
+ MeanThroughput=1
+ MinPrecedence=1
+ MinDelay=1
+ MinReliability=1
+ MinPeakThroughput=1
+ MinMeanThroughput=1
+ DataCompression=TRUE
+ HeaderCompression=TRUE
+ GprsUseEdge=FALSE
+ AnonymousAccess=TRUE
+ FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+##
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=DefaultRecordName-1
+ Ranking=0
+ Direction=OUTGOING
+ BearerSet=CSD & WCDMA
+ DialogPref=PROMPT
+ IAP=0
+ FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## WAPAccessPoint
+##
+[WAPAccessPoint]
+ADD_TEMPLATE
+ Id=0
+ Name=Default Dial In ISP
+ CurrentBearer=WAPIPBearer
+ FIELD_COUNT=3
+END_TEMPLATE
+
+
+############################################################
+## WAPIPBearer
+##
+[WAPIPBearer]
+ADD_TEMPLATE
+ Id=0
+ Name=DefaultRecordName-1
+ AccessPointId=0
+ IAP=0
+ WSPOption=CONNECTIONLESS
+ Security=FALSE
+ ProxyPortNumber=0
+ FIELD_COUNT=7
+END_TEMPLATE
+
+
+############################################################
+## WAPSMSBearer
+##
+[WAPSMSBearer]
+ADD_TEMPLATE
+ Id=0
+ Name=DefaultRecordName-1
+ AccessPointId=0
+ WSPOption=CONNECTIONLESS
+ Security=FALSE
+ FIELD_COUNT=5
+END_TEMPLATE
+
+
+############################################################
+## 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
+
+############################################################
+## 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
Binary file tcpiputils/punycodeconv/te_punycodeconverter/configs/cccccc00_punycodeconverter.cre has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/configs/te_punycodeconverter_connectionpref.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences operation="add">
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.WLANWithDynamicDaemonIP</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
Binary file tcpiputils/punycodeconv/te_punycodeconverter/configs/te_punycodeconverter_wlan.xml has changed
--- a/tcpiputils/punycodeconv/te_punycodeconverter/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// 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"
@@ -15,10 +15,15 @@
PRJ_TESTEXPORTS
./te_punycodeconverter.iby /epoc32/rom/include/te_punycodeconverter.iby
+../configs/te_punycodeconverter.ini z:/testdata/configs/te_punycodeconverter.ini
+#ifdef SIROCCO_CODE_MIGRATION
+../configs/cccccc00_punycodeconverter.cre z:/testdata/configs/cccccc00_punycodeconverter.cre
+../scripts/te_punycodeconverter_wlan.script z:/testdata/scripts/te_punycodeconverter_wlan.script
+#else
../scripts/te_punycodeconverter.script z:/testdata/scripts/te_punycodeconverter.script
-../configs/te_punycodeconverter.ini z:/testdata/configs/te_punycodeconverter.ini
../configs/te_punycodeconverter_ced.xml z:/testdata/configs/te_punycodeconverter_ced.xml
+#endif
PRJ_TESTMMPFILES
./te_punycodeconverter.mmp
--- a/tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.iby Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// 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"
@@ -20,8 +20,14 @@
#include <punycodeconverter.iby>
data=ABI_DIR\DEBUG_DIR\te_punycodeconverter.exe System\bin\te_punycodeconverter.exe
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_punycodeconverter.ini testdata\configs\te_punycodeconverter.ini
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_punycodeconverter_wlan.script testdata\scripts\te_punycodeconverter.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\cccccc00_punycodeconverter.cre testdata\configs\cccccc00_punycodeconverter.cre
+#else
data=EPOCROOT##epoc32\data\z\testdata\scripts\te_punycodeconverter.script testdata\scripts\te_punycodeconverter.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_punycodeconverter.ini testdata\configs\te_punycodeconverter.ini
data=EPOCROOT##epoc32\data\z\testdata\configs\te_punycodeconverter_ced.xml testdata\configs\te_punycodeconverter_ced.xml
+#endif
+
#endif //__TE_PUNYCODECONVERTER_IBY__
--- a/tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -27,8 +27,8 @@
SOURCE te_punycodeconvertertestserver.cpp te_punycodeconvertertestblock.cpp te_punycodeconvertertestwrapper.cpp
#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE \epoc32\include\test
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/test
#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SYSTEMINCLUDE /epoc32/include/platform/test
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/scripts/te_punycodeconverter_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,441 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//! @file
+//! @SYMTestSuiteName NET-DND-punycodeconverter-CIT
+//! @SYMScriptTestEnvironment TestExecuteFramework
+//
+//Unload esock forcefully
+RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
+
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+//Configure commdb.
+//ced -i z:\testdata\configs\te_punycodeconverter_ced.xml
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_punycodeconverter.cre c:\private\10202be9\persists\cccccc00.cre
+
+RUN_SCRIPT z:\testdata\scripts\te_esock_test_loadesock.script
+
+//Load the Server
+LOAD_SERVER te_punycodeconverter
+
+START_TESTCASE NET-DND-punycodeconverter-test1
+//! @SYMTestCaseID NET-DND-punycodeconverter-test1
+//! @SYMTestCaseDesc PREQ2296 - REQ11948
+//! Resolve International Domain Name.
+//! @SYMTestPriority Critical
+//! @SYMTestActions Load te_punycodeconverter test server
+//! Run the ResolveName test case by passing te_punycodeconverter_test1.ini, which consists available IDN.
+//! @SYMTestExpectedResults Domain name resolved successfully.
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test1
+ COMMAND punycodeconverter_test1 OpenResolver ResolveName1
+ COMMAND punycodeconverter_test1 EnableIdnSupport ResolveName1
+ COMMAND punycodeconverter_test1 ResolveName ResolveName1
+ COMMAND punycodeconverter_test1 CloseResolver ResolveName1
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test1
+
+
+START_TESTCASE NET-DND-punycodeconverter-test2
+//! @SYMTestCaseID NET-DND-punycodeconverter-test2
+//! @SYMTestCaseDesc PREQ2296 - REQ11948
+//! DND must return valid error code for unavailable International Domain Name.
+//! @SYMTestPriority High
+//! @SYMTestActions Load te_punycodeconverter test server
+//! Run the ResolveName test case by passing te_punycodeconverter_test2.ini, which consists unavailable IDN.
+//! @SYMTestExpectedResults DND must return valid error code KErrDndNameNotFound.
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test2
+ COMMAND punycodeconverter_test2 OpenResolver ResolveName2
+ COMMAND punycodeconverter_test2 EnableIdnSupport ResolveName2
+ COMMAND !Error=-5120 punycodeconverter_test2 ResolveName ResolveName2
+ COMMAND punycodeconverter_test2 CloseResolver ResolveName2
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test2
+
+
+START_TESTCASE NET-DND-punycodeconverter-test3
+//! @SYMTestCaseID NET-DND-punycodeconverter-test3
+//! @SYMTestCaseDesc PREQ2296 - REQ11948
+//! Resolve manually converted punycode name.
+//! @SYMTestPriority Critical
+//! @SYMTestActions Load te_punycodeconverter test server
+//! Run the ResolveName test case by passing te_punycodeconverter.ini, which consists an domain name of type punycode.
+//! @SYMTestExpectedResults Domain name resolved successfully.
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test3
+ COMMAND punycodeconverter_test3 OpenResolver ResolveName3
+ COMMAND punycodeconverter_test3 EnableIdnSupport ResolveName3
+ COMMAND punycodeconverter_test3 ResolveName ResolveName3
+ COMMAND punycodeconverter_test3 CloseResolver ResolveName3
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test3
+
+
+START_TESTCASE NET-DND-punycodeconverter-test4
+//! @SYMTestCaseID NET-DND-punycodeconverter-test4
+//! @SYMTestCaseDesc PREQ2296 - REQ11948
+//! DND must return valid error codes for malformed punycode names.
+//! @SYMTestPriority High
+//! @SYMTestActions Load te_punycodeconverter test server
+//! Run the ResolveName test case by passing te_punycodeconverter_test4.ini, which consists an domain name of type punycode.
+//! @SYMTestExpectedResults DND must return valid error code KErrDndNameNotFound.
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test4
+ COMMAND punycodeconverter_test4 OpenResolver ResolveName4
+ COMMAND punycodeconverter_test4 EnableIdnSupport ResolveName4
+ COMMAND !Error=-5120 punycodeconverter_test4 ResolveName ResolveName4
+ COMMAND punycodeconverter_test4 CloseResolver ResolveName4
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test4
+
+
+START_TESTCASE NET-DND-punycodeconverter-test5
+//! @SYMTestCaseID NET-DND-punycodeconverter-test5
+//! @SYMTestCaseDesc PREQ2296 - REQ11948
+//! International domain name length exceeds the max limit of 255 chars
+//! @SYMTestPriority High
+//! @SYMTestActions Load te_punycodeconverter test server
+//! Run the ResolveName test case by passing te_punycodeconverter_test5.ini i, which consists an lengthy IDN.
+//! @SYMTestExpectedResults DND must return valid error code KErrDndBadName.
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test5
+ COMMAND punycodeconverter_test5 OpenResolver ResolveName5
+ COMMAND punycodeconverter_test5 EnableIdnSupport ResolveName5
+ COMMAND !Error=-5127 punycodeconverter_test5 ResolveName ResolveName5
+ COMMAND punycodeconverter_test5 CloseResolver ResolveName5
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test5
+
+
+START_TESTCASE NET-DND-punycodeconverter-test6
+//! @SYMTestCaseID NET-DND-punycodeconverter-test6
+//! @SYMTestCaseDesc PREQ2296 - REQ11950 REQ11948
+//! Using punycodeconverter API's convert valid IDN to punycode and use DND to resolve this punycode.
+//! @SYMTestPriority Medium
+//! @SYMTestActions Load te_punycodeconverter test server
+//! Run the IdnToPuny test case and preserve the punycode.
+//! Use the converted punycode and run the ResolveName test case.
+//! @SYMTestExpectedResults Punycodeconverter conversion successfull.
+//! Converted punycode resolved successfully by DND.
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test6
+ COMMAND punycodeconverter_test6 IdnToPunyCode IdnToPunyCode6
+ COMMAND punycodeconverter_test6 OpenResolver ResolveName6
+ COMMAND punycodeconverter_test6 EnableIdnSupport ResolveName6
+ COMMAND punycodeconverter_test6 ResolveName ResolveName6
+ COMMAND punycodeconverter_test6 CloseResolver ResolveName6
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test6
+
+
+START_TESTCASE NET-DND-punycodeconverter-test7
+//! @SYMTestCaseID NET-DND-punycodeconverter-test7
+//! @SYMTestCaseDesc PREQ2296 - REQ11950
+//! Convert the valid IDN to punycode and check this against maually converted one.
+//! @SYMTestPriority High
+//! @SYMTestActions Load te_punycodeconverter test server
+//! Run the IdnToPuny test case.
+//! Compare the converted punycode against the manually converted one which is fetched from te_punycodeconverter.ini.
+//! @SYMTestExpectedResults Punycode converted by punycodeconverter and manually converted are same.
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test7
+ COMMAND punycodeconverter_test7 IdnToPunyCode IdnToPunyCode7
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test7
+
+
+START_TESTCASE NET-DND-punycodeconverter-test8
+//! @SYMTestCaseID NET-DND-punycodeconverter-test8
+//! @SYMTestCaseDesc PREQ2296 - REQ11951
+//! Convert the valid punycode to IDN and check this against maually converted one.
+//! @SYMTestPriority High
+//! @SYMTestActions Load te_punycodeconverter test server.
+//! Run the PunyToIdn test case.
+//! Compare the converted IDN against the manually converted one which is fetched from te_punycodeconverter.ini.
+//! @SYMTestExpectedResults IDN converted by punycodeconverter and manually converted are same.
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test8
+ COMMAND punycodeconverter_test8 PunyCodeToIdn PunyCodeToIdn8
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test8
+
+
+START_TESTCASE NET-DND-punycodeconverter-test9
+//! @SYMTestCaseID NET-DND-punycodeconverter-test9
+//! @SYMTestCaseDesc PREQ2296 - REQ11950
+//! Punycode converter returns valid error upon receiving malformed punycode for conversion.
+//! @SYMTestPriority High
+//! @SYMTestActions Load te_punycodeconverter test server.
+//! Run the PunyToIdn test case.
+//! @SYMTestExpectedResults Punycodeconverter conversion failed with error KErrDndBadName.
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test9
+ COMMAND !Error=-5127 punycodeconverter_test9 PunyCodeToIdn PunyCodeToIdn9
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test9
+
+
+START_TESTCASE NET-DND-punycodeconverter-test10
+//! @SYMTestCaseID NET-DND-punycodeconverter-test10
+//! @SYMTestCaseDesc PREQ2296 - REQ11948
+//! Relsolve the IDN name by providing the IP address.
+//! @SYMTestPriority Critical
+//! @SYMTestActions Load te_punycodeconverter test server
+//! Run the ResolveAddress test case.
+//! @SYMTestExpectedResults DND resolves the IP address successfully.
+//! Result is actual IDN must be as the one provided in te_punycodeconverter_test10.ini
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test10
+ COMMAND punycodeconverter_test10 OpenResolver ResolveAddress10
+ COMMAND punycodeconverter_test10 EnableIdnSupport ResolveAddress10
+ COMMAND punycodeconverter_test10 ResolveAddress ResolveAddress10
+ COMMAND punycodeconverter_test10 CloseResolver ResolveAddress10
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test10
+
+
+START_TESTCASE NET-DND-punycodeconverter-test11
+//! @SYMTestCaseID NET-DND-punycodeconverter-test11
+//! @SYMTestCaseDesc PREQ2296 - REQ11951
+//! DND must resolve the punycodeconverter converted IDN
+//! @SYMTestPriority High
+//! @SYMTestActions Load te_punycodeconverter test server
+//! Run the PunyToIdn test case, preserve the IDN
+//! Use the preserved IDN and run ResolveName test case.
+//! @SYMTestExpectedResults DND resolves the punycodeconverter converted IDN successfully.
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test11
+ COMMAND punycodeconverter_test11 PunyCodeToIdn PunyCodeToIdn11
+ COMMAND punycodeconverter_test11 OpenResolver PunyCodeToIdn11
+ COMMAND punycodeconverter_test11 EnableIdnSupport PunyCodeToIdn11
+ COMMAND punycodeconverter_test11 ResolveName ResolveName11
+ COMMAND punycodeconverter_test11 CloseResolver PunyCodeToIdn11
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test11
+
+
+START_TESTCASE NET-DND-punycodeconverter-test12
+//! @SYMTestCaseID NET-DND-punycodeconverter-test12
+//! @SYMTestCaseDesc PREQ2296 - REQ11949
+//! New component capability test.
+//! @SYMTestPriority Critical
+//! @SYMTestActions Create te_punycodeconverter1 by setting the capability UserEnvironment
+//! Create te_punycodeconverter2 by setting the capability NetworkServices
+//! Load te_punycodeconverter1 test server.
+//! Run the CapTest test case
+//! Load te_punycodeconverter2 test server.
+//! Run the CapTest test case.
+//! @SYMTestExpectedResults Error KErrPermissionDenied has to be reported for frist test case,
+//! KErrNone for the second one.
+//! @SYMTestType CIT
+//! @SYMCreationDate 11/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+//capability UserEnvironment
+RUN_PROGRAM -1 setcap.exe te_punycodeconverter.exe 80000 -SID 10281806 te_punycodeconverter1.exe
+//capability NetworkServices
+RUN_PROGRAM -1 setcap.exe te_punycodeconverter.exe 400 -SID 10281806 te_punycodeconverter2.exe
+
+//Load the Server
+LOAD_SERVER te_punycodeconverter1
+
+ START_TEST_BLOCK te_punycodeconverter1 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test12
+ COMMAND punycodeconverter_test12 OpenResolver CapTest12
+ COMMAND punycodeconverter_test12 EnableIdnSupport CapTest12
+ COMMAND !Error=-46 punycodeconverter_test12 CapTest CapTest12
+ COMMAND punycodeconverter_test12 CloseResolver CapTest12
+ END_TEST_BLOCK
+
+//Load the Server
+LOAD_SERVER te_punycodeconverter2
+
+ START_TEST_BLOCK te_punycodeconverter2 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test12
+ COMMAND punycodeconverter_test12 OpenResolver CapTest12
+ COMMAND punycodeconverter_test12 EnableIdnSupport CapTest12
+ COMMAND punycodeconverter_test12 CapTest CapTest12
+ COMMAND punycodeconverter_test12 CloseResolver CapTest12
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test12
+
+
+START_TESTCASE NET-DND-punycodeconverter-test13
+//! @SYMTestCaseID NET-DND-punycodeconverter-test13
+//! @SYMTestCaseDesc PREQ2296 - REQ12162
+//! Enable IDN, Resolve surrogate pair code unit
+//! @SYMTestPriority High
+//! @SYMTestActions Load te_punycodeconverter test server
+//! Run the surrogatepair test case
+//! @SYMTestExpectedResults Expect KErrDndBadName error
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test13
+ COMMAND punycodeconverter_test13 OpenResolver SurrogatePair13
+ COMMAND punycodeconverter_test13 EnableIdnSupport SurrogatePair13
+ COMMAND !Error=-5127 punycodeconverter_test13 SurrogatePair SurrogatePair13
+ COMMAND punycodeconverter_test13 CloseResolver SurrogatePair13
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test13
+
+
+START_TESTCASE NET-DND-punycodeconverter-test14
+//! @SYMTestCaseID NET-DND-punycodeconverter-test14
+//! @SYMTestCaseDesc PREQ2296 - REQ12162
+//! Disable IDN, Resolve surrogate pair code unit
+//! @SYMTestPriority Medium
+//! @SYMTestActions Load te_punycodeconverter test server
+//! run surrogatepair test case
+//! @SYMTestExpectedResults Expect KErrDndBadName
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test14
+ COMMAND punycodeconverter_test14 OpenResolver SurrogatePair14
+ COMMAND punycodeconverter_test14 DisableIdnSupport SurrogatePair14
+ COMMAND !Error=-5127 punycodeconverter_test14 SurrogatePair SurrogatePair14
+ COMMAND punycodeconverter_test14 CloseResolver SurrogatePair14
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test14
+
+
+START_TESTCASE NET-DND-punycodeconverter-test15
+//! @SYMTestCaseID NET-DND-punycodeconverter-test15
+//! @SYMTestCaseDesc Disable IDN using the RHostResolver API SetOpt, try to resolve valid IDN name
+//! @SYMTestPriority High
+//! @SYMTestActions Load te_punycodeconverter test server
+//! run ResolveName test case
+//! @SYMTestExpectedResults Expect the error KErrDndNameNotFound
+//! @SYMTestType CIT
+//! @SYMCreationDate 5/2/2009
+//! @SYMAuthor tamilarasub
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test15
+ COMMAND punycodeconverter_test15 OpenResolver SurrogatePair15
+ COMMAND punycodeconverter_test15 DisableIdnSupport SurrogatePair15
+ COMMAND !Error=-5120 punycodeconverter_test15 ResolveName ResolveName15
+ COMMAND punycodeconverter_test15 CloseResolver SurrogatePair15
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test15
+
+START_TESTCASE NET-DND-punycodeconverter-test16
+//! @SYMTestCaseID NET-DND-punycodeconverter-test16
+//! @SYMTestCaseDesc DEF141282 fix
+//! Convert the valid punycode to IDN and check this against maually converted one.
+//! @SYMTestPriority High
+//! @SYMTestActions Load te_punycodeconverter test server.
+//! Run the PunyToIdn test case.
+//! Compare the converted IDN against the manually converted one which is fetched from te_punycodeconverter.ini.
+//! @SYMTestExpectedResults IDN converted by punycodeconverter and manually converted are same.
+//! @SYMTestType CIT
+//! @SYMCreationDate 4/08/2009
+//! @SYMAuthor Maheswara
+//! @SYMTestStatus 3. Released
+
+ START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+ CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test16
+ COMMAND punycodeconverter_test16 PunyCodeToIdn PunyCodeToIdn16
+ END_TEST_BLOCK
+
+END_TESTCASE NET-DND-punycodeconverter-test16
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_stopallinterfaces.script
+RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/punycodeconv/te_unittest/configs/S-ced-hw-empty.cfg Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,557 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## ModemBearer
+##
+[ModemBearer]
+ADD_TEMPLATE
+ Id=0
+ Name=Default Modem
+ IfName=PPP
+ PortName=COMM::0
+ TSYName=MM
+ CSYName=ECUART
+ LastSocketActivityTimeout=30
+ LastSessionClosedTimeout=180
+ LastSocketClosedTimeout=30
+ 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
+ MessageCentreNumber=+44123456789
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=9905
+ CommRole=0
+ SIRSettings=0
+ Agent=CSD.agt
+ FIELD_COUNT=70
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+ Id=2
+ Name=GPRS Modem
+ IfName=spud-rawip
+ PortName=DATAPORT::0
+ TSYName=PHONETSY
+ CSYName=DATAPORT
+ LastSocketActivityTimeout=-1
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=-1
+ DataBits=5
+ 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
+ MessageCentreNumber=+44123456789
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=0
+ CommRole=0
+ SIRSettings=0
+ Agent=gprsumtsagent.agt
+ BCAStack=BcaToIsc
+ FIELD_COUNT=71
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+ Id=3
+ Name=CSD Modem
+ IfName=PPP
+ PortName=DATAPORT::0
+ TSYName=PHONETSY
+ CSYName=DATAPORT
+ LastSocketActivityTimeout=300
+ LastSessionClosedTimeout=1
+ LastSocketClosedTimeout=300
+ DataBits=8
+ StopBits=1
+ Parity=NONE
+ Rate=19200
+ Handshaking=196
+ SpecialRate=0
+ XonChar=17
+ XoffChar=19
+ FaxClassPref=AUTO
+ SpeakerPref=NEVER
+ SpeakerVolPref=QUIET
+ ModemInitString=ATZ
+ 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
+ MessageCentreNumber=+358508771010
+ MessageValidityPeriod=1440
+ MessageDeliveryReport=FALSE
+ MinimumSignalLevel=0
+ CommRole=0
+ SIRSettings=0
+ Agent=csd.agt
+ FIELD_COUNT=70
+END_ADD
+
+
+############################################################
+## Location
+##
+[Location]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=Default Location
+ IntlPrefixCode=+
+ NatPrefixCode=0
+ NatCode=44
+ Mobile=TRUE
+ UsePulseDial=FALSE
+ WaitForDialTone=FALSE
+ PauseAfterDialout=0
+ FIELD_COUNT=9
+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
+
+
+############################################################
+## 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
+
+
+############################################################
+## GlobalSettings
+##
+[GlobalSettings]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=DefaultRecordName-1
+ WAPAccessPoint=1
+ ConnectionAttempts=1
+ RedialAttempts=0
+ SmsBearer=3
+ SmsReceiveMode=2
+ GPRSAttachMode=1
+ AcceptIncomingGprs=1
+ GPRSClassCBearer=GSM
+ ModemForDataAndFax=3
+ ModemForPhoneServicesAndSMS=3
+ LocationForDataAndFax=1
+ LocationForPhoneServicesAndSMS=1
+ MaxMBufHeap=1
+ DefaultNetwork=1
+ BearerAvailabilityCheckTSY=PHONETSY
+ FIELD_COUNT=17
+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
+ 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=29
+END_TEMPLATE
+
+
+############################################################
+## 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
+
+
+############################################################
+## OutgoingGPRS
+##
+[OutgoingGPRS]
+ADD_TEMPLATE
+ Id=0
+ Name=template
+ 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=TRUE
+ AnonymousAccess=FALSE
+ IfNetworks=ip
+ IfPromptForAuth=FALSE
+ AuthRetries=0
+ IpGateway=0.0.0.0
+ IpAddrFromServer=TRUE
+ IpAddr=0.0.0.0
+ IpDNSAddrFromServer=TRUE
+ IpNameServer1=0.0.0.0
+ IpNameServer2=0.0.0.0
+ Ip6DNSAddrFromServer=TRUE
+ EnableLCPExtension=FALSE
+ DisablePlainTextAuth=TRUE
+ GprsAccessPointType=2
+ QosWarningTimeout=-1
+ UmtsR99QoSAndOn=1
+ FIELD_COUNT=32
+END_TEMPLATE
+
+
+############################################################
+## DefaultGPRS
+##
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=Dummy Default GPRS Settings
+ Usage=1
+ PDPType=IPV6
+ PDPAddress=www.wid.com
+ Precedence=1
+ Delay=1
+ Reliability=1
+ PeakThroughput=1
+ MeanThroughput=1
+ MinPrecedence=1
+ MinDelay=1
+ MinReliability=1
+ MinPeakThroughput=1
+ MinMeanThroughput=1
+ DataCompression=TRUE
+ HeaderCompression=TRUE
+ GprsUseEdge=FALSE
+ AnonymousAccess=TRUE
+ FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+##
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+ Id=1
+ Name=DefaultRecordName-1
+ Ranking=0
+ Direction=OUTGOING
+ BearerSet=CSD & WCDMA
+ DialogPref=PROMPT
+ IAP=0
+ FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## WAPAccessPoint
+##
+[WAPAccessPoint]
+ADD_TEMPLATE
+ Id=0
+ Name=Default Dial In ISP
+ CurrentBearer=WAPIPBearer
+ FIELD_COUNT=3
+END_TEMPLATE
+
+
+############################################################
+## WAPIPBearer
+##
+[WAPIPBearer]
+ADD_TEMPLATE
+ Id=0
+ Name=DefaultRecordName-1
+ AccessPointId=0
+ IAP=0
+ WSPOption=CONNECTIONLESS
+ Security=FALSE
+ ProxyPortNumber=0
+ FIELD_COUNT=7
+END_TEMPLATE
+
+
+############################################################
+## WAPSMSBearer
+##
+[WAPSMSBearer]
+ADD_TEMPLATE
+ Id=0
+ Name=DefaultRecordName-1
+ AccessPointId=0
+ WSPOption=CONNECTIONLESS
+ Security=FALSE
+ FIELD_COUNT=5
+END_TEMPLATE
+
+
+############################################################
+## 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
+
+############################################################
+## 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
Binary file tcpiputils/punycodeconv/te_unittest/configs/cccccc00_unittestidna.cre has changed
Binary file tcpiputils/punycodeconv/te_unittest/configs/te_unittestidna_wlan.xml has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/punycodeconv/te_unittest/configs/unittestidna_connectionpref.xml Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+ <ConnectionPreferencesTable>
+ <ConnectionPreferences operation="add">
+ <Name>ConnectionPreferencesTable1</Name>
+ <Ranking>1</Ranking>
+ <Direction>OUTGOING</Direction>
+ <DialogPref>DONOTPROMPT</DialogPref>
+ <BearerSet>WLAN</BearerSet>
+ <IAPRef>IAP.WLANWithDynamicDaemonIP</IAPRef>
+ </ConnectionPreferences>
+ </ConnectionPreferencesTable>
+</CommDB:Config>
--- a/tcpiputils/punycodeconv/te_unittest/group/bld.inf Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/punycodeconv/te_unittest/group/bld.inf Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// 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"
@@ -19,11 +19,14 @@
//-- iby file for the test
./te_unittestidna.iby /epoc32/rom/include/te_unittestidna.iby
-
+#ifdef SIROCCO_CODE_MIGRATION
+../configs/cccccc00_unittestidna.cre z:/testdata/configs/cccccc00_unittestidna.cre
+../scripts/te_unittestidna_wlan.script z:/testdata/scripts/te_unittestidna_wlan.script
+#else
//-- test script files
../scripts/te_unittestidna.script z:/testdata/scripts/te_unittestidna.script
../configs/te_unittestidna.xml z:/testdata/configs/te_unittestidna.xml
-
+#endif
PRJ_TESTMMPFILES
te_unittestidna.mmp
--- a/tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.iby Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.iby Tue Aug 31 16:45:15 2010 +0300
@@ -1,4 +1,4 @@
-// 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"
@@ -20,6 +20,12 @@
#include <punycodeconverter.iby>
file=ABI_DIR\DEBUG_DIR\testidnserver.exe System\bin\testidnserver.exe
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_unittestidna_wlan.script testdata\scripts\te_unittestidna.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\cccccc00_unittestidna.cre testdata\configs\cccccc00_unittestidna.cre
+#else
data=EPOCROOT##epoc32\data\z\testdata\scripts\te_unittestidna.script testdata\scripts\te_unittestidna.script
data=EPOCROOT##epoc32\data\z\testdata\configs\te_unittestidna.xml testdata\configs\te_unittestidna.xml
+#endif
+
#endif //__TE_IDNA_SERVER_IBY__
--- a/tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.mmp Thu Aug 19 11:25:30 2010 +0300
+++ b/tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.mmp Tue Aug 31 16:45:15 2010 +0300
@@ -29,8 +29,8 @@
SOURCE te_unittestidnastepbase.cpp
#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE \epoc32\include\test
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/test
#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SYSTEMINCLUDE /epoc32/include/platform/test
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/punycodeconv/te_unittest/scripts/te_unittestidna_wlan.script Tue Aug 31 16:45:15 2010 +0300
@@ -0,0 +1,167 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//! @file
+//! @SYMTestSuiteName NET-DND-PUNYCODECONVERTER-UNITTEST
+//! @SYMScriptTestEnvironment TEF
+
+PRINT TE_UNITTESTIDNA: Testing International Domain Name Resolution
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+RUN_UTILS MkDir c:\private
+RUN_UTILS MkDir c:\private\10202be9
+RUN_UTILS MkDir c:\private\10202be9\persists
+RUN_UTILS MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+//Configure commdb.
+//ced z:\testdata\configs\te_unittestidna.xml
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_unittestidna.cre c:\private\10202be9\persists\cccccc00.cre
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+
+LOAD_SUITE testidnserver -SharedData
+
+
+
+START_TESTCASE NET-DND-punycodeconverter-unittest01
+//! @SYMTestCaseID NET-DND-punycodeconverter-unittest01
+//! @SYMTestCaseDesc PREQ2296 - REQ11948
+//! Resolve International Domain Name.
+//! @SYMTestPriority Critical
+//! @SYMTestActions Load testidnserver test server.
+//! Test GetByName(IDN) without IDN Enabled
+//! @SYMTestExpectedResults Domain name resolved with KErrDndNameNotFound.
+//! @SYMTestType UT
+//! @SYMCreationDate 6/2/2009
+//! @SYMAuthor ahamedrafik
+//! @SYMTestStatus 3. Released
+RUN_TEST_STEP testidnserver TestIdna01
+END_TESTCASE NET-DND-punycodeconverter-unittest01
+
+
+START_TESTCASE NET-DND-punycodeconverter-unittest02
+//! @SYMTestCaseID NET-DND-punycodeconverter-unittest02
+//! @SYMTestCaseDesc PREQ2296 - REQ11948, REQ 12163
+//! Resolve International Domain Name.
+//! @SYMTestPriority Critical
+//! @SYMTestActions Load testidnserver test server.
+//! Test GetByName(IDN) with IDN Enabled
+//! @SYMTestExpectedResults Domain name resolved successfully.
+//! @SYMTestType UT
+//! @SYMCreationDate 6/2/2009
+//! @SYMAuthor ahamedrafik
+//! @SYMTestStatus 3. Released
+RUN_TEST_STEP testidnserver TestIdna02
+END_TESTCASE NET-DND-punycodeconverter-unittest02
+
+
+START_TESTCASE NET-DND-punycodeconverter-unittest03
+//! @SYMTestCaseID NET-DND-punycodeconverter-unittest03
+//! @SYMTestCaseDesc PREQ2296 - REQ11948
+//! Resolve Address for IDN.
+//! @SYMTestPriority Critical
+//! @SYMTestActions Load testidnserver test server.
+//! Test GetByAddress for an IDN without IDN Enabled
+//! @SYMTestExpectedResults Address resolved successfully.
+//! @SYMTestType UT
+//! @SYMCreationDate 6/2/2009
+//! @SYMAuthor ahamedrafik
+//! @SYMTestStatus 3. Released
+RUN_TEST_STEP testidnserver TestIdna03
+END_TESTCASE NET-DND-punycodeconverter-unittest03
+
+
+START_TESTCASE NET-DND-punycodeconverter-unittest04
+//! @SYMTestCaseID NET-DND-punycodeconverter-unittest04
+//! @SYMTestCaseDesc PREQ2296 - REQ11948, REQ 12163
+//! Resolve Address for IDN.
+//! @SYMTestPriority Critical
+//! @SYMTestActions Load testidnserver test server.
+//! Test GetByAddress for an IDN with IDN Enabled
+//! @SYMTestExpectedResults Address resolved successfully.
+//! @SYMTestType UT
+//! @SYMCreationDate 6/2/2009
+//! @SYMAuthor ahamedrafik
+//! @SYMTestStatus 3. Released
+RUN_TEST_STEP testidnserver TestIdna04
+END_TESTCASE NET-DND-punycodeconverter-unittest04
+
+
+START_TESTCASE NET-DND-punycodeconverter-unittest05
+//! @SYMTestCaseID NET-DND-punycodeconverter-unittest05
+//! @SYMTestCaseDesc PREQ2296 - REQ12162
+//! Resolve IDN in UTF16 encoding
+//! @SYMTestPriority Critical
+//! @SYMTestActions Load testidnserver test server.
+//! Test GetByName(IDN in UTF-16) without IDN Enabled
+//! @SYMTestExpectedResults Domain name resolved successfully.
+//! @SYMTestType UT
+//! @SYMCreationDate 6/2/2009
+//! @SYMAuthor ahamedrafik
+//! @SYMTestStatus 3. Released
+RUN_TEST_STEP testidnserver TestIdna05
+END_TESTCASE NET-DND-punycodeconverter-unittest05
+
+
+START_TESTCASE NET-DND-punycodeconverter-unittest06
+//! @SYMTestCaseID NET-DND-punycodeconverter-unittest06
+//! @SYMTestCaseDesc PREQ2296 - 11950
+//! Convert UCS2.0 encoding to Punycode.
+//! @SYMTestPriority Critical
+//! @SYMTestActions Load testidnserver test server.
+//! Test IDN to Punycode Conversion functionality.
+//! @SYMTestExpectedResults Conversion done successfully.
+//! @SYMTestType UT
+//! @SYMCreationDate 6/2/2009
+//! @SYMAuthor ahamedrafik
+//! @SYMTestStatus 3. Released
+RUN_TEST_STEP testidnserver TestIdna06
+END_TESTCASE NET-DND-punycodeconverter-unittest06
+
+
+START_TESTCASE NET-DND-punycodeconverter-unittest07
+//! @SYMTestCaseID NET-DND-punycodeconverter-unittest07
+//! @SYMTestCaseDesc PREQ2296 - REQ11951
+//! Convert punycode to UCS2.0 encoding.
+//! @SYMTestPriority Critical
+//! @SYMTestActions Load testidnserver test server.
+//! Test Punycode to IDN Conversion functionality.
+//! @SYMTestExpectedResults Domain name resolved successfully.
+//! @SYMTestType UT
+//! @SYMCreationDate 6/2/2009
+//! @SYMAuthor ahamedrafik
+//! @SYMTestStatus 3. Released
+RUN_TEST_STEP testidnserver TestIdna07
+END_TESTCASE NET-DND-punycodeconverter-unittest07
+
+
+START_TESTCASE NET-DND-punycodeconverter-unittest08
+//! @SYMTestCaseID NET-DND-punycodeconverter-unittest08
+//! @SYMTestCaseDesc PREQ2296 - REQ11949
+//! Load the New library.
+//! @SYMTestPriority Critical
+//! @SYMTestActions Load te_punycodeconverter test server
+//! Load the punycodeconverter library.
+//! @SYMTestExpectedResults Punycodeconverter library loaded succesfully.
+//! @SYMTestType UT
+//! @SYMCreationDate 6/2/2009
+//! @SYMAuthor ahamedrafik
+//! @SYMTestStatus 3. Released
+RUN_TEST_STEP testidnserver TestIdna08
+END_TESTCASE NET-DND-punycodeconverter-unittest08
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_stopallinterfaces.script
+RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
+