diff -r 5da8188e392b -r ae47d0499bee datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ.cfg
--- a/datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ.cfg	Tue Aug 24 14:43:02 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_RConnectionServ/configs/RConnectionServ.cfg	Mon Sep 06 13:49:23 2010 +0100
@@ -179,18 +179,15 @@
 [LANBearer]
 ADD_SECTION
 # COMMDB_ID = 1
-	Name=Ethernet
-	IfName=ethint
-	LDDFilename=enet
-	LDDName=Ethernet
-	PDDFilename=ethernet
-	PDDName=Ethernet.Wins
-	PacketDriverName=EtherPkt.drv
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=not used
+	PDDName=not used
 	LastSocketActivityTimeout=-1
 	LastSessionClosedTimeout=-1
 	LastSocketClosedTimeout=-1
-	Agent=nullagt.agt
-	FIELD_COUNT=11
+	Agent=wlanagt.agt
+	FIELD_COUNT=8
 END_ADD
 
 
@@ -271,6 +268,11 @@
 ## GlobalSettings
 ## 
 [GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=Link.TierTable.2048
+	FIELD_COUNT=1
+END_TEMPLATE
+
 ADD_SECTION
 # COMMDB_ID = 1
 	Name=DefaultRecordName-1
@@ -288,8 +290,7 @@
 	MaxMBufHeap=2
 	DefaultNetwork=1
 	BearerAvailabilityCheckTSY=mm
-	DefaultTier=Link.TierTable.2048
-	FIELD_COUNT=16
+	FIELD_COUNT=15
 END_ADD
 
 
@@ -382,18 +383,21 @@
 [LANService]
 ADD_SECTION
 # COMMDB_ID = 1
-	Name=Ethernet
+	Name=WlanConnectivity
 	IfNetworks=ip
-	IpNetMask=0.0.0.0
+	IpNetMask=255.255.255.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
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
 	ConfigDaemonManagerName=NetCfgExtnDhcp
 	ConfigDaemonName=!DhcpServ
-	FIELD_COUNT=11
+	FIELD_COUNT=14
 END_ADD
 
 ############################################################
@@ -408,7 +412,7 @@
 	MCpr=MCprTable.8
 	AccessPointSelectionPolicy=0
 	Cpr=CprTable.3
-	CprConfig=1
+	CprConfig=3
 	SCpr=SCprTable.3
 	Protocol=ProtocolTable.8
 	AppSID=0
@@ -418,14 +422,14 @@
 ADD_SECTION
 # COMMDB_ID = 2
 	Id=2
-	Name=dummynif2MappedFromIAP2
+	Name=wlannifMappedFromIAP2
 	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.8
+	MCpr=MCprTable.4
 	AccessPointSelectionPolicy=0
 	Cpr=CprTable.3
-	CprConfig=2
+	CprConfig=0
 	SCpr=SCprTable.3
-	Protocol=ProtocolTable.8
+	Protocol=ProtocolTable.4
 	AppSID=0
 	FIELD_COUNT=10
 END_ADD
@@ -599,7 +603,7 @@
 ADD_SECTION
 # COMMDB_ID = 2
 	Id=2
-	Name=ethint
+	Name=wlannif
 	Tier=Link.TierTable.271064565
 	MCpr=MCprTable.4
 	Cpr=CprTable.3
@@ -716,7 +720,7 @@
 	IAPServiceType=DialOutISP
 	IAPService=2
 	IAPBearerType=ModemBearer
-	IAPBearer=5
+	IAPBearer=8
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -725,11 +729,11 @@
 
 ADD_SECTION
 # COMMDB_ID = 2
-	Name=cdgdummy2
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=6
+	Name=cdgwifi
+	IAPServiceType=LANService
+	IAPService=1
+	IAPBearerType=LANBearer
+	IAPBearer=1
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -762,13 +766,14 @@
 	FIELD_COUNT=8
 END_ADD
 
+
 ############################################################
 ## APPrioritySelectionPolicyTable
 ## 
 [APPrioritySelectionPolicyTable]
 ADD_SECTION
 # COMMDB_ID = 1
-  	Id=1
+    Id=1
 	Name=SelectionPolicy1
 	AP1=Link.AccessPointTable.22
 	AP2=Link.AccessPointTable.24
@@ -778,7 +783,7 @@
 
 ADD_SECTION
 # COMMDB_ID = 2
-  	Id=2
+    Id=2
 	Name=SelectionPolicy2
 	AP1=Link.AccessPointTable.24
 	AP2=Link.AccessPointTable.26
@@ -788,7 +793,7 @@
 
 ADD_SECTION
 # COMMDB_ID = 3
-  	Id=3
+    Id=3
 	Name=SelectionPolicy3
 	AP1=Link.AccessPointTable.28
 	APCOUNT=1
@@ -869,10 +874,9 @@
 
 ADD_SECTION
 # COMMDB_ID = 4
-	Id=4
-	Name=ethmcpr
-	MCprUid=271064572
-	FIELD_COUNT=3
+	Name=wlanmcpr
+	MCprUid=536982226
+	FIELD_COUNT=2
 END_ADD
 
 ADD_SECTION
@@ -993,7 +997,7 @@
 # COMMDB_ID = 5
 	Id=5
 	Name=pppscpr
-	SCprUid=271065852
+	SCprUid=0x102822FC
 	FIELD_COUNT=3
 END_ADD
 
@@ -1001,7 +1005,7 @@
 # COMMDB_ID = 6
 	Id=6
 	Name=vanillascpr
-	SCprUid=271065844
+	SCprUid=0x102822F4
 	FIELD_COUNT=3
 END_ADD
 
@@ -1009,7 +1013,7 @@
 # COMMDB_ID = 7
 	Id=7
 	Name=qosscpr
-	SCprUid=271065811
+	SCprUid=0x102822D3
 	FIELD_COUNT=3
 END_ADD
 
@@ -1017,7 +1021,7 @@
 # COMMDB_ID = 8
 	Id=8
 	Name=ipqosprotoscpr
-	SCprUid=271065816
+	SCprUid=271010839
 	FIELD_COUNT=3
 END_ADD
 
@@ -1051,10 +1055,9 @@
 
 ADD_SECTION
 # COMMDB_ID = 4
-	Id=4
-	Name=ethernet
-	ProtocolUid=271064539
-	FIELD_COUNT=3
+	Name=wlan
+	ProtocolUid=536982227
+	FIELD_COUNT=2
 END_ADD
 
 ADD_SECTION