# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1283439806 -3600
# Node ID e36178c55292c2a75d8660c51e2ab4540316cb68
# Parent  8d540f55e4913b659111b52efdd94c307aaa9a01# Parent  36cc450aad1253fc025fc0744b380720f137195d
Merge RCL_3 fixes with reverted delivery

diff -r 36cc450aad12 -r e36178c55292 esockapiextensions/internetsockets/inc/in_sock.h
diff -r 36cc450aad12 -r e36178c55292 linklayercontrol/networkinterfacemgr/agentprcore/inc/CAgentAdapter.h
diff -r 36cc450aad12 -r e36178c55292 linklayercontrol/networkinterfacemgr/agentprcore/inc/agentscpr.h
diff -r 36cc450aad12 -r e36178c55292 linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp
diff -r 36cc450aad12 -r e36178c55292 linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp
diff -r 36cc450aad12 -r e36178c55292 linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpractivities.cpp
diff -r 36cc450aad12 -r e36178c55292 linklayercontrol/networkinterfacemgr/agentprcore/src/agentscprstates.cpp
diff -r 36cc450aad12 -r e36178c55292 linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcprstates.cpp
diff -r 36cc450aad12 -r e36178c55292 linklayercontrol/networkinterfacemgr/inc/nifman_internal.h
diff -r 36cc450aad12 -r e36178c55292 linklayercontrol/networkinterfacemgr/netcfgext/src/netcfgextnotify.cpp
diff -r 36cc450aad12 -r e36178c55292 linklayercontrol/nullagt/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 linklayercontrol/nullagt/src/NullAgent.cpp
diff -r 36cc450aad12 -r e36178c55292 linklayerprotocols/ethernetnif/EthInt/Ethbase.cpp
diff -r 36cc450aad12 -r e36178c55292 linklayerprotocols/pppnif/te_ppp/te_pppcomp/src/dummyPppFsm.cpp
diff -r 36cc450aad12 -r e36178c55292 linklayerprotocols/pppnif/te_ppp/te_pppcomp/src/dummyPppMisc.cpp
diff -r 36cc450aad12 -r e36178c55292 linklayerprotocols/pppnif/te_ppp/te_vjcomp/src/dummyPppFsm.cpp
diff -r 36cc450aad12 -r e36178c55292 linklayerprotocols/pppnif/te_ppp/te_vjcomp/src/dummyPppMisc.cpp
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/ipnetworklayer/addressinfohook/src/hookaddrinfo.cpp
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/ipnetworklayer/inc/IPProtoCPR.h
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/ipnetworklayer/inc/IPProtoMCpr.h
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/ipnetworklayer/src/IPProtoCprStates.cpp
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/ipnetworklayer/src/IPProtoMCpr.cpp
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/ipnetworklayer/src/IPProtoSCPR.cpp
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/ipnetworklayer/src/IPProtoTierManagerSelector.cpp
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/ipnetworklayer/src/ipprotodeftscprstates.cpp
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/iptransportlayer/inc/ipcpr_states.h
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/iptransportlayer/src/ipcpr_activities.cpp
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/iptransportlayer/src/ipcpr_states.cpp
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 networkcontrol/qosipscpr/inc/ip_subconparams.h
diff -r 36cc450aad12 -r e36178c55292 networkingsrv_info/networkingrom/group/NetworkTest.iby
diff -r 36cc450aad12 -r e36178c55292 networkingsrv_info/networkingrom/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/ipprobe/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/ipprobe/group/networking_probe.mrp
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/ipprobe/group/probe.iby
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/ipprobe/group/probe.mmp
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/ipprobe/inc/family.h
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/ipprobe/inc/prt.h
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/ipprobe/inc/sap.h
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/ipprobe/src/family.cpp
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/ipprobe/src/prt.cpp
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/ipprobe/src/sap.cpp
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingintegrationtest/Group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingintegrationtest/Group/integrationtest.iby
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingintegrationtest/Te_Http/src/TeInit.cpp
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingintegrationtest/Te_Msg/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingintegrationtest/Te_Msg/group/te_msg.iby
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingintegrationtest/Te_Msg/src/TeMsgStep.cpp
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg.ini
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingintegrationtest/te_Sblp/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingintegrationtest/te_Sblp/group/te_SblpSuite.iby
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingunittest/dummynif_params/group/dummynif_params.mmp
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingunittest/eabi/dummyetelu.def
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingunittest/group/DummyNifProtos.mmp
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingunittest/tdummyetel/etelQoS.cpp
diff -r 36cc450aad12 -r e36178c55292 networkingtestandutils/networkingunittest/tdummyetel/etelpckt.cpp
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/dnsproxy/test/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/dnsproxy/test/group/t_dnsproxy.iby
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/dnsproxy/test/group/t_dnsproxy.mmp
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/dnsproxy/test/src/hacked_servers.cpp
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/dnsproxy/test/src/t_dnsproxymain.cpp
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/ipeventnotifier/IPEventFactory/group/IPEventFactory.iby
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/ipeventnotifier/IPEventTypes/group/IPEventTypes.iby
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/ipeventnotifier/group/ipeventnotifier.iby
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/ipeventnotifier/src/DHCPUnicastTranslator.cpp
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/iphook/inhook6/inc/res_sock.h
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/iphook/inhook6/include/in_bind.h
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/tcpipv4v6prt/data/tcpip.eka2.ini
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/tcpipv4v6prt/data/tcpip.wins.ini
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/tcpipv4v6prt/group/tcpip6.mmp
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/tcpipv4v6prt/inc/inet.h
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/tcpipv4v6prt/inc/tcp.h
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/tcpipv4v6prt/src/iface.cpp
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/tcpipv4v6prt/src/in_trans.cpp
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/tcpipv4v6prt/src/inet.cpp
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/tcpipv4v6prt/src/res.cpp
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/tcpipv4v6prt/src/tcp.cpp
diff -r 36cc450aad12 -r e36178c55292 networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/group/ipsec.iby
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsec6/group/ipsec6.iby
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsec6/group/ipsec6.mmp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsec6/inc/sa_spec.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsec6/inc/spdb.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsec6/src/key_msg.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsec6/src/sa_crypt.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsec6/src/sc_prt6.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsec6/src/spdb.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsec_itest/group/ts_ipsec.iby
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipseccrypto/group/ipseccrypto.iby
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipseccrypto/src/ipseccrypto_prt.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsecpol/group/ipsecpol.iby
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsecpol/group/ipsecpol.mmp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsecpol/inc/ipsecpol.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsecpol/inc/ipsecpolmanhandler.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsecpol/src/ipsecpolmanconflict.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsecpol/src/ipsecpolmanhandler.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsecpol/src/ipsecpolmansession.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsecpol/src/ipsecpolmanutil.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsecpolapi/bwins/IPSECPOLAPIU.DEF
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsecpolapi/eabi/ipsecpolapiU.DEF
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsecpolapi/inc/ipsecpolapi.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/ipsecpolapi/src/ipsecpolapi.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/lib_pfkey/include/lib_pfkey.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/ipsec/te_ipsec/group/t_ipsec.mmp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/group/BLD.INF
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/group/SSL.MMP
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/group/ts_tls.iby
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/group/ts_tls.mmp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/protocol/tlsconnection.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/secsock/SecureSocketInterface.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/test/te_tlsunittest/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/ts_tls/COMINIT.CPP
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/ts_tls/T_Autossl_Const.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/ts_tls/T_TLS_cntrl.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/ts_tls/T_TLS_cntrl.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/ts_tls/T_TLS_test.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/ts_tls/T_TLS_test.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tls/ts_tls/scripts/ssl_ntras_30.script
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tlsprovider/Test/group/TlsProvtestServer.iby
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tlsprovider/Test/group/TlsProvtestServer.mmp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tlsprovider/Test/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tlsprovider/Test/tlstest2/startupcommsstep.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tlsprovider/group/swtlstokentypeplugin.mmp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tlsprovider/group/tlsprovider.mmp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tlsprovider/inc/tlsprovider.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tlsprovider/inc/tlstypedef.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tlsprovider/inc/tlstypedef_internal.h
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp
diff -r 36cc450aad12 -r e36178c55292 networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/group/DHCPServ.iby
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/group/DHCPServ.mmp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/group/NetCfgExtnDhcp.iby
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/include/DHCPIP4Msg.h
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/include/DHCPIP4StateMachine.h
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/include/DHCPStateMachine.h
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/include/DHCP_Std.h
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/src/DHCPIP4Msg.cpp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/src/DHCPIP4StateMachine.cpp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/src/DHCPIP6StateMachine.cpp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/src/DHCPStateMachine.cpp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/te_dhcp/bld.inf
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/te_dhcp/src/te_dhcpTestServer.cpp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/te_dhcp/te_dhcpTestServer.iby
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/te_unittest/dhcpservtest.cpp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dhcp/te_unittest/dhcpservtest.mmp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/Test/Group/BLD.INF
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/data/resolver.ini
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/inc/dnd_ini.h
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/inc/dns.h
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/inc/dns_sock.h
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/inc/engine.h
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/inc/listener.h
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/inc/servers.h
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/src/dns.cpp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/src/dns_sock.cpp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/src/engine.cpp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/src/resolver.cpp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/dnd/src/servers.cpp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/punycodeconv/te_punycodeconverter/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.iby
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.mmp
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/punycodeconv/te_unittest/group/bld.inf
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.iby
diff -r 36cc450aad12 -r e36178c55292 tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.mmp