Mercurial Mercurial > oss > FCL > sf > os > commsfw / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge updates to emulator.cfg for winsock RCL_3
authorandy simpson <andrews@symbian.org>
Mon, 25 Oct 2010 11:49:56 +0100
branchRCL_3
changeset 85 7c25be0307fe
parent 84 486e9e9c45a7 (current diff)
parent 81 c34f57d8afa7 (diff)
child 86 9d66deb8dc6f
Merge updates to emulator.cfg for winsock
--- a/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/src/emulator.cfg	Wed Oct 13 15:54:14 2010 +0300
+++ b/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/src/emulator.cfg	Mon Oct 25 11:49:56 2010 +0100
@@ -20,6 +20,17 @@
 	FIELD_COUNT=1
 END_ADD
 
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Operator
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Winsock
+	FIELD_COUNT=1
+END_ADD
 
 ############################################################
 ## ModemBearer
@@ -1220,6 +1231,22 @@
 	FIELD_COUNT=11
 END_ADD
 
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=Winsock
+	IfName=wsocki
+	LDDName=foo
+	PDDName=foo
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	Agent=wsocka.agt
+	FIELD_COUNT=9
+END_ADD
+
+
+
 
 ############################################################
 ## Location
@@ -1941,6 +1968,1051 @@
 	FIELD_COUNT=13
 END_ADD
 
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Winsock
+	IfNetworks=ip,ip6
+	IpGateway=0.0.0.0
+	IpAddrFromServer=FALSE
+	IpAddr=0.0.0.0
+	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
+	FIELD_COUNT=11
+END_ADD
+
+############################################################
+## APPrioritySelectionPolicyTable
+## 
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=20000
+	Name=APSelPolNetworkDefault
+	AP1=Link.AccessPointTable.10003
+	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.10003
+	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
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Name=WinsockMCprFactory
+	MCprUid=270561269
+	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=ipscpr
+	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=w3sock
+	ProtocolUid=270561268
+	FIELD_COUNT=2
+END_ADD
+
+############################################################
+## VirtualBearer
+## 
+[VirtualBearer]
+ADD_TEMPLATE
+	Name=Default VPN Bearer
+	IfName=VPN.nif
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	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
+
+
+############################################################
+## 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 = 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=25100800
+	CustomSelectionPolicy=1
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=2
+	Name=pppMappedFromIAP2
+	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 = 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=pppMappedFromIAP9
+	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 = 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=12
+	Name=ethintMappedFromIAP12
+	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 = 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=12
+	CustomSelectionPolicy=12
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 23
+	Id=13
+	Name=ethintMappedFromIAP13
+	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 = 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=13
+	CustomSelectionPolicy=13
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 25
+	Id=14
+	Name=ethintMappedFromIAP14
+	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 = 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=14
+	CustomSelectionPolicy=14
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 27
+	Id=15
+	Name=ethintMappedFromIAP15
+	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 = 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=15
+	CustomSelectionPolicy=15
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 29
+	Id=16
+	Name=ethintMappedFromIAP16
+	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 = 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=16
+	CustomSelectionPolicy=16
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 249
+	Id=1
+	Name=winsockFromIAP1
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.14
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.11
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+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
+
+
 
 ############################################################
 ## IAP
@@ -1948,25 +3020,25 @@
 [IAP]
 ADD_SECTION
 # COMMDB_ID = 1
-	Name=NT RAS with Null Modem
+	Name=Winsock
+	IAPServiceType=LANService
 	IAPService=2
-	IAPServiceType=DialOutISP
+	IAPBearerType=LANBearer
 	IAPBearer=2
-	IAPBearerType=ModemBearer
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=2
+	IAPNetwork=4
+ 	IAPNetworkWeighting=0
+	Location=4
 	IAPAppSid=0
 	FIELD_COUNT=9
 END_ADD
 
 ADD_SECTION
 # COMMDB_ID = 2
-	Name=CSD IAP PlaceHolder01
-	IAPService=3
+	Name=NT RAS with Null Modem
 	IAPServiceType=DialOutISP
+	IAPService=2
+	IAPBearerType=ModemBearer
 	IAPBearer=2
-	IAPBearerType=ModemBearer
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -1976,11 +3048,11 @@
 
 ADD_SECTION
 # COMMDB_ID = 3
-	Name=CSD IAP PlaceHolder02
-	IAPService=4
+	Name=CSD IAP PlaceHolder01
 	IAPServiceType=DialOutISP
+	IAPService=3
+	IAPBearerType=ModemBearer
 	IAPBearer=2
-	IAPBearerType=ModemBearer
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -1990,25 +3062,25 @@
 
 ADD_SECTION
 # COMMDB_ID = 4
-	Name=GPRS IAP PlaceHolder01
-	IAPService=1
-	IAPServiceType=OutgoingGPRS
-	IAPBearer=8
+	Name=CSD IAP PlaceHolder02
+	IAPServiceType=DialOutISP
+	IAPService=4
 	IAPBearerType=ModemBearer
+	IAPBearer=2
 	IAPNetwork=1
 	IAPNetworkWeighting=0
-	Location=4
+	Location=2
 	IAPAppSid=0
 	FIELD_COUNT=9
 END_ADD
 
 ADD_SECTION
 # COMMDB_ID = 5
-	Name=GPRS IAP PlaceHolder02
-	IAPService=2
+	Name=GPRS IAP PlaceHolder01
 	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
 	IAPBearer=8
-	IAPBearerType=ModemBearer
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=4
@@ -2018,25 +3090,25 @@
 
 ADD_SECTION
 # COMMDB_ID = 6
-	Name=mRouter Rs232
-	IAPService=8
-	IAPServiceType=DialOutISP
-	IAPBearer=12
+	Name=GPRS IAP PlaceHolder02
+	IAPServiceType=OutgoingGPRS
+	IAPService=2
 	IAPBearerType=ModemBearer
-	IAPNetwork=2
+	IAPBearer=8
+	IAPNetwork=1
 	IAPNetworkWeighting=0
-	Location=2
+	Location=4
 	IAPAppSid=0
 	FIELD_COUNT=9
 END_ADD
 
 ADD_SECTION
 # COMMDB_ID = 7
-	Name=mRouter Ir
-	IAPService=8
+	Name=mRouter Rs232
 	IAPServiceType=DialOutISP
-	IAPBearer=13
+	IAPService=8
 	IAPBearerType=ModemBearer
+	IAPBearer=12
 	IAPNetwork=2
 	IAPNetworkWeighting=0
 	Location=2
@@ -2046,11 +3118,11 @@
 
 ADD_SECTION
 # COMMDB_ID = 8
-	Name=mRouter BT
-	IAPService=8
+	Name=mRouter Ir
 	IAPServiceType=DialOutISP
-	IAPBearer=14
+	IAPService=8
 	IAPBearerType=ModemBearer
+	IAPBearer=13
 	IAPNetwork=2
 	IAPNetworkWeighting=0
 	Location=2
@@ -2060,11 +3132,11 @@
 
 ADD_SECTION
 # COMMDB_ID = 9
-	Name=mRouter USB
-	IAPService=8
+	Name=mRouter BT
 	IAPServiceType=DialOutISP
-	IAPBearer=15
+	IAPService=8
 	IAPBearerType=ModemBearer
+	IAPBearer=14
 	IAPNetwork=2
 	IAPNetworkWeighting=0
 	Location=2
@@ -2074,11 +3146,11 @@
 
 ADD_SECTION
 # COMMDB_ID = 10
-	Name=mRouter Wins
-	IAPService=8
+	Name=mRouter USB
 	IAPServiceType=DialOutISP
-	IAPBearer=11
+	IAPService=8
 	IAPBearerType=ModemBearer
+	IAPBearer=15
 	IAPNetwork=2
 	IAPNetworkWeighting=0
 	Location=2
@@ -2088,12 +3160,12 @@
 
 ADD_SECTION
 # COMMDB_ID = 11
-	Name=VPN IAP
-	IAPService=2
-	IAPServiceType=VpnService
-	IAPBearer=2
-	IAPBearerType=VirtualBearer
-	IAPNetwork=1
+	Name=mRouter Wins
+	IAPServiceType=DialOutISP
+	IAPService=8
+	IAPBearerType=ModemBearer
+	IAPBearer=11
+	IAPNetwork=2
 	IAPNetworkWeighting=0
 	Location=2
 	IAPAppSid=0
@@ -2102,11 +3174,11 @@
 
 ADD_SECTION
 # COMMDB_ID = 12
-	Name=EKA1 Assabet on-board ethernet
-	IAPService=1
-	IAPServiceType=LANService
-	IAPBearer=1
-	IAPBearerType=LANBearer
+	Name=VPN IAP
+	IAPServiceType=VpnService
+	IAPService=2
+	IAPBearerType=VirtualBearer
+	IAPBearer=2
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -2116,11 +3188,11 @@
 
 ADD_SECTION
 # COMMDB_ID = 13
-	Name=EKA2 Assabet on-board ethernet
-	IAPService=1
+	Name=EKA1 Assabet on-board ethernet
 	IAPServiceType=LANService
-	IAPBearer=2
+	IAPService=1
 	IAPBearerType=LANBearer
+	IAPBearer=1
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -2130,11 +3202,11 @@
 
 ADD_SECTION
 # COMMDB_ID = 14
-	Name=EKA1 emulator ethernet
-	IAPService=1
+	Name=EKA2 Assabet on-board ethernet
 	IAPServiceType=LANService
-	IAPBearer=3
+	IAPService=1
 	IAPBearerType=LANBearer
+	IAPBearer=2
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -2144,11 +3216,11 @@
 
 ADD_SECTION
 # COMMDB_ID = 15
-	Name=EKA2 emulator ethernet
-	IAPService=1
+	Name=EKA1 emulator ethernet
 	IAPServiceType=LANService
-	IAPBearer=4
+	IAPService=1
 	IAPBearerType=LANBearer
+	IAPBearer=3
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -2158,11 +3230,25 @@
 
 ADD_SECTION
 # COMMDB_ID = 16
-	Name=WiFi with Daemon Dynamic IP
-	IAPService=2
+	Name=EKA2 emulator ethernet
 	IAPServiceType=LANService
-	IAPBearer=5	
+	IAPService=1
 	IAPBearerType=LANBearer
+	IAPBearer=4
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	IAPAppSid=0
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 17
+	Name=WiFi with Daemon Dynamic IP
+	IAPServiceType=LANService
+	IAPService=2
+	IAPBearerType=LANBearer
+	IAPBearer=5
 	IAPNetwork=1
 	IAPNetworkWeighting=0
 	Location=2
@@ -2176,21 +3262,35 @@
 ## 
 [ConnectionPreferences]
 ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
 	Ranking=0
 	Direction=OUTGOING
+	BearerSet=CSD
+	DialogPref=PROMPT
+	IAP=2
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=DefaultRecordName-2
+	Ranking=1
+	Direction=OUTGOING
+	BearerSet=CSD & LAN & Virtual & WCDMA
+	DialogPref=PROMPT
+	IAP=1
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+	Name=DefaultRecordName-3
+	Ranking=2
+	Direction=OUTGOING
 	DialogPref=PROMPT
 	BearerSet=CSD
-	IAP=1
-	FIELD_COUNT=5
-END_ADD
-
-ADD_SECTION
-	Ranking=1
-	Direction=OUTGOING
-	DialogPref=PROMPT
-	BearerSet=CSD
-	IAP=1
-	FIELD_COUNT=5
+	IAP=2
+	FIELD_COUNT=6
 END_ADD
 
 
@@ -2225,6 +3325,18 @@
 	FIELD_COUNT=7
 END_ADD
 
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Winsock Proxy Settings
+	ISP=2
+	ProxyServiceType=LANService
+	UseProxyServer=FALSE
+	ProxyServerName=www.mycompany.com
+	ProtocolName=http
+	PortNumber=8080
+	FIELD_COUNT=7
+END_ADD
+
 
 ############################################################
 ## AgentLookup
@@ -2249,6 +3361,13 @@
 	FIELD_COUNT=3
 END_ADD
 
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Winsock
+	StartPage=http://www.s60.com/
+	FIELD_COUNT=2
+END_ADD
+
 
 ############################################################
 ## WAPIPBearer
@@ -2274,6 +3393,17 @@
 	FIELD_COUNT=6
 END_ADD
 
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Winsock
+	AccessPointId=1
+	GatewayAddress=0.0.0.0
+	IAP=1
+	WSPOption=CONNECTIONORIENTED
+	ProxyPortNumber=1
+	FIELD_COUNT=6
+END_ADD
+
 
 ############################################################
 ## WAPSMSBearer
FCL/sf/os/commsfw