# HG changeset patch # User hgs # Date 1283151022 -19800 # Node ID ea8d11a88e23df7bd4129724710b4f0790f521dd # Parent 5eca823bbf17c730a0778873c7f8c1f08618b8d9 201033_02 diff -r 5eca823bbf17 -r ea8d11a88e23 networkcontrol/qosipscpr/src/ipscpr.cpp --- a/networkcontrol/qosipscpr/src/ipscpr.cpp Wed Aug 25 09:23:03 2010 +0530 +++ b/networkcontrol/qosipscpr/src/ipscpr.cpp Mon Aug 30 12:20:22 2010 +0530 @@ -719,7 +719,8 @@ iChannelId = -1; /*phoney activity id, so nobody accidentally picks up the response*/ TCFDataClient::TStop dcStop(KErrAbort); - ReceivedL(TNodeId(Id()), TNodeCtxId(EQoSNoInterface, Id()), dcStop); + TInt errValue = (TInt)EQoSNoInterface; + ReceivedL(TNodeId(Id()), TNodeCtxId(errValue, Id()), dcStop); return; } diff -r 5eca823bbf17 -r ea8d11a88e23 networkingsrv_info/networkingrom/group/NetworkTest.iby --- a/networkingsrv_info/networkingrom/group/NetworkTest.iby Wed Aug 25 09:23:03 2010 +0530 +++ b/networkingsrv_info/networkingrom/group/NetworkTest.iby Mon Aug 30 12:20:22 2010 +0530 @@ -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" @@ -41,6 +41,8 @@ #endif +#define __NETWORKING_TEST_OBY__ + #ifdef NW_TEST_ROM_1 REM "NW_TEST_ROM_1": Generated ROM will include test components for running nw1 test group #endif @@ -275,7 +277,7 @@ //#include REM --- NETSTEB PERFORMANCE TEST FRAMEWORK --- -#include +//#include REM --- EAP Tests --- REM #include diff -r 5eca823bbf17 -r ea8d11a88e23 networkingtestandutils/networkingexamples/examplecode/group/bld.inf --- a/networkingtestandutils/networkingexamples/examplecode/group/bld.inf Wed Aug 25 09:23:03 2010 +0530 +++ b/networkingtestandutils/networkingexamples/examplecode/group/bld.inf Mon Aug 30 12:20:22 2010 +0530 @@ -15,4 +15,4 @@ #include "../ipip/group/bld.inf" #include "../tcpdumping/group/bld.inf" -#include "../inetd/group/BLD.INF" +#include "../inetd/group/bld.inf" diff -r 5eca823bbf17 -r ea8d11a88e23 networkingtestandutils/networkingintegrationtest/Te_Msg/group/te_msg.iby --- a/networkingtestandutils/networkingintegrationtest/Te_Msg/group/te_msg.iby Wed Aug 25 09:23:03 2010 +0530 +++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/group/te_msg.iby Mon Aug 30 12:20:22 2010 +0530 @@ -19,6 +19,7 @@ #define __TE_MSG_IBY__ #include +#include file=ABI_DIR\DEBUG_DIR\Te_msg.exe System\libs\te_msg.exe @@ -26,17 +27,10 @@ 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 diff -r 5eca823bbf17 -r ea8d11a88e23 networkprotocols/dnsproxy/dnsproxyserver/src/dnsproxymsgproc.cpp --- a/networkprotocols/dnsproxy/dnsproxyserver/src/dnsproxymsgproc.cpp Wed Aug 25 09:23:03 2010 +0530 +++ b/networkprotocols/dnsproxy/dnsproxyserver/src/dnsproxymsgproc.cpp Mon Aug 30 12:20:22 2010 +0530 @@ -274,7 +274,7 @@ const TUint8* ptr = (aMsg.Ptr() + offset); TPtrC8 ptrc8(aMsg.Ptr() + offset, aMsg.Size() - offset); - qname.Create(ptrc8.Size()); + qname.CreateL(ptrc8.Size()); CleanupClosePushL(qname); qname.Copy(TPtrC8(&ptr[0],ptrc8.Size())); diff -r 5eca823bbf17 -r ea8d11a88e23 networkprotocols/dnsproxy/test/group/bld.inf --- a/networkprotocols/dnsproxy/test/group/bld.inf Wed Aug 25 09:23:03 2010 +0530 +++ b/networkprotocols/dnsproxy/test/group/bld.inf Mon Aug 30 12:20:22 2010 +0530 @@ -44,6 +44,8 @@ ../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 +../testdata/tcpip_4dnxproxy.ini /epoc32/release/winscw/udeb/z/testdata/configs/tcpip_4dnxproxy.ini +../testdata/tcpip_4dnxproxy.ini /epoc32/release/winscw/urel/z/testdata/configs/tcpip_4dnxproxy.ini #ifdef SIROCCO_CODE_MIGRATION ../testdata/cccccc00_dnsproxy1.cre /epoc32/data/z/testdata/configs/cccccc00_dnsproxy1.cre @@ -55,7 +57,6 @@ //-- 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 -../testdata/tcpip_4dnxproxy.ini /epoc32/release/winscw/udeb/z/testdata/configs/tcpip_4dnxproxy.ini ../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 @@ -63,10 +64,9 @@ //urel ../scripts/ns-dnsproxy-main-ops.script /epoc32/release/winscw/urel/z/testdata/scripts/ns-dnsproxy-main-ops.script ../testdata/ns-dnsproxy-maintest-ops.ini /epoc32/release/winscw/urel/z/testdata/scripts/ns-dnsproxy-maintest-ops.ini -../testdata/tcpip_4dnxproxy.ini /epoc32/release/winscw/urel/z/testdata/configs/tcpip_4dnxproxy.ini ../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 #endif -#endif \ No newline at end of file +#endif diff -r 5eca823bbf17 -r ea8d11a88e23 networkprotocols/dnsproxy/test/group/t_dnsproxy.iby --- a/networkprotocols/dnsproxy/test/group/t_dnsproxy.iby Wed Aug 25 09:23:03 2010 +0530 +++ b/networkprotocols/dnsproxy/test/group/t_dnsproxy.iby Mon Aug 30 12:20:22 2010 +0530 @@ -28,6 +28,7 @@ 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 +data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\tcpip_4dnxproxy.ini testdata\configs\tcpip_4dnxproxy.ini #ifdef INCLUDE_SIROCCO_CODE_MIGRATION data=EPOCROOT##epoc32\data\z\testdata\configs\cccccc00_dnsproxy1.cre testdata\configs\cccccc00_dnsproxy1.cre @@ -38,7 +39,6 @@ #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 diff -r 5eca823bbf17 -r ea8d11a88e23 networkprotocols/ipeventnotifier/group/bld.inf --- a/networkprotocols/ipeventnotifier/group/bld.inf Wed Aug 25 09:23:03 2010 +0530 +++ b/networkprotocols/ipeventnotifier/group/bld.inf Mon Aug 30 12:20:22 2010 +0530 @@ -20,8 +20,8 @@ -#include "../IPEventFactory/group/BLD.INF" -#include "../IPEventTypes/group/BLD.INF" +#include "../IPEventFactory/group/bld.inf" +#include "../IPEventTypes/group/bld.inf" #include "../te_IPEventNotifier/group/bld.inf" PRJ_EXPORTS diff -r 5eca823bbf17 -r ea8d11a88e23 networkprotocols/tcpipv4v6prt/group/tcpip6.mmp --- a/networkprotocols/tcpipv4v6prt/group/tcpip6.mmp Wed Aug 25 09:23:03 2010 +0530 +++ b/networkprotocols/tcpipv4v6prt/group/tcpip6.mmp Mon Aug 30 12:20:22 2010 +0530 @@ -49,7 +49,7 @@ OS_LAYER_SYSTEMINCLUDE_SYMBIAN -LIBRARY euser.lib esock.lib esocksvr.lib mbufmgr.lib insock.lib inhook6.lib nifman.lib +LIBRARY euser.lib esock.lib esocksvr.lib mbufmgr.lib insock.lib inhook6.lib nifman.lib hal.lib CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData diff -r 5eca823bbf17 -r ea8d11a88e23 networkprotocols/tcpipv4v6prt/inc/tcp.h --- a/networkprotocols/tcpipv4v6prt/inc/tcp.h Wed Aug 25 09:23:03 2010 +0530 +++ b/networkprotocols/tcpipv4v6prt/inc/tcp.h Mon Aug 30 12:20:22 2010 +0530 @@ -32,6 +32,7 @@ #include "frag.h" #include "inet6log.h" #include +#include #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW #include @@ -49,7 +50,9 @@ // // Constants affecting protocol performance // -const TUint KOneSecondUs = 1000000; //< Help for converting longer times to microseconds +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 KTcpMaximumWindow = 0x3fffffff; //< Maximum receive window size const TUint KTcpMinimumWindow = 1024; //< Minimum receive window size @@ -59,7 +62,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 = 2; //< Transmit at most this many segments at one time. +const TUint KTcpMaxTransmit = 1; //< Transmit at most this many segments at one time. const TUint KTcpMinRTO = 1000000; //< us (1s) const TUint KTcpMaxRTO = 60000000; //< us (60s) @@ -782,13 +785,28 @@ inline TUint32 CProviderTCP6::TimeStamp() { - TTime now; + TInt tickPeriod; + TUint64 ticsInMs; + // + HAL::Get( HAL::ENanoTickPeriod, tickPeriod ); + ticsInMs = (static_cast ( User::NTickCount() ) * tickPeriod) + / KOneMsInUs; + return static_cast ( 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; now.UniversalTime(); #ifdef I64LOW return I64LOW(now.Int64()); #else return (TUint32)now.Int64().GetTInt(); #endif +*/ } /** diff -r 5eca823bbf17 -r ea8d11a88e23 networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp --- a/networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp Wed Aug 25 09:23:03 2010 +0530 +++ b/networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp Mon Aug 30 12:20:22 2010 +0530 @@ -1198,7 +1198,7 @@ // Start linger timer. RSocket::Close() returns when timer // expires or when all data has been succesfully transmitted. // - iLingerTimer->Start(iLinger * KOneSecondUs); + iLingerTimer->Start(iLinger * KOneSecondInUs); } SchedTransmit(); @@ -1788,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 * KOneSecondUs) + if (time_now - iLastTriggeredKeepAlive > KTcpKeepAliveTH * KOneSecondInMs) { iLastTriggeredKeepAlive = time_now; LOG(Log::Printf(_L("\ttcp SAP[%u] CanSend(): Sending a Keep-Alive probe"), (TInt)this)); @@ -2447,7 +2447,7 @@ if (!iLastTimeout) iLastTimeout = usec; - TUint32 distance = (usec - iLastTimeout) / KOneSecondUs; // seconds + TUint32 distance = (usec - iLastTimeout) / KOneSecondInMs; // seconds TUint32 interval = iBackoff ? Protocol()->KeepAliveRxmt() : Protocol()->KeepAliveIntv(); if (distance > interval) @@ -2456,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() * KOneSecondUs); + iRetransTimer->Restart(Protocol()->KeepAliveRxmt() * KOneSecondInUs); } 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 * KOneSecondUs : (distance * KOneSecondUs)); + 1800 * KOneSecondInUs : (distance * KOneSecondInUs)); } } @@ -2472,7 +2472,7 @@ { ASSERT(iRetransTimer); iRetransTimer->Restart((Protocol()->KeepAliveIntv() > 1800) ? - 1800 * KOneSecondUs : (Protocol()->KeepAliveIntv() * KOneSecondUs)); + 1800 * KOneSecondInUs : (Protocol()->KeepAliveIntv() * KOneSecondInUs)); // Backoff is used for counting unacknowledged keepalive retransmissions during idle periods iBackoff = 0; iLastTimeout = TimeStamp(); @@ -3718,6 +3718,13 @@ 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; @@ -3893,6 +3900,9 @@ 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++; @@ -3903,6 +3913,7 @@ iRetryAck = 0; // reset the retry count } } + */ } } diff -r 5eca823bbf17 -r ea8d11a88e23 networksecurity/tls/group/bld.inf --- a/networksecurity/tls/group/bld.inf Wed Aug 25 09:23:03 2010 +0530 +++ b/networksecurity/tls/group/bld.inf Mon Aug 30 12:20:22 2010 +0530 @@ -1,4 +1,4 @@ -// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2000-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" @@ -48,17 +48,67 @@ ../ts_tls/data/certclients_psk.dat z:/testdata/configs/certclients_psk.dat ../ts_tls/data/keys_psk.dat z:/testdata/configs/keys_psk.dat +#ifdef SIROCCO_CODE_MIGRATION +../ts_tls/scripts/ssl_ntras_31_wlan.script z:/testdata/scripts/ssl_ntras_31_wlan.script +../ts_tls/scripts/ssl_ntras_30_wlan.script z:/testdata/scripts/ssl_ntras_30_wlan.script +../ts_tls/scripts/cccccc00_ssl_30.cre z:/testdata/configs/cccccc00_ssl_30.cre +../ts_tls/scripts/tls_oom_wlan.script z:/testdata/scripts/tls_oom_wlan.script +../ts_tls/scripts/tls_psk_wlan.script z:/testdata/scripts/tls_psk_wlan.script +../ts_tls/scripts/cccccc00_tls_psk.cre z:/testdata/configs/cccccc00_tls_psk.cre +#else ../ts_tls/scripts/ssl_ntras_31.script z:/testdata/scripts/ssl_ntras_31.script ../ts_tls/scripts/ssl_ntras_30.script z:/testdata/scripts/ssl_ntras_30.script ../ts_tls/scripts/Tls_ntras.cfg z:/testdata/configs/tls_ntras.cfg ../ts_tls/scripts/tls_oom.script z:/testdata/scripts/tls_oom.script ../ts_tls/scripts/tls_psk.script z:/testdata/scripts/tls_psk.script ../ts_tls/scripts/Tls_ethernet.xml z:/testdata/configs/tls_ethernet.xml - +#endif //SIROCCO_CODE_MIGRATION // tsecdlg input file ../ts_tls/data/tls_t_secdlg_in.dat z:/testdata/configs/tls_t_secdlg_in.dat +#ifdef SIROCCO_CODE_MIGRATION +../ts_tls/scripts/Tls3_wlan.ini z:/testdata/configs/tls3_wlan.ini +../ts_tls/scripts/Tls4_wlan.ini z:/testdata/configs/tls4_wlan.ini +../ts_tls/scripts/Tls5_wlan.ini z:/testdata/configs/tls5_wlan.ini +../ts_tls/scripts/Tls8_wlan.ini z:/testdata/configs/tls8_wlan.ini +../ts_tls/scripts/Tls9_wlan.ini z:/testdata/configs/tls9_wlan.ini +../ts_tls/scripts/Tls11_wlan.ini z:/testdata/configs/tls11_wlan.ini +../ts_tls/scripts/Tls12_wlan.ini z:/testdata/configs/tls12_wlan.ini +../ts_tls/scripts/Tls13_wlan.ini z:/testdata/configs/tls13_wlan.ini +../ts_tls/scripts/Tls14_wlan.ini z:/testdata/configs/tls14_wlan.ini +../ts_tls/scripts/Tls16_wlan.ini z:/testdata/configs/tls16_wlan.ini +../ts_tls/scripts/Tls19_wlan.ini z:/testdata/configs/tls19_wlan.ini +../ts_tls/scripts/Tls20_wlan.ini z:/testdata/configs/tls20_wlan.ini +../ts_tls/scripts/Tls21_wlan.ini z:/testdata/configs/tls21_wlan.ini +../ts_tls/scripts/Tls22_wlan.ini z:/testdata/configs/tls22_wlan.ini +../ts_tls/scripts/Tls23_wlan.ini z:/testdata/configs/tls23_wlan.ini +../ts_tls/scripts/Tls24_wlan.ini z:/testdata/configs/tls24_wlan.ini +../ts_tls/scripts/Tls25_wlan.ini z:/testdata/configs/tls25_wlan.ini +../ts_tls/scripts/Tls26_wlan.ini z:/testdata/configs/tls26_wlan.ini +../ts_tls/scripts/Tls28_wlan.ini z:/testdata/configs/tls28_wlan.ini +../ts_tls/scripts/Tls5b_wlan.ini z:/testdata/configs/tls5b_wlan.ini +../ts_tls/scripts/TlsA_wlan.ini z:/testdata/configs/tlsa_wlan.ini +../ts_tls/scripts/tls2f_wlan.ini z:/testdata/configs/tls2f_wlan.ini +../ts_tls/scripts/tls35_wlan.ini z:/testdata/configs/tls35_wlan.ini +../ts_tls/scripts/Tls36_wlan.ini z:/testdata/configs/tls36_wlan.ini +../ts_tls/scripts/tls37_wlan.ini z:/testdata/configs/tls37_wlan.ini +../ts_tls/scripts/Tls38_wlan.ini z:/testdata/configs/tls38_wlan.ini +../ts_tls/scripts/Tlssa_wlan.ini z:/testdata/configs/tlssa_wlan.ini +../ts_tls/scripts/tls_oom_wlan.ini z:/testdata/configs/tls_oom_wlan.ini +../ts_tls/scripts/tls1_wlan.ini z:/testdata/configs/tls1_wlan.ini +../ts_tls/scripts/tls2_wlan.ini z:/testdata/configs/tls2_wlan.ini +../ts_tls/scripts/TLS_RSA_WITH_NULL_SHA_wlan.ini z:/testdata/configs/tls_rsa_with_null_sha_wlan.ini +../ts_tls/scripts/TLS_RSA_WITH_NULL_MD5_wlan.ini z:/testdata/configs/tls_rsa_with_null_md5_wlan.ini +../ts_tls/scripts/TLS_SNE_SINGLE_SERVER_wlan.ini z:/testdata/configs/tls_sne_single_server_wlan.ini +../ts_tls/scripts/TLS_SNE_MULTIPLE_SERVER_wlan.ini z:/testdata/configs/tls_sne_multiple_server_wlan.ini +../ts_tls/scripts/TLS_PSK_WITH_RC4_128_SHA_wlan.ini z:/testdata/configs/tls_psk_with_rc4_128_sha_wlan.ini +../ts_tls/scripts/TLS_SNE_SINGLE_SERVER_NEG_wlan.ini z:/testdata/configs/tls_sne_single_server_neg_wlan.ini +../ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_wlan.ini z:/testdata/configs/tls_psk_with_aes_128_cbc_sha_wlan.ini +../ts_tls/scripts/TLS_PSK_WITH_AES_256_CBC_SHA_wlan.ini z:/testdata/configs/tls_psk_with_aes_256_cbc_sha_wlan.ini +../ts_tls/scripts/TLS_PSK_WITH_3DES_EDE_CBC_SHA_wlan.ini z:/testdata/configs/tls_psk_with_3des_ede_cbc_sha_wlan.ini +../ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK_wlan.ini z:/testdata/configs/tls_psk_with_aes_128_cbc_sha_nocallback_wlan.ini +#else ../ts_tls/scripts/Tls3.ini z:/testdata/configs/tls3.ini ../ts_tls/scripts/Tls4.ini z:/testdata/configs/tls4.ini ../ts_tls/scripts/Tls5.ini z:/testdata/configs/tls5.ini @@ -99,7 +149,7 @@ ../ts_tls/scripts/TLS_PSK_WITH_AES_256_CBC_SHA.ini z:/testdata/configs/tls_psk_with_aes_256_cbc_sha.ini ../ts_tls/scripts/TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini z:/testdata/configs/tls_psk_with_3des_ede_cbc_sha.ini ../ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini z:/testdata/configs/tls_psk_with_aes_128_cbc_sha_nocallback.ini - +#endif //SIROCCO_CODE_MIGRATION diff -r 5eca823bbf17 -r ea8d11a88e23 tcpiputils/dhcp/te_dhcp/src/te_dhcpTestCommandSteps.cpp --- a/tcpiputils/dhcp/te_dhcp/src/te_dhcpTestCommandSteps.cpp Wed Aug 25 09:23:03 2010 +0530 +++ b/tcpiputils/dhcp/te_dhcp/src/te_dhcpTestCommandSteps.cpp Mon Aug 30 12:20:22 2010 +0530 @@ -86,7 +86,7 @@ { INFO_PRINTF2(_L("Making IAP %d private"),IAPToUseL()); - MakeIAPPrivateL(bRes); + //MakeIAPPrivateL(bRes); } SetTestStepResult(EPass); diff -r 5eca823bbf17 -r ea8d11a88e23 tcpiputils/dnd/src/dns.cpp --- a/tcpiputils/dnd/src/dns.cpp Wed Aug 25 09:23:03 2010 +0530 +++ b/tcpiputils/dnd/src/dns.cpp Mon Aug 30 12:20:22 2010 +0530 @@ -934,7 +934,9 @@ case EDnsRcode_FORMAT_ERROR: return KErrDndFormat; case EDnsRcode_SERVER_FAILURE: - return KErrDndServerFailure; + /*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; case EDnsRcode_NAME_ERROR: return KErrDndBadName; case EDnsRcode_NOT_IMPLEMENTED: