--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionntras.xml Tue Aug 24 14:43:02 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionntras.xml Mon Sep 06 13:49:23 2010 +0100
@@ -33,6 +33,9 @@
<Name>NT RAS</Name>
</Network>
<Network operation="add">
+ <Name>Intranet</Name>
+ </Network>
+ <Network operation="add">
<Name>Linux</Name>
</Network>
<Network operation="add">
@@ -99,12 +102,12 @@
<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>
+ <Name>WlanConnectivity</Name>
+ <IAPService>LANService.WlanConnectivity</IAPService>
+ <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+ <IAPNetwork>Network.Intranet</IAPNetwork>
+ <IAPNetworkWeighting>0</IAPNetworkWeighting>
+ <LocationRef>Location.Office Direct Dial</LocationRef>
</IAP>
<IAP operation="add">
<Name>Virtual Comm port</Name>
@@ -138,15 +141,6 @@
<IAPNetworkWeighting>0</IAPNetworkWeighting>
<LocationRef>Location.Office</LocationRef>
</IAP>
- <IAP operation="add">
- <Name>NT RAS Static Dns</Name>
- <IAPService>DialOutISP.NT RAS Static Dns</IAPService>
- <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
- <IAPNetwork>Network.NT RAS</IAPNetwork>
- <IAPNetworkWeighting>0</IAPNetworkWeighting>
- <LocationRef>Location.Office</LocationRef>
- </IAP>
-
</IAPTable>
<ModemBearerTable>
@@ -626,25 +620,34 @@
<LANBearerTable>
<LANBearer operation="add">
- <Name>Dummy LAN Bearer</Name>
- <Agent>PSD.agt</Agent>
- <IfName>ppp</IfName>
- <LDDName>Dummy LDD</LDDName>
- <PDDName>Dummy PDD</PDDName>
+ <Name>WLANBearer</Name>
+ <IfName>wlannif</IfName>
+ <LDDName>not used</LDDName>
+ <PDDName>not used</PDDName>
+ <LastSocketActivityTimeout>10</LastSocketActivityTimeout>
+ <LastSessionClosedTimeout>10</LastSessionClosedTimeout>
+ <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+ <Agent>wlanagt.agt</Agent>
</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>
+ <Name>WlanConnectivity</Name>
+ <IfNetworks>ip</IfNetworks>
+ <IpNetMask>255.255.255.0</IpNetMask>
+ <IpGateway>0.0.0.0</IpGateway>
+ <IpAddrFromServer>TRUE</IpAddrFromServer>
+ <IpAddr>0.0.0.0</IpAddr>
+ <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+ <IpNameServer1>0.0.0.0</IpNameServer1>
+ <IpNameServer2>0.0.0.0</IpNameServer2>
+ <Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+ <Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+ <Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+ <IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+ <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+ <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
</LANService>
</LANServiceTable>
@@ -750,52 +753,6 @@
<UseEdge>FALSE</UseEdge>
</DialOutISP>
<DialOutISP operation="add">
- <Name>NT RAS Static Dns</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>pass</IfAuthPass>
- <AuthRetries>0</AuthRetries>
- <IfCallbackEnabled>FALSE</IfCallbackEnabled>
- <CallbackTimeout>0</CallbackTimeout>
- <IpNameServer1>192.168.20.2</IpNameServer1>
- <IpNameServer2>192.168.20.2</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>
@@ -968,8 +925,8 @@
<Ranking>1</Ranking>
<Direction>OUTGOING</Direction>
<DialogPref>DONOTPROMPT</DialogPref>
- <BearerSet>CSD</BearerSet>
- <IAPRef>IAP.Actual NT RAS</IAPRef>
+ <BearerSet>LAN</BearerSet>
+ <IAPRef>IAP.WlanConnectivity</IAPRef>
</ConnectionPreferences>
</ConnectionPreferencesTable>
@@ -987,7 +944,7 @@
<LocationForDataAndFax>Location.Office</LocationForDataAndFax>
<LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
<GPRSClassCBearer>GSM</GPRSClassCBearer>
- <DefaultNetwork>Network.NT RAS</DefaultNetwork>
+ <DefaultNetwork>Network.Intranet</DefaultNetwork>
<BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
</GlobalSettings>
</GlobalSettingsTable>